From 3d5e3620dd4497e0f35e93b5128a9d92807ba62b Mon Sep 17 00:00:00 2001
From: GG Bond <whatever@tagkong.com>
Date: Thu, 7 Mar 2024 21:58:03 +0800
Subject: [PATCH] Restore dep behaviour in ReaderModeSetting

---
 .../ehviewer/ui/reader/ReaderModeSetting.kt   | 58 +++++++++++--------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderModeSetting.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderModeSetting.kt
index 0bf545560..5ca47f062 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderModeSetting.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderModeSetting.kt
@@ -1,5 +1,6 @@
 package com.hippo.ehviewer.ui.reader
 
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -53,32 +54,40 @@ private fun PagerSetting() = Column {
         modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
         color = MaterialTheme.colorScheme.onSurfaceVariant,
     )
+    val pagerNav = Settings.readerPagerNav.asMutableState()
     SpinnerChoice(
         title = stringResource(id = R.string.pref_viewer_nav),
         entries = stringArrayResource(id = R.array.pager_nav),
         values = arrayOf("0", "1", "2", "3", "4", "5"),
-        field = Settings.readerPagerNav.asMutableState(),
-    )
-    SpinnerChoice(
-        title = stringResource(id = R.string.pref_read_with_tapping_inverted),
-        entries = stringArrayResource(id = R.array.invert_tapping_mode),
-        values = arrayOf("0", "1", "2", "3"),
-        field = Settings.readerWebtoonNavInverted.asMutableState(),
-    )
-    SwitchChoice(
-        title = stringResource(id = R.string.pref_navigate_pan),
-        field = Settings.navigateToPan.asMutableState(),
+        field = pagerNav,
     )
+    AnimatedVisibility(visible = pagerNav.value != 5) {
+        Column {
+            SpinnerChoice(
+                title = stringResource(id = R.string.pref_read_with_tapping_inverted),
+                entries = stringArrayResource(id = R.array.invert_tapping_mode),
+                values = arrayOf("0", "1", "2", "3"),
+                field = Settings.readerWebtoonNavInverted.asMutableState(),
+            )
+            SwitchChoice(
+                title = stringResource(id = R.string.pref_navigate_pan),
+                field = Settings.navigateToPan.asMutableState(),
+            )
+        }
+    }
+    val scaleType = Settings.imageScaleType.asMutableState()
     SpinnerChoice(
         title = stringResource(id = R.string.pref_image_scale_type),
         entries = stringArrayResource(id = R.array.image_scale_type),
         values = arrayOf("1", "2", "3", "4", "5", "6"),
-        field = Settings.imageScaleType.asMutableState(),
-    )
-    SwitchChoice(
-        title = stringResource(id = R.string.pref_landscape_zoom),
-        field = Settings.landscapeZoom.asMutableState(),
+        field = scaleType,
     )
+    AnimatedVisibility(visible = scaleType.value == 1) {
+        SwitchChoice(
+            title = stringResource(id = R.string.pref_landscape_zoom),
+            field = Settings.landscapeZoom.asMutableState(),
+        )
+    }
     SpinnerChoice(
         title = stringResource(id = R.string.pref_zoom_start),
         entries = stringArrayResource(id = R.array.zoom_start),
@@ -98,18 +107,21 @@ private fun WebtoonSetting() = Column {
         modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
         color = MaterialTheme.colorScheme.onSurfaceVariant,
     )
+    val webtoonNav = Settings.readerWebtoonNav.asMutableState()
     SpinnerChoice(
         title = stringResource(id = R.string.pref_viewer_nav),
         entries = stringArrayResource(id = R.array.webtoon_nav),
         values = arrayOf("0", "1", "2", "3", "4", "5"),
-        field = Settings.readerWebtoonNav.asMutableState(),
-    )
-    SpinnerChoice(
-        title = stringResource(id = R.string.pref_read_with_tapping_inverted),
-        entries = stringArrayResource(id = R.array.invert_tapping_mode),
-        values = arrayOf("0", "1", "2", "3"),
-        field = Settings.readerWebtoonNavInverted.asMutableState(),
+        field = webtoonNav,
     )
+    AnimatedVisibility(visible = webtoonNav.value != 5) {
+        SpinnerChoice(
+            title = stringResource(id = R.string.pref_read_with_tapping_inverted),
+            entries = stringArrayResource(id = R.array.invert_tapping_mode),
+            values = arrayOf("0", "1", "2", "3"),
+            field = Settings.readerWebtoonNavInverted.asMutableState(),
+        )
+    }
     SpinnerChoice(
         title = stringResource(id = R.string.pref_webtoon_side_padding),
         entries = stringArrayResource(id = R.array.webtoon_side_padding),