fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-06-05 22:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #156, properly switch language after toggling Use english

Browse Source
This commit is contained in:
tibbi
2018-03-31 14:24:08 +02:00
parent 09275e6b95
commit 960b99d6f3
3 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -45,7 +45,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.17.17' implementation 'com.simplemobiletools:commons:3.17.19'
implementation files('../libs/RootTools.jar') implementation files('../libs/RootTools.jar')

20
app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
View File

@ -38,8 +38,6 @@ class MainActivity : SimpleActivity() {
private var wasBackJustPressed = false private var wasBackJustPressed = false
private var searchMenuItem: MenuItem? = null private var searchMenuItem: MenuItem? = null
private var storedUseEnglish = false
private lateinit var fragment: ItemsFragment private lateinit var fragment: ItemsFragment
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@ -59,20 +57,6 @@ class MainActivity : SimpleActivity() {
checkWhatsNewDialog() checkWhatsNewDialog()
checkIfRootAvailable() checkIfRootAvailable()
storeStateVariables()
}
override fun onResume() {
super.onResume()
if (storedUseEnglish != config.useEnglish) {
restartActivity()
return
}
}
override fun onPause() {
super.onPause()
storeStateVariables()
} }
override fun onStop() { override fun onStop() {
@ -132,10 +116,6 @@ class MainActivity : SimpleActivity() {
openPath(savedInstanceState.getString(PICKED_PATH), true) openPath(savedInstanceState.getString(PICKED_PATH), true)
} }
private fun storeStateVariables() {
storedUseEnglish = config.useEnglish
}
private fun setupSearch(menu: Menu) { private fun setupSearch(menu: Menu) {
val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager
searchMenuItem = menu.findItem(R.id.search) searchMenuItem = menu.findItem(R.id.search)

7
app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt
View File

@ -4,7 +4,10 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.dialogs.SecurityDialog import com.simplemobiletools.commons.dialogs.SecurityDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
import com.simplemobiletools.commons.extensions.handleHiddenFolderPasswordProtection
import com.simplemobiletools.commons.extensions.updateTextColors
import com.simplemobiletools.commons.helpers.PROTECTION_FINGERPRINT import com.simplemobiletools.commons.helpers.PROTECTION_FINGERPRINT
import com.simplemobiletools.commons.helpers.SHOW_ALL_TABS import com.simplemobiletools.commons.helpers.SHOW_ALL_TABS
import com.simplemobiletools.filemanager.R import com.simplemobiletools.filemanager.R
@ -60,7 +63,7 @@ class SettingsActivity : SimpleActivity() {
settings_use_english_holder.setOnClickListener { settings_use_english_holder.setOnClickListener {
settings_use_english.toggle() settings_use_english.toggle()
config.useEnglish = settings_use_english.isChecked config.useEnglish = settings_use_english.isChecked
useEnglishToggled() System.exit(0)
} }
} }