Skip to content
This repository was archived by the owner on Apr 23, 2026. It is now read-only.

Commit f0c26a0

Browse files
committed
fix: theme blinking on start
1 parent dfef442 commit f0c26a0

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

app/src/main/java/com/eps/todoturtle/preferences/logic/data/AppPreferences.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ import kotlinx.serialization.Serializable
55
@Serializable
66
data class AppPreferences(
77
val mute: Boolean = false,
8-
val theme: Themes = Themes.Amber,
8+
val theme: Themes = Themes.Default,
99
)

app/src/main/java/com/eps/todoturtle/ui/theme/Theme.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,18 @@ val ColorScheme.onFormContainer: Color
5757

5858
@Composable
5959
fun ToDoTurtleTheme(
60-
preferences: DataStore<AppPreferences>,
60+
storage: DataStore<AppPreferences>,
6161
useDarkTheme: Boolean = isSystemInDarkTheme(),
6262
content: @Composable () -> Unit,
6363
) {
64-
when (preferences.data.collectAsState(initial = AppPreferences()).value.theme) {
64+
val preferences: AppPreferences? = storage.data.collectAsState(null).value
65+
when (preferences?.theme) {
6566
Themes.Greenish -> GreenishTheme(useDarkTheme, content)
6667
Themes.Cold -> ColdTheme(useDarkTheme, content)
6768
Themes.ColdDark -> ColdDarkTheme(useDarkTheme, content)
6869
Themes.Amber -> AmberTheme(useDarkTheme, content)
6970
Themes.Magenta -> MagentaTheme(useDarkTheme, content)
7071
Themes.Default -> DefaultTheme(useDarkTheme, content)
72+
else -> {}
7173
}
7274
}

0 commit comments

Comments
 (0)