Weblates merge

app/src/main/java/eu/kanade/domain/base/BasePreferences.kt

@@ -3,12 +3,12 @@ package eu.kanade.domain.base
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
-import androidx.annotation.StringRes
-import eu.kanade.tachiyomi.R
+import dev.icerock.moko.resources.StringResource
 import eu.kanade.tachiyomi.util.system.isPreviewBuildType
 import eu.kanade.tachiyomi.util.system.isReleaseBuildType
 import tachiyomi.core.preference.Preference
 import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.i18n.MR
 
 class BasePreferences(
     val context: Context,
@@ -33,10 +33,10 @@ class BasePreferences(
         PackageManager.FEATURE_PICTURE_IN_PICTURE,
     )
 
-    enum class ExtensionInstaller(@StringRes val titleResId: Int) {
-        LEGACY(R.string.ext_installer_legacy),
-        PACKAGEINSTALLER(R.string.ext_installer_packageinstaller),
-        SHIZUKU(R.string.ext_installer_shizuku),
-        PRIVATE(R.string.ext_installer_private),
+    enum class ExtensionInstaller(val titleRes: StringResource) {
+        LEGACY(MR.strings.ext_installer_legacy),
+        PACKAGEINSTALLER(MR.strings.ext_installer_packageinstaller),
+        SHIZUKU(MR.strings.ext_installer_shizuku),
+        PRIVATE(MR.strings.ext_installer_private),
     }
 }

app/src/main/java/eu/kanade/domain/ui/model/AppTheme.kt

@@ -1,25 +1,26 @@
 package eu.kanade.domain.ui.model
 
-import eu.kanade.tachiyomi.R
+import dev.icerock.moko.resources.StringResource
+import tachiyomi.i18n.MR
 
-enum class AppTheme(val titleResId: Int?) {
-    DEFAULT(R.string.label_default),
-    MONET(R.string.theme_monet),
-    CLOUDFLARE(R.string.theme_cloudflare),
-    COTTONCANDY(R.string.theme_cottoncandy),
-    DOOM(R.string.theme_doom),
-    GREEN_APPLE(R.string.theme_greenapple),
-    LAVENDER(R.string.theme_lavender),
-    MATRIX(R.string.theme_matrix),
-    MIDNIGHT_DUSK(R.string.theme_midnightdusk),
-    MOCHA(R.string.theme_mocha),
-    SAPPHIRE(R.string.theme_sapphire),
-    STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri),
-    TAKO(R.string.theme_tako),
-    TEALTURQUOISE(R.string.theme_tealturquoise),
-    TIDAL_WAVE(R.string.theme_tidalwave),
-    YINYANG(R.string.theme_yinyang),
-    YOTSUBA(R.string.theme_yotsuba),
+enum class AppTheme(val titleRes: StringResource?) {
+    DEFAULT(MR.strings.label_default),
+    MONET(MR.strings.theme_monet),
+    CLOUDFLARE(MR.strings.theme_cloudflare),
+    COTTONCANDY(MR.strings.theme_cottoncandy),
+    DOOM(MR.strings.theme_doom),
+    GREEN_APPLE(MR.strings.theme_greenapple),
+    LAVENDER(MR.strings.theme_lavender),
+    MATRIX(MR.strings.theme_matrix),
+    MIDNIGHT_DUSK(MR.strings.theme_midnightdusk),
+    MOCHA(MR.strings.theme_mocha),
+    SAPPHIRE(MR.strings.theme_sapphire),
+    STRAWBERRY_DAIQUIRI(MR.strings.theme_strawberrydaiquiri),
+    TAKO(MR.strings.theme_tako),
+    TEALTURQUOISE(MR.strings.theme_tealturquoise),
+    TIDAL_WAVE(MR.strings.theme_tidalwave),
+    YINYANG(MR.strings.theme_yinyang),
+    YOTSUBA(MR.strings.theme_yotsuba),
 
     // Deprecated
     DARK_BLUE(null),

app/src/main/java/eu/kanade/domain/ui/model/TabletUiMode.kt

@@ -1,10 +1,11 @@
 package eu.kanade.domain.ui.model
 
-import eu.kanade.tachiyomi.R
+import dev.icerock.moko.resources.StringResource
+import tachiyomi.i18n.MR
 
-enum class TabletUiMode(val titleResId: Int) {
-    AUTOMATIC(R.string.automatic_background),
-    ALWAYS(R.string.lock_always),
-    LANDSCAPE(R.string.landscape),
-    NEVER(R.string.lock_never),
+enum class TabletUiMode(val titleRes: StringResource) {
+    AUTOMATIC(MR.strings.automatic_background),
+    ALWAYS(MR.strings.lock_always),
+    LANDSCAPE(MR.strings.landscape),
+    NEVER(MR.strings.lock_never),
 }

app/src/main/java/eu/kanade/presentation/browse/GlobalSearchResultItems.kt

@@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowForward
-import androidx.compose.material.icons.outlined.ArrowForward
 import androidx.compose.material.icons.outlined.Error
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
@@ -22,11 +21,11 @@ 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.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import eu.kanade.tachiyomi.R
+import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
+import tachiyomi.presentation.core.i18n.stringResource
 
 @Composable
 fun GlobalSearchResultItem(
@@ -93,7 +92,7 @@ fun GlobalSearchErrorResultItem(message: String?) {
         Icon(imageVector = Icons.Outlined.Error, contentDescription = null)
         Spacer(Modifier.height(4.dp))
         Text(
-            text = message ?: stringResource(R.string.unknown_error),
+            text = message ?: stringResource(MR.strings.unknown_error),
             textAlign = TextAlign.Center,
         )
     }

app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionDetailsScreen.kt

@@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.HelpOutline
-import androidx.compose.material.icons.outlined.HelpOutline
 import androidx.compose.material.icons.outlined.History
 import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material3.Button
@@ -37,7 +36,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -50,15 +48,16 @@ import eu.kanade.presentation.components.AppBarActions
 import eu.kanade.presentation.components.WarningBanner
 import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
 import eu.kanade.presentation.more.settings.widget.TrailingWidgetBuffer
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension
 import eu.kanade.tachiyomi.ui.browse.anime.extension.details.AnimeExtensionDetailsScreenModel
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import kotlinx.collections.immutable.persistentListOf
+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.stringResource
 import tachiyomi.presentation.core.screens.EmptyScreen
 
 @Composable
@@ -77,7 +76,7 @@ fun AnimeExtensionDetailsScreen(
     Scaffold(
         topBar = { scrollBehavior ->
             AppBar(
-                title = stringResource(R.string.label_extension_info),
+                title = stringResource(MR.strings.label_extension_info),
                 navigateUp = navigateUp,
                 actions = {
                     AppBarActions(
@@ -86,14 +85,14 @@ fun AnimeExtensionDetailsScreen(
                                 if (state.extension?.isUnofficial == false) {
                                     add(
                                         AppBar.Action(
-                                            title = stringResource(R.string.whats_new),
+                                            title = stringResource(MR.strings.whats_new),
                                             icon = Icons.Outlined.History,
                                             onClick = onClickWhatsNew,
                                         ),
                                     )
                                     add(
                                         AppBar.Action(
-                                            title = stringResource(R.string.action_faq_and_guides),
+                                            title = stringResource(MR.strings.action_faq_and_guides),
                                             icon = Icons.AutoMirrored.Outlined.HelpOutline,
                                             onClick = onClickReadme,
                                         ),
@@ -102,15 +101,15 @@ fun AnimeExtensionDetailsScreen(
                                 addAll(
                                     listOf(
                                         AppBar.OverflowAction(
-                                            title = stringResource(R.string.action_enable_all),
+                                            title = stringResource(MR.strings.action_enable_all),
                                             onClick = onClickEnableAll,
                                         ),
                                         AppBar.OverflowAction(
-                                            title = stringResource(R.string.action_disable_all),
+                                            title = stringResource(MR.strings.action_disable_all),
                                             onClick = onClickDisableAll,
                                         ),
                                         AppBar.OverflowAction(
-                                            title = stringResource(R.string.pref_clear_cookies),
+                                            title = stringResource(MR.strings.pref_clear_cookies),
                                             onClick = onClickClearCookies,
                                         ),
                                     ),
@@ -125,7 +124,7 @@ fun AnimeExtensionDetailsScreen(
     ) { paddingValues ->
         if (state.extension == null) {
             EmptyScreen(
-                textResource = R.string.empty_screen,
+                stringRes = MR.strings.empty_screen,
                 modifier = Modifier.padding(paddingValues),
             )
             return@Scaffold
@@ -160,11 +159,11 @@ private fun AnimeExtensionDetails(
         when {
             extension.isUnofficial ->
                 item {
-                    WarningBanner(R.string.unofficial_anime_extension_message)
+                    WarningBanner(MR.strings.unofficial_anime_extension_message)
                 }
             extension.isObsolete ->
                 item {
-                    WarningBanner(R.string.obsolete_extension_message)
+                    WarningBanner(MR.strings.obsolete_extension_message)
                 }
         }
 
@@ -262,28 +261,28 @@ private fun DetailsHeader(
             InfoText(
                 modifier = Modifier.weight(1f),
                 primaryText = extension.versionName,
-                secondaryText = stringResource(R.string.ext_info_version),
+                secondaryText = stringResource(MR.strings.ext_info_version),
             )
 
             InfoDivider()
 
             InfoText(
                 modifier = Modifier.weight(if (extension.isNsfw) 1.5f else 1f),
                 primaryText = LocaleHelper.getSourceDisplayName(extension.lang, context),
-                secondaryText = stringResource(R.string.ext_info_language),
+                secondaryText = stringResource(MR.strings.ext_info_language),
             )
 
             if (extension.isNsfw) {
                 InfoDivider()
 
                 InfoText(
                     modifier = Modifier.weight(1f),
-                    primaryText = stringResource(R.string.ext_nsfw_short),
+                    primaryText = stringResource(MR.strings.ext_nsfw_short),
                     primaryTextStyle = MaterialTheme.typography.bodyLarge.copy(
                         color = MaterialTheme.colorScheme.error,
                         fontWeight = FontWeight.Medium,
                     ),
-                    secondaryText = stringResource(R.string.ext_info_age_rating),
+                    secondaryText = stringResource(MR.strings.ext_info_age_rating),
                     onClick = onClickAgeRating,
                 )
             }
@@ -302,7 +301,7 @@ private fun DetailsHeader(
                 modifier = Modifier.weight(1f),
                 onClick = onClickUninstall,
             ) {
-                Text(stringResource(R.string.ext_uninstall))
+                Text(stringResource(MR.strings.ext_uninstall))
             }
 
             if (onClickAppInfo != null) {
@@ -311,7 +310,7 @@ private fun DetailsHeader(
                     onClick = onClickAppInfo,
                 ) {
                     Text(
-                        text = stringResource(R.string.ext_app_info),
+                        text = stringResource(MR.strings.ext_app_info),
                         color = MaterialTheme.colorScheme.onPrimary,
                     )
                 }
@@ -389,7 +388,7 @@ private fun SourceSwitchPreference(
                     IconButton(onClick = { onClickSourcePreferences(source.source.id) }) {
                         Icon(
                             imageVector = Icons.Outlined.Settings,
-                            contentDescription = stringResource(R.string.label_settings),
+                            contentDescription = stringResource(MR.strings.label_settings),
                             tint = MaterialTheme.colorScheme.onSurface,
                         )
                     }

app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionFilterScreen.kt

@@ -7,13 +7,13 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.browse.anime.extension.AnimeExtensionFilterState
 import eu.kanade.tachiyomi.util.system.LocaleHelper
+import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.Scaffold
+import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.screens.EmptyScreen
 
 @Composable
@@ -25,15 +25,15 @@ fun AnimeExtensionFilterScreen(
     Scaffold(
         topBar = { scrollBehavior ->
             AppBar(
-                title = stringResource(R.string.label_extensions),
+                title = stringResource(MR.strings.label_extensions),
                 navigateUp = navigateUp,
                 scrollBehavior = scrollBehavior,
             )
         },
     ) { contentPadding ->
         if (state.isEmpty) {
             EmptyScreen(
-                textResource = R.string.empty_screen,
+                stringRes = MR.strings.empty_screen,
                 modifier = Modifier.padding(contentPadding),
             )
             return@Scaffold