Fix #5182 Switch From Mapbox to MapLibre (#5184)

* Fix #5182 Switch From Mapbox to MapLibre * Fix #5182 Switch From Mapbox to MapLibre - Resolved requestFeature() issue * Fix #5182 Switch From Mapbox to MapLibre - Resolved dark mode issue on two screens * Fix #5182 Switch From Mapbox to MapLibre - Resolved dark mode issue on additional screens * Fix #5182 Switch From Mapbox to MapLibre - Resolved dark mode issue on notification screen * Fix #5182 Switch From Mapbox to MapLibre - Test errors
commons-app · Mar 31, 2023 · 8f8dcc0 · 8f8dcc0
1 parent 2989b73
commit 8f8dcc0
Show file tree

Hide file tree

Showing 27 changed files with 63 additions and 77 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -38,10 +38,10 @@ dependencies {
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
     implementation 'com.github.chrisbanes:PhotoView:2.0.0'
     implementation 'com.github.pedrovgs:renderers:3.3.3'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.1'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-v9:0.5.0'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-telemetry:7.0.0'
+    implementation "org.maplibre.gl:android-sdk:$MAPLIBRE_VERSION"
+    implementation 'org.maplibre.gl:android-plugin-scalebar-v9:1.0.0'
+
+    implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
     implementation 'com.dinuscxj:circleprogressbar:1.1.1'
     implementation 'com.karumi:dexter:5.0.0'
@@ -246,6 +246,8 @@ android {
 
     configurations.all {
         resolutionStrategy.force 'androidx.annotation:annotation:1.1.0'
+        resolutionStrategy.force 'com.jakewharton.timber:timber:4.7.1'
+        resolutionStrategy.force 'androidx.fragment:fragment:1.3.6'
         exclude module: 'okhttp-ws'
     }
     flavorDimensions 'tier'

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -24,6 +24,7 @@
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
 import com.mapbox.mapboxsdk.Mapbox;
+import com.mapbox.mapboxsdk.WellKnownTileServer;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table;
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
@@ -53,7 +54,6 @@
 import java.util.Set;
 import javax.inject.Inject;
 import javax.inject.Named;
-import leakcanary.ObjectWatcher;
 import org.acra.ACRA;
 import org.acra.annotation.AcraCore;
 import org.acra.annotation.AcraDialog;
@@ -121,8 +121,6 @@ public class CommonsApplication extends MultiDexApplication {
      * Constants End
      */
 
-    private ObjectWatcher objectWatcher;
-
     private static CommonsApplication INSTANCE;
 
     public static CommonsApplication getInstance() {
@@ -152,7 +150,7 @@ public void onCreate() {
 
         INSTANCE = this;
         ACRA.init(this);
-        Mapbox.getInstance(this, getString(R.string.mapbox_commons_app_token));
+        Mapbox.getInstance(this, getString(R.string.mapbox_commons_app_token), WellKnownTileServer.Mapbox);
 
         ApplicationlessInjection
             .getInstance(this)
@@ -268,17 +266,6 @@ public String getUserAgent() {
             + " (https://mediawiki.org/wiki/Apps/Commons) Android/" + Build.VERSION.RELEASE;
     }
 
-    /**
-     * Provides a way to get member objectWatcher
-     *
-     * @param context Application context
-     * @return application member objectWatcher
-     */
-    public static ObjectWatcher getObjectWatcher(Context context) {
-        CommonsApplication application = (CommonsApplication) context.getApplicationContext();
-        return application.objectWatcher;
-    }
-
     /**
      * clears data of current application
      *

diff --git a/app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.java b/app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.java
@@ -31,18 +31,18 @@
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.mapbox.android.core.location.LocationEngineCallback;
-import com.mapbox.android.core.location.LocationEngineResult;
-import com.mapbox.android.core.permissions.PermissionsManager;
 import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraPosition.Builder;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.location.LocationComponent;
 import com.mapbox.mapboxsdk.location.LocationComponentActivationOptions;
+import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback;
+import com.mapbox.mapboxsdk.location.engine.LocationEngineResult;
 import com.mapbox.mapboxsdk.location.modes.CameraMode;
 import com.mapbox.mapboxsdk.location.modes.RenderMode;
+import com.mapbox.mapboxsdk.location.permissions.PermissionsManager;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.MapboxMap.OnCameraIdleListener;
@@ -142,9 +142,9 @@ public class LocationPickerActivity extends BaseActivity implements OnMapReadyCa
 
     @Override
     protected void onCreate(@Nullable final Bundle savedInstanceState) {
+        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
         super.onCreate(savedInstanceState);
 
-        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
         final ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.hide();
@@ -194,7 +194,7 @@ private void addCredits() {
      * Clicking back button destroy locationPickerActivity
      */
     private void addBackButtonListener() {
-        final ImageView backButton = findViewById(R.id.mapbox_place_picker_toolbar_back_button);
+        final ImageView backButton = findViewById(R.id.maplibre_place_picker_toolbar_back_button);
         backButton.setOnClickListener(view -> finish());
     }
 
@@ -238,7 +238,7 @@ private void getToolbarUI() {
     @Override
     public void onMapReady(final MapboxMap mapboxMap) {
         this.mapboxMap = mapboxMap;
-        mapboxMap.setStyle(Style.MAPBOX_STREETS, this::onStyleLoaded);
+        mapboxMap.setStyle(Style.getPredefinedStyle("Streets"), this::onStyleLoaded);
     }
 
     /**

diff --git a/...ain/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelFactory.kt b/...ain/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelFactory.kt
@@ -10,7 +10,7 @@ import javax.inject.Inject
  */
 class CustomSelectorViewModelFactory @Inject constructor(val context: Context,val imageFileLoader: ImageFileLoader) : ViewModelProvider.Factory {
 
-    override fun<CustomSelectorViewModel: ViewModel?> create(modelClass: Class<CustomSelectorViewModel>) : CustomSelectorViewModel {
+    override fun<CustomSelectorViewModel: ViewModel> create(modelClass: Class<CustomSelectorViewModel>) : CustomSelectorViewModel {
         return CustomSelectorViewModel(context,imageFileLoader) as CustomSelectorViewModel
     }
 

diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
@@ -81,6 +81,7 @@
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
+import java.util.Arrays;
 import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -189,7 +190,8 @@ public void onViewCreated(@NonNull final View view, @Nullable final Bundle saved
             mapBox = mapBoxMap;
             initViews();
             presenter.setActionListeners(applicationKvStore);
-            mapBoxMap.setStyle(isDarkTheme? Style.DARK:Style.OUTDOORS, style -> {
+            mapBoxMap.setStyle(isDarkTheme? Style.getPredefinedStyle("Dark"):
+                Style.getPredefinedStyle("Outdoors"), style -> {
                 final UiSettings uiSettings = mapBoxMap.getUiSettings();
                 uiSettings.setCompassGravity(Gravity.BOTTOM | Gravity.LEFT);
                 uiSettings.setCompassMargins(12, 0, 0, 24);

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
@@ -316,7 +316,7 @@ public void onViewCreated(@NonNull final View view, @Nullable final Bundle saved
             initViews();
             presenter.setActionListeners(applicationKvStore);
             initNearbyFilter();
-            mapBoxMap.setStyle(isDarkTheme?Style.DARK:Style.OUTDOORS, style -> {
+            mapBoxMap.setStyle(isDarkTheme?Style.getPredefinedStyle("Dark"):Style.getPredefinedStyle("Outdoors"), style -> {
                 final UiSettings uiSettings = mapBoxMap.getUiSettings();
                 uiSettings.setCompassGravity(Gravity.BOTTOM | Gravity.LEFT);
                 uiSettings.setCompassMargins(12, 0, 0, 24);

diff --git a/app/src/main/java/fr/free/nrw/commons/settings/Prefs.java b/app/src/main/java/fr/free/nrw/commons/settings/Prefs.java
@@ -10,7 +10,6 @@ public class Prefs {
     public static final String DESCRIPTION_LANGUAGE = "languageDescription";
     public static final String APP_UI_LANGUAGE = "appUiLanguage";
     public static final String KEY_THEME_VALUE = "appThemePref";
-    public static final String TELEMETRY_PREFERENCE = "telemetryPref";
 
     public static class Licenses {
         public static final String CC_BY_SA_3 = "CC BY-SA 3.0";

diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
@@ -31,7 +31,6 @@
 import com.karumi.dexter.listener.PermissionGrantedResponse;
 import com.karumi.dexter.listener.single.BasePermissionListener;
 import com.mapbox.mapboxsdk.Mapbox;
-import com.mapbox.mapboxsdk.maps.TelemetryDefinition;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.campaigns.CampaignView;
@@ -161,21 +160,6 @@ public boolean onPreferenceClick(Preference preference) {
             findPreference(CampaignView.CAMPAIGNS_DEFAULT_PREFERENCE).setEnabled(false);
             findPreference("managed_exif_tags").setEnabled(false);
         }
-
-        // Opting out of telemetry due to app's privacy policy
-        telemetryOptInOut(false);
-        defaultKvStore.putBoolean(Prefs.TELEMETRY_PREFERENCE,false);
-    }
-
-    /**
-     * Opt in or out of MapBox telemetry
-     * @param shouldOptIn
-     */
-    private void telemetryOptInOut(boolean shouldOptIn){
-        TelemetryDefinition telemetry = Mapbox.getTelemetry();
-        if (telemetry != null) {
-            telemetry.setUserTelemetryRequestState(shouldOptIn);
-        }
     }
 
     @Override

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
@@ -174,15 +174,15 @@ public void bind(int position) {
             if (position == 0) {
                 removeButton.setVisibility(View.GONE);
                 captionInputLayout.setEndIconMode(TextInputLayout.END_ICON_CUSTOM);
-                captionInputLayout.setEndIconDrawable(R.drawable.mapbox_info_icon_default);
+                captionInputLayout.setEndIconDrawable(R.drawable.maplibre_info_icon_default);
                 captionInputLayout.setEndIconOnClickListener(v ->
                     callback.showAlert(R.string.media_detail_caption, R.string.caption_info));
                 Objects.requireNonNull(captionInputLayout.getEditText()).setFilters(new InputFilter[] {
                     new UploadMediaDetailInputFilter()
                 });
 
                 descInputLayout.setEndIconMode(TextInputLayout.END_ICON_CUSTOM);
-                descInputLayout.setEndIconDrawable(R.drawable.mapbox_info_icon_default);
+                descInputLayout.setEndIconDrawable(R.drawable.maplibre_info_icon_default);
                 descInputLayout.setEndIconOnClickListener(v ->
                     callback.showAlert(R.string.media_detail_description, R.string.description_info));
 

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
@@ -11,7 +11,7 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
-import com.mapbox.mapboxsdk.plugins.localization.BuildConfig
+import androidx.multidex.BuildConfig
 import dagger.android.ContributesAndroidInjector
 import fr.free.nrw.commons.CommonsApplication
 import fr.free.nrw.commons.Media

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -4,6 +4,7 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/mainBackground"
     android:orientation="vertical">
     <LinearLayout
         android:id="@+id/toolbarLayout"

diff --git a/app/src/main/res/layout/activity_notification.xml b/app/src/main/res/layout/activity_notification.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/mainBackground">
 
     <RelativeLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/activity_review.xml b/app/src/main/res/layout/activity_review.xml
@@ -4,7 +4,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/drawer_layout"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  android:background="?attr/mainBackground">
 
   <FrameLayout
     android:id="@+id/mediaDetailContainer"

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -5,6 +5,7 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/mainBackground"
     android:orientation="vertical">
     <LinearLayout
         android:id="@+id/toolbarLayout"

diff --git a/app/src/main/res/layout/content_location_picker.xml b/app/src/main/res/layout/content_location_picker.xml
@@ -36,7 +36,7 @@
     android:id="@+id/map_view"
     android:layout_width="0dp"
     android:layout_height="0dp"
-    app:mapbox_uiLogo="false"
+    app:maplibre_uiLogo="false"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/custom_selector_toolbar.xml b/app/src/main/res/layout/custom_selector_toolbar.xml
@@ -6,7 +6,8 @@
       android:id="@+id/toolbar_layout"
       android:layout_width="match_parent"
       android:layout_height="?attr/actionBarSize"
-      app:layout_constraintTop_toTopOf="parent">
+      app:layout_constraintTop_toTopOf="parent"
+      android:background="?attr/mainBackground">
 
       <ImageButton
         android:id="@+id/back"

diff --git a/app/src/main/res/layout/fragment_achievements.xml b/app/src/main/res/layout/fragment_achievements.xml
@@ -4,7 +4,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/drawer_layout"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  android:background="?attr/achievementBackground">
 
     <ScrollView
       android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/fragment_advance_query.xml b/app/src/main/res/layout/fragment_advance_query.xml
@@ -47,7 +47,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:text="@string/reset"
-    android:textColor="@color/mapbox_blue"
+    android:textColor="@color/maplibre_blue"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintRight_toLeftOf="@id/btn_apply" />
 

diff --git a/app/src/main/res/layout/fragment_leaderboard.xml b/app/src/main/res/layout/fragment_leaderboard.xml
@@ -4,7 +4,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  android:background="?attr/achievementBackground">
 
   <LinearLayout
     android:id="@+id/filters"

diff --git a/app/src/main/res/layout/fragment_media_license.xml b/app/src/main/res/layout/fragment_media_license.xml
@@ -5,7 +5,8 @@
   android:layout_height="match_parent"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_marginBottom="@dimen/activity_margin_horizontal"
-  android:padding="@dimen/standard_gap">
+  android:padding="@dimen/standard_gap"
+  android:background="?attr/achievementBackground">
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -32,7 +33,7 @@
         android:id="@+id/tooltip"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:src="@drawable/mapbox_info_icon_default"/>
+        android:src="@drawable/maplibre_info_icon_default"/>
     </LinearLayout>
 
     <TextView

diff --git a/app/src/main/res/layout/fragment_upload_media_detail_fragment.xml b/app/src/main/res/layout/fragment_upload_media_detail_fragment.xml
@@ -4,7 +4,8 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  android:background="?attr/achievementBackground">
 
     <com.github.chrisbanes.photoview.PhotoView
       android:id="@+id/backgroundImage"
@@ -50,7 +51,7 @@
                       android:id="@+id/tooltip"
                       android:layout_width="wrap_content"
                       android:layout_height="match_parent"
-                      android:src="@drawable/mapbox_info_icon_default"/>
+                      android:src="@drawable/maplibre_info_icon_default"/>
                 </LinearLayout>
 
                 <androidx.appcompat.widget.AppCompatImageButton

diff --git a/app/src/main/res/layout/toolbar_location_picker.xml b/app/src/main/res/layout/toolbar_location_picker.xml
@@ -37,7 +37,7 @@
     app:layout_constraintTop_toBottomOf="@+id/location_picker_toolbar_primary_text_view" />
 
   <ImageView
-    android:id="@+id/mapbox_place_picker_toolbar_back_button"
+    android:id="@+id/maplibre_place_picker_toolbar_back_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"

diff --git a/app/src/main/res/layout/upload_categories_fragment.xml b/app/src/main/res/layout/upload_categories_fragment.xml
@@ -35,7 +35,7 @@
         android:id="@+id/tooltip"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:src="@drawable/mapbox_info_icon_default" />
+        android:src="@drawable/maplibre_info_icon_default" />
     </LinearLayout>
 
     <TextView

diff --git a/app/src/main/res/layout/upload_depicts_fragment.xml b/app/src/main/res/layout/upload_depicts_fragment.xml
@@ -40,7 +40,7 @@
               android:id="@+id/tooltip"
               android:layout_width="wrap_content"
               android:layout_height="match_parent"
-              android:src="@drawable/mapbox_info_icon_default" />
+              android:src="@drawable/maplibre_info_icon_default" />
         </LinearLayout>
 
     <TextView