diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt index 5a769312b..e3110f726 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt @@ -3169,11 +3169,7 @@ class ReadBookViewModel( } private fun toggleDayNight() { - val nextMode = when (ThemeConfig.themeMode) { - "0" -> "1" // follow system → light - "1" -> "2" // light → dark - else -> "0" // dark → follow system - } + val nextMode = if (ReadConfig.isNightTheme) "1" else "2" ThemeConfig.themeMode = nextMode _uiState.update { it.copy(styleConfig = buildStyleConfig()) } _effects.tryEmit(ReadBookEffect.UpdateReadViewConfig( diff --git a/app/src/main/java/io/legado/app/ui/book/read/sheet/GlobalThemePage.kt b/app/src/main/java/io/legado/app/ui/book/read/sheet/GlobalThemePage.kt index bf0d2fae3..ed8d8afb0 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/sheet/GlobalThemePage.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/sheet/GlobalThemePage.kt @@ -21,7 +21,6 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add -import androidx.compose.material.icons.filled.BrightnessAuto import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.DarkMode import androidx.compose.material.icons.filled.GridView @@ -51,7 +50,6 @@ import io.legado.app.model.ReadBook import io.legado.app.ui.book.read.ConfigUpdate import io.legado.app.ui.book.read.ReadBookIntent import io.legado.app.ui.book.read.ReadBookStyleConfig -import io.legado.app.ui.config.themeConfig.ThemeConfig import io.legado.app.ui.theme.LegadoTheme import io.legado.app.ui.theme.fadingEdge import io.legado.app.ui.widget.components.button.series.SmallTonalButton @@ -155,14 +153,10 @@ fun GlobalThemePage( color = LegadoTheme.colorScheme.onSurfaceVariant, ) } - val themeMode = ThemeConfig.themeMode + val isNightTheme = LegadoTheme.isDark SmallTonalButton( onClick = onToggleDayNight, - icon = when (themeMode) { - "1" -> Icons.Default.LightMode - "2" -> Icons.Default.DarkMode - else -> Icons.Default.BrightnessAuto - }, + icon = if (isNightTheme) Icons.Default.DarkMode else Icons.Default.LightMode, contentColor = LegadoTheme.colorScheme.onSurfaceVariant, containerColor = LegadoTheme.colorScheme.surfaceContainerHigh, selectedContainerColor = LegadoTheme.colorScheme.surfaceContainerHigh,