copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions 1

Hide language icon for LocalSource

Browse source
This commit is contained in:
Cuong-Tran 2024-08-29 01:18:48 +07:00
parent f4b8fdc59e
commit 454228e78f
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt
View file

@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Warning import androidx.compose.material.icons.filled.Warning
import androidx.compose.material.icons.outlined.Folder import androidx.compose.material.icons.outlined.Folder
import androidx.compose.material.icons.outlined.Language
import androidx.compose.material.icons.outlined.LocalLibrary import androidx.compose.material.icons.outlined.LocalLibrary
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -50,14 +49,8 @@ internal fun LanguageBadge(
useLangIcon: Boolean = true, useLangIcon: Boolean = true,
// KMK <-- // KMK <--
) { ) {
if (isLocal) { // KMK -->
Badge( if (!isLocal && sourceLanguage.isNotEmpty()) {
imageVector = Icons.Outlined.Language,
color = MaterialTheme.colorScheme.tertiary,
iconColor = MaterialTheme.colorScheme.onTertiary,
)
} else if (sourceLanguage.isNotEmpty()) {
// KMK -->
if (useLangIcon) { if (useLangIcon) {
val iconResId = getLanguageIconID(sourceLanguage) ?: R.drawable.globe val iconResId = getLanguageIconID(sourceLanguage) ?: R.drawable.globe
Badge( Badge(

6
app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt
View file

@ -26,7 +26,7 @@ fun Source.getNameForMangaInfo(
) )
// SY <-- // SY <--
// KMK --> // KMK -->
this is StubSource -> toString() isLocalOrStub() -> toString()
// KMK <-- // KMK <--
// For edge cases where user disables a source they got manga of in their library. // For edge cases where user disables a source they got manga of in their library.
hasOneActiveLanguages && !isInEnabledLanguages -> hasOneActiveLanguages && !isInEnabledLanguages ->
@ -52,7 +52,7 @@ private fun getMergedSourcesString(
mergeSources.joinToString { source -> mergeSources.joinToString { source ->
when { when {
// KMK --> // KMK -->
source is StubSource -> source.toString() source.isLocalOrStub() -> source.toString()
// KMK <-- // KMK <--
source.lang !in enabledLangs -> source.lang !in enabledLangs ->
// KMK --> // KMK -->
@ -65,7 +65,7 @@ private fun getMergedSourcesString(
} else { } else {
mergeSources.joinToString { source -> mergeSources.joinToString { source ->
// KMK --> // KMK -->
if (source is StubSource) { if (source.isLocalOrStub()) {
source.toString() source.toString()
} else { } else {
"${source.name} (${FlagEmoji.getEmojiLangFlag(source.lang)})" "${source.name} (${FlagEmoji.getEmojiLangFlag(source.lang)})"