Skip to content

Commit fd0c855

Browse files
committed
fix: Lint error
Change-Id: I69a918b3768136b0827abd929ee1b5b481d92d8d
1 parent 1a84ad9 commit fd0c855

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

  • source
    • core/util/src/main/kotlin/com/xayah/core/util
    • feature/main/settings/src/main/kotlin/com/xayah/feature/main/settings

source/core/util/src/main/kotlin/com/xayah/core/util/LanguageUtil.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@ package com.xayah.core.util
33
import android.content.Context
44
import androidx.core.app.LocaleManagerCompat
55
import com.xayah.core.datastore.ConstantUtil
6+
import com.xayah.core.datastore.readLanguage
7+
import com.xayah.core.util.LanguageUtil.toLocale
8+
import kotlinx.coroutines.flow.map
69
import java.util.Locale
710

11+
fun Context.readMappedLanguage() = readLanguage().map { it.toLocale(this) }
12+
813
object LanguageUtil {
914
fun getSystemLocale(context: Context) = LocaleManagerCompat.getSystemLocales(context).get(0)!!
1015

source/feature/main/settings/src/main/kotlin/com/xayah/feature/main/settings/Index.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
2525
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2626
import com.xayah.core.datastore.KeyAutoScreenOff
2727
import com.xayah.core.datastore.KeyMonet
28-
import com.xayah.core.datastore.readLanguage
2928
import com.xayah.core.ui.component.Clickable
3029
import com.xayah.core.ui.component.InnerBottomSpacer
3130
import com.xayah.core.ui.component.Switchable
@@ -34,10 +33,9 @@ import com.xayah.core.ui.route.MainRoutes
3433
import com.xayah.core.ui.token.SizeTokens
3534
import com.xayah.core.ui.util.LocalNavController
3635
import com.xayah.core.util.LanguageUtil
37-
import com.xayah.core.util.LanguageUtil.toLocale
3836
import com.xayah.core.util.getActivity
3937
import com.xayah.core.util.navigateSingle
40-
import kotlinx.coroutines.flow.map
38+
import com.xayah.core.util.readMappedLanguage
4139
import com.xayah.feature.setup.MainActivity as SetupActivity
4240

4341
@ExperimentalLayoutApi
@@ -93,7 +91,7 @@ fun PageSettings() {
9391
}
9492
DarkThemeSelectable()
9593

96-
val locale by context.readLanguage().map { it.toLocale(context) }.collectAsStateWithLifecycle(initialValue = LanguageUtil.getSystemLocale(context))
94+
val locale by context.readMappedLanguage().collectAsStateWithLifecycle(initialValue = LanguageUtil.getSystemLocale(context))
9795
Clickable(
9896
title = stringResource(id = R.string.language),
9997
value = locale.getDisplayName(locale)

0 commit comments

Comments
 (0)