implement switching between map providers in settings

Google Maps and Mapbox

app/build.gradle

@@ -116,10 +116,10 @@ dependencies {
     implementation 'com.mapzen.android:lost:3.0.2'
 
     // AnyMaps
-    def anyMapsVersion = '3298564e93'
+    def anyMapsVersion = 'cc613d7a29'
     implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
     googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
-    fossImplementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"
+    implementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"
 
     // Google Maps v3 Beta
     googleImplementation 'com.google.android.libraries.maps:maps:3.1.0-beta'

app/src/foss/res/values-de/values.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_map_provider_names">
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+</resources>

app/src/foss/res/values/values.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_map_provider_names">
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+    <string-array name="pref_map_provider_values" tranlatable="false">
+        <item>mapbox</item>
+    </string-array>
+    <string name="pref_map_provider_default" translatable="false">mapbox</string>
+</resources>

app/src/google/res/values-de/values.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_map_provider_names">
+        <item>Google Maps</item>
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+</resources>

app/src/google/res/values/values.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_map_provider_names">
+        <item>Google Maps</item>
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+    <string-array name="pref_map_provider_values" tranlatable="false">
+        <item>google</item>
+        <item>mapbox</item>
+    </string-array>
+    <string name="pref_map_provider_default" translatable="false">mapbox</string>
+</resources>

app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt

@@ -61,6 +61,7 @@ import net.vonforst.evmap.api.goingelectric.ChargepointListItem
 import net.vonforst.evmap.autocomplete.handleAutocompleteResult
 import net.vonforst.evmap.autocomplete.launchAutocomplete
 import net.vonforst.evmap.databinding.FragmentMapBinding
+import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.ChargerIconGenerator
 import net.vonforst.evmap.ui.ClusterIconGenerator
 import net.vonforst.evmap.ui.MarkerAnimator
@@ -84,6 +85,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
     })
     private val galleryVm: GalleryViewModel by activityViewModels()
+    private lateinit var mapFragment: MapFragment
     private var map: AnyMap? = null
     private lateinit var locationClient: LostApiClient
     private lateinit var bottomSheetBehavior: BottomSheetBehaviorGoogleMapsLike<View>
@@ -117,10 +119,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -130,6 +128,29 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         binding.lifecycleOwner = this
         binding.vm = vm
 
+        mapFragment = MapFragment()
+        val provider = PreferenceDataSource(requireContext()).mapProvider
+        mapFragment.setPriority(
+            arrayOf(
+                when (provider) {
+                    "mapbox" -> MapFragment.MAPBOX
+                    "google" -> MapFragment.GOOGLE
+                    else -> null
+                }
+            )
+        )
+        requireActivity().supportFragmentManager
+            .beginTransaction()
+            .replace(R.id.map, mapFragment)
+            .commit()
+
+        // reset map-related stuff (map provider may have changed)
+        map = null
+        markers.clear()
+        clusterMarkers = emptyList()
+        searchResultMarker = null
+
+
         locationClient = LostApiClient.Builder(requireContext())
             .addConnectionCallbacks(this)
             .build()
@@ -159,7 +180,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val mapFragment = childFragmentManager.findFragmentById(R.id.map) as MapFragment
         mapFragment.getMapAsync(this)
         bottomSheetBehavior = BottomSheetBehaviorGoogleMapsLike.from(binding.bottomSheet)
         detailAppBarBehavior = MergedAppBarLayoutBehavior.from(binding.detailAppBar)

app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt

@@ -2,9 +2,10 @@ package net.vonforst.evmap.storage
 
 import android.content.Context
 import androidx.preference.PreferenceManager
+import net.vonforst.evmap.R
 import java.time.Instant
 
-class PreferenceDataSource(context: Context) {
+class PreferenceDataSource(val context: Context) {
     val sp = PreferenceManager.getDefaultSharedPreferences(context)
 
     var navigateUseMaps: Boolean
@@ -42,4 +43,10 @@ class PreferenceDataSource(context: Context) {
 
     val darkmode: String
         get() = sp.getString("darkmode", "default")!!
+
+    val mapProvider: String
+        get() = sp.getString(
+            "map_provider",
+            context.getString(R.string.pref_map_provider_default)
+        )!!
 }

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

@@ -19,9 +19,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <fragment
+        <FrameLayout
             android:id="@+id/map"
-            android:name="com.car2go.maps.MapFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 

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

@@ -34,6 +34,8 @@
     <string name="github_link_title">Quellcode</string>
     <string name="oss_licenses">Open Source-Lizenzen</string>
     <string name="settings">Einstellungen</string>
+    <string name="settings_ui">Oberfläche</string>
+    <string name="settings_map">Karte</string>
     <string name="copyright">Copyright</string>
     <string name="copyright_summary">©2020 Johan von Forstner</string>
     <string name="other">Sonstiges</string>
@@ -101,6 +103,7 @@
     <string name="filter_exclude_faults">Ladesäulen mit Störung ausschließen</string>
     <string name="charge_cards">Ladetarife</string>
     <string name="and_n_others">und %d weitere</string>
+    <string name="pref_map_provider">Kartenanbieter</string>
     <plurals name="charge_cards_compatible_num">
         <item quantity="one">%d kompatibler Ladetarif</item>
         <item quantity="other">%d kompatible Ladetarife</item>

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

@@ -33,6 +33,8 @@
     <string name="github_link_title">Source code</string>
     <string name="oss_licenses">Open Source Licenses</string>
     <string name="settings">Settings</string>
+    <string name="settings_ui">User Interface</string>
+    <string name="settings_map">Map</string>
     <string name="copyright">Copyright</string>
     <string name="copyright_summary">©2020 Johan von Forstner</string>
     <string name="other">Other</string>
@@ -100,6 +102,7 @@
     <string name="filter_exclude_faults">Exclude chargers with reported faults</string>
     <string name="charge_cards">Payment methods</string>
     <string name="and_n_others">and %d others</string>
+    <string name="pref_map_provider">Map provider</string>
     <plurals name="charge_cards_compatible_num">
         <item quantity="one">%d compatible payment method</item>
         <item quantity="other">%d compatible payment methods</item>

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

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory android:title="@string/settings">
-
-        <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 android:title="@string/settings_ui">
 
         <ListPreference
             android:key="language"
@@ -27,4 +20,22 @@
             android:summary="@string/pref_darkmode_summary" />
 
     </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" />
+
+        <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>
 </PreferenceScreen>