From 58eccf9ddb660b5ca8f0bf77237fab899d784a28 Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Thu, 4 Sep 2025 12:54:29 +0700 Subject: [PATCH] chore(settings): Always display `App Language` text in settings (#1122) * chore(settings): Add App language text all the time * spotless * English variants --- .../more/settings/screen/SettingsAppearanceScreen.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt index d4f726aff..119c77de8 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt @@ -1,6 +1,7 @@ package eu.kanade.presentation.more.settings.screen import android.app.Activity +import androidx.appcompat.app.AppCompatDelegate import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable import androidx.compose.runtime.ReadOnlyComposable @@ -37,6 +38,7 @@ import uy.kohesive.injekt.api.get import java.time.LocalDate object SettingsAppearanceScreen : SearchableSettings { + @Suppress("unused") private fun readResolve(): Any = SettingsAppearanceScreen @ReadOnlyComposable @@ -128,7 +130,6 @@ object SettingsAppearanceScreen : SearchableSettings { stringResource(KMR.strings.pref_theme_cover_based_style_fidelity) PaletteStyle.Content -> stringResource(KMR.strings.pref_theme_cover_based_style_content) - else -> it.name } } .toImmutableMap(), @@ -192,7 +193,6 @@ object SettingsAppearanceScreen : SearchableSettings { stringResource(KMR.strings.pref_theme_cover_based_style_fidelity) PaletteStyle.Content -> stringResource(KMR.strings.pref_theme_cover_based_style_content) - else -> it.name } } .toImmutableMap(), @@ -228,11 +228,16 @@ object SettingsAppearanceScreen : SearchableSettings { UiPreferences.dateFormat(dateFormat).format(now) } + val currentLanguage = remember { + AppCompatDelegate.getApplicationLocales().get(0)?.toLanguageTag() ?: "" + } + return Preference.PreferenceGroup( title = stringResource(MR.strings.pref_category_display), preferenceItems = persistentListOf( Preference.PreferenceItem.TextPreference( - title = stringResource(MR.strings.pref_app_language), + title = stringResource(MR.strings.pref_app_language) + + if (currentLanguage.isNotEmpty() && !currentLanguage.startsWith("en")) " (App Language)" else "", onClick = { navigator.push(AppLanguageScreen()) }, ), Preference.PreferenceItem.ListPreference(