From 5410b21f6c307d1a981ab687bb8e667ffd16750d Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 22 Jun 2020 14:51:29 -0500 Subject: [PATCH] Remove mapbox-android-sdk from Google Play build --- app/build.gradle.kts | 2 +- app/licenses.yml | 58 -------- .../org/tasks/location/MapboxMapFragment.java | 0 .../org/tasks/injection/LocationModule.kt | 7 +- .../res/drawable/mapbox_logo_icon.xml | 12 ++ .../drawable/mapbox_marker_icon_default.xml | 2 + app/src/main/assets/licenses.json | 126 ------------------ .../org/tasks/location/MapboxGeocoder.java | 13 -- .../tasks/location/MapboxSearchProvider.java | 2 - .../java/org/tasks/preferences/Preferences.kt | 4 - .../preferences/fragments/LookAndFeel.kt | 33 ----- app/src/main/res/layout/row_place_footer.xml | 1 + app/src/main/res/values-bg-rBG/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-eu/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-id/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-iw/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values/keys.xml | 1 - app/src/main/res/values/strings.xml | 1 - .../res/xml/preferences_look_and_feel.xml | 5 - 39 files changed, 17 insertions(+), 274 deletions(-) rename app/src/{main => generic}/java/org/tasks/location/MapboxMapFragment.java (100%) create mode 100644 app/src/googleplay/res/drawable/mapbox_logo_icon.xml create mode 100644 app/src/googleplay/res/drawable/mapbox_marker_icon_default.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1bc9f4077..4cbda365d 100644 --- a/app/build.gradle.kts +++ b/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}") diff --git a/app/licenses.yml b/app/licenses.yml index 45696b4da..87868b3b8 100644 --- a/app/licenses.yml +++ b/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 diff --git a/app/src/main/java/org/tasks/location/MapboxMapFragment.java b/app/src/generic/java/org/tasks/location/MapboxMapFragment.java similarity index 100% rename from app/src/main/java/org/tasks/location/MapboxMapFragment.java rename to app/src/generic/java/org/tasks/location/MapboxMapFragment.java diff --git a/app/src/googleplay/java/org/tasks/injection/LocationModule.kt b/app/src/googleplay/java/org/tasks/injection/LocationModule.kt index 512970629..dc7322dc6 100644 --- a/app/src/googleplay/java/org/tasks/injection/LocationModule.kt +++ b/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) - } - } } \ No newline at end of file diff --git a/app/src/googleplay/res/drawable/mapbox_logo_icon.xml b/app/src/googleplay/res/drawable/mapbox_logo_icon.xml new file mode 100644 index 000000000..a92e173ba --- /dev/null +++ b/app/src/googleplay/res/drawable/mapbox_logo_icon.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/app/src/googleplay/res/drawable/mapbox_marker_icon_default.xml b/app/src/googleplay/res/drawable/mapbox_marker_icon_default.xml new file mode 100644 index 000000000..7934ee66d --- /dev/null +++ b/app/src/googleplay/res/drawable/mapbox_marker_icon_default.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index b3ce788ef..713b71cae 100644 --- a/app/src/main/assets/licenses.json +++ b/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", diff --git a/app/src/main/java/org/tasks/location/MapboxGeocoder.java b/app/src/main/java/org/tasks/location/MapboxGeocoder.java index a46f35b3d..95d2ddd4d 100644 --- a/app/src/main/java/org/tasks/location/MapboxGeocoder.java +++ b/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) { diff --git a/app/src/main/java/org/tasks/location/MapboxSearchProvider.java b/app/src/main/java/org/tasks/location/MapboxSearchProvider.java index 130d9e877..d2e5a770b 100644 --- a/app/src/main/java/org/tasks/location/MapboxSearchProvider.java +++ b/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 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())); diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt index d5ebfbac5..bea648ee1 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.kt +++ b/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 } diff --git a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt index d5afec2d2..8bd527fce 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt +++ b/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) diff --git a/app/src/main/res/layout/row_place_footer.xml b/app/src/main/res/layout/row_place_footer.xml index 8579bbe09..e8e91a37f 100644 --- a/app/src/main/res/layout/row_place_footer.xml +++ b/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"/> diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 1c3bb07a3..cde330e66 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -457,7 +457,6 @@ Изберете местоположение Избери това местоположение Или избери местоположение - Доставчик на карти Намери доставчик Липсващи разрешения За напомняния за местоположение са необходими разрешения за местоположението diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 994107a53..a7b2193f9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -488,7 +488,6 @@ Dle systému každý %1$s %2$s Nebo vyberte místo - Poskytovatel map Poskytovatel vyhledávání Chybí oprávnění Oprávnění k přístupu k poloze je nutné pro upomínky podle polohy diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7599a458a..f633a1bcb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -449,7 +449,6 @@ Ort auswählen Diesen Ort auswählen Oder Ort auswählen - Kartendienst Suchanbieter Fehlende Berechtigungen Standortberechtigung wird für ortsbasierte Erinnerungen benötigt diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 57f37ec2a..937663745 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -457,7 +457,6 @@ Escoger ubicación Seleccionar esta ubicación O elija una ubicación - Proveedor de mapas Proveedor de búsquedas Permisos ausentes Son necesarios permisos de ubicación para los recordatorios de ubicación diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 2a5c27ab4..f19479080 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -463,7 +463,6 @@ Hautatu kokaleku bat Hautatu kokaleku hau Edo hautatu kokaleku bat - Mapa hornitzailea Bilatu hornitzailea Baimenak falta dira Kokapen baimena behar da kokalekuen araberako oroigarrientzat diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 1ec5d9fbe..81dc54572 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -455,7 +455,6 @@ Sijaintioikeudet tarvitaan sijaintipohjaisiin muistutuksiin Oikeuksia puuttuu Hauntarjoaja - Kartantarjoaja Tai valitse muu sijainti Valitse tämä sijainti Valitse sijainti diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ea225030b..5e10b8cb8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -439,7 +439,6 @@ Choisir une localisation Sélectionner cette localisation Ou choisir une localisation - Fournisseur de cartes Moteurs de recherche Permissions manquantes La permission de la localisation est nécessaire pour les rappels de localisation diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 45a7de73b..6999f6d3f 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -458,7 +458,6 @@ Hely kiválasztása Hely kiválasztása Vagy másik hely keresése - Térkép szolgáltató Keresési szolgáltató Hiányzó jogosultságok A hely emlékeztetőkhöz helymeghatározási jogosultság szükséges diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index dbbea5227..9c32e6647 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -388,7 +388,6 @@ Pilih lokasi Pilih lokasi ini Atau cari lokasi - Penyedia peta Penyedia pencarian Membutuhkan izin akses lokasi untuk pengingat lokasi Membutuhkan izin akses lokasi untuk menentukan lokasi anda saat ini diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d3b37160b..96180013c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -454,7 +454,6 @@ Scegli posizione Seleziona questa posizione O scegli un\'altra posizione - Fornitore mappe Cerca fornitore Permessi mancanti I promemoria con la posizione richiedono i permessi di localizzazione diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index c1cd35314..a63700efa 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -492,7 +492,6 @@ בחרו מיקום בחרו את המיקום הזה או בחרו מיקום - ספק מפה ספק חיפוש חסרות הרשאות הרשאות מיקום נדרשות עבור תזכורות מבוססות מיקום diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d8d6ae281..704ce7481 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -455,7 +455,6 @@ 場所を選択 この場所を選択 または場所を選ぶ - 地図プロバイダー プロバイダーを検索 アクセス許可がありません 場所リマインダーには位置のアクセス許可が必要です diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ef64948c2..8b485dda1 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -461,7 +461,6 @@ 위치 선택 현위치 선택 위치 고르기 - 지도 제공업체 검색 제공업체 권한 누락 위치 알림을 사용하려면 위치 권한이 필요합니다 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index bcacee802..52ff76ea8 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -454,7 +454,6 @@ Pasirinkti vietą Pasirinkti šią vietą Arba pasirinkti vietą - Žemėlapio tiekėjas Paieškos tiekėjas Dingę leidimai Vietos leidimai reikalingi priminimams pagal vietą diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index c017e0800..5fb776844 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -463,7 +463,6 @@ Velg et sted Velg dette stedet Eller velg et sted - Karttilbyder Søketilbyder Manglende tilganger Plasseringstilganger trengs for stedspåminnelser diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 34907de5a..15be68ce4 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -447,7 +447,6 @@ Kies een locatie Selecteer deze locatie Of kies een locatie - Kaart aanbieder Zoek aanbieder Missende rechten Locatie rechten zijn nodig voor locatie herinneringen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 56a98aec5..c10722f21 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -467,7 +467,6 @@ Wybierz lokalizację Ustaw wybraną lokalizację Lub wybierz lokalizację - Dostawca map Silnik wyszukiwania Brakujące uprawnienia Uprawnienia lokalizacji są wymagane do powiadomień o lokalizacji diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 9f0cb5745..c063ab08b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -455,7 +455,6 @@ Escolher uma localização Selecionar essa localização Ou escolha uma localização - Provedor de mapa Provedor de pesquisa Permissões faltando Permissão de Localização é necessária para lembretes de localização diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2fba1cd84..cc9ecc040 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -474,7 +474,6 @@ Выбрать местоположение Выбрать это местоположение Или выбрать местоположение - Поставщик системы карт Поставщик системы поиска Отсутствующие разрешения Версия %s diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index b0346a392..e75ab5cf1 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -454,7 +454,6 @@ Vybrať polohu Vybrať túto polohu Alebo vybrať polohu ručne - Mapy poskytuje Vyhľadávanie poskytuje Chýbajúce oprávnenia Pre upozornenia podľa polohy sú potrebné povolenia diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a69caedea..bba64c36f 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -458,7 +458,6 @@ Välj en plats Välj den här platsen Eller Välj en plats - Kartleverantör Sökleverantör Saknar behörigheter Läge behörigheter behövs för plats påminnelser diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 5e39f05e3..6cb8219f7 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -460,7 +460,6 @@ Konum seç Bu konumu seç Ya da konum seç - Harita sağlayıcı Arama sağlayıcı Eksik izinler Konum anımsatıcılar için konum izinleri gereklidir diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index b4eb18b0f..3790acb47 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -473,7 +473,6 @@ Обрати місце Обрати це місце Або вказати інше місце - Провайдер мапи Знайти провайдера Відсутні дозволи Для нагадувань за місцем необхідний дозвіл на перегляд місцезнаходження diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index dfaba7cf1..e0fa22bf3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -453,7 +453,6 @@ 选择一个位置 选中这个位置 或选择一个位置 - 地图供应商 搜索引擎供应商 缺少权限 位置提醒功能需要位置权限 diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 47c3948f0..c5059ce44 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -340,7 +340,6 @@ linkify_task_edit Mapbox Google - map_provider place_provider preference_screen google_tasks_add_to_top diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 87308787f..13af24d1d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -519,7 +519,6 @@ File %1$s contained %2$s.\n\n Choose a location Select this location Or choose a location - Map provider Search provider Missing permissions Location permissions are needed for location reminders diff --git a/app/src/main/res/xml/preferences_look_and_feel.xml b/app/src/main/res/xml/preferences_look_and_feel.xml index fdba911d8..1a889cace 100644 --- a/app/src/main/res/xml/preferences_look_and_feel.xml +++ b/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"> - -