@@ -5,6 +5,7 @@ import android.os.Bundle
55import com.simplemobiletools.commons.dialogs.RadioGroupDialog
66import com.simplemobiletools.commons.extensions.*
77import com.simplemobiletools.commons.helpers.NavigationIcon
8+ import com.simplemobiletools.commons.helpers.isTiramisuPlus
89import com.simplemobiletools.commons.models.RadioItem
910import com.simplemobiletools.keyboard.R
1011import 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 {
0 commit comments