|
@@ -1,6 +1,8 @@
|
|
|
package eu.kanade.presentation.reader.settings
|
|
|
|
|
|
import androidx.compose.foundation.layout.ColumnScope
|
|
|
+import androidx.compose.material3.FilterChip
|
|
|
+import androidx.compose.material3.Text
|
|
|
import androidx.compose.runtime.Composable
|
|
|
import androidx.compose.runtime.collectAsState
|
|
|
import androidx.compose.runtime.getValue
|
|
@@ -18,7 +20,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer
|
|
|
import eu.kanade.tachiyomi.util.system.isReleaseBuildType
|
|
|
import tachiyomi.presentation.core.components.CheckboxItem
|
|
|
import tachiyomi.presentation.core.components.HeadingItem
|
|
|
-import tachiyomi.presentation.core.components.SelectItem
|
|
|
+import tachiyomi.presentation.core.components.SettingsChipRow
|
|
|
import tachiyomi.presentation.core.components.SliderItem
|
|
|
import java.text.NumberFormat
|
|
|
|
|
@@ -32,21 +34,25 @@ internal fun ColumnScope.ReadingModePage(screenModel: ReaderSettingsScreenModel)
|
|
|
val manga by screenModel.mangaFlow.collectAsState()
|
|
|
|
|
|
val readingMode = remember(manga) { ReadingModeType.fromPreference(manga?.readingModeType?.toInt()) }
|
|
|
- SelectItem(
|
|
|
- label = stringResource(R.string.pref_category_reading_mode),
|
|
|
- options = readingModeOptions.map { stringResource(it.first) }.toTypedArray(),
|
|
|
- selectedIndex = readingModeOptions.indexOfFirst { it.second == readingMode },
|
|
|
- ) {
|
|
|
- screenModel.onChangeReadingMode(readingModeOptions[it].second)
|
|
|
+ SettingsChipRow(R.string.pref_category_reading_mode) {
|
|
|
+ readingModeOptions.map { (stringRes, it) ->
|
|
|
+ FilterChip(
|
|
|
+ selected = it == readingMode,
|
|
|
+ onClick = { screenModel.onChangeReadingMode(it) },
|
|
|
+ label = { Text(stringResource(stringRes)) },
|
|
|
+ )
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
val orientationType = remember(manga) { OrientationType.fromPreference(manga?.orientationType?.toInt()) }
|
|
|
- SelectItem(
|
|
|
- label = stringResource(R.string.rotation_type),
|
|
|
- options = orientationTypeOptions.map { stringResource(it.first) }.toTypedArray(),
|
|
|
- selectedIndex = orientationTypeOptions.indexOfFirst { it.second == orientationType },
|
|
|
- ) {
|
|
|
- screenModel.onChangeOrientation(orientationTypeOptions[it].second)
|
|
|
+ SettingsChipRow(R.string.rotation_type) {
|
|
|
+ orientationTypeOptions.map { (stringRes, it) ->
|
|
|
+ FilterChip(
|
|
|
+ selected = it == orientationType,
|
|
|
+ onClick = { screenModel.onChangeOrientation(it) },
|
|
|
+ label = { Text(stringResource(stringRes)) },
|
|
|
+ )
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
val viewer by screenModel.viewerFlow.collectAsState()
|
|
@@ -62,40 +68,35 @@ private fun ColumnScope.PagerViewerSettings(screenModel: ReaderSettingsScreenMod
|
|
|
HeadingItem(R.string.pager_viewer)
|
|
|
|
|
|
val navigationModePager by screenModel.preferences.navigationModePager().collectAsState()
|
|
|
- SelectItem(
|
|
|
- label = stringResource(R.string.pref_viewer_nav),
|
|
|
- options = ReaderPreferences.TapZones.map { stringResource(it) }.toTypedArray(),
|
|
|
- selectedIndex = navigationModePager,
|
|
|
- onSelect = { screenModel.preferences.navigationModePager().set(it) },
|
|
|
+ val pagerNavInverted by screenModel.preferences.pagerNavInverted().collectAsState()
|
|
|
+ TapZonesItems(
|
|
|
+ selected = navigationModePager,
|
|
|
+ onSelect = screenModel.preferences.navigationModePager()::set,
|
|
|
+ invertMode = pagerNavInverted,
|
|
|
+ onSelectInvertMode = screenModel.preferences.pagerNavInverted()::set,
|
|
|
)
|
|
|
|
|
|
- if (navigationModePager != 5) {
|
|
|
- val pagerNavInverted by screenModel.preferences.pagerNavInverted().collectAsState()
|
|
|
- SelectItem(
|
|
|
- label = stringResource(R.string.pref_read_with_tapping_inverted),
|
|
|
- options = tappingInvertModeOptions.map { stringResource(it.first) }.toTypedArray(),
|
|
|
- selectedIndex = tappingInvertModeOptions.indexOfFirst { it.second == pagerNavInverted },
|
|
|
- onSelect = {
|
|
|
- screenModel.preferences.pagerNavInverted().set(tappingInvertModeOptions[it].second)
|
|
|
- },
|
|
|
- )
|
|
|
- }
|
|
|
-
|
|
|
val imageScaleType by screenModel.preferences.imageScaleType().collectAsState()
|
|
|
- SelectItem(
|
|
|
- label = stringResource(R.string.pref_image_scale_type),
|
|
|
- options = ReaderPreferences.ImageScaleType.map { stringResource(it) }.toTypedArray(),
|
|
|
- selectedIndex = imageScaleType - 1,
|
|
|
- onSelect = { screenModel.preferences.imageScaleType().set(it + 1) },
|
|
|
- )
|
|
|
+ SettingsChipRow(R.string.pref_image_scale_type) {
|
|
|
+ ReaderPreferences.ImageScaleType.mapIndexed { index, it ->
|
|
|
+ FilterChip(
|
|
|
+ selected = imageScaleType == index + 1,
|
|
|
+ onClick = { screenModel.preferences.imageScaleType().set(index + 1) },
|
|
|
+ label = { Text(stringResource(it)) },
|
|
|
+ )
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
val zoomStart by screenModel.preferences.zoomStart().collectAsState()
|
|
|
- SelectItem(
|
|
|
- label = stringResource(R.string.pref_zoom_start),
|
|
|
- options = ReaderPreferences.ZoomStart.map { stringResource(it) }.toTypedArray(),
|
|
|
- selectedIndex = zoomStart - 1,
|
|
|
- onSelect = { screenModel.preferences.zoomStart().set(it + 1) },
|
|
|
- )
|
|
|
+ SettingsChipRow(R.string.pref_zoom_start) {
|
|
|
+ ReaderPreferences.ZoomStart.mapIndexed { index, it ->
|
|
|
+ FilterChip(
|
|
|
+ selected = zoomStart == index + 1,
|
|
|
+ onClick = { screenModel.preferences.zoomStart().set(index + 1) },
|
|
|
+ label = { Text(stringResource(it)) },
|
|
|
+ )
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
val cropBorders by screenModel.preferences.cropBorders().collectAsState()
|
|
|
CheckboxItem(
|
|
@@ -172,25 +173,14 @@ private fun ColumnScope.WebtoonViewerSettings(screenModel: ReaderSettingsScreenM
|
|
|
HeadingItem(R.string.webtoon_viewer)
|
|
|
|
|
|
val navigationModeWebtoon by screenModel.preferences.navigationModeWebtoon().collectAsState()
|
|
|
- SelectItem(
|
|
|
- label = stringResource(R.string.pref_viewer_nav),
|
|
|
- options = ReaderPreferences.TapZones.map { stringResource(it) }.toTypedArray(),
|
|
|
- selectedIndex = navigationModeWebtoon,
|
|
|
- onSelect = { screenModel.preferences.navigationModeWebtoon().set(it) },
|
|
|
+ val webtoonNavInverted by screenModel.preferences.webtoonNavInverted().collectAsState()
|
|
|
+ TapZonesItems(
|
|
|
+ selected = navigationModeWebtoon,
|
|
|
+ onSelect = screenModel.preferences.navigationModeWebtoon()::set,
|
|
|
+ invertMode = webtoonNavInverted,
|
|
|
+ onSelectInvertMode = screenModel.preferences.webtoonNavInverted()::set,
|
|
|
)
|
|
|
|
|
|
- if (navigationModeWebtoon != 5) {
|
|
|
- val webtoonNavInverted by screenModel.preferences.webtoonNavInverted().collectAsState()
|
|
|
- SelectItem(
|
|
|
- label = stringResource(R.string.pref_read_with_tapping_inverted),
|
|
|
- options = tappingInvertModeOptions.map { stringResource(it.first) }.toTypedArray(),
|
|
|
- selectedIndex = tappingInvertModeOptions.indexOfFirst { it.second == webtoonNavInverted },
|
|
|
- onSelect = {
|
|
|
- screenModel.preferences.webtoonNavInverted().set(tappingInvertModeOptions[it].second)
|
|
|
- },
|
|
|
- )
|
|
|
- }
|
|
|
-
|
|
|
val webtoonSidePadding by screenModel.preferences.webtoonSidePadding().collectAsState()
|
|
|
SliderItem(
|
|
|
label = stringResource(R.string.pref_webtoon_side_padding),
|
|
@@ -254,3 +244,33 @@ private fun ColumnScope.WebtoonViewerSettings(screenModel: ReaderSettingsScreenM
|
|
|
},
|
|
|
)
|
|
|
}
|
|
|
+
|
|
|
+@Composable
|
|
|
+private fun ColumnScope.TapZonesItems(
|
|
|
+ selected: Int,
|
|
|
+ onSelect: (Int) -> Unit,
|
|
|
+ invertMode: ReaderPreferences.TappingInvertMode,
|
|
|
+ onSelectInvertMode: (ReaderPreferences.TappingInvertMode) -> Unit,
|
|
|
+) {
|
|
|
+ SettingsChipRow(R.string.pref_viewer_nav) {
|
|
|
+ ReaderPreferences.TapZones.mapIndexed { index, it ->
|
|
|
+ FilterChip(
|
|
|
+ selected = selected == index,
|
|
|
+ onClick = { onSelect(index) },
|
|
|
+ label = { Text(stringResource(it)) },
|
|
|
+ )
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (selected != 5) {
|
|
|
+ SettingsChipRow(R.string.pref_read_with_tapping_inverted) {
|
|
|
+ tappingInvertModeOptions.map { (stringRes, mode) ->
|
|
|
+ FilterChip(
|
|
|
+ selected = mode == invertMode,
|
|
|
+ onClick = { onSelectInvertMode(mode) },
|
|
|
+ label = { Text(stringResource(stringRes)) },
|
|
|
+ )
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|