small improvement in sample

InsanusMokrassar · Aug 8, 2023 · d0e108d · d0e108d
1 parent a1816d3
commit d0e108d
Show file tree

Hide file tree

Showing 31 changed files with 18 additions and 19 deletions.
diff --git a/...owercase()}}/src/main/AndroidManifest.xml → ...e()}}/src/androidMain/AndroidManifest.xml b/...owercase()}}/src/main/AndroidManifest.xml → ...e()}}/src/androidMain/AndroidManifest.xml
diff --git a/...case()}}/src/main/kotlin/AndroidPlugin.kt → ...}/src/androidMain/kotlin/AndroidPlugin.kt b/...case()}}/src/main/kotlin/AndroidPlugin.kt → ...}/src/androidMain/kotlin/AndroidPlugin.kt
diff --git a/...otlin/ui/{{.ui_mvvm_name}}ViewFragment.kt → ...otlin/ui/{{.ui_mvvm_name}}ViewFragment.kt b/...otlin/ui/{{.ui_mvvm_name}}ViewFragment.kt → ...otlin/ui/{{.ui_mvvm_name}}ViewFragment.kt
diff --git a/core/src/main/AndroidManifest.xml → core/src/androidMain/AndroidManifest.xml b/core/src/main/AndroidManifest.xml → core/src/androidMain/AndroidManifest.xml
diff --git a/.../src/main/kotlin/AndroidNavigationHost.kt → ...droidMain/kotlin/AndroidNavigationHost.kt b/.../src/main/kotlin/AndroidNavigationHost.kt → ...droidMain/kotlin/AndroidNavigationHost.kt
diff --git a/core/src/main/kotlin/AndroidSPConfigsRepo.kt → ...ndroidMain/kotlin/AndroidSPConfigsRepo.kt b/core/src/main/kotlin/AndroidSPConfigsRepo.kt → ...ndroidMain/kotlin/AndroidSPConfigsRepo.kt
diff --git a/...rc/main/kotlin/FragmentsClassesFactory.kt → ...oidMain/kotlin/FragmentsClassesFactory.kt b/...rc/main/kotlin/FragmentsClassesFactory.kt → ...oidMain/kotlin/FragmentsClassesFactory.kt
diff --git a/core/src/main/kotlin/PackageInfo.kt → core/src/androidMain/kotlin/PackageInfo.kt b/core/src/main/kotlin/PackageInfo.kt → core/src/androidMain/kotlin/PackageInfo.kt
diff --git a/core/src/main/kotlin/TagExtensions.kt → core/src/androidMain/kotlin/TagExtensions.kt b/core/src/main/kotlin/TagExtensions.kt → core/src/androidMain/kotlin/TagExtensions.kt
diff --git a/...n/kotlin/fragments/AndroidFragmentNode.kt → ...n/kotlin/fragments/AndroidFragmentNode.kt b/...n/kotlin/fragments/AndroidFragmentNode.kt → ...n/kotlin/fragments/AndroidFragmentNode.kt
diff --git a/...fragments/AndroidNavigationNodeFactory.kt → ...fragments/AndroidNavigationNodeFactory.kt b/...fragments/AndroidNavigationNodeFactory.kt → ...fragments/AndroidNavigationNodeFactory.kt
diff --git a/...src/main/kotlin/fragments/NodeFragment.kt → ...roidMain/kotlin/fragments/NodeFragment.kt b/...src/main/kotlin/fragments/NodeFragment.kt → ...roidMain/kotlin/fragments/NodeFragment.kt
diff --git a/...s/view/NavigationFragmentContainerView.kt → ...s/view/NavigationFragmentContainerView.kt b/...s/view/NavigationFragmentContainerView.kt → ...s/view/NavigationFragmentContainerView.kt
diff --git a/core/src/main/res/values/attrs.xml → core/src/androidMain/res/values/attrs.xml b/core/src/main/res/values/attrs.xml → core/src/androidMain/res/values/attrs.xml
diff --git a/defaultAndroidSettings.gradle b/defaultAndroidSettings.gradle
@@ -55,10 +55,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
     sourceSets {
         String sep = File.separator
         main.java.srcDirs += "src${sep}main${sep}kotlin"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
 
-kotlin = "1.8.22"
+kotlin = "1.9.0"
 kotlin-coroutines = "1.7.3"
 kotlin-serialization = "1.5.1"
 dokka = "1.8.20"
 
-microutils = "0.19.8"
-kslog = "1.1.1"
-uuid = "0.7.1"
+microutils = "0.20.0"
+kslog = "1.2.0"
+uuid = "0.8.0"
 
-koin = "3.4.2"
+koin = "3.4.3"
 compose = "1.4.3"
 
 dexcount = "4.0.0"

diff --git a/mppProjectWithSerialization.gradle b/mppProjectWithSerialization.gradle
@@ -43,7 +43,7 @@ kotlin {
                 implementation libs.kotlin.test.junit
             }
         }
-        androidTest {
+        androidUnitTest {
             dependencies {
                 implementation libs.kotlin.test.junit
                 implementation libs.android.test.junit

diff --git a/mvvm/src/main/AndroidManifest.xml → mvvm/src/androidMain/AndroidManifest.xml b/mvvm/src/main/AndroidManifest.xml → mvvm/src/androidMain/AndroidManifest.xml
diff --git a/mvvm/src/main/kotlin/InitNavigation.kt → .../src/androidMain/kotlin/InitNavigation.kt b/mvvm/src/main/kotlin/InitNavigation.kt → .../src/androidMain/kotlin/InitNavigation.kt
diff --git a/.../kotlin/NavigationFragmentComposePlace.kt → .../kotlin/NavigationFragmentComposePlace.kt b/.../kotlin/NavigationFragmentComposePlace.kt → .../kotlin/NavigationFragmentComposePlace.kt
diff --git a/.../kotlin/NavigationFragmentInfoProvider.kt → .../kotlin/NavigationFragmentInfoProvider.kt b/.../kotlin/NavigationFragmentInfoProvider.kt → .../kotlin/NavigationFragmentInfoProvider.kt
diff --git a/...in/kotlin/NavigationMVVMSingleActivity.kt → ...in/kotlin/NavigationMVVMSingleActivity.kt b/...in/kotlin/NavigationMVVMSingleActivity.kt → ...in/kotlin/NavigationMVVMSingleActivity.kt
diff --git a/mvvm/src/main/kotlin/ViewFragment.kt → mvvm/src/androidMain/kotlin/ViewFragment.kt b/mvvm/src/main/kotlin/ViewFragment.kt → mvvm/src/androidMain/kotlin/ViewFragment.kt
diff --git a/mvvm/src/main/res/layout/activity_main.xml → .../androidMain/res/layout/activity_main.xml b/mvvm/src/main/res/layout/activity_main.xml → .../androidMain/res/layout/activity_main.xml
diff --git a/sample/src/main/AndroidManifest.xml → sample/src/androidMain/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml → sample/src/androidMain/AndroidManifest.xml
diff --git a/sample/src/main/kotlin/AndroidPlugin.kt → ...e/src/androidMain/kotlin/AndroidPlugin.kt b/sample/src/main/kotlin/AndroidPlugin.kt → ...e/src/androidMain/kotlin/AndroidPlugin.kt
diff --git a/sample/src/main/kotlin/MainActivity.kt → ...le/src/androidMain/kotlin/MainActivity.kt b/sample/src/main/kotlin/MainActivity.kt → ...le/src/androidMain/kotlin/MainActivity.kt
diff --git a/sample/src/main/kotlin/ui/LoadingFragment.kt → .../androidMain/kotlin/ui/LoadingFragment.kt b/sample/src/main/kotlin/ui/LoadingFragment.kt → .../androidMain/kotlin/ui/LoadingFragment.kt
diff --git a/.../main/kotlin/ui/NavigationViewFragment.kt → ...dMain/kotlin/ui/NavigationViewFragment.kt b/.../main/kotlin/ui/NavigationViewFragment.kt → ...dMain/kotlin/ui/NavigationViewFragment.kt
@@ -1,16 +1,19 @@
 package dev.inmo.navigation.sample.ui
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Button
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.KeyboardArrowDown
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import dev.inmo.navigation.core.NavigationNodeState
 import dev.inmo.navigation.mvvm.NavigationFragmentComposePlace
 import dev.inmo.navigation.mvvm.ViewFragment
 import dev.inmo.navigation.sample.R
@@ -26,34 +29,34 @@ class NavigationViewFragment : ViewFragment<NavigationViewModel, NavigationViewC
     override fun BoxScope.Content() {
         Column {
             Row {
-                Text(config.text, Modifier.align(Alignment.CenterVertically))
+                Text(config.text, Modifier.align(Alignment.CenterVertically), color = MaterialTheme.colorScheme.primary)
                 IconButton(
                     {
                         viewModel.back()
                     },
                     Modifier.align(Alignment.CenterVertically)
                 ) {
-                    Text(stringResource(R.string.back))
+                    Text(stringResource(R.string.back), color = MaterialTheme.colorScheme.primary)
                 }
                 IconButton(
                     {
                         viewModel.createSubChain()
                     },
                     Modifier.align(Alignment.CenterVertically)
                 ) {
-                    Text(stringResource(R.string.subchain))
+                    Text(stringResource(R.string.subchain), color = MaterialTheme.colorScheme.primary)
                 }
                 IconButton(
                     {
                         viewModel.createNextNode()
                     },
                     Modifier.align(Alignment.CenterVertically)
                 ) {
-                    Text(stringResource(R.string.forward))
+                    Text(stringResource(R.string.forward), color = MaterialTheme.colorScheme.primary)
                 }
             }
             Column {
-                viewModel.subnodesIds.forEach {
+                for (it in viewModel.subnodesIds) {
                     NavigationFragmentComposePlace(it)
                 }
             }

diff --git a/sample/src/main/res/layout/activity_main.xml → .../androidMain/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml → .../androidMain/res/layout/activity_main.xml
diff --git a/sample/src/main/res/values/strings.xml → ...le/src/androidMain/res/values/strings.xml b/sample/src/main/res/values/strings.xml → ...le/src/androidMain/res/values/strings.xml