diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e90756ba7..6af23e9d8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -168,6 +168,7 @@ dependencies {
implementation(projects.i18n)
// KMK -->
implementation(projects.i18nKmk)
+ implementation(projects.flagkit)
// KMK <--
// SY -->
implementation(projects.i18nSy)
@@ -192,7 +193,7 @@ dependencies {
implementation(compose.ui.tooling.preview)
implementation(compose.ui.util)
implementation(compose.accompanist.systemuicontroller)
-
+
implementation(androidx.interpolator)
implementation(androidx.paging.runtime)
diff --git a/app/src/main/java/eu/kanade/domain/extension/interactor/GetExtensionLanguages.kt b/app/src/main/java/eu/kanade/domain/extension/interactor/GetExtensionLanguages.kt
index 968cfbabe..6c2cc79c7 100644
--- a/app/src/main/java/eu/kanade/domain/extension/interactor/GetExtensionLanguages.kt
+++ b/app/src/main/java/eu/kanade/domain/extension/interactor/GetExtensionLanguages.kt
@@ -1,6 +1,7 @@
package eu.kanade.domain.extension.interactor
import eu.kanade.domain.source.service.SourcePreferences
+import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.extension.ExtensionManager
import eu.kanade.tachiyomi.util.system.LocaleHelper
import kotlinx.coroutines.flow.Flow
@@ -29,4 +30,128 @@ class GetExtensionLanguages(
)
}
}
+
+ // KMK -->
+ companion object {
+ fun getLanguageIconID(lang: String): Int? {
+ return when (lang) {
+ // "all" -> R.drawable.ic_flag_all
+ // "other" -> R.drawable.globe
+ "af" -> R.drawable.za // Afrikaans -> South Africa, ZA
+ "am" -> R.drawable.et // Amharic -> Ethiopia, ET
+ "ar" -> R.drawable.eg // Arabic -> Egypt, EG - Saudi Arabia, SA
+ "az" -> R.drawable.az // Azerbaijani -> Azerbaijan, AZ
+ "be" -> R.drawable.by // Belarusian -> Belarus, BY
+ "bg" -> R.drawable.bg // Bulgarian -> Bulgaria, BG
+ "bn" -> R.drawable.bd // Bengali -> Bangladesh, BD
+ "br" -> R.drawable.fr // Breton -> France, FR
+ "bs" -> R.drawable.ba // Bosnia and Herzegovina, BA
+ "ca" -> R.drawable.es // Catalan -> Spain, ES
+ "ceb" -> R.drawable.ph // Cebuano -> Philippines, PH
+ "cn" -> R.drawable.cn // Chinese -> China, CN
+ "co" -> R.drawable.es // Corsican -> Spain, ES
+ "cs" -> R.drawable.cz // Czech -> Czech Republic, CZ
+ "da" -> R.drawable.dk // Danish -> Denmark, DK
+ "de" -> R.drawable.de // German -> Germany, DE
+ "el" -> R.drawable.gr // Greek -> Greece, GR
+ "en" -> R.drawable.us // English -> United States, US
+ "eo" -> R.drawable.ic_flag_esperanto // Esperanto -> no country
+ "es-419" -> R.drawable.mx // Spanish -> Mexico MX, Latin America, Latin America
+ "es" -> R.drawable.es // Spanish -> Spain, ES
+ "et" -> R.drawable.ee // Estonian -> Estonia, EE
+ "eu" -> R.drawable.es // Basque -> Spain, ES
+ "fa" -> R.drawable.ir // Persian -> Iran, IR
+ "fi" -> R.drawable.fi // Finnish -> Finland, FI
+ "fil" -> R.drawable.ph // Filipino -> Philippines, PH
+ "fo" -> R.drawable.fo // Faroese -> Faroe Island, FO
+ "fr" -> R.drawable.fr // French -> France, FR
+ "ga" -> R.drawable.ie // Irish -> Ireland, IE
+ "gn" -> R.drawable.py // Guarani -> Paraguay, PY
+ "gu" -> R.drawable.in_ // Gujarati -> India, IN
+ "ha" -> R.drawable.ng // Hausa -> Nigeria, NG
+ "he" -> R.drawable.il // Hebrew -> Israel, IL
+ "hi" -> R.drawable.in_ // Hindi -> India, IN
+ "hr" -> R.drawable.hr // Croatian -> Croatia, HR
+ "ht" -> R.drawable.ht // Haitian -> Haiti, HT
+ "hu" -> R.drawable.hu // Hungarian -> Hungary, HU
+ "hy" -> R.drawable.am // Armenian -> Armenia, AM
+ "id" -> R.drawable.id // Indonesian -> Indonesia, ID
+ "ig" -> R.drawable.ng // Igbo -> Nigeria, NG
+ "is" -> R.drawable.is_ // Icelandic -> Iceland, IS
+ "it" -> R.drawable.it // Italian -> Italy, IT
+ "ja" -> R.drawable.jp // Japanese -> Japan, JP
+ "jv" -> R.drawable.id // Javanese -> Indonesia, ID
+ "ka" -> R.drawable.ge // Georgian -> Georgia, GE
+ "kk" -> R.drawable.kz // Kazakh -> Kazakhstan, KZ
+ "km" -> R.drawable.kh // Khmer -> Cambodia, KH
+ "kn" -> R.drawable.in_ // Kannada -> India, IN
+ "ko" -> R.drawable.kr // Korean -> South Korea, KR
+ "kr" -> R.drawable.ng // Kanuri -> Nigeria, NG
+ "ku" -> R.drawable.iq // Kurdish -> Iraq, IQ
+ "ky" -> R.drawable.kg // Kyrgyz -> Kyrgyzstan, KG
+ // "la" -> R.drawable.ic_flag_la // Latin -> Latin America, Latin America
+ "lb" -> R.drawable.lu // Luxembourgish -> Luxembourg, LU
+ "lmo" -> R.drawable.it // Lombard, Italy, IT
+ "lo" -> R.drawable.la // Lao -> Laos, LA
+ "lt" -> R.drawable.lt // Lithuanian -> Lithuania, LT
+ "lv" -> R.drawable.lv // Latvian -> Latvia, LV
+ "mg" -> R.drawable.mg // Malagasy -> Madagascar, MG
+ "mi" -> R.drawable.nz // Maori -> New Zealand, NZ
+ "mk" -> R.drawable.mk // Macedonian -> Macedonia, MK
+ "ml" -> R.drawable.in_ // Malayalam -> India, IN
+ "mn" -> R.drawable.mn // Mongolian -> Mongolia, MN
+ "mo" -> R.drawable.md // Moldavian -> Moldova, MD
+ "mr" -> R.drawable.in_ // Marathi -> India, IN
+ "ms" -> R.drawable.my // Malay -> Malaysia, MY
+ "mt" -> R.drawable.mt // Maltese -> Malta, MT
+ "my" -> R.drawable.mm // Myanmar -> Myanmar, MM
+ "ne" -> R.drawable.np // Nepali -> Nepal, NP
+ "nl" -> R.drawable.nl // Dutch -> Netherlands, NL
+ "no" -> R.drawable.no // Norwegian -> Norway, NO
+ "ny" -> R.drawable.mw // Nyanja -> Malawi, MW
+ "pl" -> R.drawable.pl // Polish -> Poland, PL
+ "ps" -> R.drawable.af // Pashto -> Afghanistan, AF - Pakistan, PK
+ "pt-BR" -> R.drawable.br // Portuguese, Brazil, BR
+ "pt-PT" -> R.drawable.pt // Portuguese, Portugal, PT
+ "pt" -> R.drawable.pt // Portuguese -> Portugal, PT
+ "rm" -> R.drawable.ch // Romansh -> Switzerland, SW
+ "ro" -> R.drawable.ro // Romanian -> Romania, RO
+ "ru" -> R.drawable.ru // Russian -> Russia, RU
+ "sd" -> R.drawable.pk // Sindhi -> Pakistan, PK
+ "sh" -> R.drawable.hr // Serbo-Croatian -> Serbia, HR
+ "si" -> R.drawable.lk // Sinhalese -> Sri Lanka, LK
+ "sk" -> R.drawable.sk // Slovak -> Slovakia, SK
+ "sl" -> R.drawable.si // Slovenian -> Slovenia, SI
+ "sm" -> R.drawable.ws // Samoan -> Samoa, WS
+ "sn" -> R.drawable.zw // Shona -> Zimbabwe, ZW
+ "so" -> R.drawable.so // Somali -> Somalia, SO
+ "sq" -> R.drawable.al // Albanian -> Albania, AL
+ "sr" -> R.drawable.hr // Serbian -> Serbia, HR
+ "st" -> R.drawable.ls // Sesotho -> South Africa, ZA - Lesotho, LS
+ "sv" -> R.drawable.se // Swedish -> Sweden, SE
+ "sw" -> R.drawable.tz // Swahili -> Tanzania, TZ - Kenya, KE
+ "ta" -> R.drawable.in_ // Tamil -> India, IN
+ "te" -> R.drawable.in_ // Telugu -> India, IN
+ "tg" -> R.drawable.tj // Tajik -> Tajikistan, TJ
+ "th" -> R.drawable.th // Thai -> Thailand, TH
+ "ti" -> R.drawable.er // Tigrinya -> Eritrea, ER
+ "tk" -> R.drawable.tm // Turkmen -> Turkmenistan, TM
+ "tl" -> R.drawable.ph // Filipino -> Philippines, PH
+ "to" -> R.drawable.to // Tonga -> Tonga, TO
+ "tr" -> R.drawable.tr // Turkish -> Turkey, TR
+ "uk" -> R.drawable.ua // Ukrainian -> Ukraine, UA
+ "ur" -> R.drawable.pk // Urdu -> Pakistan, PK
+ "uz" -> R.drawable.uz // Uzbek -> Uzbekistan, UZ
+ "vec" -> R.drawable.it // Venetian -> Italy, IT
+ "vi" -> R.drawable.vn // Vietnamese -> Vietnam, VN
+ "yo" -> R.drawable.ng // Yoruba -> Nigeria, NG
+ "zh-Hans" -> R.drawable.cn // Chinese, simplified -> China, CN
+ "zh-Hant" -> R.drawable.tw // Chinese, traditional -> Taiwan, TW
+ "zh" -> R.drawable.cn // Chinese -> China, CN
+ "zu" -> R.drawable.za // Zulu -> South Africa, ZA
+ else -> null
+ }
+ }
+ }
+ // KMK <--
}
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 0535ab3aa..768fad495 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt
@@ -1,18 +1,33 @@
package eu.kanade.presentation.browse
import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import eu.kanade.domain.extension.interactor.GetExtensionLanguages.Companion.getLanguageIconID
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.extension.ExtensionFilterState
import eu.kanade.tachiyomi.util.system.LocaleHelper
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentSetOf
import tachiyomi.i18n.MR
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
@@ -55,17 +70,166 @@ private fun ExtensionFilterContent(
val context = LocalContext.current
LazyColumn(
contentPadding = contentPadding,
+ // KMK -->
+ modifier = Modifier
+ .padding(start = MaterialTheme.padding.small)
+ // KMK <--
) {
items(state.languages) { language ->
- SwitchPreferenceWidget(
- modifier = Modifier.animateItem(),
- title = LocaleHelper.getSourceDisplayName(language, context) +
- // KMK -->
- " (${LocaleHelper.getDisplayName(language)})",
+ // KMK -->
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ val iconResId = getLanguageIconID(language) ?: R.drawable.globe
+ Icon(
+ painter = painterResource(id = iconResId),
+ tint = Color.Unspecified,
+ contentDescription = language,
+ modifier = Modifier
+ .width(48.dp)
+ .height(32.dp)
+ )
// KMK <--
- checked = language in state.enabledLanguages,
- onCheckedChanged = { onClickLang(language) },
- )
+ SwitchPreferenceWidget(
+ modifier = Modifier.animateItem(),
+ title = LocaleHelper.getSourceDisplayName(language, context) +
+ // KMK -->
+ " (${LocaleHelper.getDisplayName(language)})",
+ // KMK <--
+ checked = language in state.enabledLanguages,
+ onCheckedChanged = { onClickLang(language) },
+ )
+ }
}
}
}
+
+// KMK -->
+@Preview
+@Composable
+@Suppress("UnusedPrivateMember")
+private fun ExtensionFilterContentPreview() {
+ ExtensionFilterContent(
+ contentPadding = PaddingValues(),
+ state = ExtensionFilterState.Success(
+ languages = persistentListOf(
+ "all",
+ "other",
+ "af",
+ "am",
+ "ar",
+ "az",
+ "be",
+ "bg",
+ "bn",
+ "br",
+ "bs",
+ "ca",
+ "ceb",
+ "co",
+ "cs",
+ "da",
+ "de",
+ "el",
+ "en",
+ "eo",
+ "es-419",
+ "es",
+ "et",
+ "eu",
+ "fa",
+ "fi",
+ "fil",
+ "fo",
+ "fr",
+ "ga",
+ "gn",
+ "gu",
+ "ha",
+ "he",
+ "hi",
+ "hr",
+ "ht",
+ "hu",
+ "hy",
+ "id",
+ "ig",
+ "is",
+ "it",
+ "ja",
+ "jv",
+ "ka",
+ "kk",
+ "km",
+ "kn",
+ "ko",
+ "kr",
+ "ku",
+ "ky",
+ "la",
+ "lb",
+ "lmo",
+ "lo",
+ "lt",
+ "lv",
+ "mg",
+ "mi",
+ "mk",
+ "ml",
+ "mn",
+ "mo",
+ "mr",
+ "ms",
+ "mt",
+ "my",
+ "ne",
+ "nl",
+ "no",
+ "ny",
+ "pl",
+ "ps",
+ "pt-BR",
+ "pt-PT",
+ "pt",
+ "rm",
+ "ro",
+ "ru",
+ "sd",
+ "sh",
+ "si",
+ "sk",
+ "sl",
+ "sm",
+ "sn",
+ "so",
+ "sq",
+ "sr",
+ "st",
+ "sv",
+ "sw",
+ "ta",
+ "te",
+ "tg",
+ "th",
+ "ti",
+ "tk",
+ "tl",
+ "to",
+ "tr",
+ "uk",
+ "ur",
+ "uz",
+ "vec",
+ "vi",
+ "yo",
+ "zh-Hans",
+ "zh-Hant",
+ "zh",
+ "zu",
+ ),
+ enabledLanguages = persistentSetOf("en"),
+ ),
+ onClickLang = {},
+ )
+}
+// KMK <--
diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
index 6535c4267..603479261 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
@@ -10,8 +10,10 @@ import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Close
@@ -37,12 +39,15 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import dev.icerock.moko.resources.StringResource
+import eu.kanade.domain.extension.interactor.GetExtensionLanguages.Companion.getLanguageIconID
import eu.kanade.presentation.browse.components.BaseBrowseItem
import eu.kanade.presentation.browse.components.ExtensionIcon
import eu.kanade.presentation.components.WarningBanner
@@ -50,6 +55,7 @@ import eu.kanade.presentation.manga.components.DotSeparatorNoSpaceText
import eu.kanade.presentation.more.settings.screen.browse.ExtensionReposScreen
import eu.kanade.presentation.util.animateItemFastScroll
import eu.kanade.presentation.util.rememberRequestPackageInstallsPermissionState
+import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.extension.model.Extension
import eu.kanade.tachiyomi.extension.model.InstallStep
import eu.kanade.tachiyomi.ui.browse.extension.ExtensionUiModel
@@ -346,6 +352,7 @@ private fun ExtensionItemContent(
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.bodyMedium,
)
+
// Won't look good but it's not like we can ellipsize overflowing content
FlowRow(
modifier = Modifier.secondaryItemAlpha(),
@@ -353,9 +360,25 @@ private fun ExtensionItemContent(
) {
ProvideTextStyle(value = MaterialTheme.typography.bodySmall) {
if (extension.lang?.isNotEmpty() == true) {
- Text(
- text = LocaleHelper.getSourceDisplayName(extension.lang, LocalContext.current),
- )
+ // KMK -->
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ val iconResId = getLanguageIconID(extension.lang ?: "") ?: R.drawable.globe
+ Icon(
+ painter = painterResource(id = iconResId),
+ tint = Color.Unspecified,
+ contentDescription = extension.lang ?: "",
+ modifier = Modifier
+ .width(18.dp)
+ .height(12.dp)
+ )
+ // KMK <--
+ Text(
+ text = LocaleHelper.getSourceDisplayName(extension.lang, LocalContext.current),
+ )
+ }
}
if (extension.versionName.isNotEmpty()) {
diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
index a507e0bca..4a56b4fa2 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
@@ -6,7 +6,9 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.icons.Icons
@@ -23,12 +25,17 @@ import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import eu.kanade.domain.extension.interactor.GetExtensionLanguages.Companion.getLanguageIconID
import eu.kanade.domain.source.interactor.SetMigrateSorting
import eu.kanade.presentation.browse.components.BaseSourceItem
import eu.kanade.presentation.browse.components.SourceIcon
import eu.kanade.presentation.util.animateItemFastScroll
+import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.browse.migration.sources.MigrateSourceScreenModel
import eu.kanade.tachiyomi.util.system.copyToClipboard
import kotlinx.collections.immutable.ImmutableList
@@ -234,7 +241,7 @@ private fun MigrateSourceItem(
}
// SY <--
},
- content = { _, sourceLangString ->
+ content = { _, sourceLangString, /* KMK --> */ lang /* KMK <-- */ ->
Column(
modifier = Modifier
.padding(horizontal = MaterialTheme.padding.medium)
@@ -247,10 +254,21 @@ private fun MigrateSourceItem(
style = MaterialTheme.typography.bodyMedium,
)
Row(
- horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
+ horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall),
verticalAlignment = Alignment.CenterVertically,
) {
if (sourceLangString != null) {
+ // KMK -->
+ val iconResId = getLanguageIconID(lang) ?: R.drawable.globe
+ Icon(
+ painter = painterResource(id = iconResId),
+ tint = Color.Unspecified,
+ contentDescription = lang,
+ modifier = Modifier
+ .width(18.dp)
+ .height(12.dp)
+ )
+ // KMK <--
Text(
modifier = Modifier.secondaryItemAlpha(),
text = sourceLangString,
diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt
index 428abc523..7750fc85c 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt
@@ -3,16 +3,26 @@ package eu.kanade.presentation.browse.components
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ProvideTextStyle
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import eu.kanade.domain.extension.interactor.GetExtensionLanguages.Companion.getLanguageIconID
import eu.kanade.domain.source.model.installedExtension
+import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.util.system.LocaleHelper
import tachiyomi.domain.source.model.Source
import tachiyomi.i18n.MR
@@ -29,7 +39,7 @@ fun BaseSourceItem(
onLongClickItem: () -> Unit = {},
icon: @Composable RowScope.(Source) -> Unit = defaultIcon,
action: @Composable RowScope.(Source) -> Unit = {},
- content: @Composable RowScope.(Source, String?) -> Unit = defaultContent,
+ content: @Composable RowScope.(Source, String?, /* KMK --> */ String /* KMK <-- */) -> Unit = defaultContent,
) {
val sourceLangString = LocaleHelper.getSourceDisplayName(source.lang, LocalContext.current).takeIf {
showLanguageInContent
@@ -40,7 +50,7 @@ fun BaseSourceItem(
onLongClickItem = onLongClickItem,
icon = { icon.invoke(this, source) },
action = { action.invoke(this, source) },
- content = { content.invoke(this, source, sourceLangString) },
+ content = { content.invoke(this, source, sourceLangString, /* KMK --> */ source.lang /* KMK <-- */) },
)
}
@@ -48,7 +58,13 @@ private val defaultIcon: @Composable RowScope.(Source) -> Unit = { source ->
SourceIcon(source = source)
}
-private val defaultContent: @Composable RowScope.(Source, String?) -> Unit = { source, sourceLangString ->
+private val defaultContent: @Composable RowScope.(
+ Source,
+ String?,
+ // KMK -->
+ String,
+ // KMK <--
+) -> Unit = { source, sourceLangString, /* KMK --> */ lang /* KMK <-- */ ->
Column(
modifier = Modifier
.padding(horizontal = MaterialTheme.padding.medium)
@@ -76,13 +92,29 @@ private val defaultContent: @Composable RowScope.(Source, String?) -> Unit = { s
ProvideTextStyle(value = MaterialTheme.typography.bodySmall) {
// KMK <--
if (sourceLangString != null) {
- Text(
- modifier = Modifier.secondaryItemAlpha(),
- text = sourceLangString,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis,
- style = MaterialTheme.typography.bodySmall,
- )
+ // KMK -->
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ val iconResId = getLanguageIconID(lang) ?: R.drawable.globe
+ Icon(
+ painter = painterResource(id = iconResId),
+ tint = Color.Unspecified,
+ contentDescription = lang,
+ modifier = Modifier
+ .width(18.dp)
+ .height(12.dp)
+ )
+ // KMK <--
+ Text(
+ modifier = Modifier.secondaryItemAlpha(),
+ text = sourceLangString,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ style = MaterialTheme.typography.bodySmall,
+ )
+ }
}
// KMK -->
diff --git a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
index 87f41cbfd..dcdd4b6ce 100644
--- a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
@@ -313,6 +313,13 @@ private fun ColumnScope.DisplayPage(
pref = screenModel.libraryPreferences.languageBadge(),
)
// KMK -->
+ val showLang by screenModel.libraryPreferences.languageBadge().collectAsState()
+ if (showLang) {
+ CheckboxItem(
+ label = stringResource(KMR.strings.action_display_language_icon),
+ pref = screenModel.libraryPreferences.useLangIcon(),
+ )
+ }
CheckboxItem(
label = stringResource(KMR.strings.action_display_source_badge),
pref = screenModel.libraryPreferences.sourceBadge(),
diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt
index d540d7560..6e317852a 100644
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt
@@ -1,7 +1,7 @@
package eu.kanade.presentation.library.components
-import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Warning
import androidx.compose.material.icons.outlined.Folder
@@ -11,12 +11,17 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
+import eu.kanade.domain.extension.interactor.GetExtensionLanguages.Companion.getLanguageIconID
import eu.kanade.domain.source.model.icon
import eu.kanade.presentation.theme.TachiyomiPreviewTheme
+import eu.kanade.tachiyomi.R
import tachiyomi.domain.source.model.Source
import tachiyomi.presentation.core.components.Badge
+import tachiyomi.presentation.core.components.BadgeGroup
import tachiyomi.source.local.isLocal
@Composable
@@ -41,6 +46,9 @@ internal fun UnreadBadge(count: Long) {
internal fun LanguageBadge(
isLocal: Boolean,
sourceLanguage: String,
+ // KMK -->
+ useLangIcon: Boolean = true,
+ // KMK <--
) {
if (isLocal) {
Badge(
@@ -48,12 +56,25 @@ internal fun LanguageBadge(
color = MaterialTheme.colorScheme.tertiary,
iconColor = MaterialTheme.colorScheme.onTertiary,
)
- } else if (sourceLanguage.isNotEmpty()) {
- Badge(
- text = sourceLanguage.uppercase(),
- color = MaterialTheme.colorScheme.tertiary,
- textColor = MaterialTheme.colorScheme.onTertiary,
- )
+ } else if (sourceLanguage.isNotEmpty() /* KMK --> */ && sourceLanguage != "all" /* KMK <-- */) {
+ // KMK -->
+ if (useLangIcon) {
+ val iconResId = getLanguageIconID(sourceLanguage) ?: R.drawable.globe
+ Badge(
+ painter = painterResource(id = iconResId),
+ color = Color.Transparent,
+ modifier = Modifier
+ .width(25.dp)
+ .height(18.dp),
+ )
+ } else {
+ // KMK <--
+ Badge(
+ text = sourceLanguage.uppercase(),
+ color = MaterialTheme.colorScheme.tertiary,
+ textColor = MaterialTheme.colorScheme.onTertiary,
+ )
+ }
}
}
@@ -75,7 +96,9 @@ fun SourceIconBadge(
icon != null -> {
Badge(
imageBitmap = icon,
- modifier = Modifier.scale(1.3f).height(18.dp),
+ modifier = Modifier
+ .scale(1.3f)
+ .height(18.dp),
)
}
source.isLocal() -> {
@@ -101,11 +124,12 @@ fun SourceIconBadge(
@Composable
private fun BadgePreview() {
TachiyomiPreviewTheme {
- Column {
+ BadgeGroup {
DownloadsBadge(count = 10)
UnreadBadge(count = 10)
- LanguageBadge(isLocal = true, sourceLanguage = "EN")
- LanguageBadge(isLocal = false, sourceLanguage = "EN")
+ LanguageBadge(isLocal = true, sourceLanguage = "en")
+ LanguageBadge(isLocal = false, sourceLanguage = "en", useLangIcon = false)
+ LanguageBadge(isLocal = false, sourceLanguage = "vi")
}
}
}
diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
index 3a1bb0c12..5b5952202 100644
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
@@ -52,6 +52,9 @@ internal fun LibraryComfortableGrid(
LanguageBadge(
isLocal = libraryItem.isLocal,
sourceLanguage = libraryItem.sourceLanguage,
+ // KMK -->
+ useLangIcon = libraryItem.useLangIcon,
+ // KMK <--
)
// KMK -->
SourceIconBadge(source = libraryItem.source)
diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt
index 5d695c4ec..e70dafbd5 100644
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt
@@ -53,6 +53,9 @@ internal fun LibraryCompactGrid(
LanguageBadge(
isLocal = libraryItem.isLocal,
sourceLanguage = libraryItem.sourceLanguage,
+ // KMK -->
+ useLangIcon = libraryItem.useLangIcon,
+ // KMK <--
)
// KMK -->
SourceIconBadge(source = libraryItem.source)
diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt
index bad89ccc7..d8fa18c6b 100644
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt
@@ -60,6 +60,9 @@ internal fun LibraryList(
LanguageBadge(
isLocal = libraryItem.isLocal,
sourceLanguage = libraryItem.sourceLanguage,
+ // KMK -->
+ useLangIcon = libraryItem.useLangIcon,
+ // KMK <--
)
// KMK -->
SourceIconBadge(source = libraryItem.source)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
index 50fedf81f..f3396f893 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
@@ -14,6 +14,7 @@ data class LibraryItem(
val isLocal: Boolean = false,
val sourceLanguage: String = "",
// KMK -->
+ val useLangIcon: Boolean = true,
val source: Source? = null,
// KMK <--
private val sourceManager: SourceManager = Injekt.get(),
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
index a91c13a8c..8e18f3288 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
@@ -502,6 +502,7 @@ class LibraryScreenModel(
// SY <--
// KMK -->
libraryPreferences.sourceBadge().changes(),
+ libraryPreferences.useLangIcon().changes(),
// KMK <--
) {
ItemPreferences(
@@ -521,6 +522,7 @@ class LibraryScreenModel(
// SY <--
// KMK -->
sourceBadge = it[12] as Boolean,
+ useLangIcon = it[13] as Boolean,
// KMK <--
)
}
@@ -564,6 +566,7 @@ class LibraryScreenModel(
""
},
// KMK -->
+ useLangIcon = prefs.useLangIcon,
source = if (prefs.sourceBadge) {
DomainSource(
source.id,
@@ -1337,6 +1340,7 @@ class LibraryScreenModel(
val localBadge: Boolean,
val languageBadge: Boolean,
// KMK -->
+ val useLangIcon: Boolean,
val sourceBadge: Boolean,
// KMK <--
val skipOutsideReleasePeriod: Boolean,
diff --git a/app/src/main/res/drawable/globe.xml b/app/src/main/res/drawable/globe.xml
new file mode 100644
index 000000000..b6cbe07db
--- /dev/null
+++ b/app/src/main/res/drawable/globe.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_flag_all.xml b/app/src/main/res/drawable/ic_flag_all.xml
new file mode 100644
index 000000000..94e796e39
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flag_all.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_flag_esperanto.xml b/app/src/main/res/drawable/ic_flag_esperanto.xml
new file mode 100644
index 000000000..a9e254791
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flag_esperanto.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_flag_lfn.xml b/app/src/main/res/drawable/ic_flag_lfn.xml
new file mode 100644
index 000000000..a953812cb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flag_lfn.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt b/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt
index 934fb35ce..ea6c08f58 100644
--- a/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt
+++ b/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt
@@ -131,6 +131,8 @@ class LibraryPreferences(
// KMK -->
fun sourceBadge() = preferenceStore.getBoolean("display_source_badge", true)
+
+ fun useLangIcon() = preferenceStore.getBoolean("display_language_text", true)
// KMK <--
fun newShowUpdatesCount() = preferenceStore.getBoolean("library_show_updates_count", true)
diff --git a/flagkit/.gitignore b/flagkit/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/flagkit/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/flagkit/build.gradle.kts b/flagkit/build.gradle.kts
new file mode 100644
index 000000000..0fd4ff7df
--- /dev/null
+++ b/flagkit/build.gradle.kts
@@ -0,0 +1,12 @@
+plugins {
+ id("mihon.library")
+ kotlin("android")
+}
+
+android {
+ namespace = "com.murgupluoglu.flagkit"
+}
+
+dependencies {
+ implementation(projects.core.common)
+}
diff --git a/flagkit/src/main/AndroidManifest.xml b/flagkit/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..d60e877a5
--- /dev/null
+++ b/flagkit/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/flagkit/src/main/java/com/murgupluoglu/flagkit/FlagKit.kt b/flagkit/src/main/java/com/murgupluoglu/flagkit/FlagKit.kt
new file mode 100644
index 000000000..fa0628fc8
--- /dev/null
+++ b/flagkit/src/main/java/com/murgupluoglu/flagkit/FlagKit.kt
@@ -0,0 +1,299 @@
+package com.murgupluoglu.flagkit
+
+import android.content.Context
+import android.content.res.Resources
+import android.graphics.drawable.Drawable
+import androidx.core.content.ContextCompat
+import java.util.Locale
+
+/*
+* Created by Mustafa Ürgüplüoğlu on 06.01.2021.
+* Copyright © 2021 Mustafa Ürgüplüoğlu. All rights reserved.
+*/
+
+object FlagKit {
+
+ fun getResId(context: Context, flagName: String): Int {
+ return context.resources.getIdentifier(fixResId(flagName), "drawable", context.packageName)
+ }
+
+ fun getDrawable(context: Context, flagName: String): Drawable? {
+ val resourceId =
+ context.resources.getIdentifier(fixResId(flagName), "drawable", context.packageName)
+ return try {
+ ContextCompat.getDrawable(context, resourceId)!!
+ } catch (e: Resources.NotFoundException) {
+ null
+ }
+ }
+
+ private fun fixResId(resId: String): String {
+ var resourceId = resId.lowercase(Locale.ENGLISH)
+
+ // do is not a valid resource name (reserved Java keyword)
+ if (resourceId == "do") {
+ resourceId = "do_"
+ }
+ return resourceId
+ }
+
+ @Suppress("unused")
+ fun getAllAvailableCodes(): List {
+ return listOf(
+ "ad",
+ "ae",
+ "af",
+ "ag",
+ "ai",
+ "al",
+ "am",
+ "ao",
+ "ar",
+ "as",
+ "at",
+ "au",
+ "aw",
+ "ax",
+ "az",
+ "ba",
+ "bb",
+ "bd",
+ "be",
+ "bf",
+ "bg",
+ "bh",
+ "bi",
+ "bj",
+ "bl",
+ "bm",
+ "bn",
+ "bo",
+ "br",
+ "bs",
+ "bt",
+ "bv",
+ "bw",
+ "by",
+ "bz",
+ "ca",
+ "cc",
+ "cd",
+ "cf",
+ "cg",
+ "ch",
+ "ci",
+ "ck",
+ "cl",
+ "cm",
+ "cn",
+ "co",
+ "cr",
+ "cu",
+ "cv",
+ "cw",
+ "cx",
+ "cy",
+ "cz",
+ "de",
+ "dj",
+ "dk",
+ "dm",
+ "do",
+ "dz",
+ "ec",
+ "ee",
+ "eg",
+ "er",
+ "es",
+ "et",
+ "eu",
+ "fi",
+ "fj",
+ "fk",
+ "fm",
+ "fo",
+ "fr",
+ "ga",
+ "gb",
+ "gb_eng",
+ "gb_nir",
+ "gb_sct",
+ "gb_wls",
+ "gb_zet",
+ "gd",
+ "ge",
+ "gf",
+ "gg",
+ "gh",
+ "gi",
+ "gl",
+ "gm",
+ "gn",
+ "gp",
+ "gq",
+ "gr",
+ "gs",
+ "gt",
+ "gu",
+ "gw",
+ "gy",
+ "hk",
+ "hm",
+ "hn",
+ "hr",
+ "ht",
+ "hu",
+ "id",
+ "ie",
+ "il",
+ "im",
+ "in",
+ "io",
+ "iq",
+ "ir",
+ "is",
+ "it",
+ "je",
+ "jm",
+ "jo",
+ "jp",
+ "ke",
+ "kg",
+ "kh",
+ "ki",
+ "km",
+ "kn",
+ "kp",
+ "kr",
+ "kw",
+ "ky",
+ "kz",
+ "la",
+ "lb",
+ "lc",
+ "li",
+ "lk",
+ "lr",
+ "ls",
+ "lt",
+ "lu",
+ "lv",
+ "ly",
+ "ma",
+ "mc",
+ "md",
+ "me",
+ "mf",
+ "mg",
+ "mh",
+ "mk",
+ "ml",
+ "mm",
+ "mn",
+ "mo",
+ "mp",
+ "mq",
+ "mr",
+ "ms",
+ "mt",
+ "mu",
+ "mv",
+ "mw",
+ "mx",
+ "my",
+ "mz",
+ "na",
+ "nc",
+ "ne",
+ "nf",
+ "ng",
+ "ni",
+ "nl",
+ "no",
+ "np",
+ "nr",
+ "nu",
+ "nz",
+ "om",
+ "pa",
+ "pe",
+ "pf",
+ "pg",
+ "ph",
+ "pk",
+ "pl",
+ "pm",
+ "pn",
+ "pr",
+ "ps",
+ "pt",
+ "pw",
+ "py",
+ "qa",
+ "re",
+ "ro",
+ "rs",
+ "ru",
+ "rw",
+ "sa",
+ "sb",
+ "sc",
+ "sd",
+ "se",
+ "sg",
+ "sh",
+ "si",
+ "sj",
+ "sk",
+ "sl",
+ "sm",
+ "sn",
+ "so",
+ "sr",
+ "ss",
+ "st",
+ "sv",
+ "sx",
+ "sy",
+ "sz",
+ "tc",
+ "td",
+ "tf",
+ "tg",
+ "th",
+ "tj",
+ "tk",
+ "tl",
+ "tm",
+ "tn",
+ "to",
+ "tr",
+ "tt",
+ "tv",
+ "tw",
+ "tz",
+ "ua",
+ "ug",
+ "um",
+ "us",
+ "us_ca",
+ "uy",
+ "uz",
+ "va",
+ "vc",
+ "ve",
+ "vg",
+ "vi",
+ "vn",
+ "vu",
+ "wf",
+ "ws",
+ "xk",
+ "ye",
+ "yt",
+ "za",
+ "zm",
+ "zw"
+ )
+ }
+}
diff --git a/flagkit/src/main/res/drawable/ad.xml b/flagkit/src/main/res/drawable/ad.xml
new file mode 100644
index 000000000..9e8fb3236
--- /dev/null
+++ b/flagkit/src/main/res/drawable/ad.xml
@@ -0,0 +1,109 @@
+
+
+
+
+