From e4820938323e676a4d4a06676a3ee4b68aa469f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=B6rflinger?= <dev.doerfl@gmail.com>
Date: Wed, 23 Apr 2025 14:04:24 +0200
Subject: [PATCH] [Maps] Replaces gMaps with MapBox

In order to circumvent the usage quota of Google Maps
the map provider was changed to be MapBox now. Additionally
the maps implementation was refactored to be better extendable
in future.
---
 .idea/gradle.xml                              |   1 -
 app/build.gradle                              |   3 +
 .../familyhelpers/ShareLocationActivity.java  | 214 ++++----------
 .../familyhelpers/model/LocationObject.java   |  21 +-
 .../familyhelpers/ui/map/AbstractMap.java     | 152 ++++++++++
 .../ui/map/IMapMovementListener.java          |   6 +
 .../ui/map/gmaps/GoogleMapsView.java          | 189 ++++++++++++
 .../ui/map/mapbox/MapBoxView.java             | 276 ++++++++++++++++++
 app/src/main/res/drawable/red_marker.png      | Bin 0 -> 3163 bytes
 .../res/layout/activity_share_location.xml    |  26 +-
 app/src/main/res/values-night/themes.xml      |   1 +
 .../main/res/values/mapbox_access_token.xml   |   4 +
 app/src/main/res/values/themes.xml            |   2 +
 build.gradle                                  |   3 +
 settings.gradle                               |   3 +
 15 files changed, 733 insertions(+), 168 deletions(-)
 create mode 100644 app/src/main/java/com/aldo/apps/familyhelpers/ui/map/AbstractMap.java
 create mode 100644 app/src/main/java/com/aldo/apps/familyhelpers/ui/map/IMapMovementListener.java
 create mode 100644 app/src/main/java/com/aldo/apps/familyhelpers/ui/map/gmaps/GoogleMapsView.java
 create mode 100644 app/src/main/java/com/aldo/apps/familyhelpers/ui/map/mapbox/MapBoxView.java
 create mode 100644 app/src/main/res/drawable/red_marker.png
 create mode 100644 app/src/main/res/values/mapbox_access_token.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d12ae9e..0897082 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,6 +15,5 @@
         <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
-    <option name="offlineMode" value="true" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index ae04c4e..1b83e31 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,6 +64,9 @@ dependencies {
     implementation 'com.google.android.gms:play-services-maps:19.1.0'
     implementation 'com.google.android.gms:play-services-location:21.3.0'
 
+    //MapBox SDK
+    implementation 'com.mapbox.maps:android:11.11.0'
+
     // Glide
     implementation 'com.github.bumptech.glide:glide:4.16.0'
     implementation 'androidx.preference:preference:1.2.1'
diff --git a/app/src/main/java/com/aldo/apps/familyhelpers/ShareLocationActivity.java b/app/src/main/java/com/aldo/apps/familyhelpers/ShareLocationActivity.java
index 3cba800..cf4c670 100644
--- a/app/src/main/java/com/aldo/apps/familyhelpers/ShareLocationActivity.java
+++ b/app/src/main/java/com/aldo/apps/familyhelpers/ShareLocationActivity.java
@@ -15,7 +15,6 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -23,27 +22,26 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.aldo.apps.familyhelpers.model.LocationObject;
 import com.aldo.apps.familyhelpers.model.User;
 import com.aldo.apps.familyhelpers.ui.ActiveShareAdapter;
+import com.aldo.apps.familyhelpers.ui.map.AbstractMap;
+import com.aldo.apps.familyhelpers.ui.map.IMapMovementListener;
+
+import com.aldo.apps.familyhelpers.ui.map.mapbox.MapBoxView;
 import com.aldo.apps.familyhelpers.workers.DatabaseHelper;
 import com.aldo.apps.familyhelpers.workers.LocationHelper;
 import com.aldo.apps.familyhelpers.workers.ShareLocationBackgroundWorker;
 import com.bumptech.glide.Glide;
-import com.google.android.gms.maps.CameraUpdateFactory;
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.OnMapReadyCallback;
-import com.google.android.gms.maps.SupportMapFragment;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.MapStyleOptions;
-import com.google.android.gms.maps.model.Marker;
-import com.google.android.gms.maps.model.MarkerOptions;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.materialswitch.MaterialSwitch;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 
+import com.mapbox.maps.MapView;
+
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
+
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -53,87 +51,80 @@ import io.reactivex.rxjava3.disposables.Disposable;
 /**
  * Activity showing a Map to display the shared location plus additional information.
  */
-public class ShareLocationActivity extends AppCompatActivity implements OnMapReadyCallback {
+public class ShareLocationActivity extends AppCompatActivity implements IMapMovementListener {
 
     /**
      * Tag for debugging purpose.
      */
     private static final String TAG = "ShareLocationActivity";
-    /**
-     * Map containing all markers and the corresponding ID.
-     */
-    private final Map<String, Marker> mMarkerMap = new HashMap<>();
+
     /**
      * {@link List} of all {@link User}s.
      */
     private final List<User> mAllUsers = new ArrayList<>();
-    /**
-     * The {@link GoogleMap} view.
-     */
-    private GoogleMap mGmap;
+
     /**
      * The {@link DatabaseHelper} to read and load data from.
      */
     private DatabaseHelper mDbHelper;
+
     /**
      * The currently logged in {@link FirebaseUser}.
      */
     private FirebaseUser mCurrentUser;
+
     /**
      * The ID of the location updates to listen to.
      */
     private String mShareId;
+
     /**
      * The InfoBox {@link ImageView} showing the user icon.
      */
     private ImageView mInfoBoxIcon;
+
     /**
      * The InfoBox {@link TextView} showing the title.
      */
     private TextView mInfoBoxTitle;
+
     /**
      * The InfoBox {@link TextView} showing the Location information.
      */
     private TextView mInfoBoxLocation;
+
     /**
      * The InfoBox {@link TextView} showing the altitude..
      */
     private TextView mInfoBoxAltitude;
+
     /**
      * The InfoBox {@link TextView} showing the last received speed.
      */
     private TextView mInfoBoxSpeed;
+
     /**
      * The InfoBox {@link TextView} showing the timestamp of the last update.
      */
     private TextView mInfoBoxTimeStamp;
+
     /**
      * The {@link Disposable} holding the subscription to the {@link LocationObject}
      * {@link io.reactivex.rxjava3.subjects.BehaviorSubject} in order to have it cancellable.
      */
     private Disposable mLocationUpdateSubscription;
+
     /**
      * The {@link Disposable} holding the subscription to the {@link String}
      * {@link io.reactivex.rxjava3.subjects.BehaviorSubject} in order to know whom to follow.
      */
     private Disposable mCurrentlyFollowingSubscription;
+
     /**
      * The {@link Disposable} holding the subscription to {@link User}
      * {@link io.reactivex.rxjava3.subjects.BehaviorSubject} in order to have it cancellable.
      */
     private Disposable mUserSubscription;
-    /**
-     * Boolean flag indicating whether the system is currently in night mode or not.
-     */
-    private boolean mIsNightMode;
-    /**
-     * Reference to the Google Maps Marker, to update it's position rather than adding a new one.
-     */
-    private Marker mGmapsMarker;
-    /**
-     * The ID of who the user is currently following.
-     */
-    private String mCurrentlyFollowing;
 
     /**
      * Displays an error if no active shares.
@@ -150,25 +141,21 @@ public class ShareLocationActivity extends AppCompatActivity implements OnMapRea
      */
     private FloatingActionButton mRecenterFollowBtn;
 
-    private LocationObject mCurrentlyFollowingLocation;
-
     /**
      * The {@link ActiveShareAdapter} to populate the activeShare view.
      */
     private ActiveShareAdapter mActiveShareAdapter;
 
-    /**
-     * Flag indicating whether currently the user wants to be following another user or not.
-     */
-    private boolean mIsFollowing;
+    private AbstractMap<MapView> mMap;
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_share_location);
 
-        final SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
-                .findFragmentById(R.id.map);
+        mMap = new MapBoxView(findViewById(R.id.mapbox), this);
+        initMapView();
+
         mCurrentUser = FirebaseAuth.getInstance().getCurrentUser();
         mInfoBoxIcon = findViewById(R.id.share_location_info_user_icon);
         mInfoBoxTitle = findViewById(R.id.share_location_info_title);
@@ -185,7 +172,7 @@ public class ShareLocationActivity extends AppCompatActivity implements OnMapRea
 
         mRecenterFollowBtn.setOnClickListener(v -> startFollowingAndCenterCamera());
         mActiveShares.setAdapter(mActiveShareAdapter);
-        mapFragment.getMapAsync(this);
+
         mDbHelper = new DatabaseHelper();
     }
 
@@ -194,8 +181,9 @@ public class ShareLocationActivity extends AppCompatActivity implements OnMapRea
         super.onResume();
         final Configuration configuration = getResources().getConfiguration();
 
-        mIsNightMode = (configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK)
+        boolean isNightMode = (configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK)
                 == Configuration.UI_MODE_NIGHT_YES;
+        mMap.applyDayNightMode(isNightMode);
 
         if (mShareId == null) {
             mShareId = mCurrentUser.getUid();
@@ -257,32 +245,30 @@ public class ShareLocationActivity extends AppCompatActivity implements OnMapRea
      * @param locationObjectMap The {@link Map} matching shareIds to {@link LocationObject}s.
      */
     private void handleReceivedLocations(final Map<String, LocationObject> locationObjectMap) {
-        if (TextUtils.isEmpty(mCurrentlyFollowing)) {
+        if (TextUtils.isEmpty(mMap.getCurrentlyFollowing())) {
             clearInfoBox();
         }
+        Log.d(TAG, "handleReceivedLocations() called with: locationObjectMap = [" + locationObjectMap + "]");
         // If empty received, remove all markers.
         if (locationObjectMap.isEmpty()) {
-            for (final Marker marker : mMarkerMap.values()) {
-                marker.remove();
-            }
-            mMarkerMap.clear();
+            Log.d(TAG, "handleReceivedLocations: Noone sharing");
+            mMap.clearAllMarkers();
             clearInfoBox();
             mNoActiveShares.setVisibility(View.VISIBLE);
             mActiveShares.setVisibility(View.GONE);
         } else {
+            Log.d(TAG, "handleReceivedLocations: Sharing active");
             mNoActiveShares.setVisibility(View.GONE);
             mActiveShares.setVisibility(View.VISIBLE);
         }
-
-        if (mGmapsMarker != null) {
-            mGmapsMarker.remove();
-        }
         //Update the available active shares.
         updateActiveShares(locationObjectMap);
         // If non-empty received, remove all invalid existing markers
-        removeInvalidExistingMarkers(locationObjectMap);
+        if (mMap.removeInvalidExistingMarkers(locationObjectMap)) {
+            clearInfoBox();
+        }
         // Update/Insert all existing/new markers
-        updateExistingOrCreateValidMarkers(locationObjectMap);
+        updateInfoBox(mMap.updateOrAddCustomMarker(locationObjectMap));
     }
 
     /**
@@ -298,72 +284,6 @@ public class ShareLocationActivity extends AppCompatActivity implements OnMapRea
         mActiveShareAdapter.applyNewData(activeShares);
     }
 
-
-    /**
-     * Removed all markers that became invalid because the sharing was stopped.
-     *
-     * @param locationObjectMap The {@link Map} matching shareIds to {@link LocationObject}s.
-     */
-    private void removeInvalidExistingMarkers(final Map<String, LocationObject> locationObjectMap) {
-        final List<String> toBeRemovedKeys = new ArrayList<>();
-        for (Map.Entry<String, Marker> markerEntry : mMarkerMap.entrySet()) {
-            if (!locationObjectMap.containsKey(markerEntry.getKey())) {
-                Log.d(TAG, "handleReceivedLocations: Marker not valid anymore, remove");
-                markerEntry.getValue().remove();
-                toBeRemovedKeys.add(markerEntry.getKey());
-            }
-        }
-        // Remove from the map as well
-        for (final String removeKey : toBeRemovedKeys) {
-            if (TextUtils.equals(removeKey, mCurrentlyFollowing)) {
-                clearInfoBox();
-                mCurrentlyFollowing = null;
-                mIsFollowing = false;
-                mCurrentlyFollowingLocation = null;
-            }
-            mMarkerMap.remove(removeKey);
-        }
-    }
-
-    /**
-     * Helper method to update or create the valid markers on the map. Updates the position of a
-     * marker if it is existing before, adds a new marker if nor yet existing.
-     *
-     * @param locationObjectMap The {@link Map} matching shareIds to {@link LocationObject}s.
-     */
-    private void updateExistingOrCreateValidMarkers(final Map<String, LocationObject> locationObjectMap) {
-        for (final Map.Entry<String, LocationObject> locationSet : locationObjectMap.entrySet()) {
-            final LocationObject newReceived = locationSet.getValue();
-            final LatLng receivedLocation = new LatLng(newReceived.getLatitude(), newReceived.getLongitude());
-            final String sharingId = locationSet.getKey();
-            final User locationUser = mDbHelper.getUserForId(sharingId);
-            if (mMarkerMap.containsKey(sharingId)) {
-                final Marker existing = mMarkerMap.get(sharingId);
-                if (existing == null) {
-                    Log.w(TAG, "updateExistingOrCreateValidMarkers: Marker somehow not existing, skip");
-                    continue;
-                }
-                Log.d(TAG, "handleReceivedLocations: Marker still available, update position");
-                existing.setPosition(receivedLocation);
-
-            } else {
-                Log.d(TAG, "handleReceivedLocations: New Marker to be created.");
-                final Marker marker = mGmap.addMarker(new MarkerOptions()
-                        .position(receivedLocation)
-                        .title(locationUser == null ? "" : locationUser.getDisplayName()));
-                mMarkerMap.put(locationSet.getKey(), marker);
-            }
-            if (TextUtils.equals(mCurrentlyFollowing, sharingId)) {
-                final LocationObject locationObject = locationSet.getValue();
-                mCurrentlyFollowingLocation = locationObject;
-                updateInfoBox(locationObject);
-                if (mIsFollowing) {
-                    startFollowingAndCenterCamera();
-                }
-            }
-        }
-    }
-
     /**
      * Helper method to clear the info box.
      */
@@ -382,8 +302,12 @@ public class ShareLocationActivity extends AppCompatActivity implements OnMapRea
      * @param locationObject The {@link LocationObject} holding the information.
      */
     private void updateInfoBox(final LocationObject locationObject) {
-        if (mCurrentlyFollowing != null) {
-            final User followed = mDbHelper.getUserForId(mCurrentlyFollowing);
+        if (locationObject == null) {
+            Log.d(TAG, "updateInfoBox: Location is null, skip update...");
+            return;
+        }
+        if (mMap.getCurrentlyFollowing() != null) {
+            final User followed = mDbHelper.getUserForId(mMap.getCurrentlyFollowing());
             if (followed != null) {
                 mInfoBoxTitle.setText(String.format(getString(R.string.share_location_info_title),
                         followed.getDisplayName()));
@@ -436,19 +360,18 @@ public class ShareLocationActivity extends AppCompatActivity implements OnMapRea
     }
 
     /**
-     * Handlles the callback when the selection of currently sharedd Id changes. Re-Established the
+     * Handles the callback when the selection of currently sharedd Id changes. Re-Established the
      * subscription to all locations and updates the info box.
      *
      * @param shareId The ID of the user to be followed.
      */
     private void handleCurrentlyFollowingChanged(final String shareId) {
-        Log.d(TAG, "onCreate: Currently selected = [" + shareId + "]");
-        mCurrentlyFollowing = shareId;
-        mIsFollowing = !TextUtils.isEmpty(mCurrentlyFollowing);
+        Log.d(TAG, "handleCurrentlyFollowingChanged: Currently selected = [" + shareId + "]");
         // Re-setup the subscription.
         if (mLocationUpdateSubscription != null) {
             mLocationUpdateSubscription.dispose();
         }
+        mMap.setCurrentlyFollowing(shareId);
         mLocationUpdateSubscription = mDbHelper.subscribeToAllLocationUpdates()
                 .subscribe(this::handleReceivedLocations, this::handleSubscriptionError);
     }
@@ -466,43 +389,18 @@ public class ShareLocationActivity extends AppCompatActivity implements OnMapRea
      * Helper method to start following and recenter the camera on the location followed.
      */
     private void startFollowingAndCenterCamera() {
-        mIsFollowing = true;
-        mGmap.animateCamera(CameraUpdateFactory.newLatLngZoom(
-                new LatLng(mCurrentlyFollowingLocation.getLatitude(),
-                        mCurrentlyFollowingLocation.getLongitude()),
-                15.0f));
+        mMap.startFollowingAndCenterCamera();
         mRecenterFollowBtn.setVisibility(View.GONE);
     }
 
-    @Override
-    public void onMapReady(@NonNull final GoogleMap googleMap) {
-        if (googleMap == null) {
-            Log.w(TAG, "onMapReady: Map null, cannot continue");
-            return;
-        }
-        mGmap = googleMap;
-        if (mIsNightMode) {
-            mGmap.setMapStyle(MapStyleOptions.loadRawResourceStyle(this, R.raw.map_style_night));
-        } else {
-            mGmap.setMapStyle(MapStyleOptions.loadRawResourceStyle(this, R.raw.map_style_day));
-        }
-        final LatLng defaultHome = new LatLng(DEFAULT_HOME_LATITUDE, DEFAULT_HOME_LONGITUDE);
+    private void initMapView() {
+        mMap.zoomOnDefaultLocation();
+        mMap.displayOwnLocation();
+        mMap.registerMapMovementListener(this);
+    }
 
-        if (mGmapsMarker == null) {
-            mGmapsMarker = mGmap.addMarker(new MarkerOptions()
-                    .position(defaultHome)
-                    .title("Default - Home"));
-        } else {
-            mGmapsMarker.setPosition(defaultHome);
-        }
-        mGmap.setOnCameraMoveStartedListener(reason -> {
-            if (GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == reason
-                    && !TextUtils.isEmpty(mCurrentlyFollowing)) {
-                Log.d(TAG, "onCameraMoveStarted: User moved map, set following to false.");
-                mIsFollowing = false;
-                mRecenterFollowBtn.setVisibility(View.VISIBLE);
-            }
-        });
-        mGmap.moveCamera(CameraUpdateFactory.newLatLngZoom(defaultHome, 8.0f));
+    @Override
+    public void onMapMovementDetected() {
+        mRecenterFollowBtn.setVisibility(View.VISIBLE);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/aldo/apps/familyhelpers/model/LocationObject.java b/app/src/main/java/com/aldo/apps/familyhelpers/model/LocationObject.java
index e415eb0..f1c6325 100644
--- a/app/src/main/java/com/aldo/apps/familyhelpers/model/LocationObject.java
+++ b/app/src/main/java/com/aldo/apps/familyhelpers/model/LocationObject.java
@@ -41,6 +41,11 @@ public class LocationObject {
      */
     private long timestamp;
 
+    /**
+     * Last received bearing.
+     */
+    private float bearing;
+
     /**
      * Empty C'Tor for database usage.
      */
@@ -57,9 +62,10 @@ public class LocationObject {
      * @param altitude  Last received altitude.
      * @param speed     Last received speed.
      * @param timestamp Last received timestamp.
+     * @param bearing   Last received bearing.
      */
     public LocationObject(final String shareId, final double latitude, final double longitude,
-                          final double altitude, final float speed, final long timestamp) {
+                          final double altitude, final float speed, final long timestamp, final float bearing) {
         this.shareId = shareId;
         this.latitude = latitude;
         this.longitude = longitude;
@@ -78,7 +84,7 @@ public class LocationObject {
         final FirebaseUser firebaseUser = FirebaseAuth.getInstance().getCurrentUser();
         return new LocationObject(firebaseUser.getUid(), location.getLatitude(),
                 location.getLongitude(), location.getAltitude(), location.getSpeed(),
-                location.getTime());
+                location.getTime(), location.getBearing());
     }
 
     /**
@@ -146,11 +152,20 @@ public class LocationObject {
         return timestamp;
     }
 
+    /**
+     * Returns the last received bearing.
+     *
+     * @return The last received bearing.
+     */
+    public float getBearing() {
+        return bearing;
+    }
+
     @NonNull
     @Override
     public String toString() {
         return "LocationObject with shareId = [" + shareId + "], lat = [" + latitude
                 + "], long = [" + longitude + "], alt = [" + altitude + "], speed = [" + speed
-                + "], time = [" + timestamp + "]";
+                + "], time = [" + timestamp + "], bearing = [" + bearing + "]";
     }
 }
diff --git a/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/AbstractMap.java b/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/AbstractMap.java
new file mode 100644
index 0000000..779454f
--- /dev/null
+++ b/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/AbstractMap.java
@@ -0,0 +1,152 @@
+package com.aldo.apps.familyhelpers.ui.map;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.aldo.apps.familyhelpers.model.LocationObject;
+import com.aldo.apps.familyhelpers.model.User;
+import com.aldo.apps.familyhelpers.workers.DatabaseHelper;
+
+import java.lang.ref.WeakReference;
+import java.util.Map;
+
+/**
+ *
+ * @param <T> The generic type of MapFragment to be used.
+ */
+public abstract class AbstractMap<T> {
+
+    /**
+     * Tag for debugging purpose.
+     */
+    private static final String TAG = "AbstractMap";
+
+    /**
+     * The {@link DatabaseHelper} to read data from.
+     */
+    protected final DatabaseHelper mDbHelper = new DatabaseHelper();
+
+    /**
+     * The {@link WeakReference} to the calling {@link Context}.
+     */
+    protected final WeakReference<Context> mContextRef;
+
+    /**
+     * The ID of who the user is currently following.
+     */
+    protected String mCurrentlyFollowing;
+
+    /**
+     * The {@link LocationObject} of the currently following user.
+     */
+    protected LocationObject mCurrentlyFollowingLocation;
+
+    /**
+     * Listener to be invoked when the map moved.
+     */
+    protected IMapMovementListener mMapMovementListener;
+
+    /**
+     * The MapFragment to be shown.
+     */
+    protected T mMapFragment;
+
+
+    /**
+     * C'Tor.
+     *
+     * @param mapFragment The inflated Map-Fragment.
+     * @param context     The calling {@link Context}.
+     */
+    public AbstractMap(final T mapFragment, final Context context) {
+        Log.d(TAG, "AbstractMap() called with: mapFragment = [" + mapFragment + "]");
+        mMapFragment = mapFragment;
+        mContextRef = new WeakReference<>(context);
+    }
+
+    /**
+     * Helper method to display and zoom onto the default location until Map is loaded and location
+     * is received.
+     */
+    public abstract void zoomOnDefaultLocation();
+
+    /**
+     * Helper method to start following and recenter the camera on the location followed.
+     */
+    public abstract void startFollowingAndCenterCamera();
+
+    /**
+     * Helper method to show and display the own location.
+     */
+    public abstract void displayOwnLocation();
+
+    /**
+     * Helper method to clear all markers.
+     */
+    public abstract void clearAllMarkers();
+
+    /**
+     * Helper method to update or create the valid markers on the map. Updates the position of a
+     * marker if it is existing before, adds a new marker if nor yet existing.
+     *
+     * @param locationObjectMap The {@link Map} matching shareIds to {@link LocationObject}s.
+     *
+     * @return The {@link LocationObject} that is currently being followed.
+     */
+    public abstract LocationObject updateOrAddCustomMarker(final Map<String, LocationObject> locationObjectMap);
+
+    /**
+     * Removed all markers that became invalid because the sharing was stopped.
+     *
+     * @param locationObjectMap  The {@link Map} matching shareIds to {@link LocationObject}s.
+     *
+     * @return true if currently following was removed too, false otherwise.
+     */
+    public abstract boolean removeInvalidExistingMarkers(final Map<String, LocationObject> locationObjectMap);
+
+
+    /**
+     * Helper method to animate the camera to a specific location.
+     *
+     * @param locationObject  The {@link LocationObject} to zoom to.
+     */
+    public abstract void animateCamera(final LocationObject locationObject);
+
+    /**
+     * Helper method to apply day/night mode. As per standard, this is handled via resources directly,
+     * but may be overridden.
+     *
+     * @param isNightMode true if night mode is active, false otherwise.
+     */
+    public void applyDayNightMode(final boolean isNightMode) {
+        // Standard implementation: Do nothing as handled in resources.
+    }
+
+    /**
+     * Sets the ID of who the user is currently following.
+     *
+     * @param currentlyFollowing The ID of who the user is currently following.
+     */
+    public void setCurrentlyFollowing(final String currentlyFollowing) {
+        mCurrentlyFollowing = currentlyFollowing;
+    }
+
+    /**
+     * Returns the ID of who the user is currently following.
+     *
+     * @return The ID of who the user is currently following.
+     */
+    public String getCurrentlyFollowing() {
+        return mCurrentlyFollowing;
+    }
+
+    /**
+     * Registers a {@link IMapMovementListener} to be invoked whenever the user moves the map
+     * to properly show the re-center button.
+     *
+     * @param mapMovementListener The {@link IMapMovementListener} to be invoked.
+     */
+    public void registerMapMovementListener(final IMapMovementListener mapMovementListener) {
+        mMapMovementListener = mapMovementListener;
+    }
+}
diff --git a/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/IMapMovementListener.java b/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/IMapMovementListener.java
new file mode 100644
index 0000000..349194f
--- /dev/null
+++ b/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/IMapMovementListener.java
@@ -0,0 +1,6 @@
+package com.aldo.apps.familyhelpers.ui.map;
+
+public interface IMapMovementListener {
+
+    void onMapMovementDetected();
+}
diff --git a/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/gmaps/GoogleMapsView.java b/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/gmaps/GoogleMapsView.java
new file mode 100644
index 0000000..800c44d
--- /dev/null
+++ b/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/gmaps/GoogleMapsView.java
@@ -0,0 +1,189 @@
+package com.aldo.apps.familyhelpers.ui.map.gmaps;
+
+import static com.aldo.apps.familyhelpers.utils.GlobalConstants.DEFAULT_HOME_LATITUDE;
+import static com.aldo.apps.familyhelpers.utils.GlobalConstants.DEFAULT_HOME_LONGITUDE;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.aldo.apps.familyhelpers.R;
+import com.aldo.apps.familyhelpers.model.LocationObject;
+import com.aldo.apps.familyhelpers.model.User;
+import com.aldo.apps.familyhelpers.ui.map.AbstractMap;
+import com.aldo.apps.familyhelpers.ui.map.IMapMovementListener;
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.MapStyleOptions;
+import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.MarkerOptions;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Google Maps specific implementation of the {@link AbstractMap}.
+ */
+public class GoogleMapsView extends AbstractMap<GoogleMap> {
+
+    /**
+     * Tag for debugging purposes.
+     */
+    private static final String TAG = "GoogleMapsView";
+
+    /**
+     * The zoom level to be applied per default.
+     */
+    private static final float DEFAULT_ZOOM_LEVEL = 15.0f;
+
+    /**
+     * The default tilt level.
+     */
+    private static final float DEFAULT_TILT = 0.0f;
+
+    /**
+     * Map containing all markers and the corresponding ID.
+     */
+    private final Map<String, Marker> mMarkerMap = new HashMap<>();
+    /**
+     * Reference to the Google Maps Marker, to update it's position rather than adding a new one.
+     */
+    private Marker mGmapsMarker;
+
+    /**
+     * C'Tor.
+     *
+     * @param gMap    The inflated Map-Fragment.
+     * @param context The calling {@link Context}.
+     */
+    public GoogleMapsView(final GoogleMap gMap, final Context context) {
+        super(gMap, context);
+    }
+
+    @Override
+    public void zoomOnDefaultLocation() {
+        final LatLng defaultHome = new LatLng(DEFAULT_HOME_LATITUDE, DEFAULT_HOME_LONGITUDE);
+
+        if (mGmapsMarker == null) {
+            mGmapsMarker = mMapFragment.addMarker(new MarkerOptions()
+                    .position(defaultHome)
+                    .title("Default - Home"));
+        } else {
+            mGmapsMarker.setPosition(defaultHome);
+        }
+        mMapFragment.moveCamera(CameraUpdateFactory.newLatLngZoom(defaultHome, DEFAULT_ZOOM_LEVEL));
+    }
+
+    @Override
+    public void startFollowingAndCenterCamera() {
+        animateCamera(mCurrentlyFollowingLocation);
+    }
+
+    @Override
+    public void displayOwnLocation() {
+        // Do nothing for GMaps
+    }
+
+    @Override
+    public LocationObject updateOrAddCustomMarker(final Map<String, LocationObject> locationObjectMap) {
+        for (final Map.Entry<String, LocationObject> locationSet : locationObjectMap.entrySet()) {
+            final LocationObject newReceived = locationSet.getValue();
+            final LatLng receivedLocation = new LatLng(newReceived.getLatitude(), newReceived.getLongitude());
+            final String sharingId = locationSet.getKey();
+            final User locationUser = mDbHelper.getUserForId(sharingId);
+            if (mMarkerMap.containsKey(sharingId)) {
+                final Marker existing = mMarkerMap.get(sharingId);
+                if (existing == null) {
+                    Log.w(TAG, "updateOrAddCustomMarker: Marker somehow not existing, skip");
+                    continue;
+                }
+                Log.d(TAG, "updateOrAddCustomMarker: Marker still available, update position");
+                existing.setPosition(receivedLocation);
+
+            } else {
+                Log.d(TAG, "updateOrAddCustomMarker: New Marker to be created.");
+                final Marker marker = mMapFragment.addMarker(new MarkerOptions()
+                        .position(receivedLocation)
+                        .title(locationUser == null ? "" : locationUser.getDisplayName()));
+                mMarkerMap.put(locationSet.getKey(), marker);
+            }
+            if (TextUtils.equals(mCurrentlyFollowing, sharingId)) {
+                mCurrentlyFollowingLocation = locationSet.getValue();
+                if (mCurrentlyFollowing != null) {
+                    startFollowingAndCenterCamera();
+                }
+            }
+        }
+        return mCurrentlyFollowingLocation;
+    }
+
+    @Override
+    public void clearAllMarkers() {
+        for (final Marker marker : mMarkerMap.values()) {
+            marker.remove();
+        }
+        mMarkerMap.clear();
+    }
+
+    @Override
+    public boolean removeInvalidExistingMarkers(final Map<String, LocationObject> locationObjectMap) {
+        final List<String> toBeRemovedKeys = new ArrayList<>();
+        for (Map.Entry<String, Marker> markerEntry : mMarkerMap.entrySet()) {
+            if (!locationObjectMap.containsKey(markerEntry.getKey())) {
+                Log.d(TAG, "removeInvalidExistingMarkers: Marker not valid anymore, remove");
+                markerEntry.getValue().remove();
+                toBeRemovedKeys.add(markerEntry.getKey());
+            }
+        }
+        // Remove from the map as well
+        for (final String removeKey : toBeRemovedKeys) {
+            if (TextUtils.equals(removeKey, mCurrentlyFollowing)) {
+                mCurrentlyFollowing = null;
+                mCurrentlyFollowingLocation = null;
+            }
+            mMarkerMap.remove(removeKey);
+        }
+        return mCurrentlyFollowing == null;
+    }
+
+    @Override
+    public void applyDayNightMode(final boolean isNightMode) {
+        final Context context = mContextRef.get();
+        if (context == null) {
+            Log.w(TAG, "applyDayNightMode: Context is null, cannot continue");
+            return;
+        }
+        if (isNightMode) {
+            mMapFragment.setMapStyle(MapStyleOptions.loadRawResourceStyle(context, R.raw.map_style_night));
+        } else {
+            mMapFragment.setMapStyle(MapStyleOptions.loadRawResourceStyle(context, R.raw.map_style_day));
+        }
+
+    }
+
+    @Override
+    public void animateCamera(final LocationObject locationObject) {
+        mMapFragment.animateCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition(
+                new LatLng(locationObject.getLatitude(), locationObject.getLongitude()),
+                DEFAULT_ZOOM_LEVEL,
+                DEFAULT_TILT,
+                locationObject.getBearing())));
+    }
+
+    @Override
+    public void registerMapMovementListener(final IMapMovementListener mapMovementListener) {
+        super.registerMapMovementListener(mapMovementListener);
+        mMapFragment.setOnCameraMoveStartedListener(reason -> {
+            if (GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == reason
+                    && !TextUtils.isEmpty(mCurrentlyFollowing)) {
+                Log.d(TAG, "onCameraMoveStarted: User moved map...");
+                mMapMovementListener.onMapMovementDetected();
+            }
+        });
+
+    }
+}
diff --git a/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/mapbox/MapBoxView.java b/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/mapbox/MapBoxView.java
new file mode 100644
index 0000000..767e112
--- /dev/null
+++ b/app/src/main/java/com/aldo/apps/familyhelpers/ui/map/mapbox/MapBoxView.java
@@ -0,0 +1,276 @@
+package com.aldo.apps.familyhelpers.ui.map.mapbox;
+
+import static com.aldo.apps.familyhelpers.utils.GlobalConstants.DEFAULT_HOME_LATITUDE;
+import static com.aldo.apps.familyhelpers.utils.GlobalConstants.DEFAULT_HOME_LONGITUDE;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.aldo.apps.familyhelpers.model.LocationObject;
+import com.aldo.apps.familyhelpers.model.User;
+import com.aldo.apps.familyhelpers.ui.map.AbstractMap;
+import com.aldo.apps.familyhelpers.ui.map.IMapMovementListener;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.target.CustomTarget;
+import com.bumptech.glide.request.transition.Transition;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.mapbox.android.gestures.MoveGestureDetector;
+import com.mapbox.geojson.Point;
+import com.mapbox.maps.CameraOptions;
+import com.mapbox.maps.MapView;
+import com.mapbox.maps.plugin.Plugin;
+import com.mapbox.maps.plugin.PuckBearing;
+import com.mapbox.maps.plugin.annotation.AnnotationConfig;
+import com.mapbox.maps.plugin.annotation.AnnotationManager;
+import com.mapbox.maps.plugin.annotation.AnnotationPlugin;
+import com.mapbox.maps.plugin.annotation.AnnotationType;
+import com.mapbox.maps.plugin.annotation.generated.PointAnnotation;
+import com.mapbox.maps.plugin.annotation.generated.PointAnnotationManager;
+import com.mapbox.maps.plugin.annotation.generated.PointAnnotationOptions;
+import com.mapbox.maps.plugin.gestures.GesturesPlugin;
+import com.mapbox.maps.plugin.gestures.OnMoveListener;
+import com.mapbox.maps.plugin.locationcomponent.LocationComponentPlugin;
+import com.mapbox.maps.plugin.viewport.ViewportPlugin;
+import com.mapbox.maps.plugin.viewport.data.FollowPuckViewportStateOptions;
+import com.mapbox.maps.plugin.viewport.state.FollowPuckViewportState;
+
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MapBox specific implementation of the {@link AbstractMap}.
+ */
+public class MapBoxView extends AbstractMap<MapView> implements OnMoveListener {
+
+    /**
+     * Tag for debugging purpose.
+     */
+    private static final String TAG = "MapBoxView";
+
+    /**
+     * The default zoom level.
+     */
+    private static final double DEFAULT_ZOOM_LEVEL = 15.0;
+
+    /**
+     * {@link Map} holding the mapping of sharing ID to {@link PointAnnotation}.
+     */
+    private final Map<String, PointAnnotation> mMarkerMap = new HashMap<>();
+
+    /**
+     * The {@link LocationComponentPlugin} to enable specific UI features.
+     */
+    private final LocationComponentPlugin mLocCompPlugin;
+
+    /**
+     * The {@link ViewportPlugin} to follow own location.
+     */
+    private final ViewportPlugin mViewportPlugin;
+
+    /**
+     * The {@link GesturesPlugin} to listen to ptential swipes.
+     */
+    private final GesturesPlugin mGesturesPlugin;
+
+    /**
+     * The {@link AnnotationPlugin} to add/remove markers.
+     */
+    private final AnnotationPlugin mAnnotationPlugin;
+
+    /**
+     * The {@link AnnotationManager} to actually display markers.
+     */
+    private final PointAnnotationManager mAnnotationManager;
+
+    /**
+     * The ID of the currently logged in user.
+     */
+    private final String mCurrentUserId;
+
+    /**
+     * C'Tor.
+     *
+     * @param mapView The inflated Map-Fragment.
+     * @param context The calling {@link Context}.
+     */
+    public MapBoxView(final MapView mapView, final Context context) {
+        super(mapView, context);
+        mLocCompPlugin = mapView.getPlugin(Plugin.MAPBOX_LOCATION_COMPONENT_PLUGIN_ID);
+        mViewportPlugin = mapView.getPlugin(Plugin.MAPBOX_VIEWPORT_PLUGIN_ID);
+        mGesturesPlugin = mapView.getPlugin(Plugin.MAPBOX_GESTURES_PLUGIN_ID);
+        mAnnotationPlugin = mapView.getPlugin(Plugin.MAPBOX_ANNOTATION_PLUGIN_ID);
+        mCurrentUserId = FirebaseAuth.getInstance().getCurrentUser().getUid();
+        if (mAnnotationPlugin != null) {
+            mAnnotationManager = (PointAnnotationManager) mAnnotationPlugin.createAnnotationManager(
+                    AnnotationType.PointAnnotation, new AnnotationConfig());
+        } else {
+            Log.d(TAG, "MapBoxView: AnnotationManager is null, no markers will be set.");
+            mAnnotationManager = null;
+        }
+        if (mLocCompPlugin != null) {
+            mLocCompPlugin.setPulsingEnabled(true);
+        }
+    }
+
+    @Override
+    public void zoomOnDefaultLocation() {
+        animateCamera(mCurrentlyFollowingLocation);
+    }
+
+    @Override
+    public void startFollowingAndCenterCamera() {
+        if (mCurrentlyFollowingLocation == null || TextUtils.equals(mCurrentlyFollowingLocation.getShareId(), mCurrentUserId)) {
+            displayOwnLocation();
+        } else {
+            animateCamera(mCurrentlyFollowingLocation);
+        }
+    }
+
+    @Override
+    public void displayOwnLocation() {
+        if (mViewportPlugin != null) {
+            final FollowPuckViewportState state = mViewportPlugin.makeFollowPuckViewportState(new FollowPuckViewportStateOptions.Builder()
+                    .zoom(DEFAULT_ZOOM_LEVEL)
+                    .build());
+            mViewportPlugin.transitionTo(state, mViewportPlugin.getDefaultTransition(),
+                    done -> Log.d(TAG, "Movement finished = [" + done + "]"));
+        }
+    }
+
+    @Override
+    public void clearAllMarkers() {
+        if (mAnnotationManager != null) {
+            mAnnotationManager.deleteAll();
+            mMarkerMap.clear();
+        }
+    }
+
+    @Override
+    public LocationObject updateOrAddCustomMarker(final Map<String, LocationObject> locationObjectMap) {
+        final Context context = mContextRef.get();
+        if (context == null) {
+            Log.w(TAG, "updateOrAddCustomMarker: No valid context, cannot continue.");
+            return null;
+        }
+        for (final Map.Entry<String, LocationObject> locationSet : locationObjectMap.entrySet()) {
+            final LocationObject newReceived = locationSet.getValue();
+            final String sharingId = locationSet.getKey();
+            final User locationUser = mDbHelper.getUserForId(sharingId);
+
+            if (mMarkerMap.containsKey(sharingId)) {
+                final PointAnnotation existing = mMarkerMap.get(sharingId);
+                if (existing == null) {
+                    Log.w(TAG, "updateOrAddCustomMarker: Marker somehow not existing, skip");
+                    continue;
+                }
+                Log.d(TAG, "updateOrAddCustomMarker: Marker still available, update position");
+                existing.setPoint(Point.fromLngLat(newReceived.getLongitude(), newReceived.getLatitude()));
+            }else if (TextUtils.equals(locationUser.getuId(), mCurrentUserId)) {
+                Log.d(TAG, "updateOrAddCustomMarker: Marker to be added is from own user, no need to add");
+            } else {
+                Log.d(TAG, "updateOrAddCustomMarker: New Marker to be created.");
+                    Glide.with(context)
+                            .asBitmap()
+                            .circleCrop()
+                            .load(locationUser.getPhotoUrl())
+                            .into(new CustomTarget<Bitmap>() {
+                                @Override
+                                public void onResourceReady(@NonNull final Bitmap resource,
+                                                            @Nullable final Transition<? super Bitmap> transition) {
+                                    final PointAnnotationOptions newMarker = new PointAnnotationOptions()
+                                            .withPoint(Point.fromLngLat(newReceived.getLongitude(), newReceived.getLatitude()))
+                                            .withIconImage(resource);
+                                    final PointAnnotation pointAnnotation = mAnnotationManager.create(newMarker);
+                                    mMarkerMap.put(sharingId, pointAnnotation);
+                                }
+
+                                @Override
+                                public void onLoadCleared(@Nullable Drawable placeholder) {
+
+                                }
+                            });
+            }
+            if (TextUtils.equals(mCurrentlyFollowing, sharingId)) {
+                mCurrentlyFollowingLocation = locationSet.getValue();
+                if (mCurrentlyFollowing != null) {
+                    startFollowingAndCenterCamera();
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean removeInvalidExistingMarkers(final Map<String, LocationObject> locationObjectMap) {
+        final List<String> toBeRemovedKeys = new ArrayList<>();
+        for (Map.Entry<String, PointAnnotation> markerEntry : mMarkerMap.entrySet()) {
+            if (!locationObjectMap.containsKey(markerEntry.getKey())) {
+                Log.d(TAG, "removeInvalidExistingMarkers: Marker not valid anymore, remove");
+                mAnnotationManager.delete(markerEntry.getValue());
+                toBeRemovedKeys.add(markerEntry.getKey());
+            }
+        }
+        // Remove from the map as well
+        for (final String removeKey : toBeRemovedKeys) {
+            if (TextUtils.equals(removeKey, mCurrentlyFollowing)) {
+                mCurrentlyFollowing = null;
+                mCurrentlyFollowingLocation = null;
+            }
+            mMarkerMap.remove(removeKey);
+        }
+        return mCurrentlyFollowing == null;
+    }
+
+    @Override
+    public void animateCamera(final LocationObject locationObject) {
+        if (locationObject == null) {
+            Log.w(TAG, "animateCamera: Invalid LocationObject, skip update");
+            return;
+        }
+        mMapFragment.getMapboxMap().setCamera(
+                new CameraOptions.Builder()
+                        .center(Point.fromLngLat(locationObject.getLongitude(), locationObject.getLatitude()))
+                        .zoom(DEFAULT_ZOOM_LEVEL)
+                        .bearing((double) locationObject.getBearing())
+                        .build()
+        );
+    }
+
+    @Override
+    public void registerMapMovementListener(IMapMovementListener mapMovementListener) {
+        super.registerMapMovementListener(mapMovementListener);
+        if (mGesturesPlugin != null) {
+            mGesturesPlugin.addOnMoveListener(this);
+        }
+    }
+
+    @Override
+    public boolean onMove(@NonNull final MoveGestureDetector moveGestureDetector) {
+        return false;
+    }
+
+    @Override
+    public void onMoveBegin(@NonNull final MoveGestureDetector moveGestureDetector) {
+        if (mMapMovementListener != null) {
+            mMapMovementListener.onMapMovementDetected();
+        }
+    }
+
+    @Override
+    public void onMoveEnd(@NonNull final MoveGestureDetector moveGestureDetector) {
+        // Do nothing.
+    }
+}
diff --git a/app/src/main/res/drawable/red_marker.png b/app/src/main/res/drawable/red_marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..be782e1d4b3d842c5d07906870d86efadceee30b
GIT binary patch
literal 3163
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
B|I7dY

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_share_location.xml b/app/src/main/res/layout/activity_share_location.xml
index e78419e..20245a9 100644
--- a/app/src/main/res/layout/activity_share_location.xml
+++ b/app/src/main/res/layout/activity_share_location.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     tools:context=".ShareLocationActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -36,26 +37,39 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@android:drawable/ic_menu_compass"
-        app:layout_constraintBottom_toBottomOf="@id/map"
-        app:layout_constraintEnd_toEndOf="@id/map"
+        app:layout_constraintBottom_toBottomOf="@id/mapbox"
+        app:layout_constraintEnd_toEndOf="@id/mapbox"
         android:layout_marginBottom="25dp"
         android:layout_marginEnd="25dp"
         android:visibility="gone"/>
 
+    <com.mapbox.maps.MapView
+        android:id="@+id/mapbox"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@id/active_share_container"
+        app:layout_constraintBottom_toTopOf="@id/share_location_info_box"
+        app:mapbox_locationComponentEnabled="true"
+        app:mapbox_locationComponentPuckBearing="course"
+        mapbox:mapbox_styleUri="@string/map_box_style_uri" />
+
+    <!--
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/map"
         android:name="com.google.android.gms.maps.SupportMapFragment"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintTop_toBottomOf="@id/active_share_container"
-        app:layout_constraintBottom_toTopOf="@id/share_location_info_box"/>
-
+        app:layout_constraintBottom_toTopOf="@id/share_location_info_box"
+        android:visibility="gone"/>
+     -->
+    
     <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/switch_start_stop_sharing_location"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@id/map"
-        app:layout_constraintEnd_toEndOf="@id/map"
+        app:layout_constraintTop_toTopOf="@id/mapbox"
+        app:layout_constraintEnd_toEndOf="@id/mapbox"
         android:text="@string/share_location_toggle_button"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 6059ec6..19ba6da 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -48,6 +48,7 @@
         <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
         <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
     </style>
+    <string name="map_box_style_uri" translatable="false">mapbox://styles/mapbox/navigation-night-v1</string>
 
     <style name="HelperGroupTileStyke" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/helperGroupTileBackground_NightMode</item>
diff --git a/app/src/main/res/values/mapbox_access_token.xml b/app/src/main/res/values/mapbox_access_token.xml
new file mode 100644
index 0000000..c823355
--- /dev/null
+++ b/app/src/main/res/values/mapbox_access_token.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="mapbox_access_token" translatable="false" tools:ignore="UnusedResources">sk.eyJ1IjoiemFuZGVyMTYwOSIsImEiOiJjbTl0bDE4Y3cwMDB1MmxyMHRmd3hnNng5In0.Je5tLeuVjl8Y2-ssvqXxLg</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2b095d9..e1dc7e8 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -49,5 +49,7 @@
         <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
     </style>
 
+    <string name="map_box_style_uri" translatable="false">mapbox://styles/mapbox/navigation-day-v1</string>
+
     <style name="Theme.MyApplication" parent="Base.Theme.MyApplication" />
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2ed6ba7..e42100d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,5 +9,8 @@ allprojects {
         google()
         mavenCentral()
         maven { url "https://jitpack.io" }
+        maven {
+            url = uri("https://api.mapbox.com/downloads/v2/releases/maven")
+        }
     }
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 12ab20f..782ae6e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,6 +10,9 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven {
+            url = uri("https://api.mapbox.com/downloads/v2/releases/maven")
+        }
     }
 }