Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix sample changing material on iOS #3

Merged
merged 1 commit into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion theme/theme-prefs/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
Loading