From eb5c2afa60284eb47375d76bcf2755e469692ce8 Mon Sep 17 00:00:00 2001 From: FunkyMuse Date: Fri, 6 Oct 2023 09:56:44 +0200 Subject: [PATCH 1/4] fix: language color and upgrade to gradle 8.4 --- .../com/simplemobiletools/thankyou/screens/SettingsScreen.kt | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt b/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt index 049b5cf..61929d6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt +++ b/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt @@ -54,6 +54,7 @@ internal fun SettingsScreen( value = displayLanguage, doOnPreferenceClick = onSetupLanguagePress, preferenceLabelColor = SimpleTheme.colorScheme.onSurface, + preferenceValueColor = SimpleTheme.colorScheme.onSurface, ) } SettingsCheckBoxComponent( diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ad77464..accc7f3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip From abe4d59e0a6b525cbeca4d2fcc615c3880180488 Mon Sep 17 00:00:00 2001 From: FunkyMuse Date: Fri, 6 Oct 2023 09:57:04 +0200 Subject: [PATCH 2/4] build: bump compose versions --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a67edab..909e350 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,10 +4,10 @@ kotlin = "1.9.10" #Simple tools simple-commons = "543593cc03" #Compose -composeActivity = "1.8.0-rc01" -compose = "1.6.0-alpha06" +composeActivity = "1.8.0" +compose = "1.6.0-alpha07" composeCompiler = "1.5.3" -composeMaterial3 = "1.2.0-alpha08" +composeMaterial3 = "1.2.0-alpha09" #Androidx androidx-customView = "1.2.0-alpha02" androidx-customViewPooling = "1.0.0" From dd2cd0fdfe56cdc6176fbd8567e41d82aaa0be82 Mon Sep 17 00:00:00 2001 From: FunkyMuse Date: Fri, 6 Oct 2023 12:29:10 +0200 Subject: [PATCH 3/4] fix: alpha of preference value --- .../com/simplemobiletools/thankyou/screens/SettingsScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt b/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt index 61929d6..20c22db 100644 --- a/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt +++ b/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt @@ -54,7 +54,7 @@ internal fun SettingsScreen( value = displayLanguage, doOnPreferenceClick = onSetupLanguagePress, preferenceLabelColor = SimpleTheme.colorScheme.onSurface, - preferenceValueColor = SimpleTheme.colorScheme.onSurface, + preferenceValueColor = SimpleTheme.colorScheme.onSurface.copy(alpha = 0.7f), ) } SettingsCheckBoxComponent( From 99402fe742cd881d2a5a65b69f83b7697f30f0fa Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Fri, 6 Oct 2023 12:35:06 +0200 Subject: [PATCH 4/4] Update SettingsScreen.kt --- .../com/simplemobiletools/thankyou/screens/SettingsScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt b/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt index 20c22db..849d9f3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt +++ b/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt @@ -54,7 +54,7 @@ internal fun SettingsScreen( value = displayLanguage, doOnPreferenceClick = onSetupLanguagePress, preferenceLabelColor = SimpleTheme.colorScheme.onSurface, - preferenceValueColor = SimpleTheme.colorScheme.onSurface.copy(alpha = 0.7f), + preferenceValueColor = SimpleTheme.colorScheme.onSurface.copy(alpha = 0.6f), ) } SettingsCheckBoxComponent(