From 4f4a9049f827a6ee62171fbd4773cd4c4d653f59 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Wed, 4 Sep 2024 00:35:33 +0300
Subject: [PATCH] Fix language headers in catalog

---
 .../sections/explore/catalog/CatalogScreenModel.kt        | 5 ++---
 .../shirizu/sections/explore/sources/SourcesScreen.kt     | 8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/xtimms/shirizu/sections/explore/catalog/CatalogScreenModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/catalog/CatalogScreenModel.kt
index cd323db..478966d 100644
--- a/app/src/main/java/org/xtimms/shirizu/sections/explore/catalog/CatalogScreenModel.kt
+++ b/app/src/main/java/org/xtimms/shirizu/sections/explore/catalog/CatalogScreenModel.kt
@@ -19,7 +19,6 @@ import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaParserSource
 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.data.repository.MangaSourcesRepository
 import org.xtimms.shirizu.sections.explore.sources.SourceUiModel
@@ -39,8 +38,8 @@ class CatalogScreenModel @Inject constructor(
         val queryFilter: (String) -> ((MangaParserSource) -> Boolean) = { query ->
             filter@{ source ->
                 if (query.isEmpty()) return@filter true
-                query.split(",").any { _input ->
-                    val input = _input.trim()
+                query.split(",").any {
+                    val input = it.trim()
                     if (input.isEmpty()) return@any false
                     source.title.contains(input, ignoreCase = true)
                 }
diff --git a/app/src/main/java/org/xtimms/shirizu/sections/explore/sources/SourcesScreen.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/sources/SourcesScreen.kt
index 6763e1f..33f64fc 100644
--- a/app/src/main/java/org/xtimms/shirizu/sections/explore/sources/SourcesScreen.kt
+++ b/app/src/main/java/org/xtimms/shirizu/sections/explore/sources/SourcesScreen.kt
@@ -1,12 +1,10 @@
 package org.xtimms.shirizu.sections.explore.sources
 
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 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.MoreVert
 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.ui.screens.EmptyScreen
 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.system.getDisplayName
 import org.xtimms.shirizu.utils.system.plus
+import org.xtimms.shirizu.utils.system.toLocale
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun SourcesScreen(
     state: SourcesScreenModel.State,
@@ -97,7 +95,7 @@ fun SourceHeader(
 ) {
     val context = LocalContext.current
     Text(
-        text = LocaleHelper.getSourceDisplayName(language, context),
+        text = language.toLocale().getDisplayName(context),
         modifier = modifier
             .padding(horizontal = 16.dp, vertical = 8.dp),
         style = MaterialTheme.typography.bodyLarge,