0
0
mirror of https://github.com/florisboard/florisboard.git synced 2024-09-20 03:52:18 +02:00

Optimize SettingsMainActivity.kt

This commit is contained in:
Patrick Goldinger 2020-06-07 18:07:51 +02:00
parent 20616bf260
commit 3cf4e336ac
2 changed files with 4 additions and 15 deletions

View File

@ -6,7 +6,7 @@
<uses-permission android:name="android.permission.VIBRATE" />
<application
android:allowBackup="true"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
@ -45,10 +45,8 @@
android:name="dev.patrickgold.florisboard.settings.LauncherAlias"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:launchMode="singleTask"
android:roundIcon="@mipmap/ic_launcher_round"
android:targetActivity="dev.patrickgold.florisboard.settings.SettingsMainActivity"
android:theme="@style/SettingsTheme">
android:targetActivity="dev.patrickgold.florisboard.settings.SettingsMainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

View File

@ -54,16 +54,8 @@ class SettingsMainActivity : AppCompatActivity(),
scrollView = findViewById(R.id.settings__scroll_view)
if (savedInstanceState != null) {
val selectedId = savedInstanceState.getInt(SELECTED_ITEM_ID)
navigationView.selectedItemId = selectedId
} else {
supportActionBar?.title = String.format(
resources.getString(R.string.settings__home__title),
resources.getString(R.string.app_name)
)
loadFragment(HomeFragment())
}
navigationView.selectedItemId =
savedInstanceState?.getInt(SELECTED_ITEM_ID) ?: R.id.settings__navigation__home
}
override fun onSaveInstanceState(outState: Bundle) {
@ -110,7 +102,6 @@ class SettingsMainActivity : AppCompatActivity(),
transaction.replace(R.id.settings__frame_container, fragment, FRAGMENT_TAG)
//transaction.addToBackStack(null)
transaction.commit()
supportFragmentManager.executePendingTransactions()
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {