From 23873dccdbb411a719f21b53e36ec5096c56e85d Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Thu, 8 Jun 2023 13:04:36 +0200
Subject: [PATCH] add setting to configure map scale bar

---
 .../vonforst/evmap/fragment/MapFragment.kt    | 21 +++++++++++++++++++
 .../evmap/storage/PreferenceDataSource.kt     |  3 +++
 app/src/main/res/values-de/strings.xml        |  5 +++++
 app/src/main/res/values/arrays.xml            | 12 +++++++++++
 app/src/main/res/values/strings.xml           |  5 +++++
 app/src/main/res/xml/settings_ui.xml          |  7 +++++++
 6 files changed, 53 insertions(+)

diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
index ab9814fe..4dea3635 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -895,6 +895,27 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 map.projection.visibleRegion.latLngBounds, map.cameraPosition.zoom
             )
         }
+
+        binding.scaleView.apply {
+            when (prefs.mapScale) {
+                "both" -> {
+                    visibility = View.VISIBLE
+                    metersAndMiles()
+                }
+
+                "meters" -> {
+                    visibility = View.VISIBLE
+                    metersOnly()
+                }
+
+                "miles" -> {
+                    visibility = View.VISIBLE
+                    milesOnly()
+                }
+
+                "off" -> visibility = View.GONE
+            }
+        }
         vm.mapPosition.observe(viewLifecycleOwner) {
             binding.scaleView.update(map.cameraPosition.zoom, map.cameraPosition.target.latitude)
         }
diff --git a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
index 7cbb88d0..d593c53f 100644
--- a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
@@ -261,4 +261,7 @@ class PreferenceDataSource(val context: Context) {
         set(value) {
             sp.edit().putBoolean("dev_mode_enabled", value).apply()
         }
+
+    val mapScale: String
+        get() = sp.getString("map_scale", null) ?: "both"
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 75dfd23f..78fa0158 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -314,4 +314,9 @@
     <string name="tesla_pricing_blocking_fee">Blockiergebühr: %s</string>
     <string name="average_utilization">Durchschnittliche Auslastung</string>
     <string name="website">Website</string>
+    <string name="pref_map_scale">Kartenmaßstab</string>
+    <string name="pref_map_scale_both">Meter und Meilen</string>
+    <string name="pref_map_scale_meters">Meter</string>
+    <string name="pref_map_scale_miles">Meilen</string>
+    <string name="pref_map_scale_off">aus</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index ca4ec507..502b0da9 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -66,4 +66,16 @@
         <item>goingelectric</item>
         <item>openchargemap</item>
     </string-array>
+    <string-array name="pref_map_scale_names">
+        <item>@string/pref_map_scale_both</item>
+        <item>@string/pref_map_scale_meters</item>
+        <item>@string/pref_map_scale_miles</item>
+        <item>@string/pref_map_scale_off</item>
+    </string-array>
+    <string-array name="pref_map_scale_values" translatable="false">
+        <item>both</item>
+        <item>meters</item>
+        <item>miles</item>
+        <item>off</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f3815da6..21226e88 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -314,4 +314,9 @@
     <string name="tesla_pricing_blocking_fee">Blocking fee: %s</string>
     <string name="average_utilization">Average Utilization</string>
     <string name="website">Website</string>
+    <string name="pref_map_scale">Map scale bar</string>
+    <string name="pref_map_scale_both">meters and miles</string>
+    <string name="pref_map_scale_meters">meters</string>
+    <string name="pref_map_scale_miles">miles</string>
+    <string name="pref_map_scale_off">off</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings_ui.xml b/app/src/main/res/xml/settings_ui.xml
index d6d3a276..89081a96 100644
--- a/app/src/main/res/xml/settings_ui.xml
+++ b/app/src/main/res/xml/settings_ui.xml
@@ -22,6 +22,13 @@
         android:summaryOn="@string/pref_map_rotate_gestures_on"
         android:summaryOff="@string/pref_map_rotate_gestures_off"
         android:defaultValue="true" />
+    <ListPreference
+        android:key="map_scale"
+        android:title="@string/pref_map_scale"
+        android:entries="@array/pref_map_scale_names"
+        android:entryValues="@array/pref_map_scale_values"
+        android:defaultValue="both"
+        android:summary="%s" />
     <CheckBoxPreference
         android:key="navigate_use_maps"
         android:title="@string/pref_navigate_use_maps"