refactor: improve user experience of settings pages

Author: WhiredPlanck

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

@@ -71,11 +71,6 @@ class AboutFragment : PaddingPreferenceFragment() {
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        viewModel.setToolbarTitle(getString(R.string.pref_about))
-    }
-
     companion object {
         private val DASH_G_PATTERN = Regex("^(.*-g)([0-9a-f]+)(.*)$")
         private val COMMON_PATTERN = Regex("^([^-]*)(-.*)$")

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

@@ -22,7 +22,6 @@ class ClipboardFragment : PaddingPreferenceFragment() {
 
     override fun onResume() {
         super.onResume()
-        viewModel.setToolbarTitle(getString(R.string.clipboard))
         viewModel.disableTopOptionsMenu()
     }
 }

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

@@ -54,7 +54,6 @@ class KeyboardFragment :
 
     override fun onResume() {
         super.onResume()
-        viewModel.setToolbarTitle(getString(R.string.pref_keyboard))
         viewModel.disableTopOptionsMenu()
         preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
     }

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

@@ -54,7 +54,6 @@ class LicenseFragment : PaddingPreferenceFragment() {
 
     override fun onResume() {
         super.onResume()
-        viewModel.setToolbarTitle(getString(R.string.about__license))
         viewModel.disableTopOptionsMenu()
     }
 

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

@@ -40,7 +40,6 @@ class OtherFragment : PaddingPreferenceFragment() {
 
     override fun onResume() {
         super.onResume()
-        viewModel.setToolbarTitle(getString(R.string.pref_other))
         viewModel.disableTopOptionsMenu()
     }
 

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

@@ -23,7 +23,6 @@ class PrefFragment : PaddingPreferenceFragment() {
 
     override fun onResume() {
         super.onResume()
-        viewModel.setToolbarTitle(getString(R.string.trime_app_name))
         viewModel.enableTopOptionsMenu()
     }
 
@@ -70,7 +69,7 @@ class PrefFragment : PaddingPreferenceFragment() {
                 true
             }
             get<Preference>("pref_theme_and_color")?.setOnPreferenceClickListener {
-                findNavController().navigate(R.id.action_prefFragment_to_themeColorFragment)
+                findNavController().navigate(R.id.action_prefFragment_to_themeFragment)
                 true
             }
             get<Preference>("pref_clipboard")?.setOnPreferenceClickListener {

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

@@ -174,7 +174,6 @@ class ProfileFragment :
 
     override fun onResume() {
         super.onResume()
-        viewModel.setToolbarTitle(getString(R.string.pref_profile))
         viewModel.disableTopOptionsMenu()
         preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
     }

…trime/ui/fragments/ThemeColorFragment.kt …fans/trime/ui/fragments/ThemeFragment.ktapp/src/main/java/com/osfans/trime/ui/fragments/ThemeColorFragment.kt renamed to app/src/main/java/com/osfans/trime/ui/fragments/ThemeFragment.kt app/src/main/java/com/osfans/trime/ui/fragments/ThemeColorFragment.kt renamed to app/src/main/java/com/osfans/trime/ui/fragments/ThemeFragment.kt

@@ -16,7 +16,7 @@ import com.osfans.trime.ui.main.settings.ColorPickerDialog
 import com.osfans.trime.ui.main.settings.ThemePickerDialog
 import kotlinx.coroutines.launch
 
-class ThemeColorFragment : PaddingPreferenceFragment() {
+class ThemeFragment : PaddingPreferenceFragment() {
     private val viewModel: MainViewModel by activityViewModels()
 
     override fun onCreatePreferences(
@@ -38,7 +38,6 @@ class ThemeColorFragment : PaddingPreferenceFragment() {
 
     override fun onResume() {
         super.onResume()
-        viewModel.setToolbarTitle(getString(R.string.pref_theme_and_color))
         viewModel.disableTopOptionsMenu()
     }
 }

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

@@ -54,7 +54,6 @@ class ToolkitFragment : PaddingPreferenceFragment() {
 
     override fun onResume() {
         super.onResume()
-        viewModel.setToolbarTitle(getString(R.string.pref_toolkit))
         viewModel.disableTopOptionsMenu()
     }
 }

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

@@ -107,6 +107,12 @@ class PrefMainActivity : AppCompatActivity() {
         }
         navHostFragment.navController.addOnDestinationChangedListener { _, dest, _ ->
             dest.label?.let { viewModel.setToolbarTitle(it.toString()) }
+            binding.prefToolbar.toolbar.subtitle =
+                if (dest.id == R.id.prefFragment) {
+                    getString(R.string.trime_app_slogan)
+                } else {
+                    ""
+                }
         }
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)