Replace remaining Android-specific strings

Also renaming the helper composables so it's a bit easier to find/replace everything in forks. (cherry picked from commit 0d1bced1226878336f8156671ae0c224c02f2604) # Conflicts: # app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt # app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt # app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt # app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt # app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt # app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt # app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt # app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt # app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt # app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt # app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt # app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt # app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt # app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt # app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt # app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt # app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt # app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt
2023-11-18 19:41:33 -05:00
parent 1eccf9fad8
commit 82098460ff
123 changed files with 708 additions and 701 deletions
@@ -41,8 +41,8 @@ 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.i18n.pluralStringResource
+import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.secondaryItemAlpha

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

            Text(
-                text = localizePlural(MR.plurals.missing_chapters_warning, count = gapCount, gapCount),
+                text = pluralStringResource(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 = localize(MR.strings.label_downloaded),
+                        contentDescription = stringResource(MR.strings.label_downloaded),
                    )
                },
            ),
@@ -24,7 +24,7 @@ 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
+import tachiyomi.presentation.core.i18n.stringResource

 private val ReaderOrientationsWithoutDefault = ReaderOrientation.entries - ReaderOrientation.DEFAULT

@@ -73,7 +73,7 @@ private fun DialogContent(
                    },
                    modifier = Modifier.fillMaxWidth(),
                    imageVector = ImageVector.vectorResource(mode.iconRes),
-                    title = localize(mode.stringRes),
+                    title = stringResource(mode.stringRes),
                )
            }
        }
@@ -24,7 +24,7 @@ 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
+import tachiyomi.presentation.core.i18n.stringResource

 private val ReadingModesWithoutDefault = ReadingMode.entries - ReadingMode.DEFAULT

@@ -69,7 +69,7 @@ private fun DialogContent(
                    },
                    modifier = Modifier.fillMaxWidth(),
                    imageVector = ImageVector.vectorResource(mode.iconRes),
-                    title = localize(mode.stringRes),
+                    title = stringResource(mode.stringRes),
                )
            }
        }
@@ -21,7 +21,7 @@ import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.theme.TachiyomiTheme
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.SettingsItemsPaddings
-import tachiyomi.presentation.core.i18n.localize
+import tachiyomi.presentation.core.i18n.stringResource

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

@@ -57,7 +57,7 @@ fun ModeSelectionDialog(
                            imageVector = Icons.Outlined.Check,
                            contentDescription = null,
                        )
-                        Text(text = localize(MR.strings.action_apply))
+                        Text(text = stringResource(MR.strings.action_apply))
                    }
                }
            }
@@ -16,7 +16,7 @@ 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.i18n.stringResource
 import tachiyomi.presentation.core.util.collectAsState

@Composable
@@ -38,11 +38,11 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
                ),
            )
        }
-    }.map { localize(it) }
+    }.map { stringResource(it) }

    val customBrightness by screenModel.preferences.customBrightness().collectAsState()
    CheckboxItem(
-        label = localize(MR.strings.pref_custom_brightness),
+        label = stringResource(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 = localize(MR.strings.pref_custom_brightness),
+            label = stringResource(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 = localize(MR.strings.pref_custom_color_filter),
+        label = stringResource(MR.strings.pref_custom_color_filter),
        pref = screenModel.preferences.colorFilter(),
    )
    if (colorFilter) {
        val colorFilterValue by screenModel.preferences.colorFilterValue().collectAsState()
        SliderItem(
-            label = localize(MR.strings.color_filter_r_value),
+            label = stringResource(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 = localize(MR.strings.color_filter_g_value),
+            label = stringResource(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 = localize(MR.strings.color_filter_b_value),
+            label = stringResource(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 = localize(MR.strings.color_filter_a_value),
+            label = stringResource(MR.strings.color_filter_a_value),
            max = 255,
            value = colorFilterValue.alpha,
            valueText = colorFilterValue.alpha.toString(),
@@ -129,11 +129,11 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
    }

    CheckboxItem(
-        label = localize(MR.strings.pref_grayscale),
+        label = stringResource(MR.strings.pref_grayscale),
        pref = screenModel.preferences.grayscale(),
    )
    CheckboxItem(
-        label = localize(MR.strings.pref_inverted_colors),
+        label = stringResource(MR.strings.pref_inverted_colors),
        pref = screenModel.preferences.invertedColors(),
    )
 }
@@ -17,7 +17,7 @@ import eu.kanade.presentation.components.TabbedDialogPaddings
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import kotlinx.collections.immutable.persistentListOf
 import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.i18n.localize
+import tachiyomi.presentation.core.i18n.stringResource

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

@@ -19,7 +19,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.i18n.localize
+import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.collectAsState
 import java.text.NumberFormat

@@ -34,7 +34,7 @@ internal fun ColumnScope.ReadingModePage(screenModel: ReaderSettingsScreenModel)
            FilterChip(
                selected = it == readingMode,
                onClick = { screenModel.onChangeReadingMode(it) },
-                label = { Text(localize(it.stringRes)) },
+                label = { Text(stringResource(it.stringRes)) },
            )
        }
    }
@@ -45,7 +45,7 @@ internal fun ColumnScope.ReadingModePage(screenModel: ReaderSettingsScreenModel)
            FilterChip(
                selected = it == orientation,
                onClick = { screenModel.onChangeOrientation(it) },
-                label = { Text(localize(it.stringRes)) },
+                label = { Text(stringResource(it.stringRes)) },
            )
        }
    }
@@ -80,7 +80,7 @@ private fun ColumnScope.PagerViewerSettings(screenModel: ReaderSettingsScreenMod
            FilterChip(
                selected = imageScaleType == index + 1,
                onClick = { screenModel.preferences.imageScaleType().set(index + 1) },
-                label = { Text(localize(it)) },
+                label = { Text(stringResource(it)) },
            )
        }
    }
@@ -91,7 +91,7 @@ private fun ColumnScope.PagerViewerSettings(screenModel: ReaderSettingsScreenMod
            FilterChip(
                selected = zoomStart == index + 1,
                onClick = { screenModel.preferences.zoomStart().set(index + 1) },
-                label = { Text(localize(it)) },
+                label = { Text(stringResource(it)) },
            )
        }
    }
@@ -110,42 +110,42 @@ private fun ColumnScope.PagerViewerSettings(screenModel: ReaderSettingsScreenMod
    // SY <--

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

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

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

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

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

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

    if (dualPageRotateToFit) {
        CheckboxItem(
-            label = localize(MR.strings.pref_page_rotate_invert),
+            label = stringResource(MR.strings.pref_page_rotate_invert),
            pref = screenModel.preferences.dualPageRotateToFitInvert(),
        )
    }
@@ -191,7 +191,7 @@ private fun ColumnScope.WebtoonViewerSettings(screenModel: ReaderSettingsScreenM

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

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

@@ -225,19 +225,19 @@ private fun ColumnScope.WebtoonViewerSettings(screenModel: ReaderSettingsScreenM

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

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

    CheckboxItem(
-        label = localize(MR.strings.pref_double_tap_zoom),
+        label = stringResource(MR.strings.pref_double_tap_zoom),
        pref = screenModel.preferences.webtoonDoubleTapZoomEnabled(),
    )
 }
@@ -266,7 +266,7 @@ private fun ColumnScope.TapZonesItems(
            FilterChip(
                selected = selected == index,
                onClick = { onSelect(index) },
-                label = { Text(localize(it)) },
+                label = { Text(stringResource(it)) },
            )
        }
    }
@@ -277,7 +277,7 @@ private fun ColumnScope.TapZonesItems(
                FilterChip(
                    selected = it == invertMode,
                    onClick = { onSelectInvertMode(it) },
-                    label = { Text(localize(it.titleRes)) },
+                    label = { Text(stringResource(it.titleRes)) },
                )
            }
        }