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 a8068f945..b9ec2a26e 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt @@ -10,10 +10,8 @@ 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 @@ -39,16 +37,13 @@ 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.tooling.preview.Preview 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 @@ -56,7 +51,6 @@ 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 @@ -72,6 +66,7 @@ import tachiyomi.presentation.core.components.material.PullRefresh import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.components.material.topSmallPaddingValues import tachiyomi.presentation.core.i18n.stringResource +import tachiyomi.presentation.core.icons.FlagEmoji import tachiyomi.presentation.core.screens.EmptyScreen import tachiyomi.presentation.core.screens.EmptyScreenAction import tachiyomi.presentation.core.screens.LoadingScreen @@ -384,24 +379,13 @@ private fun ExtensionItemContent( horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall), ) { ProvideTextStyle(value = MaterialTheme.typography.bodySmall) { - if (extension.lang?.isNotEmpty() == true) { - // 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 --> + extension.lang?.let { + if (it.isNotEmpty()) { // KMK <-- Text( - text = LocaleHelper.getSourceDisplayName(extension.lang, LocalContext.current), + text = /* KMK --> */FlagEmoji.getEmojiLangFlag(it) + " " + /* KMK <-- */ + LocaleHelper.getSourceDisplayName(it, LocalContext.current), ) } } 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 911f724d1..ef3a6befe 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt @@ -6,9 +6,7 @@ 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 @@ -25,17 +23,12 @@ 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 @@ -49,6 +42,7 @@ import tachiyomi.presentation.core.components.Scroller.STICKY_HEADER_KEY_PREFIX import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.components.material.topSmallPaddingValues import tachiyomi.presentation.core.i18n.stringResource +import tachiyomi.presentation.core.icons.FlagEmoji import tachiyomi.presentation.core.screens.EmptyScreen import tachiyomi.presentation.core.screens.LoadingScreen import tachiyomi.presentation.core.theme.header @@ -254,24 +248,14 @@ private fun MigrateSourceItem( style = MaterialTheme.typography.bodyMedium, ) Row( - horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small), 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, + text = /* KMK --> */ FlagEmoji.getEmojiLangFlag(lang) + " " + /* KMK <-- */ + sourceLangString, maxLines = 1, overflow = TextOverflow.Ellipsis, style = MaterialTheme.typography.bodySmall, 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 dd3f1eba0..3b12e5bcf 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 @@ -2,32 +2,22 @@ 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 import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.i18n.stringResource +import tachiyomi.presentation.core.icons.FlagEmoji import tachiyomi.presentation.core.util.secondaryItemAlpha @Composable @@ -84,48 +74,30 @@ private val defaultContent: @Composable RowScope.( style = MaterialTheme.typography.bodyMedium, ) // KMK --> - // Won't look good but it's not like we can ellipsize overflowing content - FlowRow( + Row( modifier = Modifier.secondaryItemAlpha(), horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall), ) { - ProvideTextStyle(value = MaterialTheme.typography.bodySmall) { - // KMK <-- - if (sourceLangString != null) { - // 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 <-- + if (sourceLangString != null) { + Text( + text = /* KMK --> */ FlagEmoji.getEmojiLangFlag(lang) + " " + /* KMK <-- */ + sourceLangString, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + style = MaterialTheme.typography.bodySmall, + ) + } - // KMK --> - if (source.installedExtension?.isNsfw == true) { - Text( - text = stringResource(MR.strings.ext_nsfw_short).uppercase(), - color = MaterialTheme.colorScheme.error, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) - } + // KMK --> + if (source.installedExtension?.isNsfw == true) { + Text( + text = stringResource(MR.strings.ext_nsfw_short).uppercase(), + color = MaterialTheme.colorScheme.error, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + style = MaterialTheme.typography.bodySmall, + ) } } // KMK <--