diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt index cb10b4073..a7c7bf917 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt @@ -94,7 +94,10 @@ private fun ExtensionFilterContent( modifier = Modifier.animateItem(), title = LocaleHelper.getSourceDisplayName(language, context) + // KMK --> - " (${LocaleHelper.getDisplayName(language)})", + ( + " (${LocaleHelper.getDisplayName(language)})" + .takeIf { language !in listOf("all", "other") } ?: "" + ), // KMK <-- checked = language in state.enabledLanguages, onCheckedChanged = { onClickLang(language) }, diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt index c57944403..98ce2baa0 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt @@ -24,6 +24,7 @@ import tachiyomi.presentation.core.components.Scroller.STICKY_HEADER_KEY_PREFIX import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.i18n.stringResource +import tachiyomi.presentation.core.icons.FlagEmoji import tachiyomi.presentation.core.screens.EmptyScreen @Composable @@ -118,6 +119,9 @@ private fun SourcesFilterContent( // KMK <-- .animateItemFastScroll(), isEnabled = toggleEnabled, + // KMK --> + language = language, + // KMK <-- onClickItem = { onClickSources(!toggleEnabled, sources) }, @@ -154,7 +158,13 @@ private fun SourcesFilterHeader( ) { SwitchPreferenceWidget( modifier = modifier, - title = LocaleHelper.getSourceDisplayName(language, LocalContext.current), + title = LocaleHelper.getSourceDisplayName(language, LocalContext.current) + + // KMK --> + ( + " (${LocaleHelper.getDisplayName(language)} ${FlagEmoji.getEmojiLangFlag(language)})" + .takeIf { language !in listOf("all", "other") } ?: " (${FlagEmoji.getEmojiLangFlag(language)})" + ), + // KMK <-- checked = enabled, onCheckedChanged = { onClickItem(language) }, ) @@ -165,11 +175,17 @@ private fun SourcesFilterHeader( fun SourcesFilterToggle( modifier: Modifier, isEnabled: Boolean, + // KMK --> + language: String, + // KMK <-- onClickItem: () -> Unit, ) { SwitchPreferenceWidget( modifier = modifier, - title = stringResource(SYMR.strings.pref_category_all_sources), + title = stringResource(SYMR.strings.pref_category_all_sources) + + // KMK --> + " (${FlagEmoji.getEmojiLangFlag(language)})", + // KMK <-- checked = isEnabled, onCheckedChanged = { onClickItem() }, )