Skip to content

Commit 8dcdb86

Browse files
committed
adding custom language support on Android 13+
1 parent c52981a commit 8dcdb86

File tree

2 files changed

+41
-6
lines changed

2 files changed

+41
-6
lines changed

app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.os.Bundle
55
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
66
import com.simplemobiletools.commons.extensions.*
77
import com.simplemobiletools.commons.helpers.NavigationIcon
8+
import com.simplemobiletools.commons.helpers.isTiramisuPlus
89
import com.simplemobiletools.commons.models.RadioItem
910
import com.simplemobiletools.keyboard.R
1011
import com.simplemobiletools.keyboard.extensions.config
@@ -27,6 +28,7 @@ class SettingsActivity : SimpleActivity() {
2728
setupPurchaseThankYou()
2829
setupCustomizeColors()
2930
setupUseEnglish()
31+
setupLanguage()
3032
setupManageClipboardItems()
3133
setupVibrateOnKeypress()
3234
setupShowPopupOnKeypress()
@@ -50,6 +52,7 @@ class SettingsActivity : SimpleActivity() {
5052
// make sure the corners at ripple fit the stroke rounded corners
5153
if (settings_purchase_thank_you_holder.isGone()) {
5254
settings_use_english_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
55+
settings_language_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
5356
}
5457

5558
settings_purchase_thank_you_holder.setOnClickListener {
@@ -65,20 +68,28 @@ class SettingsActivity : SimpleActivity() {
6568
}
6669

6770
private fun setupUseEnglish() {
68-
settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
71+
settings_use_english_holder.beVisibleIf((config.wasUseEnglishToggled || Locale.getDefault().language != "en") && !isTiramisuPlus())
6972
settings_use_english.isChecked = config.useEnglish
70-
71-
if (settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone()) {
72-
settings_manage_clipboard_items_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
73-
}
74-
7573
settings_use_english_holder.setOnClickListener {
7674
settings_use_english.toggle()
7775
config.useEnglish = settings_use_english.isChecked
7876
exitProcess(0)
7977
}
8078
}
8179

80+
private fun setupLanguage() {
81+
settings_language.text = Locale.getDefault().displayLanguage
82+
settings_language_holder.beVisibleIf(isTiramisuPlus())
83+
84+
if (settings_use_english_holder.isGone() && settings_language_holder.isGone() && settings_purchase_thank_you_holder.isGone()) {
85+
settings_manage_clipboard_items_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
86+
}
87+
88+
settings_language_holder.setOnClickListener {
89+
launchChangeAppLanguageIntent()
90+
}
91+
}
92+
8293
private fun setupManageClipboardItems() {
8394
settings_manage_clipboard_items_holder.setOnClickListener {
8495
Intent(this, ManageClipboardItemsActivity::class.java).apply {

app/src/main/res/layout/activity_settings.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,30 @@
114114

115115
</RelativeLayout>
116116

117+
<RelativeLayout
118+
android:id="@+id/settings_language_holder"
119+
style="@style/SettingsHolderTextViewStyle"
120+
android:layout_width="match_parent"
121+
android:layout_height="wrap_content"
122+
android:background="@drawable/ripple_background">
123+
124+
<com.simplemobiletools.commons.views.MyTextView
125+
android:id="@+id/settings_language_label"
126+
style="@style/SettingsTextLabelStyle"
127+
android:layout_width="wrap_content"
128+
android:layout_height="wrap_content"
129+
android:text="@string/language" />
130+
131+
<com.simplemobiletools.commons.views.MyTextView
132+
android:id="@+id/settings_language"
133+
style="@style/SettingsTextValueStyle"
134+
android:layout_width="wrap_content"
135+
android:layout_height="wrap_content"
136+
android:layout_below="@+id/settings_language_label"
137+
tools:text="English" />
138+
139+
</RelativeLayout>
140+
117141
<RelativeLayout
118142
android:id="@+id/settings_manage_clipboard_items_holder"
119143
style="@style/SettingsHolderTextViewOneLinerStyle"

0 commit comments

Comments
 (0)