Clean up preference extensions/items a bit

(cherry picked from commit cf14831fbe6d3b6b07d0fe185194d27d6ac6ae17) # Conflicts: # app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt # app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt # app/src/main/java/eu/kanade/presentation/reader/settings/ReadingModePage.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
2023-07-19 21:57:22 -04:00
parent e9b15ce4a4
commit a447b011d0
33 changed files with 121 additions and 279 deletions
@@ -11,14 +11,13 @@ import androidx.core.graphics.alpha
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
 import androidx.core.graphics.red
-import eu.kanade.presentation.util.collectAsState
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import tachiyomi.core.preference.getAndSet
 import tachiyomi.presentation.core.components.CheckboxItem
 import tachiyomi.presentation.core.components.SettingsChipRow
 import tachiyomi.presentation.core.components.SliderItem
+import tachiyomi.presentation.core.util.collectAsState

@Composable
 internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel) {
@@ -44,10 +43,7 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
    val customBrightness by screenModel.preferences.customBrightness().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_custom_brightness),
-        checked = customBrightness,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::customBrightness)
-        },
+        pref = screenModel.preferences.customBrightness(),
    )

    /**
@@ -71,10 +67,7 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
    val colorFilter by screenModel.preferences.colorFilter().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_custom_color_filter),
-        checked = colorFilter,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::colorFilter)
-        },
+        pref = screenModel.preferences.colorFilter(),
    )
    if (colorFilter) {
        val colorFilterValue by screenModel.preferences.colorFilterValue().collectAsState()
@@ -135,21 +128,13 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
        }
    }

-    val grayscale by screenModel.preferences.grayscale().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_grayscale),
-        checked = grayscale,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::grayscale)
-        },
+        pref = screenModel.preferences.grayscale(),
    )
-    val invertedColors by screenModel.preferences.invertedColors().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_inverted_colors),
-        checked = invertedColors,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::invertedColors)
-        },
+        pref = screenModel.preferences.invertedColors(),
    )
 }

@@ -6,12 +6,11 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.res.stringResource
-import eu.kanade.presentation.util.collectAsState
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import tachiyomi.presentation.core.components.CheckboxItem
 import tachiyomi.presentation.core.components.SettingsChipRow
+import tachiyomi.presentation.core.util.collectAsState

 private val themes = listOf(
    R.string.black_background to 1,
@@ -33,108 +32,65 @@ internal fun ColumnScope.GeneralPage(screenModel: ReaderSettingsScreenModel) {
        }
    }

-    val showPageNumber by screenModel.preferences.showPageNumber().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_show_page_number),
-        checked = showPageNumber,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::showPageNumber)
-        },
+        pref = screenModel.preferences.showPageNumber(),
    )

    // SY -->
    val forceHorizontalSeekbar by screenModel.preferences.forceHorizontalSeekbar().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_force_horz_seekbar),
-        checked = forceHorizontalSeekbar,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::forceHorizontalSeekbar)
-        },
+        pref = screenModel.preferences.forceHorizontalSeekbar(),
    )

    if (!forceHorizontalSeekbar) {
-        val landscapeVerticalSeekbar by screenModel.preferences.landscapeVerticalSeekbar().collectAsState()
        CheckboxItem(
            label = stringResource(R.string.pref_show_vert_seekbar_landscape),
-            checked = landscapeVerticalSeekbar,
-            onClick = {
-                screenModel.togglePreference(ReaderPreferences::landscapeVerticalSeekbar)
-            },
+            pref = screenModel.preferences.landscapeVerticalSeekbar(),
        )

-        val leftVerticalSeekbar by screenModel.preferences.leftVerticalSeekbar().collectAsState()
        CheckboxItem(
            label = stringResource(R.string.pref_left_handed_vertical_seekbar),
-            checked = leftVerticalSeekbar,
-            onClick = {
-                screenModel.togglePreference(ReaderPreferences::leftVerticalSeekbar)
-            },
+            pref = screenModel.preferences.leftVerticalSeekbar(),
        )
    }
    // SY <--

-    val fullscreen by screenModel.preferences.fullscreen().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_fullscreen),
-        checked = fullscreen,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::fullscreen)
-        },
+        pref = screenModel.preferences.fullscreen(),
    )

    // TODO: hide if there's no cutout
-    val cutoutShort by screenModel.preferences.cutoutShort().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_cutout_short),
-        checked = cutoutShort,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::cutoutShort)
-        },
+        pref = screenModel.preferences.cutoutShort(),
    )

-    val keepScreenOn by screenModel.preferences.keepScreenOn().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_keep_screen_on),
-        checked = keepScreenOn,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::keepScreenOn)
-        },
+        pref = screenModel.preferences.keepScreenOn(),
    )

-    val readWithLongTap by screenModel.preferences.readWithLongTap().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_read_with_long_tap),
-        checked = readWithLongTap,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::readWithLongTap)
-        },
+        pref = screenModel.preferences.readWithLongTap(),
    )

-    val alwaysShowChapterTransition by screenModel.preferences.alwaysShowChapterTransition().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_always_show_chapter_transition),
-        checked = alwaysShowChapterTransition,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::alwaysShowChapterTransition)
-        },
+        pref = screenModel.preferences.alwaysShowChapterTransition(),
    )

    // SY -->
-    /*val pageTransitions by screenModel.preferences.pageTransitions().collectAsState()
-    CheckboxItem(
+    /*CheckboxItem(
        label = stringResource(R.string.pref_page_transitions),
-        checked = pageTransitions,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::pageTransitions)
-        },
+        pref = screenModel.preferences.pageTransitions(),
    )*/
-    val useAutoWebtoon by screenModel.preferences.useAutoWebtoon().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.auto_webtoon_mode),
-        checked = useAutoWebtoon,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::useAutoWebtoon)
-        },
+        pref = screenModel.preferences.useAutoWebtoon(),
    )
    // SY <--
 }
@@ -10,7 +10,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.res.stringResource
 import eu.kanade.domain.manga.model.orientationType
 import eu.kanade.domain.manga.model.readingModeType
-import eu.kanade.presentation.util.collectAsState
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
@@ -22,6 +21,7 @@ import tachiyomi.presentation.core.components.CheckboxItem
 import tachiyomi.presentation.core.components.HeadingItem
 import tachiyomi.presentation.core.components.SettingsChipRow
 import tachiyomi.presentation.core.components.SliderItem
+import tachiyomi.presentation.core.util.collectAsState
 import java.text.NumberFormat

 private val readingModeOptions = ReadingModeType.entries.map { it.stringRes to it }
@@ -114,90 +114,56 @@ private fun ColumnScope.PagerViewerSettings(screenModel: ReaderSettingsScreenMod
    }
    // SY <--

-    val cropBorders by screenModel.preferences.cropBorders().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_crop_borders),
-        checked = cropBorders,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::cropBorders)
-        },
+        pref = screenModel.preferences.cropBorders(),
    )

-    val landscapeZoom by screenModel.preferences.landscapeZoom().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_landscape_zoom),
-        checked = landscapeZoom,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::landscapeZoom)
-        },
+        pref = screenModel.preferences.landscapeZoom(),
    )

-    val navigateToPan by screenModel.preferences.navigateToPan().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_navigate_pan),
-        checked = navigateToPan,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::navigateToPan)
-        },
+        pref = screenModel.preferences.navigateToPan(),
    )

    val dualPageSplitPaged by screenModel.preferences.dualPageSplitPaged().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_dual_page_split),
-        checked = dualPageSplitPaged,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::dualPageSplitPaged)
-        },
+        pref = screenModel.preferences.dualPageSplitPaged(),
    )

    if (dualPageSplitPaged) {
-        val dualPageInvertPaged by screenModel.preferences.dualPageInvertPaged().collectAsState()
        CheckboxItem(
            label = stringResource(R.string.pref_dual_page_invert),
-            checked = dualPageInvertPaged,
-            onClick = {
-                screenModel.togglePreference(ReaderPreferences::dualPageInvertPaged)
-            },
+            pref = screenModel.preferences.dualPageInvertPaged(),
        )
    }

    val dualPageRotateToFit by screenModel.preferences.dualPageRotateToFit().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_page_rotate),
-        checked = dualPageRotateToFit,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::dualPageRotateToFit)
-        },
+        pref = screenModel.preferences.dualPageRotateToFit(),
    )

    if (dualPageRotateToFit) {
-        val dualPageRotateToFitInvert by screenModel.preferences.dualPageRotateToFitInvert().collectAsState()
        CheckboxItem(
            label = stringResource(R.string.pref_page_rotate_invert),
-            checked = dualPageRotateToFitInvert,
-            onClick = {
-                screenModel.togglePreference(ReaderPreferences::dualPageRotateToFitInvert)
-            },
+            pref = screenModel.preferences.dualPageRotateToFitInvert(),
        )
    }

    // SY -->
-    val pageTransitionsPager by screenModel.preferences.pageTransitionsPager().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_page_transitions),
-        checked = pageTransitionsPager,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::pageTransitionsPager)
-        },
+        pref = screenModel.preferences.pageTransitionsPager(),
    )

-    val invertDoublePages by screenModel.preferences.invertDoublePages().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.invert_double_pages),
-        checked = invertDoublePages,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::invertDoublePages)
-        },
+        pref = screenModel.preferences.invertDoublePages(),
    )

    val centerMarginType by screenModel.preferences.centerMarginType().collectAsState()
@@ -240,84 +206,51 @@ private fun ColumnScope.WebtoonViewerSettings(screenModel: ReaderSettingsScreenM
        },
    )

-    val cropBordersWebtoon by screenModel.preferences.cropBordersWebtoon().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_crop_borders),
-        checked = cropBordersWebtoon,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::cropBordersWebtoon)
-        },
+        pref = screenModel.preferences.cropBordersWebtoon(),
    )

    // SY -->
-    val smoothAutoScroll by screenModel.preferences.smoothAutoScroll().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_smooth_scroll),
-        checked = smoothAutoScroll,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::smoothAutoScroll)
-        },
+        pref = screenModel.preferences.smoothAutoScroll(),
    )

-    val pageTransitionsWebtoon by screenModel.preferences.pageTransitionsWebtoon().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_page_transitions),
-        checked = pageTransitionsWebtoon,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::pageTransitionsWebtoon)
-        },
+        pref = screenModel.preferences.pageTransitionsWebtoon(),
    )

-    val webtoonEnableZoomOut by screenModel.preferences.webtoonEnableZoomOut().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.enable_zoom_out),
-        checked = webtoonEnableZoomOut,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::webtoonEnableZoomOut)
-        },
+        pref = screenModel.preferences.webtoonEnableZoomOut(),
    )
    // SY <--

    val dualPageSplitWebtoon by screenModel.preferences.dualPageSplitWebtoon().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_dual_page_split),
-        checked = dualPageSplitWebtoon,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::dualPageSplitWebtoon)
-        },
+        pref = screenModel.preferences.dualPageSplitWebtoon(),
    )

    if (dualPageSplitWebtoon) {
-        val dualPageInvertWebtoon by screenModel.preferences.dualPageInvertWebtoon()
-            .collectAsState()
        CheckboxItem(
            label = stringResource(R.string.pref_dual_page_invert),
-            checked = dualPageInvertWebtoon,
-            onClick = {
-                screenModel.togglePreference(ReaderPreferences::dualPageInvertWebtoon)
-            },
+            pref = screenModel.preferences.dualPageInvertWebtoon(),
        )
    }

    if (!isReleaseBuildType) {
-        val longStripSplitWebtoon by screenModel.preferences.longStripSplitWebtoon()
-            .collectAsState()
        CheckboxItem(
            label = stringResource(R.string.pref_long_strip_split),
-            checked = longStripSplitWebtoon,
-            onClick = {
-                screenModel.togglePreference(ReaderPreferences::longStripSplitWebtoon)
-            },
+            pref = screenModel.preferences.longStripSplitWebtoon(),
        )
    }

-    val webtoonDoubleTapZoomEnabled by screenModel.preferences.webtoonDoubleTapZoomEnabled().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_double_tap_zoom),
-        checked = webtoonDoubleTapZoomEnabled,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::webtoonDoubleTapZoomEnabled)
-        },
+        pref = screenModel.preferences.webtoonDoubleTapZoomEnabled(),
    )
 }

@@ -326,13 +259,9 @@ private fun ColumnScope.WebtoonViewerSettings(screenModel: ReaderSettingsScreenM
 private fun ColumnScope.WebtoonWithGapsViewerSettings(screenModel: ReaderSettingsScreenModel) {
    HeadingItem(R.string.vertical_plus_viewer)

-    val cropBordersContinuousVertical by screenModel.preferences.cropBordersContinuousVertical().collectAsState()
    CheckboxItem(
        label = stringResource(R.string.pref_crop_borders),
-        checked = cropBordersContinuousVertical,
-        onClick = {
-            screenModel.togglePreference(ReaderPreferences::cropBordersContinuousVertical)
-        },
+        pref = screenModel.preferences.cropBordersContinuousVertical(),
    )
 }
 // SY <--