refactor app settings into separate sub-screens

for better overview

app/src/main/java/net/vonforst/evmap/MapsActivity.kt

@@ -19,8 +19,11 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
+import androidx.navigation.fragment.FragmentNavigator
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
 import net.vonforst.evmap.fragment.MapFragment
@@ -35,7 +38,8 @@ const val EXTRA_CHARGER_ID = "chargerId"
 const val EXTRA_LAT = "lat"
 const val EXTRA_LON = "lon"
 
-class MapsActivity : AppCompatActivity() {
+class MapsActivity : AppCompatActivity(),
+    PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
     interface FragmentCallback {
         fun getRootView(): View
     }
@@ -102,11 +106,11 @@ class MapsActivity : AppCompatActivity() {
                     }
                 })
             }
-            navGraph.startDestination = R.id.onboarding
+            navGraph.setStartDestination(R.id.onboarding)
             navController.graph = navGraph
             return
         } else {
-            navGraph.startDestination = R.id.map
+            navGraph.setStartDestination(R.id.map)
             navController.graph = navGraph
         }
 
@@ -213,4 +217,15 @@ class MapsActivity : AppCompatActivity() {
         }
         startActivity(intent)
     }
+
+    override fun onPreferenceStartFragment(
+        caller: PreferenceFragmentCompat,
+        pref: Preference
+    ): Boolean {
+        // Identify the Navigation Destination
+        val navDestination = navController.graph
+            .find { target -> target is FragmentNavigator.Destination && pref.fragment == target.className }
+        navDestination?.let { target -> navController.navigate(target.id) }
+        return true
+    }
 }

app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt

@@ -1,4 +1,4 @@
-package net.vonforst.evmap.fragment
+package net.vonforst.evmap.fragment.preference
 
 import android.os.Bundle
 import androidx.appcompat.widget.Toolbar

app/src/main/java/net/vonforst/evmap/fragment/preference/BaseSettingsFragment.kt

@@ -0,0 +1,40 @@
+package net.vonforst.evmap.fragment.preference
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.widget.Toolbar
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.ui.setupWithNavController
+import androidx.preference.PreferenceFragmentCompat
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
+import net.vonforst.evmap.storage.PreferenceDataSource
+
+abstract class BaseSettingsFragment : PreferenceFragmentCompat(),
+    SharedPreferences.OnSharedPreferenceChangeListener {
+    protected lateinit var prefs: PreferenceDataSource
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        prefs = PreferenceDataSource(requireContext())
+    }
+
+    override fun onResume() {
+        super.onResume()
+        preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+
+        val navController = findNavController()
+        val toolbar = requireView().findViewById(R.id.toolbar) as Toolbar
+        toolbar.setupWithNavController(
+            navController,
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+    }
+
+    override fun onPause() {
+        preferenceManager.sharedPreferences
+            .unregisterOnSharedPreferenceChangeListener(this)
+        super.onPause()
+    }
+}

app/src/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt

@@ -1,28 +1,15 @@
-package net.vonforst.evmap.fragment
+package net.vonforst.evmap.fragment.preference
 
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
-import android.widget.Toast
-import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.viewModels
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.ui.setupWithNavController
 import androidx.preference.MultiSelectListPreference
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
-import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.ui.updateNightMode
 import net.vonforst.evmap.viewmodel.SettingsViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
 
-
-class SettingsFragment : PreferenceFragmentCompat(),
-    SharedPreferences.OnSharedPreferenceChangeListener {
-    private lateinit var prefs: PreferenceDataSource
-
+class ChargepriceSettingsFragment : BaseSettingsFragment() {
     private val vm: SettingsViewModel by viewModels(factoryProducer = {
         viewModelFactory {
             SettingsViewModel(
@@ -37,7 +24,6 @@ class SettingsFragment : PreferenceFragmentCompat(),
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        prefs = PreferenceDataSource(requireContext())
 
         myVehiclePreference = findPreference("chargeprice_my_vehicle")!!
         myVehiclePreference.isEnabled = false
@@ -97,63 +83,17 @@ class SettingsFragment : PreferenceFragmentCompat(),
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.settings, rootKey)
-    }
-
-    override fun onPreferenceTreeClick(preference: Preference?): Boolean {
-        return when (preference?.key) {
-            "search_delete_recent" -> {
-                Toast.makeText(context, R.string.deleted_recent_search_results, Toast.LENGTH_LONG)
-                    .show()
-                vm.deleteRecentSearchResults()
-                true
-            }
-            else -> super.onPreferenceTreeClick(preference)
-        }
+        setPreferencesFromResource(R.xml.settings_chargeprice, rootKey)
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
         when (key) {
-            "language" -> {
-                activity?.let {
-                    it.finish();
-                    it.startActivity(it.intent);
-                }
-            }
-            "darkmode" -> {
-                updateNightMode(prefs)
-            }
             "chargeprice_my_vehicle" -> {
                 updateMyVehiclesSummary()
             }
             "chargeprice_my_tariffs" -> {
                 updateMyTariffsSummary()
             }
-            "search_provider" -> {
-                if (prefs.searchProvider == "google") {
-                    Toast.makeText(context, R.string.pref_search_provider_info, Toast.LENGTH_LONG)
-                        .show()
-                }
-            }
         }
     }
-
-    override fun onResume() {
-        super.onResume()
-        preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
-
-        val navController = findNavController()
-        val toolbar = requireView().findViewById(R.id.toolbar) as Toolbar
-        toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-    }
-
-    override fun onPause() {
-        preferenceManager.sharedPreferences
-            .unregisterOnSharedPreferenceChangeListener(this)
-        super.onPause()
-    }
-
 }

app/src/main/java/net/vonforst/evmap/fragment/preference/DataSettingsFragment.kt

@@ -0,0 +1,63 @@
+package net.vonforst.evmap.fragment.preference
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.widget.TextView
+import androidx.fragment.app.viewModels
+import androidx.preference.Preference
+import com.google.android.material.snackbar.Snackbar
+import net.vonforst.evmap.R
+import net.vonforst.evmap.viewmodel.SettingsViewModel
+import net.vonforst.evmap.viewmodel.viewModelFactory
+
+class DataSettingsFragment : BaseSettingsFragment() {
+    private val vm: SettingsViewModel by viewModels(factoryProducer = {
+        viewModelFactory {
+            SettingsViewModel(
+                requireActivity().application,
+                getString(R.string.chargeprice_key)
+            )
+        }
+    })
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.settings_data, rootKey)
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        when (key) {
+            "search_provider" -> {
+                if (prefs.searchProvider == "google") {
+                    Snackbar.make(
+                        requireView(),
+                        R.string.pref_search_provider_info,
+                        Snackbar.LENGTH_INDEFINITE
+                    ).apply {
+                        setAction(R.string.ok) {}
+                        this.view.findViewById<TextView>(com.google.android.material.R.id.snackbar_text)
+                            ?.apply {
+                                maxLines = 6
+                            }
+                    }
+                        .show()
+                }
+            }
+        }
+    }
+
+    override fun onPreferenceTreeClick(preference: Preference?): Boolean {
+        return when (preference?.key) {
+            "search_delete_recent" -> {
+                Snackbar.make(
+                    requireView(),
+                    R.string.deleted_recent_search_results,
+                    Snackbar.LENGTH_LONG
+                )
+                    .show()
+                vm.deleteRecentSearchResults()
+                true
+            }
+            else -> super.onPreferenceTreeClick(preference)
+        }
+    }
+}

app/src/main/java/net/vonforst/evmap/fragment/preference/SettingsFragment.kt

@@ -0,0 +1,22 @@
+package net.vonforst.evmap.fragment.preference
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.View
+import net.vonforst.evmap.R
+
+
+class SettingsFragment : BaseSettingsFragment() {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.settings, rootKey)
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+
+    }
+}

app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt

@@ -0,0 +1,26 @@
+package net.vonforst.evmap.fragment.preference
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import net.vonforst.evmap.R
+import net.vonforst.evmap.ui.updateNightMode
+
+class UiSettingsFragment : BaseSettingsFragment() {
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.settings_ui, rootKey)
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        when (key) {
+            "language" -> {
+                activity?.let {
+                    it.finish();
+                    it.startActivity(it.intent);
+                }
+            }
+            "darkmode" -> {
+                updateNightMode(prefs)
+            }
+        }
+    }
+}