Skip to content

Commit 17f8b99

Browse files
Secozzijmir1
Secozzi
and
jmir1
authored
chore: Move Aniyomi-specific strings to separate module (#2050)
Co-authored-by: jmir1 <[email protected]>
1 parent a93bcdc commit 17f8b99

File tree

367 files changed

+19477
-17654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

367 files changed

+19477
-17654
lines changed

‎app/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ kotlin {
182182

183183
dependencies {
184184
implementation(projects.i18n)
185+
implementation(projects.i18nAniyomi)
185186
implementation(projects.core.archive)
186187
implementation(projects.core.common)
187188
implementation(projects.coreMetadata)

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@ package eu.kanade.domain.ui.model
22

33
import dev.icerock.moko.resources.StringResource
44
import tachiyomi.i18n.MR
5+
import tachiyomi.i18n.aniyomi.AYMR
56

67
enum class AppTheme(val titleRes: StringResource?) {
78
DEFAULT(MR.strings.label_default),
89
MONET(MR.strings.theme_monet),
9-
CLOUDFLARE(MR.strings.theme_cloudflare),
10-
COTTONCANDY(MR.strings.theme_cottoncandy),
11-
DOOM(MR.strings.theme_doom),
10+
CLOUDFLARE(AYMR.strings.theme_cloudflare),
11+
COTTONCANDY(AYMR.strings.theme_cottoncandy),
12+
DOOM(AYMR.strings.theme_doom),
1213
GREEN_APPLE(MR.strings.theme_greenapple),
1314
LAVENDER(MR.strings.theme_lavender),
14-
MATRIX(MR.strings.theme_matrix),
15+
MATRIX(AYMR.strings.theme_matrix),
1516
MIDNIGHT_DUSK(MR.strings.theme_midnightdusk),
16-
MOCHA(MR.strings.theme_mocha),
17-
SAPPHIRE(MR.strings.theme_sapphire),
17+
MOCHA(AYMR.strings.theme_mocha),
18+
SAPPHIRE(AYMR.strings.theme_sapphire),
1819
NORD(MR.strings.theme_nord),
1920
STRAWBERRY_DAIQUIRI(MR.strings.theme_strawberrydaiquiri),
2021
TAKO(MR.strings.theme_tako),

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ import eu.kanade.tachiyomi.ui.library.anime.AnimeLibraryTab
1616
import eu.kanade.tachiyomi.ui.library.manga.MangaLibraryTab
1717
import eu.kanade.tachiyomi.ui.more.MoreTab
1818
import eu.kanade.tachiyomi.ui.updates.UpdatesTab
19-
import tachiyomi.i18n.MR
19+
import tachiyomi.i18n.aniyomi.AYMR
2020

2121
enum class NavStyle(
2222
val titleRes: StringResource,
2323
val moreTab: Tab,
2424
) {
25-
MOVE_MANGA_TO_MORE(titleRes = MR.strings.pref_bottom_nav_no_manga, moreTab = MangaLibraryTab),
26-
MOVE_UPDATES_TO_MORE(titleRes = MR.strings.pref_bottom_nav_no_updates, moreTab = UpdatesTab),
27-
MOVE_HISTORY_TO_MORE(titleRes = MR.strings.pref_bottom_nav_no_history, moreTab = HistoriesTab),
28-
MOVE_BROWSE_TO_MORE(titleRes = MR.strings.pref_bottom_nav_no_browse, moreTab = BrowseTab),
25+
MOVE_MANGA_TO_MORE(titleRes = AYMR.strings.pref_bottom_nav_no_manga, moreTab = MangaLibraryTab),
26+
MOVE_UPDATES_TO_MORE(titleRes = AYMR.strings.pref_bottom_nav_no_updates, moreTab = UpdatesTab),
27+
MOVE_HISTORY_TO_MORE(titleRes = AYMR.strings.pref_bottom_nav_no_history, moreTab = HistoriesTab),
28+
MOVE_BROWSE_TO_MORE(titleRes = AYMR.strings.pref_bottom_nav_no_browse, moreTab = BrowseTab),
2929
;
3030

3131
val moreIcon: ImageVector

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ import eu.kanade.tachiyomi.ui.library.anime.AnimeLibraryTab
88
import eu.kanade.tachiyomi.ui.library.manga.MangaLibraryTab
99
import eu.kanade.tachiyomi.ui.updates.UpdatesTab
1010
import tachiyomi.i18n.MR
11+
import tachiyomi.i18n.aniyomi.AYMR
1112

1213
enum class StartScreen(val titleRes: StringResource, val tab: Tab) {
13-
ANIME(MR.strings.label_anime, AnimeLibraryTab),
14-
MANGA(MR.strings.manga, MangaLibraryTab),
14+
ANIME(AYMR.strings.label_anime, AnimeLibraryTab),
15+
MANGA(AYMR.strings.manga, MangaLibraryTab),
1516
UPDATES(MR.strings.label_recent_updates, UpdatesTab),
1617
HISTORY(MR.strings.label_recent_manga, HistoriesTab),
1718
BROWSE(MR.strings.browse, BrowseTab),

‎app/src/main/java/eu/kanade/presentation/browse/manga/MangaSourcesScreen.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import eu.kanade.tachiyomi.util.system.LocaleHelper
2727
import tachiyomi.domain.source.manga.model.Pin
2828
import tachiyomi.domain.source.manga.model.Source
2929
import tachiyomi.i18n.MR
30+
import tachiyomi.i18n.aniyomi.AYMR
3031
import tachiyomi.presentation.core.components.ScrollbarLazyColumn
3132
import tachiyomi.presentation.core.components.material.SECONDARY_ALPHA
3233
import tachiyomi.presentation.core.components.material.padding
@@ -201,9 +202,9 @@ fun MangaSourceOptionsDialog(
201202
if (onClickToggleDataSaver != null) {
202203
Text(
203204
text = if (source.isExcludedFromDataSaver) {
204-
stringResource(MR.strings.data_saver_stop_exclude)
205+
stringResource(AYMR.strings.data_saver_stop_exclude)
205206
} else {
206-
stringResource(MR.strings.data_saver_exclude)
207+
stringResource(AYMR.strings.data_saver_exclude)
207208
},
208209
modifier = Modifier
209210
.clickable(onClick = onClickToggleDataSaver)

‎app/src/main/java/eu/kanade/presentation/category/components/CategoryListItem.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import androidx.compose.ui.Modifier
2121
import sh.calvin.reorderable.ReorderableCollectionItemScope
2222
import tachiyomi.domain.category.model.Category
2323
import tachiyomi.i18n.MR
24+
import tachiyomi.i18n.aniyomi.AYMR
2425
import tachiyomi.presentation.core.components.material.padding
2526
import tachiyomi.presentation.core.i18n.stringResource
2627

@@ -70,7 +71,7 @@ fun ReorderableCollectionItemScope.CategoryListItem(
7071
} else {
7172
Icons.Outlined.VisibilityOff
7273
},
73-
contentDescription = stringResource(MR.strings.action_hide),
74+
contentDescription = stringResource(AYMR.strings.action_hide),
7475
)
7576
},
7677
)

‎app/src/main/java/eu/kanade/presentation/components/EntryDownloadDropdownMenu.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.compose.ui.Modifier
77
import eu.kanade.presentation.entries.DownloadAction
88
import kotlinx.collections.immutable.persistentListOf
99
import tachiyomi.i18n.MR
10+
import tachiyomi.i18n.aniyomi.AYMR
1011
import tachiyomi.presentation.core.i18n.pluralStringResource
1112
import tachiyomi.presentation.core.i18n.stringResource
1213

@@ -18,8 +19,8 @@ fun EntryDownloadDropdownMenu(
1819
isManga: Boolean,
1920
modifier: Modifier = Modifier,
2021
) {
21-
val downloadAmount = if (isManga) MR.plurals.download_amount else MR.plurals.download_amount_anime
22-
val downloadUnviewed = if (isManga) MR.strings.download_unread else MR.strings.download_unseen
22+
val downloadAmount = if (isManga) MR.plurals.download_amount else AYMR.plurals.download_amount_anime
23+
val downloadUnviewed = if (isManga) MR.strings.download_unread else AYMR.strings.download_unseen
2324
val options = persistentListOf(
2425
DownloadAction.NEXT_1_ITEM to pluralStringResource(downloadAmount, 1, 1),
2526
DownloadAction.NEXT_5_ITEMS to pluralStringResource(downloadAmount, 5, 5),

‎app/src/main/java/eu/kanade/presentation/entries/anime/AnimeScreen.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ import tachiyomi.domain.items.episode.service.missingEpisodesCount
8282
import tachiyomi.domain.library.service.LibraryPreferences
8383
import tachiyomi.domain.source.anime.model.StubAnimeSource
8484
import tachiyomi.i18n.MR
85+
import tachiyomi.i18n.aniyomi.AYMR
8586
import tachiyomi.presentation.core.components.TwoPanelBox
8687
import tachiyomi.presentation.core.components.VerticalFastScroller
8788
import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton
@@ -502,7 +503,7 @@ private fun AnimeScreenSmallImpl(
502503
) {
503504
NextEpisodeAiringListItem(
504505
title = stringResource(
505-
MR.strings.display_mode_episode,
506+
AYMR.strings.display_mode_episode,
506507
formatEpisodeNumber(state.airingEpisodeNumber),
507508
),
508509
date = formatTime(state.airingTime, useDayFormat = true),
@@ -781,7 +782,7 @@ fun AnimeScreenLargeImpl(
781782
) {
782783
NextEpisodeAiringListItem(
783784
title = stringResource(
784-
MR.strings.display_mode_episode,
785+
AYMR.strings.display_mode_episode,
785786
formatEpisodeNumber(state.airingEpisodeNumber),
786787
),
787788
date = formatTime(state.airingTime, useDayFormat = true),
@@ -891,7 +892,7 @@ private fun LazyListScope.sharedEpisodeItems(
891892
AnimeEpisodeListItem(
892893
title = if (anime.displayMode == Anime.EPISODE_DISPLAY_NUMBER) {
893894
stringResource(
894-
MR.strings.display_mode_episode,
895+
AYMR.strings.display_mode_episode,
895896
formatEpisodeNumber(episodeItem.episode.episodeNumber),
896897
)
897898
} else {
@@ -902,7 +903,7 @@ private fun LazyListScope.sharedEpisodeItems(
902903
.takeIf { !episodeItem.episode.seen && it > 0L }
903904
?.let {
904905
stringResource(
905-
MR.strings.episode_progress,
906+
AYMR.strings.episode_progress,
906907
formatTime(it),
907908
formatTime(episodeItem.episode.totalSeconds),
908909
)

‎app/src/main/java/eu/kanade/presentation/entries/anime/DuplicateAnimeDialog.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import eu.kanade.presentation.components.TabbedDialogPaddings
2828
import eu.kanade.presentation.more.settings.LocalPreferenceMinHeight
2929
import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
3030
import tachiyomi.i18n.MR
31+
import tachiyomi.i18n.aniyomi.AYMR
3132
import tachiyomi.presentation.core.i18n.stringResource
3233

3334
@Composable
@@ -66,7 +67,7 @@ fun DuplicateAnimeDialog(
6667
Spacer(Modifier.height(PaddingSize))
6768

6869
TextPreferenceWidget(
69-
title = stringResource(MR.strings.action_show_anime),
70+
title = stringResource(AYMR.strings.action_show_anime),
7071
icon = Icons.Outlined.Book,
7172
onPreferenceClick = {
7273
onDismissRequest()

‎app/src/main/java/eu/kanade/presentation/entries/anime/EpisodeOptionsDialogScreen.kt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ import tachiyomi.domain.items.episode.interactor.GetEpisode
7878
import tachiyomi.domain.items.episode.model.Episode
7979
import tachiyomi.domain.source.anime.service.AnimeSourceManager
8080
import tachiyomi.i18n.MR
81+
import tachiyomi.i18n.aniyomi.AYMR
8182
import tachiyomi.presentation.core.components.material.padding
8283
import tachiyomi.presentation.core.i18n.stringResource
8384
import tachiyomi.presentation.core.screens.LoadingScreen
@@ -426,7 +427,7 @@ fun EpisodeOptionsDialog(
426427
)
427428

428429
Text(
429-
text = stringResource(MR.strings.choose_video_quality),
430+
text = stringResource(AYMR.strings.choose_video_quality),
430431
modifier = Modifier.padding(horizontal = TabbedDialogPaddings.Horizontal),
431432
fontStyle = FontStyle.Italic,
432433
style = MaterialTheme.typography.bodyMedium,
@@ -486,7 +487,7 @@ private fun VideoList(
486487
val clipboardManager = LocalClipboardManager.current
487488
val context = LocalContext.current
488489
val scope = rememberCoroutineScope()
489-
val copiedString = stringResource(MR.strings.copied_video_link_to_clipboard)
490+
val copiedString = stringResource(AYMR.strings.copied_video_link_to_clipboard)
490491

491492
AnimatedVisibility(
492493
visible = !showAllQualities,
@@ -605,7 +606,7 @@ private fun QualityOptions(
605606
)
606607

607608
ClickableRow(
608-
text = stringResource(MR.strings.action_start_download_internally),
609+
text = stringResource(AYMR.strings.action_start_download_internally),
609610
icon = Icons.Outlined.Download,
610611
onClick = {
611612
onDownloadClicked()
@@ -614,7 +615,7 @@ private fun QualityOptions(
614615
)
615616

616617
ClickableRow(
617-
text = stringResource(MR.strings.action_start_download_externally),
618+
text = stringResource(AYMR.strings.action_start_download_externally),
618619
icon = Icons.Outlined.SystemUpdateAlt,
619620
onClick = {
620621
onExtDownloadClicked()
@@ -623,7 +624,7 @@ private fun QualityOptions(
623624
)
624625

625626
ClickableRow(
626-
text = stringResource(MR.strings.action_play_externally),
627+
text = stringResource(AYMR.strings.action_play_externally),
627628
icon = Icons.Outlined.OpenInNew,
628629
onClick = {
629630
onExtPlayerClicked()
@@ -632,7 +633,7 @@ private fun QualityOptions(
632633
)
633634

634635
ClickableRow(
635-
text = stringResource(MR.strings.action_play_internally),
636+
text = stringResource(AYMR.strings.action_play_internally),
636637
icon = Icons.Outlined.Input,
637638
onClick = {
638639
onIntPlayerClicked()

0 commit comments

Comments
 (0)