|
@@ -1,18 +1,17 @@
|
|
package eu.kanade.presentation.more.settings.screen
|
|
package eu.kanade.presentation.more.settings.screen
|
|
|
|
|
|
import android.os.Build
|
|
import android.os.Build
|
|
-import androidx.annotation.StringRes
|
|
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.runtime.ReadOnlyComposable
|
|
import androidx.compose.runtime.ReadOnlyComposable
|
|
import androidx.compose.runtime.getValue
|
|
import androidx.compose.runtime.getValue
|
|
import androidx.compose.runtime.remember
|
|
import androidx.compose.runtime.remember
|
|
import androidx.compose.ui.platform.LocalView
|
|
import androidx.compose.ui.platform.LocalView
|
|
-import androidx.compose.ui.res.stringResource
|
|
|
|
import eu.kanade.presentation.more.settings.Preference
|
|
import eu.kanade.presentation.more.settings.Preference
|
|
-import eu.kanade.tachiyomi.R
|
|
|
|
import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
|
|
import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
|
|
import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
|
|
import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
|
|
import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
|
|
import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
|
|
|
|
+import tachiyomi.i18n.MR
|
|
|
|
+import tachiyomi.presentation.core.i18n.localize
|
|
import tachiyomi.presentation.core.util.collectAsState
|
|
import tachiyomi.presentation.core.util.collectAsState
|
|
import uy.kohesive.injekt.Injekt
|
|
import uy.kohesive.injekt.Injekt
|
|
import uy.kohesive.injekt.api.get
|
|
import uy.kohesive.injekt.api.get
|
|
@@ -22,8 +21,7 @@ object SettingsReaderScreen : SearchableSettings {
|
|
|
|
|
|
@ReadOnlyComposable
|
|
@ReadOnlyComposable
|
|
@Composable
|
|
@Composable
|
|
- @StringRes
|
|
|
|
- override fun getTitleRes() = R.string.pref_category_reader
|
|
|
|
|
|
+ override fun getTitleRes() = MR.strings.pref_category_reader
|
|
|
|
|
|
@Composable
|
|
@Composable
|
|
override fun getPreferences(): List<Preference> {
|
|
override fun getPreferences(): List<Preference> {
|
|
@@ -31,43 +29,43 @@ object SettingsReaderScreen : SearchableSettings {
|
|
return listOf(
|
|
return listOf(
|
|
Preference.PreferenceItem.ListPreference(
|
|
Preference.PreferenceItem.ListPreference(
|
|
pref = readerPref.defaultReadingMode(),
|
|
pref = readerPref.defaultReadingMode(),
|
|
- title = stringResource(R.string.pref_viewer_type),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_viewer_type),
|
|
entries = ReadingMode.entries.drop(1)
|
|
entries = ReadingMode.entries.drop(1)
|
|
- .associate { it.flagValue to stringResource(it.stringRes) },
|
|
|
|
|
|
+ .associate { it.flagValue to localize(it.stringRes) },
|
|
),
|
|
),
|
|
Preference.PreferenceItem.ListPreference(
|
|
Preference.PreferenceItem.ListPreference(
|
|
pref = readerPref.doubleTapAnimSpeed(),
|
|
pref = readerPref.doubleTapAnimSpeed(),
|
|
- title = stringResource(R.string.pref_double_tap_anim_speed),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_double_tap_anim_speed),
|
|
entries = mapOf(
|
|
entries = mapOf(
|
|
- 1 to stringResource(R.string.double_tap_anim_speed_0),
|
|
|
|
- 500 to stringResource(R.string.double_tap_anim_speed_normal),
|
|
|
|
- 250 to stringResource(R.string.double_tap_anim_speed_fast),
|
|
|
|
|
|
+ 1 to localize(MR.strings.double_tap_anim_speed_0),
|
|
|
|
+ 500 to localize(MR.strings.double_tap_anim_speed_normal),
|
|
|
|
+ 250 to localize(MR.strings.double_tap_anim_speed_fast),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPref.showReadingMode(),
|
|
pref = readerPref.showReadingMode(),
|
|
- title = stringResource(R.string.pref_show_reading_mode),
|
|
|
|
- subtitle = stringResource(R.string.pref_show_reading_mode_summary),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_show_reading_mode),
|
|
|
|
+ subtitle = localize(MR.strings.pref_show_reading_mode_summary),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPref.showNavigationOverlayOnStart(),
|
|
pref = readerPref.showNavigationOverlayOnStart(),
|
|
- title = stringResource(R.string.pref_show_navigation_mode),
|
|
|
|
- subtitle = stringResource(R.string.pref_show_navigation_mode_summary),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_show_navigation_mode),
|
|
|
|
+ subtitle = localize(MR.strings.pref_show_navigation_mode_summary),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPref.trueColor(),
|
|
pref = readerPref.trueColor(),
|
|
- title = stringResource(R.string.pref_true_color),
|
|
|
|
- subtitle = stringResource(R.string.pref_true_color_summary),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_true_color),
|
|
|
|
+ subtitle = localize(MR.strings.pref_true_color_summary),
|
|
enabled = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O,
|
|
enabled = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O,
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPref.pageTransitions(),
|
|
pref = readerPref.pageTransitions(),
|
|
- title = stringResource(R.string.pref_page_transitions),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_page_transitions),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPref.flashOnPageChange(),
|
|
pref = readerPref.flashOnPageChange(),
|
|
- title = stringResource(R.string.pref_flash_page),
|
|
|
|
- subtitle = stringResource(R.string.pref_flash_page_summ),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_flash_page),
|
|
|
|
+ subtitle = localize(MR.strings.pref_flash_page_summ),
|
|
),
|
|
),
|
|
getDisplayGroup(readerPreferences = readerPref),
|
|
getDisplayGroup(readerPreferences = readerPref),
|
|
getReadingGroup(readerPreferences = readerPref),
|
|
getReadingGroup(readerPreferences = readerPref),
|
|
@@ -83,42 +81,42 @@ object SettingsReaderScreen : SearchableSettings {
|
|
val fullscreenPref = readerPreferences.fullscreen()
|
|
val fullscreenPref = readerPreferences.fullscreen()
|
|
val fullscreen by fullscreenPref.collectAsState()
|
|
val fullscreen by fullscreenPref.collectAsState()
|
|
return Preference.PreferenceGroup(
|
|
return Preference.PreferenceGroup(
|
|
- title = stringResource(R.string.pref_category_display),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_category_display),
|
|
preferenceItems = listOf(
|
|
preferenceItems = listOf(
|
|
Preference.PreferenceItem.ListPreference(
|
|
Preference.PreferenceItem.ListPreference(
|
|
pref = readerPreferences.defaultOrientationType(),
|
|
pref = readerPreferences.defaultOrientationType(),
|
|
- title = stringResource(R.string.pref_rotation_type),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_rotation_type),
|
|
entries = ReaderOrientation.entries.drop(1)
|
|
entries = ReaderOrientation.entries.drop(1)
|
|
- .associate { it.flagValue to stringResource(it.stringRes) },
|
|
|
|
|
|
+ .associate { it.flagValue to localize(it.stringRes) },
|
|
),
|
|
),
|
|
Preference.PreferenceItem.ListPreference(
|
|
Preference.PreferenceItem.ListPreference(
|
|
pref = readerPreferences.readerTheme(),
|
|
pref = readerPreferences.readerTheme(),
|
|
- title = stringResource(R.string.pref_reader_theme),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_reader_theme),
|
|
entries = mapOf(
|
|
entries = mapOf(
|
|
- 1 to stringResource(R.string.black_background),
|
|
|
|
- 2 to stringResource(R.string.gray_background),
|
|
|
|
- 0 to stringResource(R.string.white_background),
|
|
|
|
- 3 to stringResource(R.string.automatic_background),
|
|
|
|
|
|
+ 1 to localize(MR.strings.black_background),
|
|
|
|
+ 2 to localize(MR.strings.gray_background),
|
|
|
|
+ 0 to localize(MR.strings.white_background),
|
|
|
|
+ 3 to localize(MR.strings.automatic_background),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = fullscreenPref,
|
|
pref = fullscreenPref,
|
|
- title = stringResource(R.string.pref_fullscreen),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_fullscreen),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.cutoutShort(),
|
|
pref = readerPreferences.cutoutShort(),
|
|
- title = stringResource(R.string.pref_cutout_short),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_cutout_short),
|
|
enabled = fullscreen &&
|
|
enabled = fullscreen &&
|
|
Build.VERSION.SDK_INT >= Build.VERSION_CODES.P &&
|
|
Build.VERSION.SDK_INT >= Build.VERSION_CODES.P &&
|
|
LocalView.current.rootWindowInsets?.displayCutout != null, // has cutout
|
|
LocalView.current.rootWindowInsets?.displayCutout != null, // has cutout
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.keepScreenOn(),
|
|
pref = readerPreferences.keepScreenOn(),
|
|
- title = stringResource(R.string.pref_keep_screen_on),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_keep_screen_on),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.showPageNumber(),
|
|
pref = readerPreferences.showPageNumber(),
|
|
- title = stringResource(R.string.pref_show_page_number),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_show_page_number),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
)
|
|
)
|
|
@@ -127,23 +125,23 @@ object SettingsReaderScreen : SearchableSettings {
|
|
@Composable
|
|
@Composable
|
|
private fun getReadingGroup(readerPreferences: ReaderPreferences): Preference.PreferenceGroup {
|
|
private fun getReadingGroup(readerPreferences: ReaderPreferences): Preference.PreferenceGroup {
|
|
return Preference.PreferenceGroup(
|
|
return Preference.PreferenceGroup(
|
|
- title = stringResource(R.string.pref_category_reading),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_category_reading),
|
|
preferenceItems = listOf(
|
|
preferenceItems = listOf(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.skipRead(),
|
|
pref = readerPreferences.skipRead(),
|
|
- title = stringResource(R.string.pref_skip_read_chapters),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_skip_read_chapters),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.skipFiltered(),
|
|
pref = readerPreferences.skipFiltered(),
|
|
- title = stringResource(R.string.pref_skip_filtered_chapters),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_skip_filtered_chapters),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.skipDupe(),
|
|
pref = readerPreferences.skipDupe(),
|
|
- title = stringResource(R.string.pref_skip_dupe_chapters),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_skip_dupe_chapters),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.alwaysShowChapterTransition(),
|
|
pref = readerPreferences.alwaysShowChapterTransition(),
|
|
- title = stringResource(R.string.pref_always_show_chapter_transition),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_always_show_chapter_transition),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
)
|
|
)
|
|
@@ -162,57 +160,57 @@ object SettingsReaderScreen : SearchableSettings {
|
|
val rotateToFit by rotateToFitPref.collectAsState()
|
|
val rotateToFit by rotateToFitPref.collectAsState()
|
|
|
|
|
|
return Preference.PreferenceGroup(
|
|
return Preference.PreferenceGroup(
|
|
- title = stringResource(R.string.pager_viewer),
|
|
|
|
|
|
+ title = localize(MR.strings.pager_viewer),
|
|
preferenceItems = listOf(
|
|
preferenceItems = listOf(
|
|
Preference.PreferenceItem.ListPreference(
|
|
Preference.PreferenceItem.ListPreference(
|
|
pref = navModePref,
|
|
pref = navModePref,
|
|
- title = stringResource(R.string.pref_viewer_nav),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_viewer_nav),
|
|
entries = ReaderPreferences.TapZones
|
|
entries = ReaderPreferences.TapZones
|
|
- .mapIndexed { index, it -> index to stringResource(it) }
|
|
|
|
|
|
+ .mapIndexed { index, it -> index to localize(it) }
|
|
.toMap(),
|
|
.toMap(),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.ListPreference(
|
|
Preference.PreferenceItem.ListPreference(
|
|
pref = readerPreferences.pagerNavInverted(),
|
|
pref = readerPreferences.pagerNavInverted(),
|
|
- title = stringResource(R.string.pref_read_with_tapping_inverted),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_read_with_tapping_inverted),
|
|
entries = listOf(
|
|
entries = listOf(
|
|
ReaderPreferences.TappingInvertMode.NONE,
|
|
ReaderPreferences.TappingInvertMode.NONE,
|
|
ReaderPreferences.TappingInvertMode.HORIZONTAL,
|
|
ReaderPreferences.TappingInvertMode.HORIZONTAL,
|
|
ReaderPreferences.TappingInvertMode.VERTICAL,
|
|
ReaderPreferences.TappingInvertMode.VERTICAL,
|
|
ReaderPreferences.TappingInvertMode.BOTH,
|
|
ReaderPreferences.TappingInvertMode.BOTH,
|
|
- ).associateWith { stringResource(it.titleResId) },
|
|
|
|
|
|
+ ).associateWith { localize(it.titleRes) },
|
|
enabled = navMode != 5,
|
|
enabled = navMode != 5,
|
|
),
|
|
),
|
|
Preference.PreferenceItem.ListPreference(
|
|
Preference.PreferenceItem.ListPreference(
|
|
pref = imageScaleTypePref,
|
|
pref = imageScaleTypePref,
|
|
- title = stringResource(R.string.pref_image_scale_type),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_image_scale_type),
|
|
entries = ReaderPreferences.ImageScaleType
|
|
entries = ReaderPreferences.ImageScaleType
|
|
- .mapIndexed { index, it -> index + 1 to stringResource(it) }
|
|
|
|
|
|
+ .mapIndexed { index, it -> index + 1 to localize(it) }
|
|
.toMap(),
|
|
.toMap(),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.ListPreference(
|
|
Preference.PreferenceItem.ListPreference(
|
|
pref = readerPreferences.zoomStart(),
|
|
pref = readerPreferences.zoomStart(),
|
|
- title = stringResource(R.string.pref_zoom_start),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_zoom_start),
|
|
entries = ReaderPreferences.ZoomStart
|
|
entries = ReaderPreferences.ZoomStart
|
|
- .mapIndexed { index, it -> index + 1 to stringResource(it) }
|
|
|
|
|
|
+ .mapIndexed { index, it -> index + 1 to localize(it) }
|
|
.toMap(),
|
|
.toMap(),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.cropBorders(),
|
|
pref = readerPreferences.cropBorders(),
|
|
- title = stringResource(R.string.pref_crop_borders),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_crop_borders),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.landscapeZoom(),
|
|
pref = readerPreferences.landscapeZoom(),
|
|
- title = stringResource(R.string.pref_landscape_zoom),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_landscape_zoom),
|
|
enabled = imageScaleType == 1,
|
|
enabled = imageScaleType == 1,
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.navigateToPan(),
|
|
pref = readerPreferences.navigateToPan(),
|
|
- title = stringResource(R.string.pref_navigate_pan),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_navigate_pan),
|
|
enabled = navMode != 5,
|
|
enabled = navMode != 5,
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = dualPageSplitPref,
|
|
pref = dualPageSplitPref,
|
|
- title = stringResource(R.string.pref_dual_page_split),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_dual_page_split),
|
|
onValueChanged = {
|
|
onValueChanged = {
|
|
rotateToFitPref.set(false)
|
|
rotateToFitPref.set(false)
|
|
true
|
|
true
|
|
@@ -220,13 +218,13 @@ object SettingsReaderScreen : SearchableSettings {
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.dualPageInvertPaged(),
|
|
pref = readerPreferences.dualPageInvertPaged(),
|
|
- title = stringResource(R.string.pref_dual_page_invert),
|
|
|
|
- subtitle = stringResource(R.string.pref_dual_page_invert_summary),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_dual_page_invert),
|
|
|
|
+ subtitle = localize(MR.strings.pref_dual_page_invert_summary),
|
|
enabled = dualPageSplit,
|
|
enabled = dualPageSplit,
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = rotateToFitPref,
|
|
pref = rotateToFitPref,
|
|
- title = stringResource(R.string.pref_page_rotate),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_page_rotate),
|
|
onValueChanged = {
|
|
onValueChanged = {
|
|
dualPageSplitPref.set(false)
|
|
dualPageSplitPref.set(false)
|
|
true
|
|
true
|
|
@@ -234,7 +232,7 @@ object SettingsReaderScreen : SearchableSettings {
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.dualPageRotateToFitInvert(),
|
|
pref = readerPreferences.dualPageRotateToFitInvert(),
|
|
- title = stringResource(R.string.pref_page_rotate_invert),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_page_rotate_invert),
|
|
enabled = rotateToFit,
|
|
enabled = rotateToFit,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
@@ -254,29 +252,29 @@ object SettingsReaderScreen : SearchableSettings {
|
|
val webtoonSidePadding by webtoonSidePaddingPref.collectAsState()
|
|
val webtoonSidePadding by webtoonSidePaddingPref.collectAsState()
|
|
|
|
|
|
return Preference.PreferenceGroup(
|
|
return Preference.PreferenceGroup(
|
|
- title = stringResource(R.string.webtoon_viewer),
|
|
|
|
|
|
+ title = localize(MR.strings.webtoon_viewer),
|
|
preferenceItems = listOf(
|
|
preferenceItems = listOf(
|
|
Preference.PreferenceItem.ListPreference(
|
|
Preference.PreferenceItem.ListPreference(
|
|
pref = navModePref,
|
|
pref = navModePref,
|
|
- title = stringResource(R.string.pref_viewer_nav),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_viewer_nav),
|
|
entries = ReaderPreferences.TapZones
|
|
entries = ReaderPreferences.TapZones
|
|
- .mapIndexed { index, it -> index to stringResource(it) }
|
|
|
|
|
|
+ .mapIndexed { index, it -> index to localize(it) }
|
|
.toMap(),
|
|
.toMap(),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.ListPreference(
|
|
Preference.PreferenceItem.ListPreference(
|
|
pref = readerPreferences.webtoonNavInverted(),
|
|
pref = readerPreferences.webtoonNavInverted(),
|
|
- title = stringResource(R.string.pref_read_with_tapping_inverted),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_read_with_tapping_inverted),
|
|
entries = listOf(
|
|
entries = listOf(
|
|
ReaderPreferences.TappingInvertMode.NONE,
|
|
ReaderPreferences.TappingInvertMode.NONE,
|
|
ReaderPreferences.TappingInvertMode.HORIZONTAL,
|
|
ReaderPreferences.TappingInvertMode.HORIZONTAL,
|
|
ReaderPreferences.TappingInvertMode.VERTICAL,
|
|
ReaderPreferences.TappingInvertMode.VERTICAL,
|
|
ReaderPreferences.TappingInvertMode.BOTH,
|
|
ReaderPreferences.TappingInvertMode.BOTH,
|
|
- ).associateWith { stringResource(it.titleResId) },
|
|
|
|
|
|
+ ).associateWith { localize(it.titleRes) },
|
|
enabled = navMode != 5,
|
|
enabled = navMode != 5,
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SliderPreference(
|
|
Preference.PreferenceItem.SliderPreference(
|
|
value = webtoonSidePadding,
|
|
value = webtoonSidePadding,
|
|
- title = stringResource(R.string.pref_webtoon_side_padding),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_webtoon_side_padding),
|
|
subtitle = numberFormat.format(webtoonSidePadding / 100f),
|
|
subtitle = numberFormat.format(webtoonSidePadding / 100f),
|
|
min = ReaderPreferences.WEBTOON_PADDING_MIN,
|
|
min = ReaderPreferences.WEBTOON_PADDING_MIN,
|
|
max = ReaderPreferences.WEBTOON_PADDING_MAX,
|
|
max = ReaderPreferences.WEBTOON_PADDING_MAX,
|
|
@@ -287,31 +285,31 @@ object SettingsReaderScreen : SearchableSettings {
|
|
),
|
|
),
|
|
Preference.PreferenceItem.ListPreference(
|
|
Preference.PreferenceItem.ListPreference(
|
|
pref = readerPreferences.readerHideThreshold(),
|
|
pref = readerPreferences.readerHideThreshold(),
|
|
- title = stringResource(R.string.pref_hide_threshold),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_hide_threshold),
|
|
entries = mapOf(
|
|
entries = mapOf(
|
|
- ReaderPreferences.ReaderHideThreshold.HIGHEST to stringResource(R.string.pref_highest),
|
|
|
|
- ReaderPreferences.ReaderHideThreshold.HIGH to stringResource(R.string.pref_high),
|
|
|
|
- ReaderPreferences.ReaderHideThreshold.LOW to stringResource(R.string.pref_low),
|
|
|
|
- ReaderPreferences.ReaderHideThreshold.LOWEST to stringResource(R.string.pref_lowest),
|
|
|
|
|
|
+ ReaderPreferences.ReaderHideThreshold.HIGHEST to localize(MR.strings.pref_highest),
|
|
|
|
+ ReaderPreferences.ReaderHideThreshold.HIGH to localize(MR.strings.pref_high),
|
|
|
|
+ ReaderPreferences.ReaderHideThreshold.LOW to localize(MR.strings.pref_low),
|
|
|
|
+ ReaderPreferences.ReaderHideThreshold.LOWEST to localize(MR.strings.pref_lowest),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.cropBordersWebtoon(),
|
|
pref = readerPreferences.cropBordersWebtoon(),
|
|
- title = stringResource(R.string.pref_crop_borders),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_crop_borders),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = dualPageSplitPref,
|
|
pref = dualPageSplitPref,
|
|
- title = stringResource(R.string.pref_dual_page_split),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_dual_page_split),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.dualPageInvertWebtoon(),
|
|
pref = readerPreferences.dualPageInvertWebtoon(),
|
|
- title = stringResource(R.string.pref_dual_page_invert),
|
|
|
|
- subtitle = stringResource(R.string.pref_dual_page_invert_summary),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_dual_page_invert),
|
|
|
|
+ subtitle = localize(MR.strings.pref_dual_page_invert_summary),
|
|
enabled = dualPageSplit,
|
|
enabled = dualPageSplit,
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.webtoonDoubleTapZoomEnabled(),
|
|
pref = readerPreferences.webtoonDoubleTapZoomEnabled(),
|
|
- title = stringResource(R.string.pref_double_tap_zoom),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_double_tap_zoom),
|
|
enabled = true,
|
|
enabled = true,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
@@ -323,15 +321,15 @@ object SettingsReaderScreen : SearchableSettings {
|
|
val readWithVolumeKeysPref = readerPreferences.readWithVolumeKeys()
|
|
val readWithVolumeKeysPref = readerPreferences.readWithVolumeKeys()
|
|
val readWithVolumeKeys by readWithVolumeKeysPref.collectAsState()
|
|
val readWithVolumeKeys by readWithVolumeKeysPref.collectAsState()
|
|
return Preference.PreferenceGroup(
|
|
return Preference.PreferenceGroup(
|
|
- title = stringResource(R.string.pref_reader_navigation),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_reader_navigation),
|
|
preferenceItems = listOf(
|
|
preferenceItems = listOf(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readWithVolumeKeysPref,
|
|
pref = readWithVolumeKeysPref,
|
|
- title = stringResource(R.string.pref_read_with_volume_keys),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_read_with_volume_keys),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.readWithVolumeKeysInverted(),
|
|
pref = readerPreferences.readWithVolumeKeysInverted(),
|
|
- title = stringResource(R.string.pref_read_with_volume_keys_inverted),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_read_with_volume_keys_inverted),
|
|
enabled = readWithVolumeKeys,
|
|
enabled = readWithVolumeKeys,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
@@ -341,16 +339,16 @@ object SettingsReaderScreen : SearchableSettings {
|
|
@Composable
|
|
@Composable
|
|
private fun getActionsGroup(readerPreferences: ReaderPreferences): Preference.PreferenceGroup {
|
|
private fun getActionsGroup(readerPreferences: ReaderPreferences): Preference.PreferenceGroup {
|
|
return Preference.PreferenceGroup(
|
|
return Preference.PreferenceGroup(
|
|
- title = stringResource(R.string.pref_reader_actions),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_reader_actions),
|
|
preferenceItems = listOf(
|
|
preferenceItems = listOf(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.readWithLongTap(),
|
|
pref = readerPreferences.readWithLongTap(),
|
|
- title = stringResource(R.string.pref_read_with_long_tap),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_read_with_long_tap),
|
|
),
|
|
),
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
Preference.PreferenceItem.SwitchPreference(
|
|
pref = readerPreferences.folderPerManga(),
|
|
pref = readerPreferences.folderPerManga(),
|
|
- title = stringResource(R.string.pref_create_folder_per_manga),
|
|
|
|
- subtitle = stringResource(R.string.pref_create_folder_per_manga_summary),
|
|
|
|
|
|
+ title = localize(MR.strings.pref_create_folder_per_manga),
|
|
|
|
+ subtitle = localize(MR.strings.pref_create_folder_per_manga_summary),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
)
|
|
)
|