Remove mapbox-android-sdk from Google Play build

app/build.gradle.kts

@@ -191,6 +191,7 @@ dependencies {
     implementation("com.google.apis:google-api-services-drive:v3-rev20200413-1.30.9")
     implementation("com.google.auth:google-auth-library-oauth2-http:0.20.0")
     implementation("androidx.work:work-runtime:${Versions.work}")
+    implementation("com.mapbox.mapboxsdk:mapbox-android-core:3.0.0")
     implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.2.1")
     implementation("com.etesync:journalmanager:1.1.0")
     implementation("com.github.QuadFlask:colorpicker:0.0.15")
@@ -198,7 +199,6 @@ dependencies {
     // https://github.com/mapbox/mapbox-gl-native-android/issues/316
     genericImplementation("com.mapbox.mapboxsdk:mapbox-android-sdk:7.4.1")
 
-    googleplayImplementation("com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.1")
     googleplayImplementation("com.crashlytics.sdk.android:crashlytics:${Versions.crashlytics}")
     googleplayImplementation("com.google.firebase:firebase-analytics:${Versions.analytics}")
     googleplayImplementation("com.google.firebase:firebase-config-ktx:${Versions.remote_config}")

app/licenses.yml

@@ -102,13 +102,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: http://developer.android.com/tools/extras/support-library.html
-- artifact: com.mapbox.mapboxsdk:mapbox-sdk-turf:+
-  name: Mapbox services-turf
-  copyrightHolder: Mapbox
-  license: MIT License
-  licenseUrl: http://www.opensource.org/licenses/mit-license.php
-  url: https://github.com/mapbox/mapbox-java
-  forceGenerate: true
 - artifact: androidx.viewpager:viewpager:+
   name: Android Support Library View Pager
   copyrightHolder: Android Open Source Project
@@ -134,13 +127,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: http://commons.apache.org/proper/commons-codec/
-- artifact: com.mapbox.mapboxsdk:mapbox-android-sdk:+
-  name: Mapbox Maps SDK for Android
-  copyrightHolder: Mapbox
-  license: BSD 2-Clause
-  licenseUrl: https://opensource.org/licenses/BSD-2-Clause
-  url: https://github.com/mapbox/mapbox-gl-native
-  forceGenerate: true
 - artifact: androidx.annotation:annotation:+
   name: Android Support Library Annotations
   copyrightHolder: Android Open Source Project
@@ -212,13 +198,6 @@
   licenseUrl: http://www.opensource.org/licenses/mit-license.php
   url: https://github.com/mapbox/mapbox-java
   forceGenerate: true
-- artifact: com.mapbox.mapboxsdk:mapbox-android-telemetry:+
-  name: Mapbox Android Telemetry Library
-  copyrightHolder: Mapbox
-  license: BSD 2-Clause
-  licenseUrl: https://opensource.org/licenses/BSD-2-Clause
-  url: https://github.com/mapbox/mapbox-events-android
-  forceGenerate: true
 - artifact: androidx.loader:loader:+
   name: Android Support Library loader
   copyrightHolder: Android Open Source Project
@@ -255,24 +234,12 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.documentfile:documentfile:+
-  name: Android Support Library Document File
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
 - artifact: androidx.lifecycle:lifecycle-extensions:+
   name: Android Lifecycle Extensions
   copyrightHolder: Android Open Source Project
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: https://developer.android.com/topic/libraries/architecture/index.html
-- artifact: androidx.legacy:legacy-support-core-utils:+
-  name: Android Support Library core utils
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
 - artifact: androidx.arch.core:core-runtime:+
   name: Android Arch-Runtime
   copyrightHolder: Android Open Source Project
@@ -316,12 +283,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.print:print:+
-  name: Android Support Library Print
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
 - artifact: com.rubiconproject.oss:jchronic:+
   name: jchronic
   copyrightHolder: The jchronic authors
@@ -340,12 +301,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.localbroadcastmanager:localbroadcastmanager:+
-  name: Android Support Library Local Broadcast Manager
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
 - artifact: com.google.android.apps.dashclock:dashclock-api:+
   name: DashClock API
   copyrightHolder: Google Inc.
@@ -389,13 +344,6 @@
   licenseUrl: http://www.opensource.org/licenses/mit-license.php
   url: https://github.com/mapbox/mapbox-java
   forceGenerate: true
-- artifact: com.mapbox.mapboxsdk:mapbox-android-gestures:+
-  name: Mapbox Android Gestures Library
-  copyrightHolder: Mapbox
-  license: BSD 2-Clause
-  licenseUrl: https://opensource.org/licenses/BSD-2-Clause
-  url: https://github.com/mapbox/mapbox-gestures-android
-  forceGenerate: true
 - artifact: androidx.lifecycle:lifecycle-process:+
   name: Android Lifecycle Process
   copyrightHolder: Android Open Source Project
@@ -729,12 +677,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: https://github.com/mapbox/mapbox-java
-- artifact: com.mapbox.mapboxsdk:mapbox-android-accounts:+
-  name: mapbox-android-accounts
-  copyrightHolder: Mapbox
-  license: Mapbox Terms of Service
-  licenseUrl: https://www.mapbox.com/tos/
-  url: https://github.com/mapbox/mapbox-accounts-android
 - artifact: com.sun.mail:android-mail:+
   name: android-mail
   copyrightHolder: Oracle and/or its affiliates

app/src/googleplay/java/org/tasks/injection/LocationModule.kt

@@ -33,11 +33,6 @@ internal class LocationModule {
 
     @Provides
     @ActivityScoped
-    fun getMapFragment(@ApplicationContext context: Context, preferences: Preferences): MapFragment {
-        return if (preferences.useGoogleMaps()) {
+    fun getMapFragment(@ApplicationContext context: Context): MapFragment =
             GoogleMapFragment(context)
-        } else {
-            MapboxMapFragment(context)
-        }
-    }
 }

app/src/googleplay/res/drawable/mapbox_logo_icon.xml

@@ -0,0 +1,12 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="180" android:viewportWidth="800"
+    android:width="106.666664dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M594.6,49.8c-9.9,0 -19.4,4.1 -26.3,11.3V23c0,-1.2 -1,-2.2 -2.2,-2.2l0,0h-13.4c-1.2,0 -2.2,1 -2.2,2.2v103c0,1.2 1,2.2 2.2,2.2h13.4c1.2,0 2.2,-1 2.2,-2.2v0v-7.1c6.9,7.2 16.3,11.3 26.3,11.3c20.9,0 37.8,-18 37.8,-40.2S615.5,49.8 594.6,49.8zM591.5,114.1c-12.7,0 -23,-10.6 -23.1,-23.8v-0.6c0.2,-13.2 10.4,-23.8 23.1,-23.8c12.8,0 23.1,10.8 23.1,24.1S604.2,114.1 591.5,114.1L591.5,114.1z"/>
+    <path android:fillColor="#FF000000" android:pathData="M681.7,49.8c-22.6,0 -40.9,18 -40.9,40.2s18.3,40.2 40.9,40.2c22.6,0 40.9,-18 40.9,-40.2S704.3,49.8 681.7,49.8zM681.6,114.1c-12.8,0 -23.1,-10.8 -23.1,-24.1s10.4,-24.1 23.1,-24.1s23.1,10.8 23.1,24.1S694.3,114.1 681.6,114.1L681.6,114.1z"/>
+    <path android:fillColor="#FF000000" android:pathData="M431.6,51.8h-13.4c-1.2,0 -2.2,1 -2.2,2.2c0,0 0,0 0,0v7.1c-6.9,-7.2 -16.3,-11.3 -26.3,-11.3c-20.9,0 -37.8,18 -37.8,40.2s16.9,40.2 37.8,40.2c9.9,0 19.4,-4.1 26.3,-11.3v7.1c0,1.2 1,2.2 2.2,2.2l0,0h13.4c1.2,0 2.2,-1 2.2,-2.2v0V54C433.8,52.8 432.8,51.8 431.6,51.8zM392.8,114.1c-12.8,0 -23.1,-10.8 -23.1,-24.1s10.4,-24.1 23.1,-24.1c12.7,0 23,10.6 23.1,23.8v0.6C415.8,103.5 405.5,114.1 392.8,114.1L392.8,114.1z"/>
+    <path android:fillColor="#FF000000" android:pathData="M498.5,49.8c-9.9,0 -19.4,4.1 -26.3,11.3V54c0,-1.2 -1,-2.2 -2.2,-2.2l0,0h-13.4c-1.2,0 -2.2,1 -2.2,2.2c0,0 0,0 0,0v103c0,1.2 1,2.2 2.2,2.2l0,0h13.4c1.2,0 2.2,-1 2.2,-2.2v0v-38.1c6.9,7.2 16.3,11.3 26.3,11.3c20.9,0 37.8,-18 37.8,-40.2S519.4,49.8 498.5,49.8zM495.4,114.1c-12.7,0 -23,-10.6 -23.1,-23.8v-0.6c0.2,-13.2 10.4,-23.8 23.1,-23.8c12.8,0 23.1,10.8 23.1,24.1S508.2,114.1 495.4,114.1L495.4,114.1z"/>
+    <path android:fillColor="#FF000000" android:pathData="M311.8,49.8c-10,0.1 -19.1,5.9 -23.4,15c-4.9,-9.3 -14.7,-15.1 -25.2,-15c-8.2,0 -15.9,4 -20.7,10.6V54c0,-1.2 -1,-2.2 -2.2,-2.2l0,0h-13.4c-1.2,0 -2.2,1 -2.2,2.2c0,0 0,0 0,0v72c0,1.2 1,2.2 2.2,2.2h0h13.4c1.2,0 2.2,-1 2.2,-2.2v0V82.9c0.5,-9.6 7.2,-17.3 15.4,-17.3c8.5,0 15.6,7.1 15.6,16.4v44c0,1.2 1,2.2 2.2,2.2l13.5,0c1.2,0 2.2,-1 2.2,-2.2c0,0 0,0 0,0l-0.1,-44.8c1.2,-8.8 7.5,-15.6 15.2,-15.6c8.5,0 15.6,7.1 15.6,16.4v44c0,1.2 1,2.2 2.2,2.2l13.5,0c1.2,0 2.2,-1 2.2,-2.2c0,0 0,0 0,0l-0.1,-49.5C339.9,61.7 327.3,49.8 311.8,49.8z"/>
+    <path android:fillColor="#FF000000" android:pathData="M794.7,125.1l-23.2,-35.3l23,-35c0.6,-0.9 0.3,-2.2 -0.6,-2.8c-0.3,-0.2 -0.7,-0.3 -1.1,-0.3h-15.5c-1.2,0 -2.3,0.6 -2.9,1.6L760.9,76l-13.5,-22.6c-0.6,-1 -1.7,-1.6 -2.9,-1.6h-15.5c-1.1,0 -2,0.9 -2,2c0,0.4 0.1,0.8 0.3,1.1l23,35l-23.2,35.3c-0.6,0.9 -0.3,2.2 0.6,2.8c0.3,0.2 0.7,0.3 1.1,0.3h15.5c1.2,0 2.3,-0.6 2.9,-1.6l13.8,-23l13.8,23c0.6,1 1.7,1.6 2.9,1.6H793c1.1,0 2,-0.9 2,-2C795,125.9 794.9,125.5 794.7,125.1z"/>
+    <path android:fillColor="#FF000000" android:pathData="M93.9,1.1C44.8,1.1 5,40.9 5,90s39.8,88.9 88.9,88.9s88.9,-39.8 88.9,-88.9C182.8,40.9 143,1.1 93.9,1.1zM136.1,111.8c-30.4,30.4 -84.7,20.7 -84.7,20.7s-9.8,-54.2 20.7,-84.7C89,30.9 117,31.6 134.7,49.2S153,94.9 136.1,111.8L136.1,111.8z"/>
+    <path android:fillColor="#FF000000" android:pathData="M104.1,53.2l-8.7,17.9l-17.9,8.7l17.9,8.7l8.7,17.9l8.7,-17.9l17.9,-8.7l-17.9,-8.7z"/>
+</vector>

app/src/googleplay/res/drawable/mapbox_marker_icon_default.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape />

app/src/main/assets/licenses.json

@@ -247,20 +247,6 @@
       "url": "http://developer.android.com/tools/extras/support-library.html",
       "libraryName": "VersionedParcelable and friends"
     },
-    {
-      "artifactId": {
-        "name": "mapbox-sdk-turf",
-        "group": "com.mapbox.mapboxsdk",
-        "version": "+"
-      },
-      "copyrightHolder": "Mapbox",
-      "copyrightStatement": "Copyright © Mapbox. All rights reserved.",
-      "license": "MIT License",
-      "licenseUrl": "http://www.opensource.org/licenses/mit-license.php",
-      "normalizedLicense": "mit",
-      "url": "https://github.com/mapbox/mapbox-java",
-      "libraryName": "Mapbox services-turf"
-    },
     {
       "artifactId": {
         "name": "viewpager",
@@ -317,20 +303,6 @@
       "url": "http://commons.apache.org/proper/commons-codec/",
       "libraryName": "Apache Commons Codec"
     },
-    {
-      "artifactId": {
-        "name": "mapbox-android-sdk",
-        "group": "com.mapbox.mapboxsdk",
-        "version": "+"
-      },
-      "copyrightHolder": "Mapbox",
-      "copyrightStatement": "Copyright © Mapbox. All rights reserved.",
-      "license": "BSD 2-Clause",
-      "licenseUrl": "https://opensource.org/licenses/BSD-2-Clause",
-      "normalizedLicense": "bsd_2_clauses",
-      "url": "https://github.com/mapbox/mapbox-gl-native",
-      "libraryName": "Mapbox Maps SDK for Android"
-    },
     {
       "artifactId": {
         "name": "annotation",
@@ -497,20 +469,6 @@
       "url": "https://github.com/mapbox/mapbox-java",
       "libraryName": "Mapbox services-geojson"
     },
-    {
-      "artifactId": {
-        "name": "mapbox-android-telemetry",
-        "group": "com.mapbox.mapboxsdk",
-        "version": "+"
-      },
-      "copyrightHolder": "Mapbox",
-      "copyrightStatement": "Copyright © Mapbox. All rights reserved.",
-      "license": "BSD 2-Clause",
-      "licenseUrl": "https://opensource.org/licenses/BSD-2-Clause",
-      "normalizedLicense": "bsd_2_clauses",
-      "url": "https://github.com/mapbox/mapbox-events-android",
-      "libraryName": "Mapbox Android Telemetry Library"
-    },
     {
       "artifactId": {
         "name": "loader",
@@ -595,20 +553,6 @@
       "url": "http://developer.android.com/tools/extras/support-library.html",
       "libraryName": "Android Support Library Custom View"
     },
-    {
-      "artifactId": {
-        "name": "documentfile",
-        "group": "androidx.documentfile",
-        "version": "+"
-      },
-      "copyrightHolder": "Android Open Source Project",
-      "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
-      "license": "The Apache Software License, Version 2.0",
-      "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
-      "normalizedLicense": "apache2",
-      "url": "http://developer.android.com/tools/extras/support-library.html",
-      "libraryName": "Android Support Library Document File"
-    },
     {
       "artifactId": {
         "name": "lifecycle-extensions",
@@ -623,20 +567,6 @@
       "url": "https://developer.android.com/topic/libraries/architecture/index.html",
       "libraryName": "Android Lifecycle Extensions"
     },
-    {
-      "artifactId": {
-        "name": "legacy-support-core-utils",
-        "group": "androidx.legacy",
-        "version": "+"
-      },
-      "copyrightHolder": "Android Open Source Project",
-      "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
-      "license": "The Apache Software License, Version 2.0",
-      "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
-      "normalizedLicense": "apache2",
-      "url": "http://developer.android.com/tools/extras/support-library.html",
-      "libraryName": "Android Support Library core utils"
-    },
     {
       "artifactId": {
         "name": "core-runtime",
@@ -735,20 +665,6 @@
       "url": "http://developer.android.com/tools/extras/support-library.html",
       "libraryName": "Android Support CardView v7"
     },
-    {
-      "artifactId": {
-        "name": "print",
-        "group": "androidx.print",
-        "version": "+"
-      },
-      "copyrightHolder": "Android Open Source Project",
-      "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
-      "license": "The Apache Software License, Version 2.0",
-      "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
-      "normalizedLicense": "apache2",
-      "url": "http://developer.android.com/tools/extras/support-library.html",
-      "libraryName": "Android Support Library Print"
-    },
     {
       "artifactId": {
         "name": "jchronic",
@@ -791,20 +707,6 @@
       "url": "http://developer.android.com/tools/extras/support-library.html",
       "libraryName": "Material Components for Android"
     },
-    {
-      "artifactId": {
-        "name": "localbroadcastmanager",
-        "group": "androidx.localbroadcastmanager",
-        "version": "+"
-      },
-      "copyrightHolder": "Android Open Source Project",
-      "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
-      "license": "The Apache Software License, Version 2.0",
-      "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
-      "normalizedLicense": "apache2",
-      "url": "http://developer.android.com/tools/extras/support-library.html",
-      "libraryName": "Android Support Library Local Broadcast Manager"
-    },
     {
       "artifactId": {
         "name": "dashclock-api",
@@ -903,20 +805,6 @@
       "url": "https://github.com/mapbox/mapbox-java",
       "libraryName": "Mapbox services-core"
     },
-    {
-      "artifactId": {
-        "name": "mapbox-android-gestures",
-        "group": "com.mapbox.mapboxsdk",
-        "version": "+"
-      },
-      "copyrightHolder": "Mapbox",
-      "copyrightStatement": "Copyright © Mapbox. All rights reserved.",
-      "license": "BSD 2-Clause",
-      "licenseUrl": "https://opensource.org/licenses/BSD-2-Clause",
-      "normalizedLicense": "bsd_2_clauses",
-      "url": "https://github.com/mapbox/mapbox-gestures-android",
-      "libraryName": "Mapbox Android Gestures Library"
-    },
     {
       "artifactId": {
         "name": "lifecycle-process",
@@ -1722,20 +1610,6 @@
       "url": "https://github.com/mapbox/mapbox-java",
       "libraryName": "mapbox-sdk-directions-models"
     },
-    {
-      "artifactId": {
-        "name": "mapbox-android-accounts",
-        "group": "com.mapbox.mapboxsdk",
-        "version": "+"
-      },
-      "copyrightHolder": "Mapbox",
-      "copyrightStatement": "Copyright © Mapbox. All rights reserved.",
-      "license": "Mapbox Terms of Service",
-      "licenseUrl": "https://www.mapbox.com/tos/",
-      "normalizedLicense": "Mapbox Terms of Service",
-      "url": "https://github.com/mapbox/mapbox-accounts-android",
-      "libraryName": "mapbox-android-accounts"
-    },
     {
       "artifactId": {
         "name": "android-mail",

app/src/main/java/org/tasks/location/MapboxGeocoder.java

@@ -4,15 +4,12 @@ import static com.todoroo.andlib.utility.AndroidUtilities.assertNotMainThread;
 import static org.tasks.data.Place.newPlace;
 
 import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParser;
 import com.mapbox.api.geocoding.v5.MapboxGeocoding;
 import com.mapbox.api.geocoding.v5.models.CarmenFeature;
 import com.mapbox.api.geocoding.v5.models.GeocodingResponse;
 import com.mapbox.geojson.Point;
-import com.mapbox.mapboxsdk.Mapbox;
 import java.io.IOException;
 import java.util.List;
 import org.tasks.BuildConfig;
@@ -27,16 +24,6 @@ public class MapboxGeocoder implements Geocoder {
 
   public MapboxGeocoder(Context context) {
     token = context.getString(R.string.mapbox_key);
-    Looper mainLooper = Looper.getMainLooper();
-    if (mainLooper.getThread() == Thread.currentThread()) {
-      init(context);
-    } else {
-      new Handler(mainLooper).post(() -> init(context));
-    }
-  }
-
-  private void init(Context context) {
-    Mapbox.getInstance(context, token);
   }
 
   private static String prettyPrint(String json) {

app/src/main/java/org/tasks/location/MapboxSearchProvider.java

@@ -9,7 +9,6 @@ import com.mapbox.api.geocoding.v5.MapboxGeocoding;
 import com.mapbox.api.geocoding.v5.models.CarmenFeature;
 import com.mapbox.api.geocoding.v5.models.GeocodingResponse;
 import com.mapbox.geojson.Point;
-import com.mapbox.mapboxsdk.Mapbox;
 import java.util.ArrayList;
 import java.util.List;
 import org.tasks.Callback;
@@ -46,7 +45,6 @@ public class MapboxSearchProvider implements PlaceSearchProvider {
       Callback<String> onError) {
     if (builder == null) {
       String token = context.getString(R.string.mapbox_key);
-      Mapbox.getInstance(context, token);
       builder = MapboxGeocoding.builder().autocomplete(true).accessToken(token);
       if (bias != null) {
         builder.proximity(Point.fromLngLat(bias.getLongitude(), bias.getLatitude()));

app/src/main/java/org/tasks/preferences/Preferences.kt

@@ -416,10 +416,6 @@ class Preferences @JvmOverloads constructor(private val context: Context, name:
             setBoolean(R.string.p_sync_ongoing, value)
         }
 
-    fun useGoogleMaps(): Boolean {
-        return getInt(R.string.p_map_provider, 0) == 1
-    }
-
     fun useGooglePlaces(): Boolean {
         return getInt(R.string.p_place_provider, 0) == 1
     }

app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt

@@ -171,32 +171,6 @@ class LookAndFeel : InjectingPreferenceFragment() {
         val choices =
             listOf(getString(R.string.map_provider_mapbox), getString(R.string.map_provider_google))
         val singleCheckedArrayAdapter = SingleCheckedArrayAdapter(requireContext(), choices)
-        val mapProviderPreference = findPreference(R.string.p_map_provider)
-        mapProviderPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            dialogBuilder
-                .newDialog()
-                .setSingleChoiceItems(
-                    singleCheckedArrayAdapter,
-                    getMapProvider()
-                ) { dialog: DialogInterface, which: Int ->
-                    if (which == 1) {
-                        if (!playServices.refreshAndCheck()) {
-                            playServices.resolve(activity)
-                            dialog.dismiss()
-                            return@setSingleChoiceItems
-                        }
-                    }
-                    preferences.setInt(R.string.p_map_provider, which)
-                    mapProviderPreference.summary = choices[which]
-                    dialog.dismiss()
-                }
-                .setNegativeButton(android.R.string.cancel, null)
-                .show()
-            false
-        }
-        val mapProvider: Int = getMapProvider()
-        mapProviderPreference.summary =
-            if (mapProvider == -1) getString(R.string.none) else choices[mapProvider]
 
         val placeProviderPreference = findPreference(R.string.p_place_provider)
         placeProviderPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
@@ -237,13 +211,6 @@ class LookAndFeel : InjectingPreferenceFragment() {
         ) else 0
     }
 
-    private fun getMapProvider(): Int {
-        return if (playServices.isPlayServicesAvailable) preferences.getInt(
-            R.string.p_map_provider,
-            0
-        ) else 0
-    }
-
     private fun setBaseTheme(index: Int) {
         activity?.intent?.removeExtra(EXTRA_THEME_OVERRIDE)
         preferences.setInt(R.string.p_theme, index)

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

@@ -16,6 +16,7 @@
     android:paddingBottom="@dimen/keyline_first"
     android:paddingStart="@dimen/keyline_content_inset"
     android:paddingEnd="@dimen/keyline_second"
+    android:tint="@color/icon_tint_with_alpha"
     android:src="@drawable/mapbox_logo_icon"/>
 
 </LinearLayout>

app/src/main/res/values-bg-rBG/strings.xml

@@ -457,7 +457,6 @@
     <string name="choose_a_location">Изберете местоположение</string>
     <string name="pick_this_location">Избери това местоположение</string>
     <string name="or_choose_a_location">Или избери местоположение</string>
-    <string name="map_provider">Доставчик на карти</string>
     <string name="map_search_provider">Намери доставчик</string>
     <string name="missing_permissions">Липсващи разрешения</string>
     <string name="location_permission_required_geofence">За напомняния за местоположение са необходими разрешения за местоположението</string>

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

@@ -488,7 +488,6 @@
     <string name="theme_system_default">Dle systému</string>
     <string name="repeat_monthly_on_every_day_of_nth_week">každý %1$s %2$s</string>
     <string name="or_choose_a_location">Nebo vyberte místo</string>
-    <string name="map_provider">Poskytovatel map</string>
     <string name="map_search_provider">Poskytovatel vyhledávání</string>
     <string name="missing_permissions">Chybí oprávnění</string>
     <string name="location_permission_required_geofence">Oprávnění k přístupu k poloze je nutné pro upomínky podle polohy</string>

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

@@ -449,7 +449,6 @@
     <string name="choose_a_location">Ort auswählen</string>
     <string name="pick_this_location">Diesen Ort auswählen</string>
     <string name="or_choose_a_location">Oder Ort auswählen</string>
-    <string name="map_provider">Kartendienst</string>
     <string name="map_search_provider">Suchanbieter</string>
     <string name="missing_permissions">Fehlende Berechtigungen</string>
     <string name="location_permission_required_geofence">Standortberechtigung wird für ortsbasierte Erinnerungen benötigt</string>

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

@@ -457,7 +457,6 @@
     <string name="choose_a_location">Escoger ubicación</string>
     <string name="pick_this_location">Seleccionar esta ubicación</string>
     <string name="or_choose_a_location">O elija una ubicación</string>
-    <string name="map_provider">Proveedor de mapas</string>
     <string name="map_search_provider">Proveedor de búsquedas</string>
     <string name="missing_permissions">Permisos ausentes</string>
     <string name="location_permission_required_geofence">Son necesarios permisos de ubicación para los recordatorios de ubicación</string>

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

@@ -463,7 +463,6 @@
     <string name="choose_a_location">Hautatu kokaleku bat</string>
     <string name="pick_this_location">Hautatu kokaleku hau</string>
     <string name="or_choose_a_location">Edo hautatu kokaleku bat</string>
-    <string name="map_provider">Mapa hornitzailea</string>
     <string name="map_search_provider">Bilatu hornitzailea</string>
     <string name="missing_permissions">Baimenak falta dira</string>
     <string name="location_permission_required_geofence">Kokapen baimena behar da kokalekuen araberako oroigarrientzat</string>

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

@@ -455,7 +455,6 @@
     <string name="location_permission_required_geofence">Sijaintioikeudet tarvitaan sijaintipohjaisiin muistutuksiin</string>
     <string name="missing_permissions">Oikeuksia puuttuu</string>
     <string name="map_search_provider">Hauntarjoaja</string>
-    <string name="map_provider">Kartantarjoaja</string>
     <string name="or_choose_a_location">Tai valitse muu sijainti</string>
     <string name="pick_this_location">Valitse tämä sijainti</string>
     <string name="choose_a_location">Valitse sijainti</string>

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

@@ -439,7 +439,6 @@
     <string name="choose_a_location">Choisir une localisation</string>
     <string name="pick_this_location">Sélectionner cette localisation</string>
     <string name="or_choose_a_location">Ou choisir une localisation</string>
-    <string name="map_provider">Fournisseur de cartes</string>
     <string name="map_search_provider">Moteurs de recherche</string>
     <string name="missing_permissions">Permissions manquantes</string>
     <string name="location_permission_required_geofence">La permission de la localisation est nécessaire pour les rappels de localisation</string>

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

@@ -458,7 +458,6 @@
     <string name="choose_a_location">Hely kiválasztása</string>
     <string name="pick_this_location">Hely kiválasztása</string>
     <string name="or_choose_a_location">Vagy másik hely keresése</string>
-    <string name="map_provider">Térkép szolgáltató</string>
     <string name="map_search_provider">Keresési szolgáltató</string>
     <string name="missing_permissions">Hiányzó jogosultságok</string>
     <string name="location_permission_required_geofence">A hely emlékeztetőkhöz helymeghatározási jogosultság szükséges</string>

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

@@ -388,7 +388,6 @@
     <string name="choose_a_location">Pilih lokasi</string>
     <string name="pick_this_location">Pilih lokasi ini</string>
     <string name="or_choose_a_location">Atau cari lokasi</string>
-    <string name="map_provider">Penyedia peta</string>
     <string name="map_search_provider">Penyedia pencarian</string>
     <string name="location_permission_required_geofence">Membutuhkan izin akses lokasi untuk pengingat lokasi</string>
     <string name="location_permission_required_location">Membutuhkan izin akses lokasi untuk menentukan lokasi anda saat ini</string>

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

@@ -454,7 +454,6 @@
     <string name="choose_a_location">Scegli posizione</string>
     <string name="pick_this_location">Seleziona questa posizione</string>
     <string name="or_choose_a_location">O scegli un\'altra posizione</string>
-    <string name="map_provider">Fornitore mappe</string>
     <string name="map_search_provider">Cerca fornitore</string>
     <string name="missing_permissions">Permessi mancanti</string>
     <string name="location_permission_required_geofence">I promemoria con la posizione richiedono i permessi di localizzazione</string>

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

@@ -492,7 +492,6 @@
     <string name="choose_a_location">בחרו מיקום</string>
     <string name="pick_this_location">בחרו את המיקום הזה</string>
     <string name="or_choose_a_location">או בחרו מיקום</string>
-    <string name="map_provider">ספק מפה</string>
     <string name="map_search_provider">ספק חיפוש</string>
     <string name="missing_permissions">חסרות הרשאות</string>
     <string name="location_permission_required_geofence">הרשאות מיקום נדרשות עבור תזכורות מבוססות מיקום</string>

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

@@ -455,7 +455,6 @@
     <string name="choose_a_location">場所を選択</string>
     <string name="pick_this_location">この場所を選択</string>
     <string name="or_choose_a_location">または場所を選ぶ</string>
-    <string name="map_provider">地図プロバイダー</string>
     <string name="map_search_provider">プロバイダーを検索</string>
     <string name="missing_permissions">アクセス許可がありません</string>
     <string name="location_permission_required_geofence">場所リマインダーには位置のアクセス許可が必要です</string>

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

@@ -461,7 +461,6 @@
     <string name="choose_a_location">위치 선택</string>
     <string name="pick_this_location">현위치 선택</string>
     <string name="or_choose_a_location">위치 고르기</string>
-    <string name="map_provider">지도 제공업체</string>
     <string name="map_search_provider">검색 제공업체</string>
     <string name="missing_permissions">권한 누락</string>
     <string name="location_permission_required_geofence">위치 알림을 사용하려면 위치 권한이 필요합니다</string>

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

@@ -454,7 +454,6 @@
     <string name="choose_a_location">Pasirinkti vietą</string>
     <string name="pick_this_location">Pasirinkti šią vietą</string>
     <string name="or_choose_a_location">Arba pasirinkti vietą</string>
-    <string name="map_provider">Žemėlapio tiekėjas</string>
     <string name="map_search_provider">Paieškos tiekėjas</string>
     <string name="missing_permissions">Dingę leidimai</string>
     <string name="location_permission_required_geofence">Vietos leidimai reikalingi priminimams pagal vietą</string>

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

@@ -463,7 +463,6 @@
     <string name="choose_a_location">Velg et sted</string>
     <string name="pick_this_location">Velg dette stedet</string>
     <string name="or_choose_a_location">Eller velg et sted</string>
-    <string name="map_provider">Karttilbyder</string>
     <string name="map_search_provider">Søketilbyder</string>
     <string name="missing_permissions">Manglende tilganger</string>
     <string name="location_permission_required_geofence">Plasseringstilganger trengs for stedspåminnelser</string>

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

@@ -447,7 +447,6 @@
     <string name="choose_a_location">Kies een locatie</string>
     <string name="pick_this_location">Selecteer deze locatie</string>
     <string name="or_choose_a_location">Of kies een locatie</string>
-    <string name="map_provider">Kaart aanbieder</string>
     <string name="map_search_provider">Zoek aanbieder</string>
     <string name="missing_permissions">Missende rechten</string>
     <string name="location_permission_required_geofence">Locatie rechten zijn nodig voor locatie herinneringen</string>

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

@@ -467,7 +467,6 @@
     <string name="choose_a_location">Wybierz lokalizację</string>
     <string name="pick_this_location">Ustaw wybraną lokalizację</string>
     <string name="or_choose_a_location">Lub wybierz lokalizację</string>
-    <string name="map_provider">Dostawca map</string>
     <string name="map_search_provider">Silnik wyszukiwania</string>
     <string name="missing_permissions">Brakujące uprawnienia</string>
     <string name="location_permission_required_geofence">Uprawnienia lokalizacji są wymagane do powiadomień o lokalizacji</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -455,7 +455,6 @@
     <string name="choose_a_location">Escolher uma localização</string>
     <string name="pick_this_location">Selecionar essa localização</string>
     <string name="or_choose_a_location">Ou escolha uma localização</string>
-    <string name="map_provider">Provedor de mapa</string>
     <string name="map_search_provider">Provedor de pesquisa</string>
     <string name="missing_permissions">Permissões faltando</string>
     <string name="location_permission_required_geofence">Permissão de Localização é necessária para lembretes de localização</string>

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

@@ -474,7 +474,6 @@
     <string name="choose_a_location">Выбрать местоположение</string>
     <string name="pick_this_location">Выбрать это местоположение</string>
     <string name="or_choose_a_location">Или выбрать местоположение</string>
-    <string name="map_provider">Поставщик системы карт</string>
     <string name="map_search_provider">Поставщик системы поиска</string>
     <string name="missing_permissions">Отсутствующие разрешения</string>
     <string name="version_string">Версия %s</string>

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

@@ -454,7 +454,6 @@
     <string name="choose_a_location">Vybrať polohu</string>
     <string name="pick_this_location">Vybrať túto polohu</string>
     <string name="or_choose_a_location">Alebo vybrať polohu ručne</string>
-    <string name="map_provider">Mapy poskytuje</string>
     <string name="map_search_provider">Vyhľadávanie poskytuje</string>
     <string name="missing_permissions">Chýbajúce oprávnenia</string>
     <string name="location_permission_required_geofence">Pre upozornenia podľa polohy sú potrebné povolenia</string>

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

@@ -458,7 +458,6 @@
     <string name="choose_a_location">Välj en plats</string>
     <string name="pick_this_location">Välj den här platsen</string>
     <string name="or_choose_a_location">Eller Välj en plats</string>
-    <string name="map_provider">Kartleverantör</string>
     <string name="map_search_provider">Sökleverantör</string>
     <string name="missing_permissions">Saknar behörigheter</string>
     <string name="location_permission_required_geofence">Läge behörigheter behövs för plats påminnelser</string>

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

@@ -460,7 +460,6 @@
     <string name="choose_a_location">Konum seç</string>
     <string name="pick_this_location">Bu konumu seç</string>
     <string name="or_choose_a_location">Ya da konum seç</string>
-    <string name="map_provider">Harita sağlayıcı</string>
     <string name="map_search_provider">Arama sağlayıcı</string>
     <string name="missing_permissions">Eksik izinler</string>
     <string name="location_permission_required_geofence">Konum anımsatıcılar için konum izinleri gereklidir</string>

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

@@ -473,7 +473,6 @@
     <string name="choose_a_location">Обрати місце</string>
     <string name="pick_this_location">Обрати це місце</string>
     <string name="or_choose_a_location">Або вказати інше місце</string>
-    <string name="map_provider">Провайдер мапи</string>
     <string name="map_search_provider">Знайти провайдера</string>
     <string name="missing_permissions">Відсутні дозволи</string>
     <string name="location_permission_required_geofence">Для нагадувань за місцем необхідний дозвіл на перегляд місцезнаходження </string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -453,7 +453,6 @@
     <string name="choose_a_location">选择一个位置</string>
     <string name="pick_this_location">选中这个位置</string>
     <string name="or_choose_a_location">或选择一个位置</string>
-    <string name="map_provider">地图供应商</string>
     <string name="map_search_provider">搜索引擎供应商</string>
     <string name="missing_permissions">缺少权限</string>
     <string name="location_permission_required_geofence">位置提醒功能需要位置权限</string>

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

@@ -340,7 +340,6 @@
   <string name="p_linkify_task_edit">linkify_task_edit</string>
   <string name="map_provider_mapbox">Mapbox</string>
   <string name="map_provider_google">Google</string>
-  <string name="p_map_provider">map_provider</string>
   <string name="p_place_provider">place_provider</string>
   <string name="preference_screen">preference_screen</string>
   <string name="p_add_to_top">google_tasks_add_to_top</string>

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

@@ -519,7 +519,6 @@ File %1$s contained %2$s.\n\n
   <string name="choose_a_location">Choose a location</string>
   <string name="pick_this_location">Select this location</string>
   <string name="or_choose_a_location">Or choose a location</string>
-  <string name="map_provider">Map provider</string>
   <string name="map_search_provider">Search provider</string>
   <string name="missing_permissions">Missing permissions</string>
   <string name="location_permission_required_geofence">Location permissions are needed for location reminders</string>

app/src/main/res/xml/preferences_look_and_feel.xml

@@ -186,11 +186,6 @@
     android:key="@string/TEA_control_location"
     android:title="@string/TEA_control_location">
 
-    <Preference
-      android:defaultValue="-1"
-      android:key="@string/p_map_provider"
-      android:title="@string/map_provider" />
-
     <Preference
       android:defaultValue="-1"
       android:key="@string/p_place_provider"