Xtimms/Shirizu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix language headers in catalog

Browse Source
This commit is contained in:
Zakhar Timoshenko
2024-09-04 00:35:33 +03:00
parent 4acbe85ea1
commit 4f4a9049f8
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/xtimms/shirizu/sections/explore/catalog/CatalogScreenModel.kt
View File

@@ -19,7 +19,6 @@ import kotlinx.coroutines.launch
import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.ContentType
import org.koitharu.kotatsu.parsers.model.MangaParserSource import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.model.MangaSource
import org.xtimms.shirizu.core.model.getTitle
import org.xtimms.shirizu.core.prefs.AppSettings import org.xtimms.shirizu.core.prefs.AppSettings
import org.xtimms.shirizu.data.repository.MangaSourcesRepository import org.xtimms.shirizu.data.repository.MangaSourcesRepository
import org.xtimms.shirizu.sections.explore.sources.SourceUiModel import org.xtimms.shirizu.sections.explore.sources.SourceUiModel
@@ -39,8 +38,8 @@ class CatalogScreenModel @Inject constructor(
val queryFilter: (String) -> ((MangaParserSource) -> Boolean) = { query -> val queryFilter: (String) -> ((MangaParserSource) -> Boolean) = { query ->
filter@{ source -> filter@{ source ->
if (query.isEmpty()) return@filter true if (query.isEmpty()) return@filter true
query.split(",").any { _input -> query.split(",").any {
val input = _input.trim() val input = it.trim()
if (input.isEmpty()) return@any false if (input.isEmpty()) return@any false
source.title.contains(input, ignoreCase = true) source.title.contains(input, ignoreCase = true)
} }

8
app/src/main/java/org/xtimms/shirizu/sections/explore/sources/SourcesScreen.kt
View File

@@ -1,12 +1,10 @@
package org.xtimms.shirizu.sections.explore.sources package org.xtimms.shirizu.sections.explore.sources
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.PushPin import androidx.compose.material.icons.filled.PushPin
import androidx.compose.material.icons.outlined.ExploreOff
import androidx.compose.material.icons.outlined.ExtensionOff import androidx.compose.material.icons.outlined.ExtensionOff
import androidx.compose.material.icons.outlined.MoreVert import androidx.compose.material.icons.outlined.MoreVert
import androidx.compose.material.icons.outlined.PushPin import androidx.compose.material.icons.outlined.PushPin
@@ -27,11 +25,11 @@ import org.xtimms.shirizu.core.components.ScrollbarLazyColumn
import org.xtimms.shirizu.core.model.isNsfw import org.xtimms.shirizu.core.model.isNsfw
import org.xtimms.shirizu.core.ui.screens.EmptyScreen import org.xtimms.shirizu.core.ui.screens.EmptyScreen
import org.xtimms.shirizu.core.ui.screens.LoadingScreen import org.xtimms.shirizu.core.ui.screens.LoadingScreen
import org.xtimms.shirizu.utils.LocaleHelper
import org.xtimms.shirizu.utils.material.SecondaryItemAlpha import org.xtimms.shirizu.utils.material.SecondaryItemAlpha
import org.xtimms.shirizu.utils.system.getDisplayName
import org.xtimms.shirizu.utils.system.plus import org.xtimms.shirizu.utils.system.plus
import org.xtimms.shirizu.utils.system.toLocale
@OptIn(ExperimentalFoundationApi::class)
@Composable @Composable
fun SourcesScreen( fun SourcesScreen(
state: SourcesScreenModel.State, state: SourcesScreenModel.State,
@@ -97,7 +95,7 @@ fun SourceHeader(
) { ) {
val context = LocalContext.current val context = LocalContext.current
Text( Text(
text = LocaleHelper.getSourceDisplayName(language, context), text = language.toLocale().getDisplayName(context),
modifier = modifier modifier = modifier
.padding(horizontal = 16.dp, vertical = 8.dp), .padding(horizontal = 16.dp, vertical = 8.dp),
style = MaterialTheme.typography.bodyLarge, style = MaterialTheme.typography.bodyLarge,