Skip to content

Commit e70bd6e

Browse files
committed
fixing errors
1 parent 30862f4 commit e70bd6e

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

domain/src/commonMain/kotlin/ireader/domain/models/prefs/PreferenceValues.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ object PreferenceValues {
1414
Light,
1515
}
1616

17-
enum class DynamicColorMode {
18-
Off,
19-
On,
20-
}
2117

2218
enum class SecureScreenMode(val titleResId: UiText.MStringResource) {
2319
ALWAYS(UiText.MStringResource(MR.strings.lock_always)),

domain/src/commonMain/kotlin/ireader/domain/preferences/prefs/UiPreferences.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import ireader.core.prefs.getEnum
99
import ireader.domain.models.prefs.PreferenceValues
1010
import java.text.DateFormat
1111
import java.text.SimpleDateFormat
12-
import java.util.*
12+
import java.util.Locale
1313

1414

1515
class UiPreferences(private val preferenceStore: PreferenceStore) {
@@ -18,8 +18,8 @@ class UiPreferences(private val preferenceStore: PreferenceStore) {
1818
return preferenceStore.getEnum("theme_mode", PreferenceValues.ThemeMode.System)
1919
}
2020

21-
fun dynamicColorMode(): Preference<PreferenceValues.DynamicColorMode> {
22-
return preferenceStore.getEnum("dynamic_color_mode", PreferenceValues.DynamicColorMode.Off)
21+
fun dynamicColorMode(): Preference<Boolean> {
22+
return preferenceStore.getBoolean("dynamic_color_mode", false)
2323
}
2424
fun installerMode(): Preference<PreferenceValues.Installer> {
2525
return preferenceStore.getEnum("installer_mode", ireader.domain.models.prefs.PreferenceValues.Installer.AndroidPackageManager)

presentation/src/commonMain/kotlin/ireader/presentation/core/theme/AppThemeViewModel.kt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package ireader.presentation.core.theme
22

33
import androidx.compose.foundation.isSystemInDarkTheme
4-
54
import androidx.compose.material3.ColorScheme
6-
import androidx.compose.runtime.*
5+
import androidx.compose.runtime.Composable
6+
import androidx.compose.runtime.getValue
7+
import androidx.compose.runtime.mutableStateOf
8+
import androidx.compose.runtime.remember
9+
import androidx.compose.runtime.setValue
710
import androidx.compose.ui.graphics.Color
811
import androidx.compose.ui.graphics.luminance
912
import androidx.compose.ui.graphics.takeOrElse
@@ -14,7 +17,11 @@ import ireader.domain.models.prefs.PreferenceValues
1417
import ireader.domain.models.theme.ExtraColors
1518
import ireader.domain.models.theme.Theme
1619
import ireader.domain.preferences.prefs.UiPreferences
17-
import ireader.presentation.ui.core.theme.*
20+
import ireader.presentation.ui.core.theme.asState
21+
import ireader.presentation.ui.core.theme.getDarkColors
22+
import ireader.presentation.ui.core.theme.getLightColors
23+
import ireader.presentation.ui.core.theme.isLight
24+
import ireader.presentation.ui.core.theme.themes
1825
import ireader.presentation.ui.core.ui.PreferenceMutableState
1926
import kotlinx.coroutines.CoroutineScope
2027
import kotlinx.coroutines.SupervisorJob
@@ -61,7 +68,7 @@ class AppThemeViewModel(
6168
}
6269

6370
// Check if dynamic colors should be used
64-
val useDynamicColors = dynamicColorMode == PreferenceValues.DynamicColorMode.On
71+
val useDynamicColors = dynamicColorMode
6572
&& dynamicColorScheme.isSupported()
6673

6774
val material = if (useDynamicColors) {

presentation/src/commonMain/kotlin/ireader/presentation/ui/settings/appearance/AppearanceSettingScreen.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ import ireader.presentation.ui.component.reusable_composable.MidSizeTextComposab
5656
import ireader.presentation.ui.core.theme.AppColors
5757
import ireader.presentation.ui.core.theme.LocalLocalizeHelper
5858
import ireader.presentation.ui.core.theme.isLight
59-
import kotlinx.coroutines.delay
6059
import kotlinx.coroutines.launch
6160

6261
@Composable
@@ -118,13 +117,14 @@ fun AppearanceSettingScreen(
118117
}.Build()
119118
}
120119
item {
121-
Components.Dynamic {
122-
Components.SwitchPreference(
123-
preference = vm.dynamicColorMode,
124-
title = "Material You (Dynamic Colors)",
125-
subtitle = "Adapt colors from your wallpaper (Android 12+)",
126-
)
127-
}.Build()
120+
Components.Switch(
121+
preference = vm.dynamicColorMode,
122+
title = "Material You (Dynamic Colors)",
123+
subtitle = "Adapt colors from your wallpaper (Android 12+)",
124+
onValue = {
125+
126+
}
127+
).Build()
128128
}
129129
item {
130130
Components.Header(

0 commit comments

Comments
 (0)