@@ -15,6 +15,7 @@ import com.simplemobiletools.filemanager.pro.extensions.config
1515import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
1616import kotlinx.android.synthetic.main.activity_settings.*
1717import java.util.*
18+ import kotlin.system.exitProcess
1819
1920class SettingsActivity : SimpleActivity () {
2021 override fun onCreate (savedInstanceState : Bundle ? ) {
@@ -28,6 +29,7 @@ class SettingsActivity : SimpleActivity() {
2829
2930 setupCustomizeColors()
3031 setupUseEnglish()
32+ setupLanguage()
3133 setupManageFavorites()
3234 setupManageShownTabs()
3335 setupChangeDateTimeFormat()
@@ -73,17 +75,25 @@ class SettingsActivity : SimpleActivity() {
7375 }
7476
7577 private fun setupUseEnglish () {
76- settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale .getDefault().language != " en" )
78+ settings_use_english_holder.beVisibleIf(( config.wasUseEnglishToggled || Locale .getDefault().language != " en" ) && ! isTiramisuPlus() )
7779 settings_use_english.isChecked = config.useEnglish
80+ settings_use_english_holder.setOnClickListener {
81+ settings_use_english.toggle()
82+ config.useEnglish = settings_use_english.isChecked
83+ exitProcess(0 )
84+ }
85+ }
7886
79- if (settings_use_english_holder.isGone()) {
87+ private fun setupLanguage () {
88+ settings_language.text = Locale .getDefault().displayLanguage
89+ settings_language_holder.beVisibleIf(isTiramisuPlus())
90+
91+ if (settings_use_english_holder.isGone() && settings_language_holder.isGone()) {
8092 settings_manage_favorites_holder.background = resources.getDrawable(R .drawable.ripple_top_corners, theme)
8193 }
8294
83- settings_use_english_holder.setOnClickListener {
84- settings_use_english.toggle()
85- config.useEnglish = settings_use_english.isChecked
86- System .exit(0 )
95+ settings_language_holder.setOnClickListener {
96+ launchChangeAppLanguageIntent()
8797 }
8898 }
8999
0 commit comments