From 515496f058b5ecd708bee52f35d430e4a0d997a0 Mon Sep 17 00:00:00 2001 From: "Tran M. Cuong" Date: Mon, 5 Aug 2024 18:44:14 +0700 Subject: [PATCH] add description to long-press on saved searches (#225) * add description to long-press on saved searches * more i18n string --- .../more/settings/screen/SettingsAdvancedScreen.kt | 2 +- .../ui/browse/migration/search/SourceSearchScreen.kt | 5 +++++ .../ui/browse/source/browse/BrowseSourceScreen.kt | 4 ++++ .../tachiyomi/ui/browse/source/browse/SavedSearchItem.kt | 9 ++++++--- .../ui/browse/source/browse/SourceFilterDialog.kt | 6 ++++++ .../tachiyomi/ui/browse/source/feed/SourceFeedScreen.kt | 5 +++++ i18n-kmk/src/commonMain/moko-resources/base/strings.xml | 3 +++ 7 files changed, 30 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt index 7754900d7..34f1fb32e 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt @@ -350,7 +350,7 @@ object SettingsAdvancedScreen : SearchableSettings { // KMK --> Preference.PreferenceItem.SwitchPreference( pref = uiPreferences.preloadLibraryColor(), - title = "Preload library's cover color", + title = stringResource(KMR.strings.preload_library_cover_color), ), // KMK <-- Preference.PreferenceItem.TextPreference( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt index d31a6c7f6..4ae5ad969 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt @@ -33,7 +33,9 @@ import exh.ui.ifSourcesLoaded import kotlinx.collections.immutable.persistentListOf import tachiyomi.core.common.Constants import tachiyomi.domain.manga.model.Manga +import tachiyomi.i18n.sy.SYMR import tachiyomi.presentation.core.components.material.Scaffold +import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.presentation.core.screens.LoadingScreen import tachiyomi.source.local.LocalSource @@ -179,6 +181,9 @@ data class SourceSearchScreen( onSave = {}, savedSearches = persistentListOf(), onSavedSearch = {}, + // KMK --> + onSavedSearchPressDesc = stringResource(SYMR.strings.saved_searches), + // KMK <-- onSavedSearchPress = {}, openMangaDexRandom = null, openMangaDexFollows = null, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt index 57508cf82..9cb57d292 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt @@ -72,6 +72,7 @@ import tachiyomi.core.common.util.lang.launchIO import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.source.model.StubSource import tachiyomi.i18n.MR +import tachiyomi.i18n.kmk.KMR import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.i18n.stringResource @@ -355,6 +356,9 @@ data class BrowseSourceScreen( } }, onSavedSearchPress = screenModel::onSavedSearchPress, + // KMK --> + onSavedSearchPressDesc = stringResource(KMR.strings.saved_searches_delete), + // KMK <-- openMangaDexRandom = if (screenModel.sourceIsMangaDex) { { screenModel.onMangaDexRandom { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SavedSearchItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SavedSearchItem.kt index ddb1a1606..7ae65c7fd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SavedSearchItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SavedSearchItem.kt @@ -15,15 +15,16 @@ import eu.kanade.presentation.components.SuggestionChip import eu.kanade.presentation.components.SuggestionChipDefaults import kotlinx.collections.immutable.ImmutableList import tachiyomi.domain.source.model.EXHSavedSearch -import tachiyomi.i18n.sy.SYMR import tachiyomi.presentation.core.components.SettingsItemsPaddings -import tachiyomi.presentation.core.i18n.stringResource @Composable fun SavedSearchItem( savedSearches: ImmutableList, onSavedSearch: (EXHSavedSearch) -> Unit, onSavedSearchPress: (EXHSavedSearch) -> Unit, + // KMK --> + onSavedSearchPressDesc: String, + // KMK <-- ) { if (savedSearches.isEmpty()) return Column( @@ -35,7 +36,9 @@ fun SavedSearchItem( ), ) { Text( - text = stringResource(SYMR.strings.saved_searches), + // KMK --> + text = onSavedSearchPressDesc, + // KMK <-- style = MaterialTheme.typography.bodySmall, ) FlowRow( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt index fcec11c7d..73a24935a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt @@ -50,6 +50,9 @@ fun SourceFilterDialog( onSave: () -> Unit, onSavedSearch: (EXHSavedSearch) -> Unit, onSavedSearchPress: (EXHSavedSearch) -> Unit, + // KMK --> + onSavedSearchPressDesc: String, + // KMK <-- openMangaDexRandom: (() -> Unit)?, openMangaDexFollows: (() -> Unit)?, // SY <-- @@ -108,6 +111,9 @@ fun SourceFilterDialog( savedSearches = savedSearches, onSavedSearch = onSavedSearch, onSavedSearchPress = onSavedSearchPress, + // KMK --> + onSavedSearchPressDesc = onSavedSearchPressDesc, + // KMK <-- ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreen.kt index 2d52241ae..878990f2e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreen.kt @@ -35,6 +35,8 @@ import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.source.interactor.GetRemoteManga import tachiyomi.domain.source.model.SavedSearch import tachiyomi.domain.source.model.StubSource +import tachiyomi.i18n.kmk.KMR +import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.presentation.core.screens.LoadingScreen class SourceFeedScreen(val sourceId: Long) : Screen() { @@ -176,6 +178,9 @@ class SourceFeedScreen(val sourceId: Long) : Screen() { context.toast(it) } }, + // KMK --> + onSavedSearchPressDesc = stringResource(KMR.strings.saved_searches_add_feed), + // KMK <-- openMangaDexRandom = if (screenModel.sourceIsMangaDex) { { screenModel.onMangaDexRandom { diff --git a/i18n-kmk/src/commonMain/moko-resources/base/strings.xml b/i18n-kmk/src/commonMain/moko-resources/base/strings.xml index 2be27c103..236a099a6 100644 --- a/i18n-kmk/src/commonMain/moko-resources/base/strings.xml +++ b/i18n-kmk/src/commonMain/moko-resources/base/strings.xml @@ -68,6 +68,7 @@ Invalid downloads cleaned Avoid using Private Installer because it\'s not stable yet, will lead to really slow start/resume App. Saved Searches & Feeds + Preload library's cover color Access media files permission @@ -97,6 +98,8 @@ Related Titles Show related titles while viewing entry More like these... + Saved Searches (Hold to add to Feed) + Saved Searches (Hold to delete) Too many sources in your feed, cannot add more than limited (20)