Skip to content

Commit

Permalink
Merge pull request #56 from stslex/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
stslex authored Sep 10, 2023
2 parents fdb619b + 21b874e commit c49e63b
Show file tree
Hide file tree
Showing 267 changed files with 2,136 additions and 814 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/testReportJob.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: code-coverage-report
path: /*/build/reports/kover/project-html
path: app/build/reports/kover/project-html

saveReport:
name: SaveReport
Expand Down
7 changes: 1 addition & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
/.idea
.DS_Store
/build
/captures
Expand Down
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

123 changes: 0 additions & 123 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/compiler.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/deploymentTargetDropDown.xml

This file was deleted.

42 changes: 0 additions & 42 deletions .idea/gradle.xml

This file was deleted.

30 changes: 0 additions & 30 deletions .idea/jarRepositories.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/kotlinc.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/migrations.xml

This file was deleted.

47 changes: 0 additions & 47 deletions .idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dependencies {
implementation(project(":core:navigation"))
implementation(project(":feature:home"))
implementation(project(":feature:edit"))
implementation(project(":feature:edit-label"))
}

android.namespace = "com.stslex93.notes"
4 changes: 3 additions & 1 deletion app/src/main/java/com/stslex93/notes/ui/NavigationHost.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import com.stslex93.notes.core.navigation.model.AppDestination
import com.stslex93.notes.feature.edit.ui.init.editGraph
import com.stslex93.notes.feature.home.ui.init.homeGraph
import com.stslex93.notes.feature.edit_label.navigation.graph.editLabelGraph
import com.stslex93.notes.feature.home.navigation.homeGraph

@Composable
fun NavigationHost(
Expand All @@ -20,5 +21,6 @@ fun NavigationHost(
) {
homeGraph(modifier)
editGraph(modifier)
editLabelGraph(modifier)
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
7
0
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationComposePlugin$apply$lambda$0$$inlined$getByType$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationComposePlugin.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationPlugin$apply$1$2$1$1$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationPlugin$apply$1$2$1$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationPlugin$apply$1$2$1$2$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationPlugin$apply$1$2$1$2$2.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationPlugin$apply$1$2$1$2.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationPlugin$apply$1$2.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationPlugin$apply$lambda$1$$inlined$configure$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationPlugin$inlined$sam$i$org_gradle_api_Action$0.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationPlugin.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidApplicationPluginKt.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidLibraryComposePlugin$apply$lambda$0$$inlined$getByType$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidLibraryComposePlugin.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidLibraryPlugin$apply$1$2$1$1$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidLibraryPlugin$apply$1$2$1$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidLibraryPlugin$apply$1$2.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidLibraryPlugin$apply$lambda$1$$inlined$configure$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidLibraryPlugin$inlined$sam$i$org_gradle_api_Action$0.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AndroidLibraryPlugin.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/AppVersion.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/AndroidComposeKt$configureAndroidCompose$$inlined$getByType$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/AndroidComposeKt$configureAndroidCompose$1$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/AndroidComposeKt$configureAndroidCompose$2$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/AndroidComposeKt$configureAndroidCompose$2.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/AndroidComposeKt.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/KotlinAndroidKt$configureKotlin$1$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/KotlinAndroidKt$configureKotlin$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/KotlinAndroidKt$configureKotlinAndroid$$inlined$getByType$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/KotlinAndroidKt$configureKotlinAndroid$1$1.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/KotlinAndroidKt$configureKotlinAndroid$1$2.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/KotlinAndroidKt$configureKotlinAndroid$2.class:/Users/stslex/StudioProjects/Notes/build-logic/dependencies/build/classes/kotlin/main/com/stslex93/notes/KotlinAndroidKt.class
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=AndroidApplicationComposePlugin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=AndroidApplicationPlugin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=AndroidLibraryComposePlugin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=AndroidLibraryPlugin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=AndroidApplicationComposePlugin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=AndroidApplicationPlugin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=AndroidLibraryComposePlugin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=AndroidLibraryPlugin
2 changes: 2 additions & 0 deletions build-logic/dependencies/build/tmp/jar/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Manifest-Version: 1.0

4 changes: 2 additions & 2 deletions build-logic/dependencies/src/main/kotlin/AppVersion.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
object AppVersion {
const val VERSION_CODE = 16
const val VERSION_NAME = "1.16"
const val VERSION_CODE = 17
const val VERSION_NAME = "1.17"
}
Loading

0 comments on commit c49e63b

Please sign in to comment.