Migrate to multiplatform string resources (#10147)

* Migrate to multiplatform string resources * Move plurals translations into separate files * Fix lint check on generated files (cherry picked from commit 46e734fc8eefb8c06a880194e702559ca3fa769d) # Conflicts: # app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt # 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/BrowseSourceDialogs.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/MigrationFlags.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrateMangaScreen.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/reader/setting/ReaderPreferences.kt # app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt # build.gradle.kts # i18n/build.gradle.kts # i18n/src/commonMain/resources/MR/base/strings_sy.xml # i18n/src/commonMain/resources/MR/fr/strings_sy.xml # i18n/src/commonMain/resources/MR/in/strings_sy.xml # i18n/src/commonMain/resources/MR/pt-rBR/strings_sy.xml # i18n/src/commonMain/resources/MR/ru/strings_sy.xml # i18n/src/commonMain/resources/MR/zh-rCN/strings_sy.xml # i18n/src/commonMain/resources/MR/zh-rTW/strings_sy.xml
2023-11-18 13:54:56 -05:00
parent 120ac6dbda
commit 1eccf9fad8
318 changed files with 5701 additions and 6080 deletions
@@ -1,6 +1,5 @@
 package eu.kanade.presentation.track

-import androidx.annotation.StringRes
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -42,20 +41,21 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
+import dev.icerock.moko.resources.StringResource
 import eu.kanade.domain.track.model.toDbTrack
 import eu.kanade.presentation.components.DropdownMenu
 import eu.kanade.presentation.theme.TachiyomiTheme
 import eu.kanade.presentation.track.components.TrackLogoIcon
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.track.Tracker
 import eu.kanade.tachiyomi.ui.manga.track.TrackItem
 import eu.kanade.tachiyomi.util.system.copyToClipboard
+import tachiyomi.i18n.MR
+import tachiyomi.presentation.core.i18n.localize
 import java.text.DateFormat

 private const val UnsetStatusTextAlpha = 0.5F
@@ -131,7 +131,7 @@ fun TrackInfoDialogHome(
 private fun TrackInfoItem(
    title: String,
    tracker: Tracker,
-    @StringRes status: Int?,
+    status: StringResource?,
    onStatusClick: () -> Unit,
    chapters: String,
    onChaptersClick: () -> Unit,
@@ -194,7 +194,7 @@ private fun TrackInfoItem(
                Row(modifier = Modifier.height(IntrinsicSize.Min)) {
                    TrackDetailsItem(
                        modifier = Modifier.weight(1f),
-                        text = status?.let { stringResource(it) } ?: "",
+                        text = status?.let { localize(it) } ?: "",
                        onClick = onStatusClick,
                    )
                    VerticalDivider()
@@ -209,7 +209,7 @@ private fun TrackInfoItem(
                            modifier = Modifier
                                .weight(1f)
                                .alpha(if (score == null) UnsetStatusTextAlpha else 1f),
-                            text = score ?: stringResource(R.string.score),
+                            text = score ?: localize(MR.strings.score),
                            onClick = onScoreClick,
                        )
                    }
@@ -221,14 +221,14 @@ private fun TrackInfoItem(
                        TrackDetailsItem(
                            modifier = Modifier.weight(1F),
                            text = startDate,
-                            placeholder = stringResource(R.string.track_started_reading_date),
+                            placeholder = localize(MR.strings.track_started_reading_date),
                            onClick = onStartDateClick,
                        )
                        VerticalDivider()
                        TrackDetailsItem(
                            modifier = Modifier.weight(1F),
                            text = endDate,
-                            placeholder = stringResource(R.string.track_finished_reading_date),
+                            placeholder = localize(MR.strings.track_finished_reading_date),
                            onClick = onEndDateClick,
                        )
                    }
@@ -279,7 +279,7 @@ private fun TrackInfoItemEmpty(
                .padding(start = 16.dp)
                .weight(1f),
        ) {
-            Text(text = stringResource(R.string.add_tracking))
+            Text(text = localize(MR.strings.add_tracking))
        }
    }
 }
@@ -294,7 +294,7 @@ private fun TrackInfoItemMenu(
        IconButton(onClick = { expanded = true }) {
            Icon(
                imageVector = Icons.Default.MoreVert,
-                contentDescription = stringResource(R.string.label_more),
+                contentDescription = localize(MR.strings.label_more),
            )
        }
        DropdownMenu(
@@ -302,14 +302,14 @@ private fun TrackInfoItemMenu(
            onDismissRequest = { expanded = false },
        ) {
            DropdownMenuItem(
-                text = { Text(stringResource(R.string.action_open_in_browser)) },
+                text = { Text(localize(MR.strings.action_open_in_browser)) },
                onClick = {
                    onOpenInBrowser()
                    expanded = false
                },
            )
            DropdownMenuItem(
-                text = { Text(stringResource(R.string.action_remove)) },
+                text = { Text(localize(MR.strings.action_remove)) },
                onClick = {
                    onRemoved()
                    expanded = false
@@ -29,18 +29,19 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
+import dev.icerock.moko.resources.StringResource
 import eu.kanade.presentation.theme.TachiyomiTheme
-import eu.kanade.tachiyomi.R
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
+import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.ScrollbarLazyColumn
 import tachiyomi.presentation.core.components.WheelNumberPicker
 import tachiyomi.presentation.core.components.WheelTextPicker
 import tachiyomi.presentation.core.components.material.AlertDialogContent
 import tachiyomi.presentation.core.components.material.padding
+import tachiyomi.presentation.core.i18n.localize
 import tachiyomi.presentation.core.util.isScrolledToEnd
 import tachiyomi.presentation.core.util.isScrolledToStart

@@ -48,12 +49,12 @@ import tachiyomi.presentation.core.util.isScrolledToStart
 fun TrackStatusSelector(
    selection: Int,
    onSelectionChange: (Int) -> Unit,
-    selections: Map<Int, Int?>,
+    selections: Map<Int, StringResource?>,
    onConfirm: () -> Unit,
    onDismissRequest: () -> Unit,
 ) {
    BaseSelector(
-        title = stringResource(R.string.status),
+        title = localize(MR.strings.status),
        content = {
            val state = rememberLazyListState()
            ScrollbarLazyColumn(state = state) {
@@ -76,7 +77,7 @@ fun TrackStatusSelector(
                                onClick = null,
                            )
                            Text(
-                                text = value?.let { stringResource(it) } ?: "",
+                                text = value?.let { localize(it) } ?: "",
                                style = MaterialTheme.typography.bodyLarge.merge(),
                                modifier = Modifier.padding(start = 24.dp),
                            )
@@ -101,7 +102,7 @@ fun TrackChapterSelector(
    onDismissRequest: () -> Unit,
 ) {
    BaseSelector(
-        title = stringResource(R.string.chapters),
+        title = localize(MR.strings.chapters),
        content = {
            WheelNumberPicker(
                items = range.toImmutableList(),
@@ -124,7 +125,7 @@ fun TrackScoreSelector(
    onDismissRequest: () -> Unit,
 ) {
    BaseSelector(
-        title = stringResource(R.string.score),
+        title = localize(MR.strings.score),
        content = {
            WheelTextPicker(
                items = selections,
@@ -171,15 +172,15 @@ fun TrackDateSelector(
                ) {
                    if (onRemove != null) {
                        TextButton(onClick = onRemove) {
-                            Text(text = stringResource(R.string.action_remove))
+                            Text(text = localize(MR.strings.action_remove))
                        }
                        Spacer(modifier = Modifier.weight(1f))
                    }
                    TextButton(onClick = onDismissRequest) {
-                        Text(text = stringResource(R.string.action_cancel))
+                        Text(text = localize(MR.strings.action_cancel))
                    }
                    TextButton(onClick = { onConfirm(pickerState.selectedDateMillis!!) }) {
-                        Text(text = stringResource(R.string.action_ok))
+                        Text(text = localize(MR.strings.action_ok))
                    }
                }
            }
@@ -214,10 +215,10 @@ private fun BaseSelector(
                    Spacer(modifier = Modifier.weight(1f))
                }
                TextButton(onClick = onDismissRequest) {
-                    Text(text = stringResource(R.string.action_cancel))
+                    Text(text = localize(MR.strings.action_cancel))
                }
                TextButton(onClick = onConfirm) {
-                    Text(text = stringResource(R.string.action_ok))
+                    Text(text = localize(MR.strings.action_ok))
                }
            }
        },
@@ -234,12 +235,12 @@ private fun TrackStatusSelectorPreviews() {
                onSelectionChange = {},
                selections = mapOf(
                    // Anilist values
-                    1 to R.string.reading,
-                    2 to R.string.plan_to_read,
-                    3 to R.string.completed,
-                    4 to R.string.on_hold,
-                    5 to R.string.dropped,
-                    6 to R.string.repeating,
+                    1 to MR.strings.reading,
+                    2 to MR.strings.plan_to_read,
+                    3 to MR.strings.completed,
+                    4 to MR.strings.on_hold,
+                    5 to MR.strings.dropped,
+                    6 to MR.strings.repeating,
                ),
                onConfirm = {},
                onDismissRequest = {},
@@ -29,7 +29,6 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowBack
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.CheckCircle
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.Button
@@ -50,7 +49,6 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.TextFieldValue
@@ -62,11 +60,12 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.manga.components.MangaCover
 import eu.kanade.presentation.theme.TachiyomiTheme
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.ScrollbarLazyColumn
 import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.components.material.padding
+import tachiyomi.presentation.core.i18n.localize
 import tachiyomi.presentation.core.screens.EmptyScreen
 import tachiyomi.presentation.core.screens.LoadingScreen
 import tachiyomi.presentation.core.util.plus
@@ -121,7 +120,7 @@ fun TrackerSearch(
                            decorationBox = {
                                if (query.text.isEmpty()) {
                                    Text(
-                                        text = stringResource(R.string.action_search_hint),
+                                        text = localize(MR.strings.action_search_hint),
                                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                                        style = MaterialTheme.typography.bodyLarge,
                                    )
@@ -164,7 +163,7 @@ fun TrackerSearch(
                        .fillMaxWidth(),
                    elevation = ButtonDefaults.elevatedButtonElevation(),
                ) {
-                    Text(text = stringResource(R.string.action_track))
+                    Text(text = localize(MR.strings.action_track))
                }
            }
        },
@@ -177,7 +176,7 @@ fun TrackerSearch(
                if (availableTracks.isEmpty()) {
                    EmptyScreen(
                        modifier = Modifier.padding(innerPadding),
-                        textResource = R.string.no_results_found,
+                        stringRes = MR.strings.no_results_found,
                    )
                } else {
                    ScrollbarLazyColumn(
@@ -205,7 +204,7 @@ fun TrackerSearch(
                EmptyScreen(
                    modifier = Modifier.padding(innerPadding),
                    message = queryResult.exceptionOrNull()?.message
-                        ?: stringResource(R.string.unknown_error),
+                        ?: localize(MR.strings.unknown_error),
                )
            }
        }
@@ -264,19 +263,19 @@ private fun SearchResultItem(
                    )
                    if (type.isNotBlank()) {
                        SearchResultItemDetails(
-                            title = stringResource(R.string.track_type),
+                            title = localize(MR.strings.track_type),
                            text = type,
                        )
                    }
                    if (startDate.isNotBlank()) {
                        SearchResultItemDetails(
-                            title = stringResource(R.string.label_started),
+                            title = localize(MR.strings.label_started),
                            text = startDate,
                        )
                    }
                    if (status.isNotBlank()) {
                        SearchResultItemDetails(
-                            title = stringResource(R.string.track_status),
+                            title = localize(MR.strings.track_status),
                            text = status,
                        )
                    }