From a9a624b494709f29968f501c65db5e39defa545b Mon Sep 17 00:00:00 2001
From: junkfood <69683722+JunkFood02@users.noreply.github.com>
Date: Wed, 31 Jan 2024 02:50:40 +0800
Subject: [PATCH 1/6] feat(i18n): add languages to in-app language picker
---
.../preference/LanguagesPreference.kt | 273 +++++++++++-------
1 file changed, 171 insertions(+), 102 deletions(-)
diff --git a/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
index 296169302..72db99a1f 100644
--- a/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
+++ b/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
@@ -2,6 +2,8 @@ package me.ash.reader.infrastructure.preference
import android.content.Context
import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
import androidx.core.os.LocaleListCompat
import androidx.datastore.preferences.core.Preferences
import kotlinx.coroutines.CoroutineScope
@@ -14,128 +16,195 @@ import me.ash.reader.ui.ext.put
import java.util.*
sealed class LanguagesPreference(val value: Int) : Preference() {
- object UseDeviceLanguages : LanguagesPreference(0)
- object English : LanguagesPreference(1)
- object ChineseSimplified : LanguagesPreference(2)
- object German : LanguagesPreference(3)
- object French : LanguagesPreference(4)
- object Czech : LanguagesPreference(5)
- object Italian : LanguagesPreference(6)
- object Hindi : LanguagesPreference(7)
- object Spanish : LanguagesPreference(8)
- object Polish : LanguagesPreference(9)
- object Russian : LanguagesPreference(10)
- object Basque : LanguagesPreference(11)
- object Indonesian : LanguagesPreference(12)
-
- object ChineseTraditional : LanguagesPreference(13)
+ data object UseDeviceLanguages : LanguagesPreference(0)
+ data object English : LanguagesPreference(1)
+ data object ChineseSimplified : LanguagesPreference(2)
+ data object German : LanguagesPreference(3)
+ data object French : LanguagesPreference(4)
+ data object Czech : LanguagesPreference(5)
+ data object Italian : LanguagesPreference(6)
+ data object Hindi : LanguagesPreference(7)
+ data object Spanish : LanguagesPreference(8)
+ data object Polish : LanguagesPreference(9)
+ data object Russian : LanguagesPreference(10)
+ data object Basque : LanguagesPreference(11)
+ data object Indonesian : LanguagesPreference(12)
+
+ data object ChineseTraditional : LanguagesPreference(13)
+
+ data object Arabic : LanguagesPreference(14)
+ data object Bulgarian : LanguagesPreference(15)
+ data object Catalan : LanguagesPreference(16)
+ data object Danish : LanguagesPreference(17)
+ data object Dutch : LanguagesPreference(18)
+ data object Esperanto : LanguagesPreference(19)
+ data object Filipino : LanguagesPreference(20)
+ data object Hebrew : LanguagesPreference(21)
+ data object Hungarian : LanguagesPreference(22)
+ data object Japanese : LanguagesPreference(23)
+ data object Kannada : LanguagesPreference(24)
+ data object NorwegianBokmal : LanguagesPreference(25)
+ data object Persian : LanguagesPreference(26)
+ data object Portuguese : LanguagesPreference(27)
+ data object PortugueseBrazil : LanguagesPreference(28)
+ data object Romanian : LanguagesPreference(29)
+ data object Serbian : LanguagesPreference(30)
+ data object Slovenian : LanguagesPreference(31)
+ data object Swedish : LanguagesPreference(32)
+ data object Turkish : LanguagesPreference(33)
+ data object Ukrainian : LanguagesPreference(34)
+ data object Vietnamese : LanguagesPreference(35)
+
override fun put(context: Context, scope: CoroutineScope) {
scope.launch {
context.dataStore.put(
- DataStoreKeys.Languages,
- value
+ DataStoreKeys.Languages, value
)
scope.launch(Dispatchers.Main) { setLocale(this@LanguagesPreference) }
}
}
- fun toDesc(context: Context): String =
- when (this) {
- UseDeviceLanguages -> context.getString(R.string.use_device_languages)
- English -> context.getString(R.string.english)
- ChineseSimplified -> context.getString(R.string.chinese_simplified)
- German -> context.getString(R.string.german)
- French -> context.getString(R.string.french)
- Czech -> context.getString(R.string.czech)
- Italian -> context.getString(R.string.italian)
- Hindi -> context.getString(R.string.hindi)
- Spanish -> context.getString(R.string.spanish)
- Polish -> context.getString(R.string.polish)
- Russian -> context.getString(R.string.russian)
- Basque -> context.getString(R.string.basque)
- Indonesian -> context.getString(R.string.indonesian)
- ChineseTraditional -> context.getString(R.string.chinese_traditional)
+ @Composable
+ fun toDesc(context: Context): String {
+ return when (this) {
+ ChineseTraditional -> stringResource(id = R.string.chinese_traditional)
+ ChineseSimplified -> stringResource(id = R.string.chinese_simplified)
+ else -> {
+ this.toLocale()?.let { locale -> locale.getDisplayName(locale) } ?: stringResource(
+ id = R.string.use_device_languages
+ )
}
+ }
+ }
- private fun toLocale(): Locale? =
- when (this) {
- UseDeviceLanguages -> null
- English -> Locale("en", "US")
- ChineseSimplified -> Locale("zh", "CN")
- German -> Locale("de", "DE")
- French -> Locale("fr", "FR")
- Czech -> Locale("cs", "CZ")
- Italian -> Locale("it", "IT")
- Hindi -> Locale("hi", "IN")
- Spanish -> Locale("es", "ES")
- Polish -> Locale("pl", "PL")
- Russian -> Locale("ru", "RU")
- Basque -> Locale("eu", "ES")
- Indonesian -> Locale("in", "ID")
- ChineseTraditional -> Locale("zh", "TW")
- }
- private fun toLocaleList(): LocaleListCompat = toLocale()?.let { LocaleListCompat.create(it) }
- ?: LocaleListCompat.getEmptyLocaleList()
+ private fun toLocale(): Locale? = when (this) {
+ UseDeviceLanguages -> null
+ English -> Locale("en")
+ ChineseSimplified -> Locale("zh", "CN")
+ German -> Locale("de")
+ French -> Locale("fr")
+ Czech -> Locale("cs")
+ Italian -> Locale("it")
+ Hindi -> Locale("hi")
+ Spanish -> Locale("es")
+ Polish -> Locale("pl")
+ Russian -> Locale("ru")
+ Basque -> Locale("eu")
+ Indonesian -> Locale("in")
+ ChineseTraditional -> Locale("zh", "TW")
+ Arabic -> Locale("ar")
+ Bulgarian -> Locale("bg")
+ Catalan -> Locale("ca")
+ Danish -> Locale("da")
+ Dutch -> Locale("nl")
+ Esperanto -> Locale("eo")
+ Filipino -> Locale("fil")
+ Hebrew -> Locale("he")
+ Hungarian -> Locale("hu")
+ Japanese -> Locale("ja")
+ Kannada -> Locale("kn")
+ NorwegianBokmal -> Locale("nb")
+ Persian -> Locale("fa")
+ Portuguese -> Locale("pt")
+ PortugueseBrazil -> Locale("pt", "BR")
+ Romanian -> Locale("ro")
+ Serbian -> Locale("sr")
+ Slovenian -> Locale("sl")
+ Swedish -> Locale("sv")
+ Turkish -> Locale("tr")
+ Ukrainian -> Locale("uk")
+ Vietnamese -> Locale("vi")
+ }
+
+ private fun toLocaleList(): LocaleListCompat =
+ toLocale()?.let { LocaleListCompat.create(it) } ?: LocaleListCompat.getEmptyLocaleList()
companion object {
val default = UseDeviceLanguages
+
val values = listOf(
- UseDeviceLanguages,
- English,
- ChineseSimplified,
- German,
- French,
- Czech,
- Italian,
- Hindi,
- Spanish,
- Polish,
- Russian,
- Basque,
- Indonesian,
- ChineseTraditional,
+ UseDeviceLanguages,
+ Arabic,
+ Basque,
+ Bulgarian,
+ Catalan,
+ ChineseSimplified,
+ ChineseTraditional,
+ Czech,
+ Danish,
+ Dutch,
+ English,
+ Esperanto,
+ Filipino,
+ French,
+ German,
+ Hebrew,
+ Hindi,
+ Hungarian,
+ Indonesian,
+ Italian,
+ Japanese,
+ Kannada,
+ NorwegianBokmal,
+ Persian,
+ Polish,
+ Portuguese,
+ PortugueseBrazil,
+ Romanian,
+ Serbian,
+ Slovenian,
+ Spanish,
+ Swedish,
+ Turkish,
+ Ukrainian,
+ Vietnamese
)
fun fromPreferences(preferences: Preferences): LanguagesPreference =
- when (preferences[DataStoreKeys.Languages.key]) {
- 0 -> UseDeviceLanguages
- 1 -> English
- 2 -> ChineseSimplified
- 3 -> German
- 4 -> French
- 5 -> Czech
- 6 -> Italian
- 7 -> Hindi
- 8 -> Spanish
- 9 -> Polish
- 10 -> Russian
- 11 -> Basque
- 12 -> Indonesian
- 13 -> ChineseTraditional
- else -> default
- }
-
- fun fromValue(value: Int): LanguagesPreference =
- when (value) {
- 0 -> UseDeviceLanguages
- 1 -> English
- 2 -> ChineseSimplified
- 3 -> German
- 4 -> French
- 5 -> Czech
- 6 -> Italian
- 7 -> Hindi
- 8 -> Spanish
- 9 -> Polish
- 10 -> Russian
- 11 -> Basque
- 12 -> Indonesian
- 13 -> ChineseTraditional
- else -> default
- }
+ fromValue(preferences[DataStoreKeys.Languages.key] ?: 0)
+
+ fun fromValue(value: Int): LanguagesPreference = when (value) {
+ 0 -> UseDeviceLanguages
+ 1 -> English
+ 2 -> ChineseSimplified
+ 3 -> German
+ 4 -> French
+ 5 -> Czech
+ 6 -> Italian
+ 7 -> Hindi
+ 8 -> Spanish
+ 9 -> Polish
+ 10 -> Russian
+ 11 -> Basque
+ 12 -> Indonesian
+ 13 -> ChineseTraditional
+ 14 -> Arabic
+ 15 -> Bulgarian
+ 16 -> Catalan
+ 17 -> Danish
+ 18 -> Dutch
+ 19 -> Esperanto
+ 20 -> Filipino
+ 21 -> Hebrew
+ 22 -> Hungarian
+ 23 -> Japanese
+ 24 -> Kannada
+ 25 -> NorwegianBokmal
+ 26 -> Persian
+ 27 -> Portuguese
+ 28 -> PortugueseBrazil
+ 29 -> Romanian
+ 30 -> Serbian
+ 31 -> Slovenian
+ 32 -> Swedish
+ 33 -> Turkish
+ 34 -> Ukrainian
+ 35 -> Vietnamese
+ else -> default
+ }
fun setLocale(preference: LanguagesPreference) {
AppCompatDelegate.setApplicationLocales(preference.toLocaleList())
From 4abfaa0fb893aabca2d9ad1d82ea00a7bee0630e Mon Sep 17 00:00:00 2001
From: junkfood <69683722+JunkFood02@users.noreply.github.com>
Date: Wed, 31 Jan 2024 01:50:51 +0800
Subject: [PATCH 2/6] fix(i18n): locale system settings not working for Android
13
---
.../me/ash/reader/infrastructure/android/MainActivity.kt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt b/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt
index ff746690d..dd3a0e82e 100644
--- a/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt
+++ b/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt
@@ -39,14 +39,16 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
WindowCompat.setDecorFitsSystemWindows(window, false)
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
window.addFlags(FLAG_LAYOUT_IN_SCREEN or FLAG_LAYOUT_NO_LIMITS)
}
Log.i("RLog", "onCreate: ${ProfileInstallerInitializer().create(this)}")
// Set the language
- LanguagesPreference.fromValue(languages).let {
- LanguagesPreference.setLocale(it)
+ if (Build.VERSION.SDK_INT < 33) {
+ LanguagesPreference.fromValue(languages).let {
+ LanguagesPreference.setLocale(it)
+ }
}
// Workaround for https://github.com/Ashinch/ReadYou/issues/312: increase cursor window size
From f9255e83d44437116d9c50c4cc663e890bd1b7ae Mon Sep 17 00:00:00 2001
From: junkfood <69683722+JunkFood02@users.noreply.github.com>
Date: Wed, 31 Jan 2024 03:30:20 +0800
Subject: [PATCH 3/6] feat(i18n): show selected language at settings page
---
.../reader/infrastructure/android/MainActivity.kt | 3 +++
.../preference/LanguagesPreference.kt | 15 +++++++++------
.../ash/reader/ui/page/settings/SettingsPage.kt | 4 +++-
.../ui/page/settings/languages/LanguagesPage.kt | 2 +-
app/src/main/res/values/strings.xml | 1 -
5 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt b/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt
index dd3a0e82e..c03eca4ad 100644
--- a/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt
+++ b/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt
@@ -21,6 +21,7 @@ import me.ash.reader.infrastructure.preference.SettingsProvider
import me.ash.reader.ui.ext.languages
import me.ash.reader.ui.page.common.HomeEntry
import java.lang.reflect.Field
+import java.util.Locale
import javax.inject.Inject
@@ -51,6 +52,8 @@ class MainActivity : AppCompatActivity() {
}
}
+ Log.d("RLog", "onCreate: ${Locale.getDefault().toLanguageTag()}")
+
// Workaround for https://github.com/Ashinch/ReadYou/issues/312: increase cursor window size
try {
val field: Field = CursorWindow::class.java.getDeclaredField("sCursorWindowSize")
diff --git a/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
index 72db99a1f..65bfc452d 100644
--- a/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
+++ b/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
@@ -66,14 +66,12 @@ sealed class LanguagesPreference(val value: Int) : Preference() {
}
@Composable
- fun toDesc(context: Context): String {
+ fun toDesc(): String {
return when (this) {
ChineseTraditional -> stringResource(id = R.string.chinese_traditional)
ChineseSimplified -> stringResource(id = R.string.chinese_simplified)
else -> {
- this.toLocale()?.let { locale -> locale.getDisplayName(locale) } ?: stringResource(
- id = R.string.use_device_languages
- )
+ this.toLocale().toDisplayName()
}
}
}
@@ -82,7 +80,7 @@ sealed class LanguagesPreference(val value: Int) : Preference() {
private fun toLocale(): Locale? = when (this) {
UseDeviceLanguages -> null
English -> Locale("en")
- ChineseSimplified -> Locale("zh", "CN")
+ ChineseSimplified -> Locale.forLanguageTag("zh-Hans")
German -> Locale("de")
French -> Locale("fr")
Czech -> Locale("cs")
@@ -93,7 +91,7 @@ sealed class LanguagesPreference(val value: Int) : Preference() {
Russian -> Locale("ru")
Basque -> Locale("eu")
Indonesian -> Locale("in")
- ChineseTraditional -> Locale("zh", "TW")
+ ChineseTraditional -> Locale.forLanguageTag("zh-Hant")
Arabic -> Locale("ar")
Bulgarian -> Locale("bg")
Catalan -> Locale("ca")
@@ -212,3 +210,8 @@ sealed class LanguagesPreference(val value: Int) : Preference() {
}
}
+
+@Composable
+fun Locale?.toDisplayName(): String = this?.getDisplayName(this) ?: stringResource(
+ id = R.string.use_device_languages
+)
diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt
index 2a0a60be9..83a160809 100644
--- a/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt
+++ b/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt
@@ -17,11 +17,13 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
+import androidx.core.os.LocaleListCompat
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavHostController
import me.ash.reader.R
import me.ash.reader.infrastructure.preference.LocalNewVersionNumber
import me.ash.reader.infrastructure.preference.LocalSkipVersionNumber
+import me.ash.reader.infrastructure.preference.toDisplayName
import me.ash.reader.ui.component.base.Banner
import me.ash.reader.ui.component.base.DisplayText
import me.ash.reader.ui.component.base.FeedbackIconButton
@@ -123,7 +125,7 @@ fun SettingsPage(
item {
SelectableSettingGroupItem(
title = stringResource(R.string.languages),
- desc = stringResource(R.string.languages_desc),
+ desc = LocaleListCompat.getDefault()[0].toDisplayName(),
icon = Icons.Outlined.Language,
) {
navController.navigate(RouteName.LANGUAGES) {
diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt
index 026e7c65e..c8318a064 100644
--- a/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt
+++ b/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt
@@ -71,7 +71,7 @@ fun LanguagesPage(
item {
LanguagesPreference.values.map {
SettingItem(
- title = it.toDesc(context),
+ title = it.toDesc(),
onClick = {
it.put(context, scope)
},
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 231f2baf3..b3b2d38b9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,7 +102,6 @@
Interaction
Initial page, haptic feedback
Languages
- English, Chinese, more
Help translate
https://hosted.weblate.org/projects/readyou/
Use device language
From 1b27789aae2195e4d9533d5ac9c2f3020a4cec4b Mon Sep 17 00:00:00 2001
From: junkfood <69683722+JunkFood02@users.noreply.github.com>
Date: Wed, 31 Jan 2024 03:55:35 +0800
Subject: [PATCH 4/6] fix(ci): ignore ExtraTranslation for linter
---
app/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/build.gradle b/app/build.gradle
index 95c0e6105..c3051a005 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@ android {
}
}
lint {
- disable += "MissingTranslation"
+ disable.addAll("MissingTranslation", "ExtraTranslation")
}
buildTypes {
release {
From cf51363be23ff587fb00062d4904bc372198ff72 Mon Sep 17 00:00:00 2001
From: junkfood <69683722+JunkFood02@users.noreply.github.com>
Date: Wed, 31 Jan 2024 04:07:33 +0800
Subject: [PATCH 5/6] feat(i18n): add fallback in in-app language picker for
A13+
---
.../preference/LanguagesPreference.kt | 2 +-
.../me/ash/reader/ui/page/settings/SettingsPage.kt | 3 ++-
.../ui/page/settings/languages/LanguagesPage.kt | 14 ++++++++++++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
index 65bfc452d..ca5f3857a 100644
--- a/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
+++ b/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
@@ -77,7 +77,7 @@ sealed class LanguagesPreference(val value: Int) : Preference() {
}
- private fun toLocale(): Locale? = when (this) {
+ fun toLocale(): Locale? = when (this) {
UseDeviceLanguages -> null
English -> Locale("en")
ChineseSimplified -> Locale.forLanguageTag("zh-Hans")
diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt
index 83a160809..a2f6658a0 100644
--- a/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt
+++ b/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt
@@ -33,6 +33,7 @@ import me.ash.reader.ui.page.common.RouteName
import me.ash.reader.ui.page.settings.tips.UpdateDialog
import me.ash.reader.ui.page.settings.tips.UpdateViewModel
import me.ash.reader.ui.theme.palette.onLight
+import java.util.Locale
@Composable
fun SettingsPage(
@@ -125,7 +126,7 @@ fun SettingsPage(
item {
SelectableSettingGroupItem(
title = stringResource(R.string.languages),
- desc = LocaleListCompat.getDefault()[0].toDisplayName(),
+ desc = Locale.getDefault().toDisplayName(),
icon = Icons.Outlined.Language,
) {
navController.navigate(RouteName.LANGUAGES) {
diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt
index c8318a064..69df8a49d 100644
--- a/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt
+++ b/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt
@@ -28,6 +28,7 @@ import me.ash.reader.ui.component.base.RYScaffold
import me.ash.reader.ui.ext.openURL
import me.ash.reader.ui.page.settings.SettingItem
import me.ash.reader.ui.theme.palette.onLight
+import java.util.Locale
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -35,7 +36,13 @@ fun LanguagesPage(
navController: NavHostController,
) {
val context = LocalContext.current
- val languages = LocalLanguages.current
+ val currentLocale = Locale.getDefault()
+
+ val languages = LocalLanguages.current.run {
+ if (toLocale() == currentLocale) this
+ else LanguagesPreference.default
+ }
+
val scope = rememberCoroutineScope()
RYScaffold(
@@ -64,7 +71,10 @@ fun LanguagesPage(
)
},
) {
- context.openURL(context.getString(R.string.translatable_url), OpenLinkPreference.AutoPreferCustomTabs)
+ context.openURL(
+ context.getString(R.string.translatable_url),
+ OpenLinkPreference.AutoPreferCustomTabs
+ )
}
Spacer(modifier = Modifier.height(16.dp))
}
From 03404801535047b1142eccdd78e7f79e82aa27a7 Mon Sep 17 00:00:00 2001
From: junkfood <69683722+JunkFood02@users.noreply.github.com>
Date: Wed, 31 Jan 2024 04:20:18 +0800
Subject: [PATCH 6/6] chore: clean up
---
.../java/me/ash/reader/infrastructure/android/MainActivity.kt | 2 --
.../ash/reader/infrastructure/preference/LanguagesPreference.kt | 2 --
2 files changed, 4 deletions(-)
diff --git a/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt b/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt
index c03eca4ad..2239a2fdb 100644
--- a/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt
+++ b/app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt
@@ -52,8 +52,6 @@ class MainActivity : AppCompatActivity() {
}
}
- Log.d("RLog", "onCreate: ${Locale.getDefault().toLanguageTag()}")
-
// Workaround for https://github.com/Ashinch/ReadYou/issues/312: increase cursor window size
try {
val field: Field = CursorWindow::class.java.getDeclaredField("sCursorWindowSize")
diff --git a/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
index ca5f3857a..3ab957aba 100644
--- a/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
+++ b/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt
@@ -29,9 +29,7 @@ sealed class LanguagesPreference(val value: Int) : Preference() {
data object Russian : LanguagesPreference(10)
data object Basque : LanguagesPreference(11)
data object Indonesian : LanguagesPreference(12)
-
data object ChineseTraditional : LanguagesPreference(13)
-
data object Arabic : LanguagesPreference(14)
data object Bulgarian : LanguagesPreference(15)
data object Catalan : LanguagesPreference(16)