From 46bd091a569b4ee52b8dded6238538b0a5f25797 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 12 Feb 2018 18:39:51 +0100 Subject: [PATCH] move onOptionsItemSelected upper in the code --- .../filemanager/activities/MainActivity.kt | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt index a890ee59..a5945617 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt @@ -103,6 +103,23 @@ class MainActivity : SimpleActivity() { return true } + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + R.id.go_home -> goHome() + R.id.go_to_favorite -> goToFavorite() + R.id.sort -> showSortingDialog() + R.id.add_favorite -> addFavorite() + R.id.remove_favorite -> removeFavorite() + R.id.set_as_home -> setAsHome() + R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden() + R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden() + R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java)) + R.id.about -> launchAbout() + else -> return super.onOptionsItemSelected(item) + } + return true + } + private fun storeStateVariables() { storedUseEnglish = config.useEnglish } @@ -181,23 +198,6 @@ class MainActivity : SimpleActivity() { (fragment_holder as ItemsFragment).openPath(newPath) } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - R.id.go_home -> goHome() - R.id.go_to_favorite -> goToFavorite() - R.id.sort -> showSortingDialog() - R.id.add_favorite -> addFavorite() - R.id.remove_favorite -> removeFavorite() - R.id.set_as_home -> setAsHome() - R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden() - R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden() - R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java)) - R.id.about -> launchAbout() - else -> return super.onOptionsItemSelected(item) - } - return true - } - private fun goHome() { if (config.homeFolder != fragment.currentPath) openPath(config.homeFolder)