refactor(ui): apply MainViewModel to PerfMainActivity and its fragments

Author: WhiredPlanck

app/src/main/java/com/osfans/trime/ui/fragments/ConfFragment.kt

@@ -4,12 +4,14 @@ import android.content.Context
 import android.os.Bundle
 import android.view.Menu
 import androidx.core.view.forEach
+import androidx.fragment.app.activityViewModels
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreferenceCompat
 import com.osfans.trime.R
 import com.osfans.trime.data.AppPrefs
 import com.osfans.trime.ui.components.ResetAssetsDialog
+import com.osfans.trime.ui.main.MainViewModel
 import com.osfans.trime.util.RimeUtils
 import com.osfans.trime.util.createLoadingDialog
 import com.osfans.trime.util.formatDateTime
@@ -20,17 +22,11 @@ import timber.log.Timber
 
 class ConfFragment : PreferenceFragmentCompat(), CoroutineScope by MainScope() {
 
+    private val viewModel : MainViewModel by activityViewModels()
     private val prefs get() = AppPrefs.defaultInstance()
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.conf_preference)
-
-        setHasOptionsMenu(true)
-    }
-
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        menu.forEach { item -> item.isVisible = false }
-        super.onPrepareOptionsMenu(menu)
     }
 
     override fun onPreferenceTreeClick(preference: Preference?): Boolean {
@@ -62,6 +58,7 @@ class ConfFragment : PreferenceFragmentCompat(), CoroutineScope by MainScope() {
 
     override fun onResume() {
         super.onResume()
+        viewModel.disableTopOptionsMenu()
         setBackgroundSyncSummary(context)
     }
 

app/src/main/java/com/osfans/trime/ui/fragments/KeyboardFragment.kt

@@ -4,26 +4,22 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.Menu
 import androidx.core.view.forEach
+import androidx.fragment.app.activityViewModels
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.osfans.trime.R
 import com.osfans.trime.core.Rime
 import com.osfans.trime.data.AppPrefs
 import com.osfans.trime.ime.core.Trime
 import com.osfans.trime.ui.components.SoundPickerDialog
+import com.osfans.trime.ui.main.MainViewModel
 
 class KeyboardFragment :
     PreferenceFragmentCompat(),
     SharedPreferences.OnSharedPreferenceChangeListener {
+    private val viewModel : MainViewModel by activityViewModels()
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.keyboard_preference)
-
-        setHasOptionsMenu(true)
-    }
-
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        menu.forEach { item -> item.isVisible = false }
-        super.onPrepareOptionsMenu(menu)
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
@@ -61,6 +57,7 @@ class KeyboardFragment :
     }
     override fun onResume() {
         super.onResume()
+        viewModel.disableTopOptionsMenu()
         preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
     }
 

app/src/main/java/com/osfans/trime/ui/fragments/LooksFragment.kt

@@ -3,22 +3,24 @@ package com.osfans.trime.ui.fragments
 import android.os.Bundle
 import android.view.Menu
 import androidx.core.view.forEach
+import androidx.fragment.app.activityViewModels
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.osfans.trime.R
 import com.osfans.trime.ui.components.ColorPickerDialog
 import com.osfans.trime.ui.components.ThemePickerDialog
+import com.osfans.trime.ui.main.MainViewModel
 
 class LooksFragment : PreferenceFragmentCompat() {
+    private val viewModel : MainViewModel by activityViewModels()
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.looks_preference)
-
-        setHasOptionsMenu(true)
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        menu.forEach { item -> item.isVisible = false }
-        super.onPrepareOptionsMenu(menu)
+    override fun onResume() {
+        super.onResume()
+        viewModel.disableTopOptionsMenu()
     }
 
     override fun onPreferenceTreeClick(preference: Preference?): Boolean {

app/src/main/java/com/osfans/trime/ui/fragments/OtherFragment.kt

@@ -8,16 +8,19 @@ import android.os.Bundle
 import android.view.Menu
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.view.forEach
+import androidx.fragment.app.activityViewModels
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceFragmentCompat
 import com.osfans.trime.R
 import com.osfans.trime.data.AppPrefs
 import com.osfans.trime.data.Config
 import com.osfans.trime.ime.core.Trime
+import com.osfans.trime.ui.main.MainViewModel
 
 class OtherFragment :
     PreferenceFragmentCompat(),
     SharedPreferences.OnSharedPreferenceChangeListener {
+    private val viewModel : MainViewModel by activityViewModels()
     private val prefs get() = AppPrefs.defaultInstance()
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.other_preference)
@@ -31,13 +34,6 @@ class OtherFragment :
             AppCompatDelegate.setDefaultNightMode(uiMode)
             true
         }
-
-        setHasOptionsMenu(true)
-    }
-
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        menu.forEach { item -> item.isVisible = false }
-        super.onPrepareOptionsMenu(menu)
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
@@ -71,13 +67,14 @@ class OtherFragment :
 
     override fun onResume() {
         super.onResume()
+        viewModel.disableTopOptionsMenu()
         preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
     }
 
     override fun onPause() {
-        super.onPause()
         updateLauncherIconStatus()
         preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+        super.onPause()
     }
 
     private fun updateLauncherIconStatus() {

app/src/main/java/com/osfans/trime/ui/fragments/PrefFragment.kt

@@ -1,13 +1,28 @@
 package com.osfans.trime.ui.fragments
 
 import android.os.Bundle
+import androidx.fragment.app.activityViewModels
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
 import com.osfans.trime.R
 import com.osfans.trime.ui.components.SchemaPickerDialog
+import com.osfans.trime.ui.main.MainViewModel
 
 class PrefFragment : PreferenceFragmentCompat() {
+
+    private val viewModel : MainViewModel by activityViewModels()
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.enableTopOptionsMenu()
+    }
+
+    override fun onPause() {
+        viewModel.disableTopOptionsMenu()
+        super.onPause()
+    }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         val context = preferenceManager.context
         setPreferencesFromResource(R.xml.prefs, rootKey)

app/src/main/java/com/osfans/trime/ui/fragments/ToolkitFragment.kt

@@ -3,13 +3,18 @@ package com.osfans.trime.ui.fragments
 import android.os.Bundle
 import android.view.Menu
 import androidx.core.view.forEach
+import androidx.fragment.app.activityViewModels
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.osfans.trime.R
+import com.osfans.trime.ui.main.MainViewModel
 import com.osfans.trime.util.ShortcutUtils
 
 @Suppress("unused")
 class ToolkitFragment : PreferenceFragmentCompat() {
+
+    private val viewModel : MainViewModel by activityViewModels()
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         val context = preferenceManager.context
         val screen = preferenceManager.createPreferenceScreen(context)
@@ -24,12 +29,10 @@ class ToolkitFragment : PreferenceFragmentCompat() {
             }
         )
         preferenceScreen = screen
-
-        setHasOptionsMenu(true)
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        menu.forEach { item -> item.isVisible = false }
-        super.onPrepareOptionsMenu(menu)
+    override fun onResume() {
+        super.onResume()
+        viewModel.disableTopOptionsMenu()
     }
 }

app/src/main/java/com/osfans/trime/ui/main/PrefMainActivity.kt

@@ -10,12 +10,12 @@ import android.os.Bundle
 import android.provider.Settings
 import android.view.Menu
 import android.view.MenuItem
-import android.view.inputmethod.InputMethodManager
+import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.appcompat.widget.Toolbar
 import androidx.core.app.ActivityCompat
+import androidx.core.view.forEach
 import androidx.fragment.app.Fragment
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
@@ -43,10 +43,10 @@ class PrefMainActivity :
     PreferenceFragmentCompat.OnPreferenceStartFragmentCallback,
     ActivityCompat.OnRequestPermissionsResultCallback,
     CoroutineScope by MainScope() {
+    private val viewModel : MainViewModel by viewModels()
     private val prefs get() = AppPrefs.defaultInstance()
 
     lateinit var binding: PrefActivityBinding
-    lateinit var imeManager: InputMethodManager
 
     override fun onCreate(savedInstanceState: Bundle?) {
         prefs.sync()
@@ -72,11 +72,16 @@ class PrefMainActivity :
                 resources.getColor(R.color.windowBackground)
             )
         setContentView(binding.root)
+        setSupportActionBar(binding.toolbar.toolbar)
 
-        val toolbar = findViewById<Toolbar>(R.id.toolbar)
-        setSupportActionBar(toolbar)
-
-        imeManager = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
+        viewModel.toolbarTitle.observe(this) {
+            binding.toolbar.toolbar.title = it
+        }
+        viewModel.topOptionsMenu.observe(this) {
+            binding.toolbar.toolbar.menu.forEach { m ->
+                m.isVisible = it
+            }
+        }
 
         if (savedInstanceState == null) {
             loadFragment(PrefFragment())
@@ -162,6 +167,9 @@ class PrefMainActivity :
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.preference_main_menu, menu)
+        menu?.forEach {
+            it.isVisible = viewModel.topOptionsMenu.value ?: true
+        }
         return true
     }
 

app/src/main/res/layout/pref_activity.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/toolbar" />
+    <include android:id="@+id/toolbar" layout="@layout/toolbar" />
 
     <FrameLayout
         android:id="@+id/preference"