Migrate to multiplatform string resources (#10147)

* Migrate to multiplatform string resources * Move plurals translations into separate files * Fix lint check on generated files
2025-11-12 20:19:05 +01:00 · 2023-11-18 13:54:56 -05:00
parent c39ae21f4a
commit 46e734fc8e
340 changed files with 5741 additions and 6292 deletions
--- a/app/src/main/java/eu/kanade/presentation/reader/ChapterTransition.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/ChapterTransition.kt
@@ -26,8 +26,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.pluralStringResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.Placeholder
 import androidx.compose.ui.text.PlaceholderVerticalAlign
 import androidx.compose.ui.text.buildAnnotatedString
@@ -36,13 +34,15 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import eu.kanade.presentation.theme.TachiyomiTheme
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.ChapterImpl
 import eu.kanade.tachiyomi.data.database.models.toDomainChapter
 import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition
 import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter
 import tachiyomi.domain.chapter.service.calculateChapterGap
+import tachiyomi.i18n.MR
+import tachiyomi.presentation.core.i18n.localize
+import tachiyomi.presentation.core.i18n.localizePlural
 import tachiyomi.presentation.core.util.secondaryItemAlpha

@Composable
@@ -58,25 +58,25 @@ fun ChapterTransition(
        when (transition) {
            is ChapterTransition.Prev -> {
                TransitionText(
-                    topLabel = stringResource(R.string.transition_previous),
+                    topLabel = localize(MR.strings.transition_previous),
                    topChapter = goingToChapter,
                    topChapterDownloaded = goingToChapterDownloaded,
-                    bottomLabel = stringResource(R.string.transition_current),
+                    bottomLabel = localize(MR.strings.transition_current),
                    bottomChapter = currChapter,
                    bottomChapterDownloaded = currChapterDownloaded,
-                    fallbackLabel = stringResource(R.string.transition_no_previous),
+                    fallbackLabel = localize(MR.strings.transition_no_previous),
                    chapterGap = calculateChapterGap(currChapter.toDomainChapter(), goingToChapter?.toDomainChapter()),
                )
            }
            is ChapterTransition.Next -> {
                TransitionText(
-                    topLabel = stringResource(R.string.transition_finished),
+                    topLabel = localize(MR.strings.transition_finished),
                    topChapter = currChapter,
                    topChapterDownloaded = currChapterDownloaded,
-                    bottomLabel = stringResource(R.string.transition_next),
+                    bottomLabel = localize(MR.strings.transition_next),
                    bottomChapter = goingToChapter,
                    bottomChapterDownloaded = goingToChapterDownloaded,
-                    fallbackLabel = stringResource(R.string.transition_no_next),
+                    fallbackLabel = localize(MR.strings.transition_no_next),
                    chapterGap = calculateChapterGap(goingToChapter?.toDomainChapter(), currChapter.toDomainChapter()),
                )
            }
@@ -191,7 +191,7 @@ private fun ChapterGapWarning(
            )

            Text(
-                text = pluralStringResource(R.plurals.missing_chapters_warning, count = gapCount, gapCount),
+                text = localizePlural(MR.plurals.missing_chapters_warning, count = gapCount, gapCount),
                style = MaterialTheme.typography.bodyMedium,
            )
        }
@@ -245,7 +245,7 @@ private fun ChapterText(
                ) {
                    Icon(
                        imageVector = Icons.Filled.CheckCircle,
-                        contentDescription = stringResource(R.string.label_downloaded),
+                        contentDescription = localize(MR.strings.label_downloaded),
                    )
                },
            ),
--- a/app/src/main/java/eu/kanade/presentation/reader/OrientationSelectDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/OrientationSelectDialog.kt
@@ -12,18 +12,19 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.PreviewLightDark
+import dev.icerock.moko.resources.StringResource
 import eu.kanade.domain.manga.model.readerOrientation
 import eu.kanade.presentation.components.AdaptiveSheet
 import eu.kanade.presentation.reader.components.ModeSelectionDialog
 import eu.kanade.presentation.theme.TachiyomiTheme
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
+import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.SettingsIconGrid
 import tachiyomi.presentation.core.components.material.IconToggleButton
+import tachiyomi.presentation.core.i18n.localize

 private val ReaderOrientationsWithoutDefault = ReaderOrientation.entries - ReaderOrientation.DEFAULT

@@ -31,7 +32,7 @@ private val ReaderOrientationsWithoutDefault = ReaderOrientation.entries - Reade
 fun OrientationSelectDialog(
    onDismissRequest: () -> Unit,
    screenModel: ReaderSettingsScreenModel,
-    onChange: (Int) -> Unit,
+    onChange: (StringResource) -> Unit,
 ) {
    val manga by screenModel.mangaFlow.collectAsState()
    val orientation = remember(manga) { ReaderOrientation.fromPreference(manga?.readerOrientation?.toInt()) }
@@ -63,7 +64,7 @@ private fun DialogContent(
        }.takeIf { orientation != ReaderOrientation.DEFAULT },
        onApply = { onChangeOrientation(selected) },
    ) {
-        SettingsIconGrid(R.string.rotation_type) {
+        SettingsIconGrid(MR.strings.rotation_type) {
            items(ReaderOrientationsWithoutDefault) { mode ->
                IconToggleButton(
                    checked = mode == selected,
@@ -72,7 +73,7 @@ private fun DialogContent(
                    },
                    modifier = Modifier.fillMaxWidth(),
                    imageVector = ImageVector.vectorResource(mode.iconRes),
-                    title = stringResource(mode.stringRes),
+                    title = localize(mode.stringRes),
                )
            }
        }
--- a/app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt
@@ -17,12 +17,12 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.components.AdaptiveSheet
-import eu.kanade.tachiyomi.R
+import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.ActionButton
 import tachiyomi.presentation.core.components.material.padding
+import tachiyomi.presentation.core.i18n.localize

@Composable
 fun ReaderPageActionsDialog(
@@ -42,13 +42,13 @@ fun ReaderPageActionsDialog(
        ) {
            ActionButton(
                modifier = Modifier.weight(1f),
-                title = stringResource(R.string.set_as_cover),
+                title = localize(MR.strings.set_as_cover),
                icon = Icons.Outlined.Photo,
                onClick = { showSetCoverDialog = true },
            )
            ActionButton(
                modifier = Modifier.weight(1f),
-                title = stringResource(R.string.action_share),
+                title = localize(MR.strings.action_share),
                icon = Icons.Outlined.Share,
                onClick = {
                    onShare()
@@ -57,7 +57,7 @@ fun ReaderPageActionsDialog(
            )
            ActionButton(
                modifier = Modifier.weight(1f),
-                title = stringResource(R.string.action_save),
+                title = localize(MR.strings.action_save),
                icon = Icons.Outlined.Save,
                onClick = {
                    onSave()
@@ -85,16 +85,16 @@ private fun SetCoverDialog(
 ) {
    AlertDialog(
        text = {
-            Text(stringResource(R.string.confirm_set_image_as_cover))
+            Text(localize(MR.strings.confirm_set_image_as_cover))
        },
        confirmButton = {
            TextButton(onClick = onConfirm) {
-                Text(stringResource(R.string.action_ok))
+                Text(localize(MR.strings.action_ok))
            }
        },
        dismissButton = {
            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.action_cancel))
+                Text(localize(MR.strings.action_cancel))
            }
        },
        onDismissRequest = onDismiss,
--- a/app/src/main/java/eu/kanade/presentation/reader/ReadingModeSelectDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/ReadingModeSelectDialog.kt
@@ -12,18 +12,19 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.PreviewLightDark
+import dev.icerock.moko.resources.StringResource
 import eu.kanade.domain.manga.model.readingMode
 import eu.kanade.presentation.components.AdaptiveSheet
 import eu.kanade.presentation.reader.components.ModeSelectionDialog
 import eu.kanade.presentation.theme.TachiyomiTheme
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
+import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.SettingsIconGrid
 import tachiyomi.presentation.core.components.material.IconToggleButton
+import tachiyomi.presentation.core.i18n.localize

 private val ReadingModesWithoutDefault = ReadingMode.entries - ReadingMode.DEFAULT

@@ -31,7 +32,7 @@ private val ReadingModesWithoutDefault = ReadingMode.entries - ReadingMode.DEFAU
 fun ReadingModeSelectDialog(
    onDismissRequest: () -> Unit,
    screenModel: ReaderSettingsScreenModel,
-    onChange: (Int) -> Unit,
+    onChange: (StringResource) -> Unit,
 ) {
    val manga by screenModel.mangaFlow.collectAsState()
    val readingMode = remember(manga) { ReadingMode.fromPreference(manga?.readingMode?.toInt()) }
@@ -59,7 +60,7 @@ private fun DialogContent(
        onUseDefault = { onChangeReadingMode(ReadingMode.DEFAULT) }.takeIf { readingMode != ReadingMode.DEFAULT },
        onApply = { onChangeReadingMode(selected) },
    ) {
-        SettingsIconGrid(R.string.pref_category_reading_mode) {
+        SettingsIconGrid(MR.strings.pref_category_reading_mode) {
            items(ReadingModesWithoutDefault) { mode ->
                IconToggleButton(
                    checked = mode == selected,
@@ -68,7 +69,7 @@ private fun DialogContent(
                    },
                    modifier = Modifier.fillMaxWidth(),
                    imageVector = ImageVector.vectorResource(mode.iconRes),
-                    title = stringResource(mode.stringRes),
+                    title = localize(mode.stringRes),
                )
            }
        }
--- a/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
@@ -14,11 +14,12 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
+import tachiyomi.i18n.MR
+import tachiyomi.presentation.core.i18n.localize

@Composable
 fun BottomReaderBar(
@@ -42,28 +43,28 @@ fun BottomReaderBar(
        IconButton(onClick = onClickReadingMode) {
            Icon(
                painter = painterResource(readingMode.iconRes),
-                contentDescription = stringResource(R.string.viewer),
+                contentDescription = localize(MR.strings.viewer),
            )
        }

        IconButton(onClick = onClickOrientation) {
            Icon(
                painter = painterResource(orientation.iconRes),
-                contentDescription = stringResource(R.string.rotation_type),
+                contentDescription = localize(MR.strings.rotation_type),
            )
        }

        IconButton(onClick = onClickCropBorder) {
            Icon(
                painter = painterResource(if (cropEnabled) R.drawable.ic_crop_24dp else R.drawable.ic_crop_off_24dp),
-                contentDescription = stringResource(R.string.pref_crop_borders),
+                contentDescription = localize(MR.strings.pref_crop_borders),
            )
        }

        IconButton(onClick = onClickSettings) {
            Icon(
                imageVector = Icons.Outlined.Settings,
-                contentDescription = stringResource(R.string.action_settings),
+                contentDescription = localize(MR.strings.action_settings),
            )
        }
    }
--- a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
@@ -18,18 +18,18 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.AppBarActions
 import eu.kanade.presentation.reader.components.ChapterNavigator
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
 import eu.kanade.tachiyomi.ui.reader.viewer.Viewer
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.R2LPagerViewer
 import kotlinx.collections.immutable.persistentListOf
+import tachiyomi.i18n.MR
+import tachiyomi.presentation.core.i18n.localize

 private val animationSpec = tween<IntOffset>(200)

@@ -103,11 +103,11 @@ fun ReaderAppBars(
                            .apply {
                                add(
                                    AppBar.Action(
-                                        title = stringResource(
+                                        title = localize(
                                            if (bookmarked) {
-                                                R.string.action_remove_bookmark
+                                                MR.strings.action_remove_bookmark
                                            } else {
-                                                R.string.action_bookmark
+                                                MR.strings.action_bookmark
                                            },
                                        ),
                                        icon = if (bookmarked) {
@@ -121,7 +121,7 @@ fun ReaderAppBars(
                                onOpenInWebView?.let {
                                    add(
                                        AppBar.OverflowAction(
-                                            title = stringResource(R.string.action_open_in_web_view),
+                                            title = localize(MR.strings.action_open_in_web_view),
                                            onClick = it,
                                        ),
                                    )
@@ -129,7 +129,7 @@ fun ReaderAppBars(
                                onShare?.let {
                                    add(
                                        AppBar.OverflowAction(
-                                            title = stringResource(R.string.action_share),
+                                            title = localize(MR.strings.action_share),
                                            onClick = it,
                                        ),
                                    )
--- a/app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt
@@ -30,11 +30,11 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.util.isTabletUi
-import eu.kanade.tachiyomi.R
+import tachiyomi.i18n.MR
+import tachiyomi.presentation.core.i18n.localize
 import kotlin.math.roundToInt

@Composable
@@ -77,8 +77,8 @@ fun ChapterNavigator(
            ) {
                Icon(
                    imageVector = Icons.Outlined.SkipPrevious,
-                    contentDescription = stringResource(
-                        if (isRtl) R.string.action_next_chapter else R.string.action_previous_chapter,
+                    contentDescription = localize(
+                        if (isRtl) MR.strings.action_next_chapter else MR.strings.action_previous_chapter,
                    ),
                )
            }
@@ -129,8 +129,8 @@ fun ChapterNavigator(
            ) {
                Icon(
                    imageVector = Icons.Outlined.SkipNext,
-                    contentDescription = stringResource(
-                        if (isRtl) R.string.action_previous_chapter else R.string.action_next_chapter,
+                    contentDescription = localize(
+                        if (isRtl) MR.strings.action_previous_chapter else MR.strings.action_next_chapter,
                    ),
                )
            }
--- a/app/src/main/java/eu/kanade/presentation/reader/components/ModeSelectionDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/components/ModeSelectionDialog.kt
@@ -16,12 +16,12 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.theme.TachiyomiTheme
-import eu.kanade.tachiyomi.R
+import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.SettingsItemsPaddings
+import tachiyomi.presentation.core.i18n.localize

@Composable
 fun ModeSelectionDialog(
@@ -40,7 +40,7 @@ fun ModeSelectionDialog(
            ) {
                onUseDefault?.let {
                    OutlinedButton(onClick = it) {
-                        Text(text = stringResource(R.string.action_revert_to_default))
+                        Text(text = localize(MR.strings.action_revert_to_default))
                    }
                }

@@ -57,7 +57,7 @@ fun ModeSelectionDialog(
                            imageVector = Icons.Outlined.Check,
                            contentDescription = null,
                        )
-                        Text(text = stringResource(R.string.action_apply))
+                        Text(text = localize(MR.strings.action_apply))
                    }
                }
            }
--- a/app/src/main/java/eu/kanade/presentation/reader/settings/ColorFilterPage.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/settings/ColorFilterPage.kt
@@ -6,17 +6,17 @@ import androidx.compose.material3.FilterChip
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.res.stringResource
 import androidx.core.graphics.alpha
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
 import androidx.core.graphics.red
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import tachiyomi.core.preference.getAndSet
+import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.CheckboxItem
 import tachiyomi.presentation.core.components.SettingsChipRow
 import tachiyomi.presentation.core.components.SliderItem
+import tachiyomi.presentation.core.i18n.localize
 import tachiyomi.presentation.core.util.collectAsState

@Composable
@@ -24,25 +24,25 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
    val colorFilterModes = buildList {
        addAll(
            listOf(
-                R.string.label_default,
-                R.string.filter_mode_multiply,
-                R.string.filter_mode_screen,
+                MR.strings.label_default,
+                MR.strings.filter_mode_multiply,
+                MR.strings.filter_mode_screen,
            ),
        )
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
            addAll(
                listOf(
-                    R.string.filter_mode_overlay,
-                    R.string.filter_mode_lighten,
-                    R.string.filter_mode_darken,
+                    MR.strings.filter_mode_overlay,
+                    MR.strings.filter_mode_lighten,
+                    MR.strings.filter_mode_darken,
                ),
            )
        }
-    }.map { stringResource(it) }
+    }.map { localize(it) }

    val customBrightness by screenModel.preferences.customBrightness().collectAsState()
    CheckboxItem(
-        label = stringResource(R.string.pref_custom_brightness),
+        label = localize(MR.strings.pref_custom_brightness),
        pref = screenModel.preferences.customBrightness(),
    )

@@ -55,7 +55,7 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
    if (customBrightness) {
        val customBrightnessValue by screenModel.preferences.customBrightnessValue().collectAsState()
        SliderItem(
-            label = stringResource(R.string.pref_custom_brightness),
+            label = localize(MR.strings.pref_custom_brightness),
            min = -75,
            max = 100,
            value = customBrightnessValue,
@@ -66,13 +66,13 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)

    val colorFilter by screenModel.preferences.colorFilter().collectAsState()
    CheckboxItem(
-        label = stringResource(R.string.pref_custom_color_filter),
+        label = localize(MR.strings.pref_custom_color_filter),
        pref = screenModel.preferences.colorFilter(),
    )
    if (colorFilter) {
        val colorFilterValue by screenModel.preferences.colorFilterValue().collectAsState()
        SliderItem(
-            label = stringResource(R.string.color_filter_r_value),
+            label = localize(MR.strings.color_filter_r_value),
            max = 255,
            value = colorFilterValue.red,
            valueText = colorFilterValue.red.toString(),
@@ -83,7 +83,7 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
            },
        )
        SliderItem(
-            label = stringResource(R.string.color_filter_g_value),
+            label = localize(MR.strings.color_filter_g_value),
            max = 255,
            value = colorFilterValue.green,
            valueText = colorFilterValue.green.toString(),
@@ -94,7 +94,7 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
            },
        )
        SliderItem(
-            label = stringResource(R.string.color_filter_b_value),
+            label = localize(MR.strings.color_filter_b_value),
            max = 255,
            value = colorFilterValue.blue,
            valueText = colorFilterValue.blue.toString(),
@@ -105,7 +105,7 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
            },
        )
        SliderItem(
-            label = stringResource(R.string.color_filter_a_value),
+            label = localize(MR.strings.color_filter_a_value),
            max = 255,
            value = colorFilterValue.alpha,
            valueText = colorFilterValue.alpha.toString(),
@@ -117,7 +117,7 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
        )

        val colorFilterMode by screenModel.preferences.colorFilterMode().collectAsState()
-        SettingsChipRow(R.string.pref_color_filter_mode) {
+        SettingsChipRow(MR.strings.pref_color_filter_mode) {
            colorFilterModes.mapIndexed { index, it ->
                FilterChip(
                    selected = colorFilterMode == index,
@@ -129,11 +129,11 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
    }

    CheckboxItem(
-        label = stringResource(R.string.pref_grayscale),
+        label = localize(MR.strings.pref_grayscale),
        pref = screenModel.preferences.grayscale(),
    )
    CheckboxItem(
-        label = stringResource(R.string.pref_inverted_colors),
+        label = localize(MR.strings.pref_inverted_colors),
        pref = screenModel.preferences.invertedColors(),
    )
 }
--- a/app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt
@@ -5,72 +5,72 @@ import androidx.compose.material3.FilterChip
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.res.stringResource
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
+import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.CheckboxItem
 import tachiyomi.presentation.core.components.SettingsChipRow
+import tachiyomi.presentation.core.i18n.localize
 import tachiyomi.presentation.core.util.collectAsState

 private val themes = listOf(
-    R.string.black_background to 1,
-    R.string.gray_background to 2,
-    R.string.white_background to 0,
-    R.string.automatic_background to 3,
+    MR.strings.black_background to 1,
+    MR.strings.gray_background to 2,
+    MR.strings.white_background to 0,
+    MR.strings.automatic_background to 3,
 )

@Composable
 internal fun ColumnScope.GeneralPage(screenModel: ReaderSettingsScreenModel) {
    val readerTheme by screenModel.preferences.readerTheme().collectAsState()
-    SettingsChipRow(R.string.pref_reader_theme) {
+    SettingsChipRow(MR.strings.pref_reader_theme) {
        themes.map { (labelRes, value) ->
            FilterChip(
                selected = readerTheme == value,
                onClick = { screenModel.preferences.readerTheme().set(value) },
-                label = { Text(stringResource(labelRes)) },
+                label = { Text(localize(labelRes)) },
            )
        }
    }

    CheckboxItem(
-        label = stringResource(R.string.pref_show_page_number),
+        label = localize(MR.strings.pref_show_page_number),
        pref = screenModel.preferences.showPageNumber(),
    )

    CheckboxItem(
-        label = stringResource(R.string.pref_fullscreen),
+        label = localize(MR.strings.pref_fullscreen),
        pref = screenModel.preferences.fullscreen(),
    )

    if (screenModel.hasDisplayCutout) {
        CheckboxItem(
-            label = stringResource(R.string.pref_cutout_short),
+            label = localize(MR.strings.pref_cutout_short),
            pref = screenModel.preferences.cutoutShort(),
        )
    }

    CheckboxItem(
-        label = stringResource(R.string.pref_keep_screen_on),
+        label = localize(MR.strings.pref_keep_screen_on),
        pref = screenModel.preferences.keepScreenOn(),
    )

    CheckboxItem(
-        label = stringResource(R.string.pref_read_with_long_tap),
+        label = localize(MR.strings.pref_read_with_long_tap),
        pref = screenModel.preferences.readWithLongTap(),
    )

    CheckboxItem(
-        label = stringResource(R.string.pref_always_show_chapter_transition),
+        label = localize(MR.strings.pref_always_show_chapter_transition),
        pref = screenModel.preferences.alwaysShowChapterTransition(),
    )

    CheckboxItem(
-        label = stringResource(R.string.pref_page_transitions),
+        label = localize(MR.strings.pref_page_transitions),
        pref = screenModel.preferences.pageTransitions(),
    )

    CheckboxItem(
-        label = stringResource(R.string.pref_flash_page),
+        label = localize(MR.strings.pref_flash_page),
        pref = screenModel.preferences.flashOnPageChange(),
    )
 }
--- a/app/src/main/java/eu/kanade/presentation/reader/settings/ReaderSettingsDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/settings/ReaderSettingsDialog.kt
@@ -11,13 +11,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.window.DialogWindowProvider
 import eu.kanade.presentation.components.TabbedDialog
 import eu.kanade.presentation.components.TabbedDialogPaddings
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import kotlinx.collections.immutable.persistentListOf
+import tachiyomi.i18n.MR
+import tachiyomi.presentation.core.i18n.localize

@Composable
 fun ReaderSettingsDialog(
@@ -27,9 +27,9 @@ fun ReaderSettingsDialog(
    screenModel: ReaderSettingsScreenModel,
 ) {
    val tabTitles = persistentListOf(
-        stringResource(R.string.pref_category_reading_mode),
-        stringResource(R.string.pref_category_general),
-        stringResource(R.string.custom_filter),
+        localize(MR.strings.pref_category_reading_mode),
+        localize(MR.strings.pref_category_general),
+        localize(MR.strings.custom_filter),
    )
    val pagerState = rememberPagerState { tabTitles.size }

--- a/app/src/main/java/eu/kanade/presentation/reader/settings/ReadingModePage.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/settings/ReadingModePage.kt
@@ -7,45 +7,45 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.ui.res.stringResource
 import eu.kanade.domain.manga.model.readerOrientation
 import eu.kanade.domain.manga.model.readingMode
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
 import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer
+import tachiyomi.i18n.MR
 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.i18n.localize
 import tachiyomi.presentation.core.util.collectAsState
 import java.text.NumberFormat

@Composable
 internal fun ColumnScope.ReadingModePage(screenModel: ReaderSettingsScreenModel) {
-    HeadingItem(R.string.pref_category_for_this_series)
+    HeadingItem(MR.strings.pref_category_for_this_series)
    val manga by screenModel.mangaFlow.collectAsState()

    val readingMode = remember(manga) { ReadingMode.fromPreference(manga?.readingMode?.toInt()) }
-    SettingsChipRow(R.string.pref_category_reading_mode) {
+    SettingsChipRow(MR.strings.pref_category_reading_mode) {
        ReadingMode.entries.map {
            FilterChip(
                selected = it == readingMode,
                onClick = { screenModel.onChangeReadingMode(it) },
-                label = { Text(stringResource(it.stringRes)) },
+                label = { Text(localize(it.stringRes)) },
            )
        }
    }

    val orientation = remember(manga) { ReaderOrientation.fromPreference(manga?.readerOrientation?.toInt()) }
-    SettingsChipRow(R.string.rotation_type) {
+    SettingsChipRow(MR.strings.rotation_type) {
        ReaderOrientation.entries.map {
            FilterChip(
                selected = it == orientation,
                onClick = { screenModel.onChangeOrientation(it) },
-                label = { Text(stringResource(it.stringRes)) },
+                label = { Text(localize(it.stringRes)) },
            )
        }
    }
@@ -60,7 +60,7 @@ internal fun ColumnScope.ReadingModePage(screenModel: ReaderSettingsScreenModel)

@Composable
 private fun ColumnScope.PagerViewerSettings(screenModel: ReaderSettingsScreenModel) {
-    HeadingItem(R.string.pager_viewer)
+    HeadingItem(MR.strings.pager_viewer)

    val navigationModePager by screenModel.preferences.navigationModePager().collectAsState()
    val pagerNavInverted by screenModel.preferences.pagerNavInverted().collectAsState()
@@ -72,64 +72,64 @@ private fun ColumnScope.PagerViewerSettings(screenModel: ReaderSettingsScreenMod
    )

    val imageScaleType by screenModel.preferences.imageScaleType().collectAsState()
-    SettingsChipRow(R.string.pref_image_scale_type) {
+    SettingsChipRow(MR.strings.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)) },
+                label = { Text(localize(it)) },
            )
        }
    }

    val zoomStart by screenModel.preferences.zoomStart().collectAsState()
-    SettingsChipRow(R.string.pref_zoom_start) {
+    SettingsChipRow(MR.strings.pref_zoom_start) {
        ReaderPreferences.ZoomStart.mapIndexed { index, it ->
            FilterChip(
                selected = zoomStart == index + 1,
                onClick = { screenModel.preferences.zoomStart().set(index + 1) },
-                label = { Text(stringResource(it)) },
+                label = { Text(localize(it)) },
            )
        }
    }

    CheckboxItem(
-        label = stringResource(R.string.pref_crop_borders),
+        label = localize(MR.strings.pref_crop_borders),
        pref = screenModel.preferences.cropBorders(),
    )

    CheckboxItem(
-        label = stringResource(R.string.pref_landscape_zoom),
+        label = localize(MR.strings.pref_landscape_zoom),
        pref = screenModel.preferences.landscapeZoom(),
    )

    CheckboxItem(
-        label = stringResource(R.string.pref_navigate_pan),
+        label = localize(MR.strings.pref_navigate_pan),
        pref = screenModel.preferences.navigateToPan(),
    )

    val dualPageSplitPaged by screenModel.preferences.dualPageSplitPaged().collectAsState()
    CheckboxItem(
-        label = stringResource(R.string.pref_dual_page_split),
+        label = localize(MR.strings.pref_dual_page_split),
        pref = screenModel.preferences.dualPageSplitPaged(),
    )

    if (dualPageSplitPaged) {
        CheckboxItem(
-            label = stringResource(R.string.pref_dual_page_invert),
+            label = localize(MR.strings.pref_dual_page_invert),
            pref = screenModel.preferences.dualPageInvertPaged(),
        )
    }

    val dualPageRotateToFit by screenModel.preferences.dualPageRotateToFit().collectAsState()
    CheckboxItem(
-        label = stringResource(R.string.pref_page_rotate),
+        label = localize(MR.strings.pref_page_rotate),
        pref = screenModel.preferences.dualPageRotateToFit(),
    )

    if (dualPageRotateToFit) {
        CheckboxItem(
-            label = stringResource(R.string.pref_page_rotate_invert),
+            label = localize(MR.strings.pref_page_rotate_invert),
            pref = screenModel.preferences.dualPageRotateToFitInvert(),
        )
    }
@@ -139,7 +139,7 @@ private fun ColumnScope.PagerViewerSettings(screenModel: ReaderSettingsScreenMod
 private fun ColumnScope.WebtoonViewerSettings(screenModel: ReaderSettingsScreenModel) {
    val numberFormat = remember { NumberFormat.getPercentInstance() }

-    HeadingItem(R.string.webtoon_viewer)
+    HeadingItem(MR.strings.webtoon_viewer)

    val navigationModeWebtoon by screenModel.preferences.navigationModeWebtoon().collectAsState()
    val webtoonNavInverted by screenModel.preferences.webtoonNavInverted().collectAsState()
@@ -152,7 +152,7 @@ private fun ColumnScope.WebtoonViewerSettings(screenModel: ReaderSettingsScreenM

    val webtoonSidePadding by screenModel.preferences.webtoonSidePadding().collectAsState()
    SliderItem(
-        label = stringResource(R.string.pref_webtoon_side_padding),
+        label = localize(MR.strings.pref_webtoon_side_padding),
        min = ReaderPreferences.WEBTOON_PADDING_MIN,
        max = ReaderPreferences.WEBTOON_PADDING_MAX,
        value = webtoonSidePadding,
@@ -163,25 +163,25 @@ private fun ColumnScope.WebtoonViewerSettings(screenModel: ReaderSettingsScreenM
    )

    CheckboxItem(
-        label = stringResource(R.string.pref_crop_borders),
+        label = localize(MR.strings.pref_crop_borders),
        pref = screenModel.preferences.cropBordersWebtoon(),
    )

    val dualPageSplitWebtoon by screenModel.preferences.dualPageSplitWebtoon().collectAsState()
    CheckboxItem(
-        label = stringResource(R.string.pref_dual_page_split),
+        label = localize(MR.strings.pref_dual_page_split),
        pref = screenModel.preferences.dualPageSplitWebtoon(),
    )

    if (dualPageSplitWebtoon) {
        CheckboxItem(
-            label = stringResource(R.string.pref_dual_page_invert),
+            label = localize(MR.strings.pref_dual_page_invert),
            pref = screenModel.preferences.dualPageInvertWebtoon(),
        )
    }

    CheckboxItem(
-        label = stringResource(R.string.pref_double_tap_zoom),
+        label = localize(MR.strings.pref_double_tap_zoom),
        pref = screenModel.preferences.webtoonDoubleTapZoomEnabled(),
    )
 }
@@ -193,23 +193,23 @@ private fun ColumnScope.TapZonesItems(
    invertMode: ReaderPreferences.TappingInvertMode,
    onSelectInvertMode: (ReaderPreferences.TappingInvertMode) -> Unit,
 ) {
-    SettingsChipRow(R.string.pref_viewer_nav) {
+    SettingsChipRow(MR.strings.pref_viewer_nav) {
        ReaderPreferences.TapZones.mapIndexed { index, it ->
            FilterChip(
                selected = selected == index,
                onClick = { onSelect(index) },
-                label = { Text(stringResource(it)) },
+                label = { Text(localize(it)) },
            )
        }
    }

    if (selected != 5) {
-        SettingsChipRow(R.string.pref_read_with_tapping_inverted) {
+        SettingsChipRow(MR.strings.pref_read_with_tapping_inverted) {
            ReaderPreferences.TappingInvertMode.entries.map {
                FilterChip(
                    selected = it == invertMode,
                    onClick = { onSelectInvertMode(it) },
-                    label = { Text(stringResource(it.titleResId)) },
+                    label = { Text(localize(it.titleRes)) },
                )
            }
        }