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)
+            }
+        }
+    }
+}

app/src/main/res/drawable/ic_chargeprice.xml

@@ -1,4 +1,5 @@
 <vector android:height="15.811624dp" android:viewportHeight="131.5"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="199.6" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M197.544,65.685l-9.2,-4.8l8,-4.2c2.7,-1.4 2.7,-3.8 0,-5.2l-8.6,-4.5l8.6,-4.5c2.7,-1.4 2.7,-3.8 0,-5.2l-68.9,-36.1c-2.7,-1.4 -7.2,-1.4 -9.9,0l-115.5,59.7c-2.7,1.4 -2.7,3.7 0,5.1l8.8,4.5l-8.8,4.6c-2.7,1.4 -2.7,3.7 0,5.1l9.4,4.8l-8.2,4.3c-2.7,1.4 -2.7,3.7 0,5.1l70.4,36.2c2.7,1.4 7.2,1.4 9.9,0l114,-59.6C200.344,69.385 200.344,67.085 197.544,65.685L197.544,65.685zM123.144,18.785L105.844,38.685c-0.9,1 -0.6,2.3 0.6,2.9l13.7,7.1c1.2,0.6 1.2,1.6 0,2.2l-43.1,22.3c-1.2,0.6 -1.4,0.3 -0.6,-0.7l17.3,-19.9c0.9,-1 0.6,-2.3 -0.6,-2.9l-13.7,-7.1c-1.2,-0.6 -1.2,-1.6 0,-2.2l43.1,-22.3C123.744,17.485 123.944,17.785 123.144,18.785L123.144,18.785z"/>
 </vector>

app/src/main/res/drawable/ic_settings_data_source.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="#000"
+        android:pathData="M12,3C7.58,3 4,4.79 4,7C4,9.21 7.58,11 12,11C12.5,11 13,10.97 13.5,10.92V9.5H16.39L15.39,8.5L18.9,5C17.5,3.8 14.94,3 12,3M18.92,7.08L17.5,8.5L20,11H15V13H20L17.5,15.5L18.92,16.92L23.84,12M4,9V12C4,14.21 7.58,16 12,16C13.17,16 14.26,15.85 15.25,15.63L16.38,14.5H13.5V12.92C13,12.97 12.5,13 12,13C7.58,13 4,11.21 4,9M4,14V17C4,19.21 7.58,21 12,21C14.94,21 17.5,20.2 18.9,19L17,17.1C15.61,17.66 13.9,18 12,18C7.58,18 4,16.21 4,14Z" />
+</vector>

app/src/main/res/drawable/ic_settings_ui.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7,14c-1.66,0 -3,1.34 -3,3 0,1.31 -1.16,2 -2,2 0.92,1.22 2.49,2 4,2 2.21,0 4,-1.79 4,-4 0,-1.66 -1.34,-3 -3,-3zM20.71,4.63l-1.34,-1.34c-0.39,-0.39 -1.02,-0.39 -1.41,0L9,12.25 11.75,15l8.96,-8.96c0.39,-0.39 0.39,-1.02 0,-1.41z" />
+</vector>

app/src/main/res/navigation/nav_graph.xml

@@ -36,7 +36,7 @@
     </fragment>
     <fragment
         android:id="@+id/about"
-        android:name="net.vonforst.evmap.fragment.AboutFragment"
+        android:name="net.vonforst.evmap.fragment.preference.AboutFragment"
         android:label="@string/about"
         tools:layout="@layout/fragment_preference">
         <action
@@ -48,9 +48,24 @@
     </fragment>
     <fragment
         android:id="@+id/settings"
-        android:name="net.vonforst.evmap.fragment.SettingsFragment"
+        android:name="net.vonforst.evmap.fragment.preference.SettingsFragment"
         android:label="@string/settings"
         tools:layout="@layout/fragment_preference" />
+    <fragment
+        android:id="@+id/settings_ui"
+        android:name="net.vonforst.evmap.fragment.preference.UiSettingsFragment"
+        android:label="@string/settings_ui"
+        tools:layout="@layout/fragment_preference" />
+    <fragment
+        android:id="@+id/settings_data"
+        android:name="net.vonforst.evmap.fragment.preference.DataSettingsFragment"
+        android:label="@string/settings_data_sources"
+        tools:layout="@layout/fragment_preference" />
+    <fragment
+        android:id="@+id/settings_chargeprice"
+        android:name="net.vonforst.evmap.fragment.preference.ChargepriceSettingsFragment"
+        android:label="@string/settings_chargeprice"
+        tools:layout="@layout/fragment_preference" />
     <fragment
         android:id="@+id/favs"
         android:name="net.vonforst.evmap.fragment.FavoritesFragment"

app/src/main/res/values-de/strings.xml

@@ -245,4 +245,5 @@
     <string name="edit_filter_profile">„%s“ bearbeiten</string>
     <string name="pref_search_delete_recent">Suchverlauf löschen</string>
     <string name="deleted_recent_search_results">Suchverlauf wurde gelöscht</string>
+    <string name="settings_data_sources">Datenquellen</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -230,4 +230,5 @@
     <string name="edit_filter_profile">Edit “%s”</string>
     <string name="pref_search_delete_recent">Delete recent search results</string>
     <string name="deleted_recent_search_results">Recent search results have been deleted</string>
+    <string name="settings_data_sources">Data sources</string>
 </resources>

app/src/main/res/xml/settings.xml

@@ -1,91 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <PreferenceCategory android:title="@string/settings_ui">
-        <ListPreference
-            android:key="language"
-            android:title="@string/pref_language"
-            android:entries="@array/pref_language_names"
-            android:entryValues="@array/pref_language_values"
-            android:defaultValue="default"
-            android:summary="@string/pref_language_summary" />
-
-        <ListPreference
-            android:key="darkmode"
-            android:title="@string/pref_darkmode"
-            android:entries="@array/pref_darkmode_names"
-            android:entryValues="@array/pref_darkmode_values"
-            android:defaultValue="default"
-            android:summary="@string/pref_darkmode_summary" />
-
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/settings_charger_data">
-        <net.vonforst.evmap.ui.DataSourceSelectDialogPreference
-            android:key="data_source"
-            android:title="@string/pref_data_source"
-            android:entries="@array/pref_data_source_names"
-            android:entryValues="@array/pref_data_source_values"
-            android:defaultValue="goingelectric"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/settings_map">
-
-        <ListPreference
-            android:key="map_provider"
-            android:title="@string/pref_map_provider"
-            android:entries="@array/pref_map_provider_names"
-            android:entryValues="@array/pref_map_provider_values"
-            android:defaultValue="@string/pref_map_provider_default"
-            android:summary="%s" />
-
-        <ListPreference
-            android:key="search_provider"
-            android:title="@string/pref_search_provider"
-            android:entries="@array/pref_search_provider_names"
-            android:entryValues="@array/pref_search_provider_values"
-            android:defaultValue="@string/pref_search_provider_default"
-            android:summary="%s" />
-
-        <Preference
-            android:key="search_delete_recent"
-            android:title="@string/pref_search_delete_recent" />
-
-        <CheckBoxPreference
-            android:key="navigate_use_maps"
-            android:title="@string/pref_navigate_use_maps"
-            android:summaryOn="@string/pref_navigate_use_maps_on"
-            android:summaryOff="@string/pref_navigate_use_maps_off"
-            android:defaultValue="true" />
-
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/settings_chargeprice">
-        <net.vonforst.evmap.ui.MultiSelectDialogPreference
-            android:key="chargeprice_my_vehicle"
-            android:title="@string/pref_my_vehicle"
-            app:showAllButton="false"
-            app:defaultToAll="false" />
-        <net.vonforst.evmap.ui.MultiSelectDialogPreference
-            android:key="chargeprice_my_tariffs"
-            android:title="@string/pref_my_tariffs"
-            android:summary="@string/pref_my_tariffs_summary" />
-        <ListPreference
-            android:key="chargeprice_currency"
-            android:title="@string/pref_chargeprice_currency"
-            android:entries="@array/pref_chargeprice_currency_names"
-            android:entryValues="@array/pref_chargeprice_currency_values"
-            android:defaultValue="EUR"
-            app:useSimpleSummaryProvider="true" />
-        <CheckBoxPreference
-            android:key="chargeprice_no_base_fee"
-            android:title="@string/pref_chargeprice_no_base_fee"
-            android:defaultValue="false"
-            app:singleLineTitle="false" />
-        <CheckBoxPreference
-            android:key="chargeprice_show_provider_customer_tariffs"
-            android:title="@string/pref_chargeprice_show_provider_customer_tariffs"
-            android:summary="@string/pref_chargeprice_show_provider_customer_tariffs_summary"
-            android:defaultValue="false"
-            app:singleLineTitle="false" />
-    </PreferenceCategory>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:fragment="net.vonforst.evmap.fragment.preference.UiSettingsFragment"
+        android:title="@string/settings_ui"
+        android:icon="@drawable/ic_settings_ui" />
+    <Preference
+        android:fragment="net.vonforst.evmap.fragment.preference.DataSettingsFragment"
+        android:title="@string/settings_data_sources"
+        android:icon="@drawable/ic_settings_data_source" />
+    <Preference
+        android:fragment="net.vonforst.evmap.fragment.preference.ChargepriceSettingsFragment"
+        android:title="@string/settings_chargeprice"
+        android:icon="@drawable/ic_chargeprice" />
 </PreferenceScreen>

app/src/main/res/xml/settings_chargeprice.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <net.vonforst.evmap.ui.MultiSelectDialogPreference
+        android:key="chargeprice_my_vehicle"
+        android:title="@string/pref_my_vehicle"
+        app:showAllButton="false"
+        app:defaultToAll="false" />
+    <net.vonforst.evmap.ui.MultiSelectDialogPreference
+        android:key="chargeprice_my_tariffs"
+        android:title="@string/pref_my_tariffs"
+        android:summary="@string/pref_my_tariffs_summary" />
+    <ListPreference
+        android:key="chargeprice_currency"
+        android:title="@string/pref_chargeprice_currency"
+        android:entries="@array/pref_chargeprice_currency_names"
+        android:entryValues="@array/pref_chargeprice_currency_values"
+        android:defaultValue="EUR"
+        app:useSimpleSummaryProvider="true" />
+    <CheckBoxPreference
+        android:key="chargeprice_no_base_fee"
+        android:title="@string/pref_chargeprice_no_base_fee"
+        android:defaultValue="false"
+        app:singleLineTitle="false" />
+    <CheckBoxPreference
+        android:key="chargeprice_show_provider_customer_tariffs"
+        android:title="@string/pref_chargeprice_show_provider_customer_tariffs"
+        android:summary="@string/pref_chargeprice_show_provider_customer_tariffs_summary"
+        android:defaultValue="false"
+        app:singleLineTitle="false" />
+</PreferenceScreen>

app/src/main/res/xml/settings_data.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <PreferenceCategory android:title="@string/settings_charger_data">
+        <net.vonforst.evmap.ui.DataSourceSelectDialogPreference
+            android:key="data_source"
+            android:title="@string/pref_data_source"
+            android:entries="@array/pref_data_source_names"
+            android:entryValues="@array/pref_data_source_values"
+            android:defaultValue="goingelectric"
+            app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/settings_map">
+
+        <ListPreference
+            android:key="map_provider"
+            android:title="@string/pref_map_provider"
+            android:entries="@array/pref_map_provider_names"
+            android:entryValues="@array/pref_map_provider_values"
+            android:defaultValue="@string/pref_map_provider_default"
+            android:summary="%s" />
+
+        <ListPreference
+            android:key="search_provider"
+            android:title="@string/pref_search_provider"
+            android:entries="@array/pref_search_provider_names"
+            android:entryValues="@array/pref_search_provider_values"
+            android:defaultValue="@string/pref_search_provider_default"
+            android:summary="%s" />
+
+        <Preference
+            android:key="search_delete_recent"
+            android:title="@string/pref_search_delete_recent" />
+
+    </PreferenceCategory>
+</PreferenceScreen>

app/src/main/res/xml/settings_ui.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <ListPreference
+        android:key="language"
+        android:title="@string/pref_language"
+        android:entries="@array/pref_language_names"
+        android:entryValues="@array/pref_language_values"
+        android:defaultValue="default"
+        android:summary="@string/pref_language_summary" />
+
+    <ListPreference
+        android:key="darkmode"
+        android:title="@string/pref_darkmode"
+        android:entries="@array/pref_darkmode_names"
+        android:entryValues="@array/pref_darkmode_values"
+        android:defaultValue="default"
+        android:summary="@string/pref_darkmode_summary" />
+    <CheckBoxPreference
+        android:key="navigate_use_maps"
+        android:title="@string/pref_navigate_use_maps"
+        android:summaryOn="@string/pref_navigate_use_maps_on"
+        android:summaryOff="@string/pref_navigate_use_maps_off"
+        android:defaultValue="true" />
+</PreferenceScreen>