fix: Reset font size box when resetting to defaults

aniyomiorg · Oct 22, 2023 · f5436a4 · f5436a4
1 parent f35aafb
commit f5436a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/app/src/main/java/eu/kanade/presentation/components/SettingsItems.kt b/app/src/main/java/eu/kanade/presentation/components/SettingsItems.kt
@@ -30,7 +30,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -193,7 +192,7 @@ fun OutlinedNumericChooser(
     min: Int? = null,
     onValueChanged: (Int) -> Unit,
 ) {
-    var currentValue by rememberSaveable { mutableStateOf(value) }
+    var currentValue = value
 
     val updateValue: (Boolean) -> Unit = {
         currentValue += if (it) step else -step

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/subtitle/SubtitleFontPage.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/subtitle/SubtitleFontPage.kt
@@ -43,6 +43,10 @@ private fun SubtitleFont(
 ) {
     val boldSubtitles by screenModel.preferences.boldSubtitles().collectAsState()
     val italicSubtitles by screenModel.preferences.italicSubtitles().collectAsState()
+    val subtitleFontSize by screenModel.preferences.subtitleFontSize().collectAsState()
+    val textColor by screenModel.preferences.textColorSubtitles().collectAsState()
+    val borderColor by screenModel.preferences.borderColorSubtitles().collectAsState()
+    val backgroundColor by screenModel.preferences.backgroundColorSubtitles().collectAsState()
 
     val updateBold = {
         val toBold = if (boldSubtitles) "no" else "yes"
@@ -56,10 +60,6 @@ private fun SubtitleFont(
         MPVLib.setPropertyString("sub-italic", toItalicize)
     }
 
-    val textColorPref = screenModel.preferences.textColorSubtitles()
-    val borderColorPref = screenModel.preferences.borderColorSubtitles()
-    val backgroundColorPref = screenModel.preferences.backgroundColorSubtitles()
-
     val onSizeChanged: (Int) -> Unit = {
         MPVLib.setPropertyInt("sub-font-size", it)
         screenModel.preferences.subtitleFontSize().set(it)
@@ -84,7 +84,7 @@ private fun SubtitleFont(
                 label = stringResource(id = R.string.player_font_size_text_field),
                 placeholder = "55",
                 suffix = "",
-                value = screenModel.preferences.subtitleFontSize().get(),
+                value = subtitleFontSize,
                 step = 1,
                 min = 1,
                 onValueChanged = onSizeChanged,
@@ -112,11 +112,11 @@ private fun SubtitleFont(
         }
 
         SubtitlePreview(
-            isBold = screenModel.preferences.boldSubtitles().collectAsState().value,
-            isItalic = screenModel.preferences.italicSubtitles().collectAsState().value,
-            textColor = Color(textColorPref.collectAsState().value),
-            borderColor = Color(borderColorPref.collectAsState().value),
-            backgroundColor = Color(backgroundColorPref.collectAsState().value),
+            isBold = boldSubtitles,
+            isItalic = italicSubtitles,
+            textColor = Color(textColor),
+            borderColor = Color(borderColor),
+            backgroundColor = Color(backgroundColor),
         )
     }
 }