@@ -5,10 +5,12 @@ import android.os.Bundle
55import com.simplemobiletools.commons.extensions.*
66import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
77import com.simplemobiletools.commons.helpers.NavigationIcon
8+ import com.simplemobiletools.commons.helpers.isTiramisuPlus
89import com.simplemobiletools.flashlight.R
910import com.simplemobiletools.flashlight.extensions.config
1011import kotlinx.android.synthetic.main.activity_settings.*
1112import java.util.*
13+ import kotlin.system.exitProcess
1214
1315class SettingsActivity : SimpleActivity () {
1416 override fun onCreate (savedInstanceState : Bundle ? ) {
@@ -24,6 +26,7 @@ class SettingsActivity : SimpleActivity() {
2426 setupCustomizeColors()
2527 setupCustomizeWidgetColors()
2628 setupUseEnglish()
29+ setupLanguage()
2730 setupTurnFlashlightOn()
2831 setupBrightDisplay()
2932 setupStroboscope()
@@ -70,17 +73,25 @@ class SettingsActivity : SimpleActivity() {
7073 }
7174
7275 private fun setupUseEnglish () {
73- settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale .getDefault().language != " en" )
76+ settings_use_english_holder.beVisibleIf(( config.wasUseEnglishToggled || Locale .getDefault().language != " en" ) && ! isTiramisuPlus() )
7477 settings_use_english.isChecked = config.useEnglish
78+ settings_use_english_holder.setOnClickListener {
79+ settings_use_english.toggle()
80+ config.useEnglish = settings_use_english.isChecked
81+ exitProcess(0 )
82+ }
83+ }
7584
76- if (settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone()) {
85+ private fun setupLanguage () {
86+ settings_language.text = Locale .getDefault().displayLanguage
87+ settings_language_holder.beVisibleIf(isTiramisuPlus())
88+
89+ if (settings_use_english_holder.isGone() && settings_language_holder.isGone() && settings_purchase_thank_you_holder.isGone()) {
7790 settings_turn_flashlight_on_holder.background = resources.getDrawable(R .drawable.ripple_top_corners, theme)
7891 }
7992
80- settings_use_english_holder.setOnClickListener {
81- settings_use_english.toggle()
82- config.useEnglish = settings_use_english.isChecked
83- System .exit(0 )
93+ settings_language_holder.setOnClickListener {
94+ launchChangeAppLanguageIntent()
8495 }
8596 }
8697
0 commit comments