Merge pull request #3 from artikhon/master

fix sample changing material on iOS
softartdev · Nov 15, 2024 · 4f2fb9e · 4f2fb9e
2 parents 79fb821 + 321b0cd
commit 4f2fb9e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,8 +11,8 @@ buildscript {
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["kotlin_version"]}")
         classpath("org.jetbrains.kotlin:compose-compiler-gradle-plugin:${rootProject.extra["kotlin_version"]}")
-        classpath("com.android.tools.build:gradle:8.7.0")
-        classpath("org.jetbrains.compose:compose-gradle-plugin:1.6.11")
+        classpath("com.android.tools.build:gradle:8.7.2")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:1.7.1")
     }
 }
 allprojects {

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=io.github.softartdev
-VERSION=0.9.0
+VERSION=0.9.2
 
 org.gradle.jvmargs=-Xmx16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx16g" -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
 org.gradle.parallel=true

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Thu Oct 10 19:33:03 GET 2024
+#Wed Nov 13 14:00:34 GET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -30,7 +30,7 @@ kotlin {
 
         androidMain.dependencies {
             implementation(compose.preview)
-            implementation("androidx.activity:activity-compose:1.9.1")
+            implementation("androidx.activity:activity-compose:1.9.3")
         }
         commonMain.dependencies {
             api(project(":theme:theme-material"))

diff --git a/sample/src/commonMain/kotlin/com/softartdev/shared/AppState.kt b/sample/src/commonMain/kotlin/com/softartdev/shared/AppState.kt
@@ -51,6 +51,6 @@ object AppState {
             }
         }
 
-    val changeMaterialCallback: (Boolean) -> Unit = { showMaterial3.value = it }
+    val changeMaterialCallback: (Boolean) -> Unit = showMaterial3::value::set
     val switchMaterialCallback: () -> Unit = { showMaterial3.value = !showMaterial3.value }
 }
diff --git a/sample/src/commonMain/kotlin/com/softartdev/shared/material/MaterialApp.kt b/sample/src/commonMain/kotlin/com/softartdev/shared/material/MaterialApp.kt
@@ -21,7 +21,8 @@ fun MaterialApp(
 ) = PreferableMaterialTheme { // provides composition locals
     NavHost(
         navController = navController,
-        startDestination = AppNavGraph.Settings.name,
+        startDestination = navController.currentDestination?.route ?: AppNavGraph.Settings.name,
+        route = "MaterialApp"
     ) {
         composable(route = AppNavGraph.Settings.name) {
             SettingsBody(

diff --git a/sample/src/commonMain/kotlin/com/softartdev/shared/material3/Material3App.kt b/sample/src/commonMain/kotlin/com/softartdev/shared/material3/Material3App.kt
@@ -21,7 +21,8 @@ fun Material3App(
 ) = PreferableMaterialTheme { // provides composition locals
     NavHost(
         navController = navController,
-        startDestination = AppNavGraph.Settings.name,
+        startDestination = navController.currentDestination?.route ?: AppNavGraph.Settings.name,
+        route = "Material3App"
     ) {
         composable(route = AppNavGraph.Settings.name) {
             SettingsBody(

diff --git a/theme/theme-prefs/build.gradle.kts b/theme/theme-prefs/build.gradle.kts
@@ -27,7 +27,7 @@ kotlin {
         commonMain.dependencies {
             api(compose.runtime)
             api(compose.components.resources)
-            implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
+            implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
         }
         commonTest.dependencies {
             implementation(kotlin("test"))