From 39aa963d4036631a1cfc9e984ac6bb09a5cea571 Mon Sep 17 00:00:00 2001
From: Zhandr <zhako11@gmail.com>
Date: Mon, 30 Sep 2024 18:28:42 +0500
Subject: [PATCH 01/46] replaced viewmodel to simple class realisation replaced
 viewmodel to simple class realisation added access token into constructor
 added userlocation to calculation method added mapready callback added
 mapready callback remove unused commented code fix kotlin version fix kotlin
 version adding context to viewmodel added context as argument to initialize
 viewmodel added context as argument to initialize viewmodel decreased kotlin
 version and buildtoolsversion added arguments in calculateRoute function map
 and routing on one screen making mapBoxMap variable public removing route
 when canceling navigation removing route when canceling navigation fixed
 branch name and PR title Push to new repo map and routing on one screen map
 and routing on one screen map and routing on one screen Made mapview and
 route navigation in one single view (Activity) Made mapview and route
 navigation in one single view (Activity)

---
 README.md                                     |   2 +-
 app/build.gradle                              |   9 +-
 .../NavigationViewOrientationTest.java        | 103 --
 .../java/testapp/NavigationViewTest.java      |  37 -
 .../OnNavigationReadyIdlingResource.java      |   5 +
 .../testapp/NavigationUIActivity.kt           | 242 +++--
 .../res/layout/activity_navigation_ui.xml     |  57 +-
 build.gradle                                  |   7 +-
 gradle/wrapper/gradle-wrapper.properties      |   1 +
 libandroid-navigation-ui/build.gradle         | 155 +--
 .../ui/v5/MapboxNavigationActivity.java       |   5 +
 .../navigation/ui/v5/NavigationLauncher.java  |  12 +-
 .../navigation/ui/v5/NavigationRouteView.kt   | 986 ++++++++++++++++++
 .../navigation/ui/v5/NavigationView.java      |  12 +-
 .../ui/v5/NavigationViewEventDispatcher.java  |   1 +
 .../navigation/ui/v5/NavigationViewModel.java |  40 +-
 .../ui/v5/NavigationViewSubscriber.java       |   2 +-
 .../ui/v5/OnNavigationReadyCallback.java      |   2 +
 .../ui/v5/camera/NavigationCamera.java        |   4 +
 .../ui/v5/map/MapLayerInteractor.java         |   8 +-
 .../navigation/ui/v5/route/MapRouteArrow.java |  20 +-
 .../navigation/ui/v5/route/MapRouteLine.java  |  19 +-
 .../ui/v5/route/RouteConstants.java           |   6 +
 .../res/layout/navigation_view_layout.xml     | 131 ++-
 .../main/res/layout/summary_peek_layout.xml   |   2 +-
 .../src/main/res/values/developer-config.xml  |   9 +
 .../src/main/res/values/styles.xml            |   8 +
 libandroid-navigation/build.gradle            |  31 +
 libandroid-navigation/proguard-consumer.pro   |   1 +
 .../src/main/AndroidManifest.xml              |   2 +-
 .../MapboxNavigationNotification.java         |  12 +-
 .../v5/navigation/NavigationMapRoute.java     |   2 +-
 .../v5/utils/DistanceFormatter.java           |   2 +-
 .../navigation/v5/utils/ManeuverMap.java      |   2 +-
 .../navigation/v5/utils/ManeuverUtils.java    |   2 +-
 .../v5/utils/time/TimeFormatter.java          |   2 +-
 .../v5/utils/DistanceFormatterTest.java       |   2 +-
 settings.gradle                               |  10 +
 38 files changed, 1507 insertions(+), 446 deletions(-)
 delete mode 100644 app/src/androidTest/java/testapp/NavigationViewOrientationTest.java
 delete mode 100644 app/src/androidTest/java/testapp/NavigationViewTest.java
 create mode 100644 libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
 create mode 100644 libandroid-navigation-ui/src/main/res/values/developer-config.xml

diff --git a/README.md b/README.md
index 59df22d59..73ba297c3 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ With this SDK you can implement turn-by-turn navigation in your own Android app
 - No Telemetry
 
 
-## Why have we forked
+## Why have we forked¬
 
 1. Mapbox decided to put a closed-source component to their navigation SDK and introduced a non-open-source license. Maplibre wants an open-source solution.
 2. Mapbox decided to put telemetry in their SDK. We couldn't turn this off without adjusting the source.
diff --git a/app/build.gradle b/app/build.gradle
index f16ba96cf..8a2d818a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,6 +22,8 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
+    namespace 'com.mapbox.services.android.navigation.testapp'
+
     defaultConfig {
         applicationId "com.mapbox.services.android.navigation.testapp"
         minSdkVersion androidVersions.minSdkVersion
@@ -29,7 +31,11 @@ android {
         versionCode 1
         versionName "0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled true
+        multiDexEnabled false
+    }
+
+    buildFeatures {
+        buildConfig true
     }
 
     buildTypes {
@@ -53,6 +59,7 @@ android {
 
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
 
     lintOptions {
diff --git a/app/src/androidTest/java/testapp/NavigationViewOrientationTest.java b/app/src/androidTest/java/testapp/NavigationViewOrientationTest.java
deleted file mode 100644
index 9001f67ed..000000000
--- a/app/src/androidTest/java/testapp/NavigationViewOrientationTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package testapp;
-
-import android.content.res.Configuration;
-import androidx.test.espresso.ViewAction;
-
-import com.mapbox.services.android.navigation.testapp.R;
-import com.mapbox.services.android.navigation.testapp.test.TestNavigationActivity;
-import com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMap;
-
-import org.junit.Test;
-
-import testapp.activity.BaseNavigationActivityTest;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.swipeUp;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static junit.framework.Assert.assertFalse;
-import static testapp.action.OrientationChangeAction.orientationLandscape;
-import static testapp.action.OrientationChangeAction.orientationPortrait;
-
-public class NavigationViewOrientationTest extends BaseNavigationActivityTest {
-
-  @Override
-  protected Class getActivityClass() {
-    return TestNavigationActivity.class;
-  }
-
-  @Test
-  public void onOrientationLandscape_navigationContinuesRunning() {
-    if (checkOrientation(Configuration.ORIENTATION_LANDSCAPE)) {
-      return;
-    }
-    validateTestSetup();
-
-    changeOrientation(orientationLandscape());
-  }
-
-  @Test
-  public void onOrientationPortrait_navigationContinuesRunning() {
-    if (checkOrientation(Configuration.ORIENTATION_PORTRAIT)) {
-      return;
-    }
-    validateTestSetup();
-
-    changeOrientation(orientationPortrait());
-  }
-
-  @Test
-  public void onOrientationChange_recenterBtnStateIsRestore() {
-    if (checkOrientation(Configuration.ORIENTATION_LANDSCAPE)) {
-      return;
-    }
-    validateTestSetup();
-
-    onView(withId(R.id.routeOverviewBtn)).perform(click());
-    changeOrientation(orientationLandscape());
-    onView(withId(R.id.recenterBtn)).check(matches(isDisplayed()));
-  }
-
-  @Test
-  public void onOrientationChange_cameraTrackingIsRestore() {
-    if (checkOrientation(Configuration.ORIENTATION_LANDSCAPE)) {
-      return;
-    }
-    validateTestSetup();
-
-    onView(withId(R.id.navigationMapView)).perform(swipeUp());
-    changeOrientation(orientationLandscape());
-
-    NavigationMapboxMap navigationMapboxMap = getNavigationView().retrieveNavigationMapboxMap();
-    boolean isTrackingEnabled = navigationMapboxMap.retrieveCamera().isTrackingEnabled();
-    assertFalse(isTrackingEnabled);
-  }
-
-  @Test
-  public void onOrientationChange_waynameVisibilityIsRestored() {
-    if (checkOrientation(Configuration.ORIENTATION_LANDSCAPE)) {
-      return;
-    }
-    validateTestSetup();
-
-    onView(withId(R.id.navigationMapView)).perform(swipeUp());
-    changeOrientation(orientationLandscape());
-
-    NavigationMapboxMap navigationMapboxMap = getNavigationView().retrieveNavigationMapboxMap();
-    boolean isWaynameVisible = navigationMapboxMap.isWaynameVisible();
-    assertFalse(isWaynameVisible);
-  }
-
-  // TODO create test rule for this to conditionally ignore
-  private boolean checkOrientation(int testedOrientation) {
-    int orientation = getNavigationView().getContext().getResources().getConfiguration().orientation;
-    return orientation == testedOrientation;
-  }
-
-  private void changeOrientation(ViewAction newOrientation) {
-    onView(isRoot()).perform(newOrientation);
-  }
-}
diff --git a/app/src/androidTest/java/testapp/NavigationViewTest.java b/app/src/androidTest/java/testapp/NavigationViewTest.java
deleted file mode 100644
index 16465de64..000000000
--- a/app/src/androidTest/java/testapp/NavigationViewTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package testapp;
-
-import com.mapbox.services.android.navigation.testapp.test.TestNavigationActivity;
-import com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMap;
-import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation;
-
-import org.junit.Test;
-
-import testapp.activity.BaseNavigationActivityTest;
-
-import static junit.framework.Assert.assertNotNull;
-
-public class NavigationViewTest extends BaseNavigationActivityTest {
-
-  @Override
-  protected Class getActivityClass() {
-    return TestNavigationActivity.class;
-  }
-
-  @Test
-  public void onInitialization_navigationMapboxMapIsNotNull() {
-    validateTestSetup();
-
-    NavigationMapboxMap navigationMapboxMap = getNavigationView().retrieveNavigationMapboxMap();
-
-    assertNotNull(navigationMapboxMap);
-  }
-
-  @Test
-  public void onNavigationStart_mapboxNavigationIsNotNull() {
-    validateTestSetup();
-
-    MapboxNavigation mapboxNavigation = getNavigationView().retrieveMapboxNavigation();
-
-    assertNotNull(mapboxNavigation);
-  }
-}
diff --git a/app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java b/app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java
index ba64b4c1d..a2039ce9e 100644
--- a/app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java
+++ b/app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java
@@ -85,6 +85,11 @@ public void onNavigationReady(boolean isRunning) {
     transitionToIdle();
   }
 
+  @Override
+  public void onMapReadyCallback() {
+    // Intentional empty
+  }
+
   private void fetchRoute(Context context) {
     Point origin = Point.fromLngLat(-77.033987, 38.900123);
     Point destination = Point.fromLngLat(-77.044818, 38.848942);
diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
index 7b3b793fb..202544fde 100644
--- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
+++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
@@ -2,8 +2,10 @@ package com.mapbox.services.android.navigation.testapp
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.View
+import android.os.Parcelable
+import android.preference.PreferenceManager
 import android.widget.Toast
+import androidx.activity.ComponentActivity
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.snackbar.Snackbar
 import com.mapbox.api.directions.v5.DirectionsCriteria
@@ -22,10 +24,14 @@ import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.services.android.navigation.testapp.databinding.ActivityNavigationUiBinding
 import com.mapbox.services.android.navigation.ui.v5.NavigationLauncher
 import com.mapbox.services.android.navigation.ui.v5.NavigationLauncherOptions
+import com.mapbox.services.android.navigation.ui.v5.NavigationViewOptions
+import com.mapbox.services.android.navigation.ui.v5.OnNavigationReadyCallback
+import com.mapbox.services.android.navigation.ui.v5.listeners.NavigationListener
 import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute
-import com.mapbox.services.android.navigation.v5.milestone.*
 import com.mapbox.services.android.navigation.v5.models.DirectionsRoute
-import com.mapbox.services.android.navigation.v5.navigation.*
+import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions
+import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants
+import com.mapbox.services.android.navigation.v5.navigation.NavigationMapRoute
 import com.mapbox.turf.TurfConstants
 import com.mapbox.turf.TurfMeasurement
 import okhttp3.Request
@@ -35,10 +41,9 @@ import retrofit2.Response
 import timber.log.Timber
 
 class NavigationUIActivity :
-    AppCompatActivity(),
-    OnMapReadyCallback,
-    MapboxMap.OnMapClickListener {
-    private lateinit var mapboxMap: MapboxMap
+    ComponentActivity(),
+    MapboxMap.OnMapClickListener, OnNavigationReadyCallback,
+    NavigationListener {
 
     // Navigation related variables
     private var route: DirectionsRoute? = null
@@ -61,69 +66,43 @@ class NavigationUIActivity :
 
         binding = ActivityNavigationUiBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.mapView.apply {
-            onCreate(savedInstanceState)
-            getMapAsync(this@NavigationUIActivity)
-        }
+        binding.navigationView.onCreate(this, savedInstanceState, this)
 
-        binding.startRouteButton.setOnClickListener {
-            route?.let { route ->
-                val userLocation = mapboxMap.locationComponent.lastKnownLocation ?: return@let
-
-                val options = NavigationLauncherOptions.builder()
-                    .directionsRoute(route)
-                    .shouldSimulateRoute(simulateRoute)
-                    .initialMapCameraPosition(CameraPosition.Builder().target(LatLng(userLocation.latitude, userLocation.longitude)).build())
-                    .lightThemeResId(R.style.TestNavigationViewLight)
-                    .darkThemeResId(R.style.TestNavigationViewDark)
-                    .build()
-                NavigationLauncher.startNavigation(this@NavigationUIActivity, options)
-            }
-        }
-
-        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
-            simulateRoute = checked
-        }
+//        binding.mapView.apply {
+//            onCreate(savedInstanceState)
+//            getMapAsync(this@NavigationUIActivity)
+//        }
 
+//        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
+//            simulateRoute = checked
+//        }
 
-        binding.clearPoints.setOnClickListener {
-            if (::mapboxMap.isInitialized) {
-                mapboxMap.markers.forEach {
-                    mapboxMap.removeMarker(it)
-                }
-            }
-            destination = null
-            waypoint = null
-            it.visibility = View.GONE
-            binding.startRouteLayout.visibility = View.GONE
-
-            navigationMapRoute?.removeRoute()
-        }
-    }
-
-    override fun onMapReady(mapboxMap: MapboxMap) {
-        this.mapboxMap = mapboxMap
-        mapboxMap.setStyle(Style.Builder().fromUri(getString(R.string.map_style_light))) { style ->
-            enableLocationComponent(style)
+        binding.startRouteButton.setOnClickListener {
+            val points = mutableListOf<Pair<Double, Double>>()
+            points.add(Pair(76.930137, 43.230361))
+            points.add(Pair(76.928316, 43.236109))
+            points.add(Pair(76.920187, 43.236783))
+            binding.navigationView.calculateRoute(points, Pair(76.930137, 43.230361), getString(R.string.mapbox_access_token))
         }
-
-        navigationMapRoute = NavigationMapRoute(
-            binding.mapView,
-            mapboxMap
-        )
-
-        mapboxMap.addOnMapClickListener(this)
-        Snackbar.make(
-            findViewById(R.id.container),
-            "Tap map to place waypoint",
-            Snackbar.LENGTH_LONG,
-        ).show()
+//        binding.clearPoints.setOnClickListener {
+//            if (::mapboxMap.isInitialized) {
+//                mapboxMap.markers.forEach {
+//                    mapboxMap.removeMarker(it)
+//                }
+//            }
+//            destination = null
+//            waypoint = null
+//            it.visibility = View.GONE
+//            binding.startRouteLayout.visibility = View.GONE
+//
+//            navigationMapRoute?.removeRoute()
+//        }
     }
 
     @SuppressWarnings("MissingPermission")
     private fun enableLocationComponent(style: Style) {
         // Get an instance of the component
-        locationComponent = mapboxMap.locationComponent
+//        locationComponent = mapboxMap.locationComponent
 
         locationComponent?.let {
             // Activate with a built LocationComponentActivationOptions object
@@ -143,46 +122,46 @@ class NavigationUIActivity :
     }
 
     override fun onMapClick(point: LatLng): Boolean {
-        var addMarker = true
-        when {
-            destination == null -> destination = Point.fromLngLat(point.longitude, point.latitude)
-            waypoint == null -> waypoint = Point.fromLngLat(point.longitude, point.latitude)
-            else -> {
-                Toast.makeText(this, "Only 2 waypoints supported", Toast.LENGTH_LONG).show()
-                addMarker = false
-            }
-        }
-
-        if (addMarker) {
-            mapboxMap.addMarker(MarkerOptions().position(point))
-            binding.clearPoints.visibility = View.VISIBLE
-        }
-        calculateRoute()
+//        var addMarker = true
+//        when {
+//            destination == null -> destination = Point.fromLngLat(point.longitude, point.latitude)
+//            waypoint == null -> waypoint = Point.fromLngLat(point.longitude, point.latitude)
+//            else -> {
+//                Toast.makeText(this, "Only 2 waypoints supported", Toast.LENGTH_LONG).show()
+//                addMarker = false
+//            }
+//        }
+//
+//        if (addMarker) {
+//            mapboxMap.addMarker(MarkerOptions().position(point))
+//            binding.clearPoints.visibility = View.VISIBLE
+//        }
+//        calculateRoute()
         return true
     }
 
     private fun calculateRoute() {
-        binding.startRouteLayout.visibility = View.GONE
-        val userLocation = mapboxMap.locationComponent.lastKnownLocation
+//        binding.startRouteLayout.visibility = View.GONE
+//        val userLocation = mapboxMap.locationComponent.lastKnownLocation
         val destination = destination
-        if (userLocation == null) {
-            Timber.d("calculateRoute: User location is null, therefore, origin can't be set.")
-            return
-        }
+//        if (userLocation == null) {
+//            Timber.d("calculateRoute: User location is null, therefore, origin can't be set.")
+//            return
+//        }
 
         if (destination == null) {
             return
         }
 
-        val origin = Point.fromLngLat(userLocation.longitude, userLocation.latitude)
-        if (TurfMeasurement.distance(origin, destination, TurfConstants.UNIT_METERS) < 50) {
-            binding.startRouteLayout.visibility = View.GONE
-            return
-        }
+//        val origin = Point.fromLngLat(userLocation.longitude, userLocation.latitude)
+//        if (TurfMeasurement.distance(origin, destination, TurfConstants.UNIT_METERS) < 50) {
+//            binding.startRouteLayout.visibility = View.GONE
+//            return
+//        }
 
         val navigationRouteBuilder = NavigationRoute.builder(this).apply {
             this.accessToken(getString(R.string.mapbox_access_token))
-            this.origin(origin)
+//            this.origin(origin)
             this.destination(destination)
             this.voiceUnits(DirectionsCriteria.METRIC)
             this.alternatives(true)
@@ -192,6 +171,20 @@ class NavigationUIActivity :
             this.baseUrl(getString(R.string.base_url))
         }
 
+
+        navigationRouteBuilder.addWaypoint(
+            Point.fromLngLat(76.930137, 43.230361)
+        )
+
+        navigationRouteBuilder.addWaypoint(
+            Point.fromLngLat(76.928316, 43.236109)
+        )
+
+        navigationRouteBuilder.addWaypoint(
+            Point.fromLngLat(76.920187, 43.236783)
+        )
+
+
         navigationRouteBuilder.build().getRoute(object : Callback<DirectionsResponse> {
             override fun onResponse(
                 call: Call<DirectionsResponse>,
@@ -200,10 +193,13 @@ class NavigationUIActivity :
                 Timber.d("Url: %s", (call.request() as Request).url.toString())
                 response.body()?.let { response ->
                     if (response.routes().isNotEmpty()) {
-                        val maplibreResponse = com.mapbox.services.android.navigation.v5.models.DirectionsResponse.fromJson(response.toJson());
+                        val maplibreResponse =
+                            com.mapbox.services.android.navigation.v5.models.DirectionsResponse.fromJson(
+                                response.toJson()
+                            );
                         this@NavigationUIActivity.route = maplibreResponse.routes().first()
                         navigationMapRoute?.addRoutes(maplibreResponse.routes())
-                        binding.startRouteLayout.visibility = View.VISIBLE
+//                        binding.startRouteLayout.visibility = View.VISIBLE
                     }
                 }
 
@@ -217,39 +213,85 @@ class NavigationUIActivity :
 
     override fun onResume() {
         super.onResume()
-        binding.mapView.onResume()
+        binding.navigationView.onResume()
     }
 
     override fun onPause() {
         super.onPause()
-        binding.mapView.onPause()
+        binding.navigationView.onPause()
     }
 
     override fun onStart() {
         super.onStart()
-        binding.mapView.onStart()
+        binding.navigationView.onStart()
     }
 
     override fun onStop() {
         super.onStop()
-        binding.mapView.onStop()
+        binding.navigationView.onStop()
     }
 
     override fun onLowMemory() {
         super.onLowMemory()
-        binding.mapView.onLowMemory()
+        binding.navigationView.onLowMemory()
     }
 
     override fun onDestroy() {
         super.onDestroy()
-        if (::mapboxMap.isInitialized) {
-            mapboxMap.removeOnMapClickListener(this)
-        }
-        binding.mapView.onDestroy()
+//        if (::mapboxMap.isInitialized) {
+//            mapboxMap.removeOnMapClickListener(this)
+//        }
+//        binding.navigationView.onDestroy()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        binding.mapView.onSaveInstanceState(outState)
+        binding.navigationView.onSaveInstanceState(outState)
+    }
+
+    override fun onNavigationReady(isRunning: Boolean) {
+        val options = NavigationViewOptions.builder()
+        options.navigationListener(this)
+        extractRoute(options)
+        extractConfiguration(options)
+        options.navigationOptions(MapboxNavigationOptions.builder().build())
+        binding.navigationView.startNavigation(options.build())
+    }
+
+    override fun onCancelNavigation() {
+        finishNavigation()
+    }
+
+    override fun onNavigationFinished() {
+        finishNavigation()
+    }
+
+    override fun onNavigationRunning() {
+        // Intentionally empty
+    }
+
+    override fun onMapReadyCallback() {
+        // Intentionally empty
+    }
+
+    private fun extractRoute(options: NavigationViewOptions.Builder) {
+        val route = NavigationLauncher.extractRoute(this)
+        options.directionsRoute(route)
+    }
+
+    private fun extractConfiguration(options: NavigationViewOptions.Builder) {
+        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
+        options.shouldSimulateRoute(
+            preferences.getBoolean(
+                NavigationConstants.NAVIGATION_VIEW_SIMULATE_ROUTE,
+                false
+            )
+        )
+    }
+
+    private fun finishNavigation() {
+//        NavigationLauncher.cleanUpPreferences(this)
+        binding.navigationView.onDestroy()
+//        finish()
     }
 }
diff --git a/app/src/main/res/layout/activity_navigation_ui.xml b/app/src/main/res/layout/activity_navigation_ui.xml
index eabd7890d..a9593b15f 100644
--- a/app/src/main/res/layout/activity_navigation_ui.xml
+++ b/app/src/main/res/layout/activity_navigation_ui.xml
@@ -6,32 +6,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@+id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    <com.mapbox.services.android.navigation.ui.v5.NavigationRouteView
+        android:id="@+id/navigationView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:navigationLightTheme="@style/NavigationViewLight"
+        app:navigationDarkTheme="@style/NavigationViewDark"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0"
-        app:maplibre_cameraTargetLat="52.039176"
-        app:maplibre_cameraTargetLng="5.550339"
-        app:maplibre_cameraZoom="12"
-        app:maplibre_enableTilePrefetch="true"
-        app:maplibre_enableZMediaOverlay="true"
-        app:maplibre_renderTextureMode="true"
-        app:maplibre_renderTextureTranslucentSurface="true"
-        app:maplibre_uiAttribution="false"
-        app:maplibre_uiCompass="false"
-        app:maplibre_uiDoubleTapGestures="true"
-        app:maplibre_uiLogo="false"
-        app:maplibre_uiRotateGestures="true"
-        app:maplibre_uiScrollGestures="true"
-        app:maplibre_uiTiltGestures="true"
-        app:maplibre_uiZoomGestures="true" />
-
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/startRouteLayout"
@@ -39,12 +23,12 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="160dp"
         android:background="@drawable/rounded_corners"
-        android:backgroundTint="@color/colorPrimaryDark"
+        android:backgroundTint="@color/mapbox_navigation_route_shield_layer_color"
         android:orientation="horizontal"
         android:padding="8dp"
-        android:visibility="invisible"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:visibility="visible">
@@ -53,8 +37,8 @@
             android:id="@+id/simulateRouteSwitch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/simulate_route"
-            android:textColor="@color/white"
+            android:text="simulate_route"
+            android:textColor="@color/mapbox_navigation_route_upcoming_maneuver_arrow_color"
             app:switchPadding="4dp" />
 
         <Button
@@ -69,21 +53,4 @@
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/clearPoints"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp"
-        android:src="@drawable/ic_delete_black_24dp"
-        android:tint="@android:color/white"
-        android:visibility="gone"
-        app:backgroundTint="@color/red"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 41b9b7746..efa830e96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,8 +2,11 @@ apply plugin: 'com.github.kt3k.coveralls'
 
 buildscript {
     apply from: "${rootDir}/gradle/dependencies.gradle"
+    ext {
+        kotlin_version = '1.9.24'
+    }
 
-  repositories {
+    repositories {
     google()
     mavenCentral()
     maven { url 'https://plugins.gradle.org/m2' }
@@ -15,6 +18,7 @@ buildscript {
     classpath pluginDependencies.errorprone
     classpath pluginDependencies.dependencyUpdates
     classpath pluginDependencies.kotlinGradle
+      classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
@@ -27,6 +31,7 @@ allprojects {
   repositories {
     google()
     maven { url 'https://plugins.gradle.org/m2' }
+      mavenCentral()
   }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 17655d0ef..edb86bf6c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,4 @@
+#Wed Aug 14 12:06:20 QYZT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
diff --git a/libandroid-navigation-ui/build.gradle b/libandroid-navigation-ui/build.gradle
index 92733d1bf..b4620815a 100644
--- a/libandroid-navigation-ui/build.gradle
+++ b/libandroid-navigation-ui/build.gradle
@@ -1,3 +1,6 @@
+plugins {
+    id 'org.jetbrains.kotlin.android'
+}
 apply plugin: 'com.android.library'
 
 java {
@@ -6,51 +9,64 @@ java {
   }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 android {
   namespace 'com.mapbox.services.android.navigation.ui.v5'
 
-  compileSdkVersion androidVersions.compileSdkVersion
-  buildToolsVersion androidVersions.buildToolsVersion
-
-  defaultConfig {
-    minSdkVersion androidVersions.minSdkVersion
-    targetSdkVersion androidVersions.targetSdkVersion
-    testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-    vectorDrawables.useSupportLibrary = true
-
-    buildConfigField('String',
-        "MAPBOX_NAVIGATION_SDK_IDENTIFIER", String.format("\"%s\"", "mapbox-navigation-ui-android")
-    )
-    buildConfigField 'String',
-        "MAPBOX_NAVIGATION_EVENTS_USER_AGENT", String.format("\"mapbox-navigation-ui-android/%s\"",
-        project.VERSION_NAME
-    )
-    consumerProguardFiles 'proguard-consumer.pro'
-  }
+    compileSdkVersion androidVersions.compileSdkVersion
+    buildToolsVersion androidVersions.buildToolsVersion
+
+    namespace 'com.mapbox.services.android.navigation.ui.v5'
+
+    defaultConfig {
+        minSdkVersion androidVersions.minSdkVersion
+        targetSdkVersion androidVersions.targetSdkVersion
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        vectorDrawables.useSupportLibrary = true
+
+        buildConfigField('String',
+                "MAPBOX_NAVIGATION_SDK_IDENTIFIER", String.format("\"%s\"", "mapbox-navigation-ui-android")
+        )
+        buildConfigField 'String',
+                "MAPBOX_NAVIGATION_EVENTS_USER_AGENT", String.format("\"mapbox-navigation-ui-android/%s\"",
+                project.VERSION_NAME
+        )
+        consumerProguardFiles 'proguard-consumer.pro'
+    }
 
-  configurations {
-    javadocDeps
-  }
+    configurations {
+        javadocDeps
+    }
 
-  buildTypes {
-    debug {
-      testCoverageEnabled = true
+    buildFeatures {
+        buildConfig true
+    }
+
+    buildTypes {
+        debug {
+            testCoverageEnabled = true
+        }
     }
-  }
 
   buildFeatures {
     buildConfig true
   }
 
-  testOptions {
-    unitTests.returnDefaultValues = true
-    unitTests.includeAndroidResources = true
-    unitTests.all {
-      jacoco {
-        includeNoLocationClasses = true
-        excludes = ['jdk.internal.*']
-      }
+    buildFeatures {
+        buildConfig = true
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
     }
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
   }
 
   publishing {
@@ -59,50 +75,59 @@ android {
       withJavadocJar()
     }
   }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {
-  // Navigation SDK
-  api project(':libandroid-navigation')
-
-  // Maplibre Maps SDK
-  api dependenciesList.mapLibreServices
-  api dependenciesList.mapLibreTurf
-  api dependenciesList.mapLibreAnnotations
-  implementation(dependenciesList.mapLibre){
-    exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-sdk-geojson'
-    exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-sdk-turf'
-  }
+    // Navigation SDK
+    api project(':libandroid-navigation')
+
+    // Maplibre Maps SDK
+    api dependenciesList.mapLibreServices
+    api dependenciesList.mapLibreTurf
+    api dependenciesList.mapLibreAnnotations
+    implementation(dependenciesList.mapLibre) {
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-sdk-geojson'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-sdk-turf'
+    }
 
-  // Support libraries
-  implementation dependenciesList.materialDesign
-  implementation dependenciesList.androidxRecyclerView
-  implementation dependenciesList.androidxConstraintLayout
-  implementation dependenciesList.androidxCardView
+    // Support libraries
+    implementation dependenciesList.materialDesign
+    implementation dependenciesList.androidxRecyclerView
+    implementation dependenciesList.androidxConstraintLayout
+    implementation dependenciesList.androidxCardView
+    implementation 'androidx.core:core-ktx:1.13.1'
 
-  // AutoValues
-  annotationProcessor dependenciesList.autoValue
-  implementation dependenciesList.autoValueAnnotations
+    // AutoValues
+    annotationProcessor dependenciesList.autoValue
+    implementation dependenciesList.autoValueAnnotations
 
-  // AutoValues
-  annotationProcessor dependenciesList.autoValue
-  compileOnly dependenciesList.autoValue
+    // AutoValues
+    annotationProcessor dependenciesList.autoValue
+    compileOnly dependenciesList.autoValue
 
-  // Picasso
-  implementation dependenciesList.picasso
+    // Picasso
+    implementation dependenciesList.picasso
 
-  // Timber
-  implementation dependenciesList.timber
+    // Timber
+    implementation dependenciesList.timber
 
-  // Unit testing
-  testImplementation dependenciesList.junit
-  testImplementation dependenciesList.mockito
-  testImplementation dependenciesList.robolectric
-  testImplementation dependenciesList.json
+    // Unit testing
+    testImplementation dependenciesList.junit
+    testImplementation dependenciesList.mockito
+    testImplementation dependenciesList.robolectric
+    testImplementation dependenciesList.json
 }
 
 apply from: 'javadoc.gradle'
 apply from: "${rootDir}/gradle/mvn-push-android.gradle"
 apply from: "${rootDir}/gradle/checkstyle.gradle"
 apply from: "${rootDir}/gradle/dependencies-graph.gradle"
-apply from: "${rootDir}/gradle/dependency-updates.gradle"
\ No newline at end of file
+apply from: "${rootDir}/gradle/dependency-updates.gradle"
+apply from: "${rootDir}/gradle/mvn-push-android.gradle"
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapboxNavigationActivity.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapboxNavigationActivity.java
index a475c144f..63ff029fa 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapboxNavigationActivity.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapboxNavigationActivity.java
@@ -114,6 +114,11 @@ public void onNavigationRunning() {
     // Intentionally empty
   }
 
+  @Override
+  public void onMapReadyCallback() {
+    // Intentionally empty
+  }
+
   private void initialize() {
     Parcelable position = getIntent().getParcelableExtra(NavigationConstants.NAVIGATION_VIEW_INITIAL_MAP_POSITION);
     if (position != null) {
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncher.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncher.java
index a599883fe..ff51fcb6f 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncher.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncher.java
@@ -30,8 +30,8 @@ public class NavigationLauncher {
    * @param activity must be launched from another {@link Activity}
    * @param options  with fields to customize the navigation view
    */
-  public static void startNavigation(Activity activity, NavigationLauncherOptions options) {
-    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
+  public static void startNavigation(Context context, NavigationLauncherOptions options) {
+    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
     SharedPreferences.Editor editor = preferences.edit();
 
     storeDirectionsRouteValue(options, editor);
@@ -40,10 +40,6 @@ public static void startNavigation(Activity activity, NavigationLauncherOptions
     storeThemePreferences(options, editor);
 
     editor.apply();
-
-    Intent navigationActivity = new Intent(activity, MapboxNavigationActivity.class);
-    storeInitialMapPosition(options, navigationActivity);
-    activity.startActivity(navigationActivity);
   }
 
   /**
@@ -55,13 +51,13 @@ public static void startNavigation(Activity activity, NavigationLauncherOptions
    * @param context to retrieve {@link SharedPreferences}
    * @return {@link DirectionsRoute} stored when launching
    */
-  static DirectionsRoute extractRoute(Context context) {
+  public static DirectionsRoute extractRoute(Context context) {
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
     String directionsRouteJson = preferences.getString(NavigationConstants.NAVIGATION_VIEW_ROUTE_KEY, "");
     return DirectionsRoute.fromJson(directionsRouteJson);
   }
 
-  static void cleanUpPreferences(Context context) {
+  public static void cleanUpPreferences(Context context) {
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
     SharedPreferences.Editor editor = preferences.edit();
     editor
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
new file mode 100644
index 000000000..e70584a5e
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
@@ -0,0 +1,986 @@
+package com.mapbox.services.android.navigation.ui.v5
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Context
+import android.graphics.BitmapFactory
+import android.graphics.drawable.Drawable
+import android.location.Location
+import android.os.Bundle
+import android.util.AttributeSet
+import android.util.Log
+import android.widget.Button
+import android.widget.ImageButton
+import androidx.activity.ComponentActivity
+import androidx.annotation.UiThread
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.graphics.drawable.toBitmap
+import androidx.core.view.ViewCompat
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.mapbox.api.directions.v5.DirectionsCriteria
+import com.mapbox.api.directions.v5.models.DirectionsResponse
+import com.mapbox.core.utils.TextUtils
+import com.mapbox.geojson.Point
+import com.mapbox.mapboxsdk.annotations.Icon
+import com.mapbox.mapboxsdk.annotations.MarkerOptions
+import com.mapbox.mapboxsdk.camera.CameraPosition
+import com.mapbox.mapboxsdk.geometry.LatLng
+import com.mapbox.mapboxsdk.location.LocationComponent
+import com.mapbox.mapboxsdk.location.LocationComponentActivationOptions
+import com.mapbox.mapboxsdk.location.modes.CameraMode
+import com.mapbox.mapboxsdk.location.modes.RenderMode
+import com.mapbox.mapboxsdk.maps.MapView
+import com.mapbox.mapboxsdk.maps.MapboxMap
+import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
+import com.mapbox.mapboxsdk.maps.Projection
+import com.mapbox.mapboxsdk.maps.Style
+import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
+import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera
+import com.mapbox.services.android.navigation.ui.v5.instruction.ImageCreator
+import com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView
+import com.mapbox.services.android.navigation.ui.v5.instruction.NavigationAlertView
+import com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMap
+import com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMapInstanceState
+import com.mapbox.services.android.navigation.ui.v5.map.WayNameView
+import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute
+import com.mapbox.services.android.navigation.ui.v5.summary.SummaryBottomSheet
+import com.mapbox.services.android.navigation.v5.models.DirectionsRoute
+import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation
+import com.mapbox.services.android.navigation.v5.navigation.NavigationMapRoute
+import com.mapbox.services.android.navigation.v5.navigation.NavigationTimeFormat
+import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter
+import com.mapbox.services.android.navigation.v5.utils.LocaleUtils
+import okhttp3.Request
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import timber.log.Timber
+
+/**
+ * View that creates the drop-in UI.
+ *
+ *
+ * Once started, this view will check if the [Activity] that inflated
+ * it was launched with a [DirectionsRoute].
+ *
+ *
+ * Or, if not found, this view will look for a set of [Point] coordinates.
+ * In the latter case, a new [DirectionsRoute] will be retrieved from [NavigationRoute].
+ *
+ *
+ * Once valid data is obtained, this activity will immediately begin navigation
+ * with [MapboxNavigation].
+ *
+ *
+ * If launched with the simulation boolean set to true, a [ReplayRouteLocationEngine]
+ * will be initialized and begin pushing updates.
+ *
+ *
+ * This activity requires user permissions ACCESS_FINE_LOCATION
+ * and ACCESS_COARSE_LOCATION have already been granted.
+ *
+ *
+ * A Mapbox access token must also be set by the developer (to initialize navigation).
+ *
+ * @since 0.7.0
+ */
+class NavigationRouteView @JvmOverloads constructor(
+    context: Context?,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = -1
+) :
+    CoordinatorLayout(context!!, attrs, defStyleAttr), LifecycleOwner, OnMapReadyCallback,
+    NavigationContract.View {
+    private var mapView: MapView? = null
+    private var instructionView: InstructionView? = null
+    private var summaryBottomSheet: SummaryBottomSheet? = null
+    private var summaryBehavior: BottomSheetBehavior<*>? = null
+    private var cancelBtn: ImageButton? = null
+    private var recenterBtn: RecenterButton? = null
+    private var wayNameView: WayNameView? = null
+    private var routeOverviewBtn: ImageButton? = null
+
+    private var navigationPresenter: NavigationPresenter? = null
+    private var navigationViewEventDispatcher: NavigationViewEventDispatcher? = null
+    private var navigationViewModel: NavigationViewModel? = null
+    private var navigationMap: NavigationMapboxMap? = null
+    private var onNavigationReadyCallback: OnNavigationReadyCallback? = null
+    private var onTrackingChangedListener: NavigationOnCameraTrackingChangedListener? = null
+    private var mapInstanceState: NavigationMapboxMapInstanceState? = null
+    private var initialMapCameraPosition: CameraPosition? = null
+    private var isMapInitialized = false
+    private var isSubscribed = false
+    private var lifecycleRegistry: LifecycleRegistry? = null
+    public var mapboxMap: MapboxMap? = null
+    private var locationComponent: LocationComponent? = null
+    private var route: DirectionsRoute? = null
+    private var navigationMapRoute: NavigationMapRoute? = null
+    private var baseCameraPosition: CameraPosition? = null
+    private var isMapReinitialized: Boolean = false
+
+    init {
+        ThemeSwitcher.setTheme(context, attrs)
+    }
+
+    /**
+     * Uses savedInstanceState as a cue to restore state (if not null).
+     *
+     * @param savedInstanceState to restore state if not null
+     */
+    fun onCreate(navigationCallback: OnNavigationReadyCallback, savedInstanceState: Bundle?, context: ComponentActivity) {
+        initializeNavigationViewModel(context)
+        initializeView()
+        mapView?.let {
+            it.apply {
+                if (!isMapInitialized) {
+                    it.getMapAsync(this@NavigationRouteView)
+                    it.onCreate(savedInstanceState)
+                } else {
+                    onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
+                }
+            }
+        }
+        updatePresenterState(savedInstanceState)
+        lifecycleRegistry = LifecycleRegistry(this)
+        lifecycleRegistry!!.markState(Lifecycle.State.CREATED)
+        this.onNavigationReadyCallback = navigationCallback
+    }
+
+    /**
+     * Low memory must be reported so the [MapView]
+     * can react appropriately.
+     */
+    fun onLowMemory() {
+        mapView!!.onLowMemory()
+    }
+
+    /**
+     * If the instruction list is showing and onBackPressed is called,
+     * hide the instruction list and do not hide the activity or fragment.
+     *
+     * @return true if back press handled, false if not
+     */
+    fun onBackPressed(): Boolean {
+        return instructionView!!.handleBackPressed()
+    }
+
+    /**
+     * Used to store the bottomsheet state and re-center
+     * button visibility.  As well as anything the [MapView]
+     * needs to store in the bundle.
+     *
+     * @param outState to store state variables
+     */
+    fun onSaveInstanceState(outState: Bundle) {
+        val bottomSheetBehaviorState =
+            if (summaryBehavior == null) INVALID_STATE else summaryBehavior!!.state
+        val isWayNameVisible = wayNameView!!.visibility == VISIBLE
+        val navigationViewInstanceState = NavigationViewInstanceState(
+            bottomSheetBehaviorState,
+            recenterBtn!!.visibility,
+            instructionView!!.isShowingInstructionList,
+            isWayNameVisible,
+            wayNameView!!.retrieveWayNameText(),
+            navigationViewModel!!.isMuted
+        )
+        val instanceKey = context.getString(R.string.navigation_view_instance_state)
+        outState.putParcelable(instanceKey, navigationViewInstanceState)
+        outState.putBoolean(
+            context.getString(R.string.navigation_running),
+            navigationViewModel!!.isRunning
+        )
+        mapView!!.onSaveInstanceState(outState)
+        saveNavigationMapInstanceState(outState)
+    }
+
+    /**
+     * Used to restore the bottomsheet state and re-center
+     * button visibility.  As well as the [MapView]
+     * position prior to rotation.
+     *
+     * @param savedInstanceState to extract state variables
+     */
+    fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        val instanceKey = context.getString(R.string.navigation_view_instance_state)
+        val navigationViewInstanceState =
+            savedInstanceState.getParcelable<NavigationViewInstanceState>(instanceKey)
+        recenterBtn!!.visibility = navigationViewInstanceState!!.recenterButtonVisibility
+        wayNameView!!.visibility =
+            if (navigationViewInstanceState.isWayNameVisible) VISIBLE else INVISIBLE
+        wayNameView!!.updateWayNameText(navigationViewInstanceState.wayNameText)
+        resetBottomSheetState(navigationViewInstanceState.bottomSheetBehaviorState)
+        updateInstructionListState(navigationViewInstanceState.isInstructionViewVisible)
+        updateInstructionMutedState(navigationViewInstanceState.isMuted)
+        mapInstanceState = savedInstanceState.getParcelable(MAP_INSTANCE_STATE_KEY)
+    }
+
+    /**
+     * Called to ensure the [MapView] is destroyed
+     * properly.
+     *
+     *
+     * In an [Activity] this should be in [Activity.onDestroy].
+     *
+     *
+     * In a [Fragment], this should
+     * be in [Fragment.onDestroyView].
+     */
+    @UiThread
+    fun onDestroy() {
+//        shutdown()
+        stopNavigation()
+        lifecycleRegistry!!.markState(Lifecycle.State.DESTROYED)
+    }
+
+    fun onDestroy2() {
+        shutdown()
+    }
+
+    fun onStart() {
+        mapView!!.onStart()
+        if (navigationMap != null) {
+            navigationMap!!.onStart()
+        }
+        lifecycleRegistry!!.markState(Lifecycle.State.STARTED)
+    }
+
+    fun onResume() {
+        mapView!!.onResume()
+        lifecycleRegistry!!.markState(Lifecycle.State.RESUMED)
+    }
+
+    fun onPause() {
+        mapView!!.onPause()
+    }
+
+    fun onStop() {
+        mapView!!.onStop()
+        if (navigationMap != null) {
+            navigationMap!!.onStop()
+        }
+    }
+
+    /**
+     * Fired after the map is ready, this is our cue to finish
+     * setting up the rest of the plugins / location engine.
+     *
+     *
+     * Also, we check for launch data (coordinates or route).
+     *
+     * @param mapboxMap used for route, camera, and location UI
+     * @since 0.6.0
+     */
+    override fun onMapReady(mapboxMap: MapboxMap) {
+        val builder = Style.Builder().fromUri(
+            context.getString(R.string.map_style_light)
+        )
+        this.mapboxMap = mapboxMap
+        if (!isMapInitialized) {
+            mapboxMap.setStyle((builder)) {
+                isMapInitialized = true
+                enableLocationComponent(it)
+                baseCameraPosition?.let {
+                    mapboxMap.cameraPosition = it
+                }
+            }
+        } else {
+            mapboxMap.getStyle {
+                enableLocationComponent(it)
+                baseCameraPosition?.let {
+                    mapboxMap.cameraPosition = it
+                }
+            }
+        }
+        navigationMapRoute = NavigationMapRoute(
+            mapView!!,
+            mapboxMap
+        )
+        onNavigationReadyCallback!!.onMapReadyCallback()
+    }
+
+    @SuppressWarnings("MissingPermission")
+    private fun enableLocationComponent(style: Style) {
+        // Get an instance of the component
+        locationComponent = mapboxMap!!.locationComponent
+
+        locationComponent?.let {
+            // Activate with a built LocationComponentActivationOptions object
+            it.activateLocationComponent(
+                LocationComponentActivationOptions.builder(context, style).build(),
+            )
+
+            // Enable to make component visible
+            it.isLocationComponentEnabled = true
+
+            // Set the component's camera mode
+            it.cameraMode = CameraMode.TRACKING_GPS_NORTH
+
+            // Set the component's render mode
+            it.renderMode = RenderMode.NORMAL
+        }
+    }
+
+    fun calculateRoute(routeList: List<Pair<Double, Double>>, userLocation: Pair<Double, Double>, accessToken: String) {
+        if (isMapReinitialized) {
+            onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
+        } else {
+            val startRouteButton = findViewById<Button>(R.id.routeButton)
+//        startRouteButton.setOnClickListener {
+            val destination = Point.fromLngLat(76.930137, 43.230361)
+            val origin = Point.fromLngLat(userLocation.first, userLocation.second)
+            val navigationRouteBuilder = NavigationRoute.builder(context).apply {
+                this.accessToken(accessToken)
+                this.origin(origin)
+
+                this.voiceUnits(DirectionsCriteria.PROFILE_DRIVING)
+                this.alternatives(true)
+                // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
+                this.user("gh")
+                this.profile("car")
+                this.baseUrl(context.getString(R.string.base_url))
+            }
+            for (point in routeList) {
+                navigationRouteBuilder.addWaypoint(
+                    Point.fromLngLat(point.first, point.second)
+                )
+            }
+            navigationRouteBuilder.build().getRoute(object : Callback<DirectionsResponse> {
+                override fun onResponse(
+                    call: Call<DirectionsResponse>,
+                    response: Response<DirectionsResponse>,
+                ) {
+                    Timber.d("Url: %s", (call.request() as Request).url.toString())
+                    response.body()?.let { response ->
+                        if (response.routes().isNotEmpty()) {
+                            val maplibreResponse =
+                                com.mapbox.services.android.navigation.v5.models.DirectionsResponse.fromJson(
+                                    response.toJson()
+                                );
+                            this@NavigationRouteView.route = maplibreResponse.routes().first()
+                            navigationMapRoute?.addRoutes(maplibreResponse.routes())
+
+                            val options = NavigationLauncherOptions.builder()
+                                .directionsRoute(route)
+//                    .shouldSimulateRoute(simulateRoute)
+                                .initialMapCameraPosition(
+                                    CameraPosition.Builder().target(
+                                        LatLng(
+                                            userLocation.first,
+                                            userLocation.second
+                                        )
+                                    ).build()
+                                )
+                                .lightThemeResId(R.style.TestNavigationViewLight)
+                                .darkThemeResId(R.style.TestNavigationViewDark)
+                                .build()
+                            baseCameraPosition = mapboxMap!!.cameraPosition
+                            NavigationLauncher.startNavigation(context, options)
+                            route?.let {
+                                isMapReinitialized = true
+                                if (options.initialMapCameraPosition() != null) {
+                                    initialize(
+                                        options.initialMapCameraPosition()!!
+                                    )
+                                } else {
+                                    initialize()
+                                }
+                            }
+//                        binding.startRouteLayout.visibility = View.VISIBLE
+                        }
+                    }
+
+                }
+
+                override fun onFailure(call: Call<DirectionsResponse>, throwable: Throwable) {
+                    Timber.e(throwable, "onFailure: navigation.getRoute()")
+                }
+            })
+        }
+    }
+
+    override fun setSummaryBehaviorState(state: Int) {
+        summaryBehavior!!.state = state
+    }
+
+    override fun setSummaryBehaviorHideable(isHideable: Boolean) {
+        summaryBehavior!!.isHideable = isHideable
+    }
+
+    override fun isSummaryBottomSheetHidden(): Boolean {
+        return summaryBehavior!!.state == BottomSheetBehavior.STATE_HIDDEN
+    }
+
+    override fun resetCameraPosition() {
+        if (navigationMap != null) {
+            navigationMap!!.resetPadding()
+            navigationMap!!.resetCameraPositionWith(NavigationCamera.NAVIGATION_TRACKING_MODE_GPS)
+        }
+    }
+
+    override fun showRecenterBtn() {
+        recenterBtn!!.show()
+    }
+
+    override fun hideRecenterBtn() {
+        recenterBtn!!.hide()
+    }
+
+    override fun isRecenterButtonVisible(): Boolean {
+        return recenterBtn!!.visibility == VISIBLE
+    }
+
+    override fun drawRoute(directionsRoute: DirectionsRoute) {
+        if (navigationMap != null) {
+            navigationMap!!.drawRoute(directionsRoute)
+        }
+    }
+
+    override fun addMarker(position: Point) {
+        if (navigationMap != null) {
+            navigationMap!!.addDestinationMarker(position)
+        }
+    }
+
+    val isWayNameVisible: Boolean
+        /**
+         * Provides the current visibility of the way name view.
+         *
+         * @return true if visible, false if not visible
+         */
+        get() = wayNameView!!.visibility == VISIBLE
+
+    /**
+     * Updates the text of the way name view below the
+     * navigation icon.
+     *
+     *
+     * If you'd like to use this method without being overridden by the default way names
+     * values we provide, please disabled auto-query with
+     * [NavigationMapboxMap.updateWaynameQueryMap].
+     *
+     * @param wayName to update the view
+     */
+    override fun updateWayNameView(wayName: String) {
+        wayNameView!!.updateWayNameText(wayName)
+    }
+
+    /**
+     * Updates the visibility of the way name view that is show below
+     * the navigation icon.
+     *
+     *
+     * If you'd like to use this method without being overridden by the default visibility values
+     * values we provide, please disabled auto-query with
+     * [NavigationMapboxMap.updateWaynameQueryMap].
+     *
+     * @param isVisible true to show, false to hide
+     */
+    override fun updateWayNameVisibility(isVisible: Boolean) {
+        var isVisible = isVisible
+        if (TextUtils.isEmpty(wayNameView!!.retrieveWayNameText())) {
+            isVisible = false
+        }
+        wayNameView!!.updateVisibility(isVisible)
+        if (navigationMap != null) {
+            navigationMap!!.updateWaynameQueryMap(isVisible)
+        }
+    }
+
+    /**
+     * Used when starting this [android.app.Activity]
+     * for the first time.
+     *
+     *
+     * Zooms to the beginning of the [DirectionsRoute].
+     *
+     * @param directionsRoute where camera should move to
+     */
+    override fun startCamera(directionsRoute: DirectionsRoute) {
+        if (navigationMap != null) {
+            navigationMap!!.startCamera(directionsRoute)
+        }
+    }
+
+    /**
+     * Used after configuration changes to resume the camera
+     * to the last location update from the Navigation SDK.
+     *
+     * @param location where the camera should move to
+     */
+    override fun resumeCamera(location: Location) {
+        if (navigationMap != null) {
+            navigationMap!!.resumeCamera(location)
+        }
+    }
+
+    override fun updateNavigationMap(location: Location) {
+        if (navigationMap != null) {
+            navigationMap!!.updateLocation(location)
+        }
+    }
+
+    override fun updateCameraRouteOverview() {
+        if (navigationMap != null) {
+            val padding = buildRouteOverviewPadding(context)
+            navigationMap!!.showRouteOverview(padding)
+        }
+    }
+
+    /**
+     * Should be called when this view is completely initialized.
+     *
+     * @param options with containing route / coordinate data
+     */
+    fun startNavigation(options: NavigationViewOptions) {
+        initializeNavigation(options)
+    }
+
+    /**
+     * Call this when the navigation session needs to end navigation without finishing the whole view
+     *
+     * @since 0.16.0
+     */
+    @UiThread
+    fun stopNavigation() {
+        navigationPresenter!!.onNavigationStopped()
+        navigationViewModel!!.stopNavigation()
+        baseCameraPosition?.let {
+            mapboxMap!!.cameraPosition = it
+        }
+        if (navigationMap != null) {
+            navigationMap!!.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
+            navigationMap!!.removeRoute()
+            navigationMap!!.clearMarkers()
+        }
+        mapboxMap!!.markers.forEach {
+            mapboxMap!!.removeMarker(it)
+        }
+        navigationMapRoute?.removeRoute()
+    }
+
+    /**
+     * Should be called after [NavigationView.onCreate].
+     *
+     *
+     * This method adds the [OnNavigationReadyCallback],
+     * which will fire the ready events for this view.
+     *
+     * @param onNavigationReadyCallback to be set to this view
+     */
+    fun initialize() {
+        if (!isMapInitialized) {
+            mapView!!.getMapAsync(this)
+        } else {
+            initializeNavigationMap(mapView, mapboxMap!!)
+            initializeWayNameListener()
+            onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
+        }
+    }
+
+    /**
+     * Should be called after [NavigationView.onCreate].
+     *
+     *
+     * This method adds the [OnNavigationReadyCallback],
+     * which will fire the ready events for this view.
+     *
+     *
+     * This method also accepts a [CameraPosition] that will be set as soon as the map is
+     * ready.  Note, this position is ignored during rotation in favor of the last known map position.
+     *
+     * @param onNavigationReadyCallback to be set to this view
+     * @param initialMapCameraPosition  to be shown once the map is ready
+     */
+    fun initialize(
+        initialMapCameraPosition: CameraPosition
+    ) {
+        this.initialMapCameraPosition = initialMapCameraPosition
+        if (!isMapInitialized) {
+            mapView!!.getMapAsync(this)
+        } else {
+            initializeNavigationMap(mapView, mapboxMap!!)
+            initializeWayNameListener()
+            onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
+        }
+    }
+
+    /**
+     * Gives the ability to manipulate the map directly for anything that might not currently be
+     * supported. This returns null until the view is initialized.
+     *
+     *
+     * The [NavigationMapboxMap] gives direct access to the map UI (location marker, route, etc.).
+     *
+     * @return navigation mapbox map object, or null if view has not been initialized
+     */
+    fun retrieveNavigationMapboxMap(): NavigationMapboxMap? {
+        return navigationMap
+    }
+
+    /**
+     * Returns the instance of [MapboxNavigation] powering the [NavigationView]
+     * once navigation has started.  Will return null if navigation has not been started with
+     * [NavigationView.startNavigation].
+     *
+     * @return mapbox navigation, or null if navigation has not started
+     */
+    fun retrieveMapboxNavigation(): MapboxNavigation? {
+        return navigationViewModel!!.retrieveNavigation()
+    }
+
+    /**
+     * Returns the sound button used for muting instructions
+     *
+     * @return sound button
+     */
+    fun retrieveSoundButton(): NavigationButton {
+        return instructionView!!.retrieveSoundButton()
+    }
+
+
+    /**
+     * Returns the re-center button for recentering on current location
+     *
+     * @return recenter button
+     */
+    fun retrieveRecenterButton(): NavigationButton? {
+        return recenterBtn
+    }
+
+    /**
+     * Returns the [NavigationAlertView] that is shown during off-route events with
+     * "Report a Problem" text.
+     *
+     * @return alert view that is used in the instruction view
+     */
+    fun retrieveAlertView(): NavigationAlertView {
+        return instructionView!!.retrieveAlertView()
+    }
+
+    private fun initializeView() {
+        inflate(context, R.layout.navigation_view_layout, this)
+        bind()
+//        initializeNavigationViewModel()
+        initializeNavigationEventDispatcher()
+        initializeNavigationPresenter()
+        initializeInstructionListListener()
+        initializeSummaryBottomSheet()
+        initializeClickListeners()
+    }
+
+    private fun bind() {
+        mapView = findViewById(R.id.navigationMapView)
+        instructionView = findViewById(R.id.instructionView)
+        instructionView?.let {
+            ViewCompat.setElevation(it, 10f)
+        }
+        summaryBottomSheet = findViewById(R.id.summaryBottomSheet)
+        cancelBtn = findViewById(R.id.cancelBtn)
+        recenterBtn = findViewById(R.id.recenterBtn)
+        wayNameView = findViewById(R.id.wayNameView)
+        routeOverviewBtn = findViewById(R.id.routeOverviewBtn)
+    }
+
+    fun initializeNavigationViewModel(context: ComponentActivity) {
+        try {
+            navigationViewModel = NavigationViewModel(context)
+        } catch (exception: ClassCastException) {
+            throw ClassCastException("Please ensure that the provided Context is a valid FragmentActivity")
+        }
+    }
+
+    private fun initializeSummaryBottomSheet() {
+        summaryBehavior = BottomSheetBehavior.from(summaryBottomSheet!!)
+        summaryBehavior?.let {
+            it.isHideable = false
+            it.addBottomSheetCallback(
+                SummaryBottomSheetCallback(
+                    navigationPresenter,
+                    navigationViewEventDispatcher
+                )
+            )
+        }
+    }
+
+    private fun initializeNavigationEventDispatcher() {
+        navigationViewEventDispatcher = NavigationViewEventDispatcher()
+        navigationViewModel!!.initializeEventDispatcher(navigationViewEventDispatcher)
+    }
+
+    private fun initializeInstructionListListener() {
+        instructionView!!.setInstructionListListener(
+            NavigationInstructionListListener(
+                navigationPresenter,
+                navigationViewEventDispatcher
+            )
+        )
+    }
+
+    private fun initializeNavigationMap(mapView: MapView?, map: MapboxMap) {
+        if (initialMapCameraPosition != null) {
+            map.cameraPosition = initialMapCameraPosition!!
+        }
+        navigationMap = NavigationMapboxMap(mapView!!, map)
+        navigationMap!!.updateLocationLayerRenderMode(RenderMode.GPS)
+        if (mapInstanceState != null) {
+            navigationMap!!.restoreFrom(mapInstanceState)
+            return
+        }
+    }
+
+    private fun initializeWayNameListener() {
+        val wayNameListener = NavigationViewWayNameListener(navigationPresenter)
+        navigationMap!!.addOnWayNameChangedListener(wayNameListener)
+    }
+
+    private fun saveNavigationMapInstanceState(outState: Bundle) {
+        if (navigationMap != null) {
+            navigationMap!!.saveStateWith(MAP_INSTANCE_STATE_KEY, outState)
+        }
+    }
+
+    private fun resetBottomSheetState(bottomSheetState: Int) {
+        if (bottomSheetState > INVALID_STATE) {
+            val isShowing = bottomSheetState == BottomSheetBehavior.STATE_EXPANDED
+            summaryBehavior!!.isHideable = !isShowing
+            summaryBehavior!!.state = bottomSheetState
+        }
+    }
+
+    private fun updateInstructionListState(visible: Boolean) {
+        if (visible) {
+            instructionView!!.showInstructionList()
+        } else {
+            instructionView!!.hideInstructionList()
+        }
+    }
+
+    private fun updateInstructionMutedState(isMuted: Boolean) {
+        if (isMuted) {
+            (instructionView!!.retrieveSoundButton() as SoundButton).soundFabOff()
+        }
+    }
+
+    private fun buildRouteOverviewPadding(context: Context): IntArray {
+        val resources = context.resources
+        val leftRightPadding =
+            resources.getDimension(R.dimen.route_overview_left_right_padding).toInt()
+        val paddingBuffer = resources.getDimension(R.dimen.route_overview_buffer_padding).toInt()
+        val instructionHeight =
+            (resources.getDimension(R.dimen.instruction_layout_height) + paddingBuffer).toInt()
+        val summaryHeight = resources.getDimension(R.dimen.summary_bottomsheet_height).toInt()
+        return intArrayOf(leftRightPadding, instructionHeight, leftRightPadding, summaryHeight)
+    }
+
+    private val isChangingConfigurations: Boolean
+        get() {
+            try {
+                return (context as FragmentActivity).isChangingConfigurations
+            } catch (exception: ClassCastException) {
+                throw ClassCastException("Please ensure that the provided Context is a valid FragmentActivity")
+            }
+        }
+
+    private fun initializeNavigationPresenter() {
+        navigationPresenter = NavigationPresenter(this)
+    }
+
+    private fun updatePresenterState(savedInstanceState: Bundle?) {
+        if (savedInstanceState != null) {
+            val navigationRunningKey = context.getString(R.string.navigation_running)
+            val resumeState = savedInstanceState.getBoolean(navigationRunningKey)
+            navigationPresenter!!.updateResumeState(resumeState)
+        }
+    }
+
+    private fun initializeNavigation(options: NavigationViewOptions) {
+        establish(options)
+        navigationViewModel!!.initialize(options)
+        initializeNavigationListeners(options, navigationViewModel)
+        setupNavigationMapboxMap(options)
+
+        if (!isSubscribed) {
+            initializeClickListeners()
+            initializeOnCameraTrackingChangedListener()
+            subscribeViewModels()
+        }
+    }
+
+    private fun initializeClickListeners() {
+        cancelBtn!!.setOnClickListener(CancelBtnClickListener(navigationViewEventDispatcher))
+        recenterBtn!!.addOnClickListener(RecenterBtnClickListener(navigationPresenter))
+        routeOverviewBtn!!.setOnClickListener(RouteOverviewBtnClickListener(navigationPresenter))
+    }
+
+    private fun initializeOnCameraTrackingChangedListener() {
+        onTrackingChangedListener =
+            NavigationOnCameraTrackingChangedListener(navigationPresenter, summaryBehavior)
+        navigationMap!!.addOnCameraTrackingChangedListener(onTrackingChangedListener)
+    }
+
+    private fun establish(options: NavigationViewOptions) {
+        val localeUtils = LocaleUtils()
+        establishDistanceFormatter(localeUtils, options)
+        establishTimeFormat(options)
+    }
+
+    private fun establishDistanceFormatter(
+        localeUtils: LocaleUtils,
+        options: NavigationViewOptions
+    ) {
+        val unitType = establishUnitType(localeUtils, options)
+        val language = establishLanguage(localeUtils, options)
+        val roundingIncrement = establishRoundingIncrement(options)
+        val distanceFormatter = DistanceFormatter(context, language, unitType, roundingIncrement)
+
+        instructionView!!.setDistanceFormatter(distanceFormatter)
+        summaryBottomSheet!!.setDistanceFormatter(distanceFormatter)
+    }
+
+    private fun establishRoundingIncrement(navigationViewOptions: NavigationViewOptions): Int {
+        val mapboxNavigationOptions = navigationViewOptions.navigationOptions()
+        return mapboxNavigationOptions.roundingIncrement()
+    }
+
+    private fun establishLanguage(
+        localeUtils: LocaleUtils,
+        options: NavigationViewOptions
+    ): String {
+        return localeUtils.getNonEmptyLanguage(context, options.directionsRoute().voiceLanguage())
+    }
+
+    private fun establishUnitType(
+        localeUtils: LocaleUtils,
+        options: NavigationViewOptions
+    ): String {
+        val routeOptions = options.directionsRoute().routeOptions()
+        val voiceUnits = routeOptions?.voiceUnits()
+        return localeUtils.retrieveNonNullUnitType(context, voiceUnits)
+    }
+
+    private fun establishTimeFormat(options: NavigationViewOptions) {
+        @NavigationTimeFormat.Type val timeFormatType = options.navigationOptions().timeFormatType()
+        summaryBottomSheet!!.setTimeFormat(timeFormatType)
+    }
+
+    private fun initializeNavigationListeners(
+        options: NavigationViewOptions,
+        navigationViewModel: NavigationViewModel?
+    ) {
+        navigationMap!!.addProgressChangeListener(navigationViewModel!!.retrieveNavigation()!!)
+        navigationViewEventDispatcher!!.initializeListeners(options, navigationViewModel)
+    }
+
+    private fun setupNavigationMapboxMap(options: NavigationViewOptions) {
+        navigationMap!!.updateWaynameQueryMap(options.waynameChipEnabled())
+    }
+
+    /**
+     * Subscribes the [InstructionView] and [SummaryBottomSheet] to the [NavigationViewModel].
+     *
+     *
+     * Then, creates an instance of [NavigationViewSubscriber], which takes a presenter.
+     *
+     *
+     * The subscriber then subscribes to the view models, setting up the appropriate presenter / listener
+     * method calls based on the [androidx.lifecycle.LiveData] updates.
+     */
+    private fun subscribeViewModels() {
+        instructionView!!.subscribe(this, navigationViewModel)
+        summaryBottomSheet!!.subscribe(this, navigationViewModel)
+
+        NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).subscribe()
+        isSubscribed = true
+    }
+
+    @SuppressLint("MissingPermission")
+    private fun shutdown() {
+        if (navigationMap != null) {
+            navigationMap!!.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
+            navigationMap!!.removeRoute()
+        }
+//        navigationViewModel?.let {
+//            it.isOffRoute.removeObservers(this)
+//            it.instructionModel.removeObservers(this)
+//            it.bannerInstructionModel.removeObservers(this)
+//            it.summaryModel.removeObservers(this)
+//            it.retrieveNavigationLocation().removeObservers(this)
+//            it.retrieveRoute().removeObservers(this)
+//            it.retrieveShouldRecordScreenshot().removeObservers(this)
+//            it.retrieveDestination().removeObservers(this)
+//        }
+        isMapInitialized = false
+        NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).unsubscribe()
+        navigationViewModel!!.stopNavigation()
+        mapboxMap!!.markers.forEach {
+            mapboxMap!!.removeMarker(it)
+        }
+        navigationViewEventDispatcher!!.onDestroy(navigationViewModel!!.retrieveNavigation())
+        mapboxMap!!.getStyle {
+            mapboxMap!!.locationComponent.isLocationComponentEnabled = false
+        }
+//        mapView!!.onDestroy()
+//        mapView!!.getMapAsync(this)
+
+        baseCameraPosition?.let {
+            mapboxMap!!.cameraPosition = it
+        }
+
+        navigationViewModel!!.onDestroy(false)
+        ImageCreator.getInstance().shutdown()
+        navigationMap = null
+
+        navigationMapRoute?.removeRoute()
+
+        isSubscribed = false
+    }
+
+    private fun shutDown2() {
+        if (navigationMap != null) {
+            navigationMap!!.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
+        }
+        NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).unsubscribe()
+        navigationViewEventDispatcher!!.onDestroy(navigationViewModel!!.retrieveNavigation())
+//        mapView!!.onDestroy()
+        navigationViewModel!!.onDestroy(false)
+        ImageCreator.getInstance().shutdown()
+        navigationMap = null
+    }
+
+    fun setMinZoomLevel(minZoomLevel: Double) {
+        mapboxMap!!.setMinZoomPreference(minZoomLevel)
+    }
+
+    fun setMaxZoomLevel(maxZoomLevel: Double) {
+        mapboxMap!!.setMaxZoomPreference(maxZoomLevel)
+    }
+
+    fun getProjection() : Projection {
+        return mapboxMap!!.projection
+    }
+
+    fun addMarker(icon: Int, latitude: Double, longitude: Double, id: String) {
+        mapboxMap!!.addMarker(MarkerOptions())
+        val position = LatLng(latitude, longitude)
+//        val icon = Icon(id, BitmapFactory.decodeResource(resources, icon))
+//        val markerOptions = MarkerOptions()
+//            .position(position)
+//            .icon(icon)
+//        mapboxMap!!.setOnMarkerClickListener {
+//        }
+    }
+
+    companion object {
+        private const val MAP_INSTANCE_STATE_KEY = "navgation_mapbox_map_instance_state"
+        private const val INVALID_STATE = 0
+    }
+
+    override val lifecycle: Lifecycle
+        get() = lifecycleRegistry!!
+
+}
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java
index 0a445dacf..f784fe5bc 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java
@@ -234,7 +234,10 @@ public Lifecycle getLifecycle() {
    */
   @Override
   public void onMapReady(final MapboxMap mapboxMap) {
-    mapboxMap.setStyle(ThemeSwitcher.retrieveMapStyle(getContext()), new Style.OnStyleLoaded() {
+
+    Style.Builder builder = new Style.Builder().fromUri(getContext().getString(R.string.map_style_light));
+
+    mapboxMap.setStyle((builder), new Style.OnStyleLoaded() {
       @Override
       public void onStyleLoaded(@NonNull Style style) {
         initializeNavigationMap(mapView, mapboxMap);
@@ -243,6 +246,11 @@ public void onStyleLoaded(@NonNull Style style) {
         isMapInitialized = true;
       }
     });
+    calculateRoute();
+  }
+
+  private void calculateRoute() {
+
   }
 
   @Override
@@ -521,7 +529,7 @@ private void bind() {
 
   private void initializeNavigationViewModel() {
     try {
-      navigationViewModel = new ViewModelProvider((FragmentActivity) getContext()).get(NavigationViewModel.class);
+      navigationViewModel = new NavigationViewModel(getContext());
     } catch (ClassCastException exception) {
       throw new ClassCastException("Please ensure that the provided Context is a valid FragmentActivity");
     }
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewEventDispatcher.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewEventDispatcher.java
index fc3460a74..a15c26984 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewEventDispatcher.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewEventDispatcher.java
@@ -183,6 +183,7 @@ private void removeMilestoneEventListener(MapboxNavigation navigation) {
   private void removeProgressChangeListener(MapboxNavigation navigation) {
     if (progressChangeListener != null) {
       navigation.removeProgressChangeListener(progressChangeListener);
+      progressChangeListener = null;
     }
   }
 }
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java
index 230cfa07d..2b66c9c3a 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java
@@ -43,7 +43,7 @@
 
 import java.util.List;
 
-public class NavigationViewModel extends AndroidViewModel {
+public class NavigationViewModel {
 
     private static final String EMPTY_STRING = "";
     private static final String OKHTTP_INSTRUCTION_CACHE = "okhttp-instruction-cache";
@@ -77,8 +77,10 @@ public class NavigationViewModel extends AndroidViewModel {
     private boolean isChangingConfigurations;
     private MapConnectivityController connectivityController;
 
-    public NavigationViewModel(Application application) {
-        super(application);
+    private Context context;
+
+    public NavigationViewModel(Context context) {
+        this.context = context;
         initializeLocationEngine();
         initializeRouter();
         this.routeUtils = new RouteUtils();
@@ -88,10 +90,9 @@ public NavigationViewModel(Application application) {
 
     @TestOnly
         // Package private (no modifier) for testing purposes
-    NavigationViewModel(Application application, MapboxNavigation navigation,
+    NavigationViewModel(MapboxNavigation navigation,
                         MapConnectivityController connectivityController,
                         NavigationViewRouter router) {
-        super(application);
         this.navigation = navigation;
         this.router = router;
         this.connectivityController = connectivityController;
@@ -99,27 +100,21 @@ public NavigationViewModel(Application application) {
 
     @TestOnly
         // Package private (no modifier) for testing purposes
-    NavigationViewModel(Application application, MapboxNavigation navigation,
+    NavigationViewModel(MapboxNavigation navigation,
                         LocationEngineConductor conductor, NavigationViewEventDispatcher dispatcher, SpeechPlayer speechPlayer) {
-        super(application);
         this.navigation = navigation;
         this.locationEngineConductor = conductor;
         this.navigationViewEventDispatcher = dispatcher;
         this.speechPlayer = speechPlayer;
     }
 
-    @Override
-    protected void onCleared() {
-        super.onCleared();
-        destroyRouter();
-    }
-
     public void onDestroy(boolean isChangingConfigurations) {
         this.isChangingConfigurations = isChangingConfigurations;
         if (!isChangingConfigurations) {
             endNavigation();
             deactivateInstructionPlayer();
             isRunning = false;
+            this.route.setValue(null);
         }
         clearDynamicCameraMap();
         navigationViewEventDispatcher = null;
@@ -158,7 +153,7 @@ void initialize(NavigationViewOptions options) {
         initializeDistanceFormatter(options);
         if (!isRunning()) {
             LocationEngine locationEngine = initializeLocationEngineFrom(options);
-            initializeNavigation(getApplication(), navigationOptions, locationEngine);
+            initializeNavigation(context, navigationOptions, locationEngine);
             addMilestones(options);
             initializeNavigationSpeechPlayer(options);
         }
@@ -205,7 +200,7 @@ void updateRouteProgress(RouteProgress routeProgress) {
         this.routeProgress = routeProgress;
         sendEventArrival(routeProgress, milestone);
         instructionModel.setValue(new InstructionModel(distanceFormatter, routeProgress));
-        summaryModel.setValue(new SummaryModel(getApplication(), distanceFormatter, routeProgress, timeFormatType));
+        summaryModel.setValue(new SummaryModel(context, distanceFormatter, routeProgress, timeFormatType));
     }
 
     void updateLocation(Location location) {
@@ -236,9 +231,8 @@ MutableLiveData<Boolean> retrieveShouldRecordScreenshot() {
     }
 
     private void initializeRouter() {
-        MapboxRouteFetcher onlineRouter = new MapboxRouteFetcher(getApplication());
-        Context applicationContext = getApplication().getApplicationContext();
-        ConnectivityStatusProvider connectivityStatus = new ConnectivityStatusProvider(applicationContext);
+        MapboxRouteFetcher onlineRouter = new MapboxRouteFetcher(context);
+        ConnectivityStatusProvider connectivityStatus = new ConnectivityStatusProvider(context);
         router = new NavigationViewRouter(onlineRouter, connectivityStatus, routeEngineListener);
     }
 
@@ -248,7 +242,7 @@ private void initializeLocationEngine() {
 
     private void initializeLanguage(NavigationUiOptions options) {
         RouteOptions routeOptions = options.directionsRoute().routeOptions();
-        language = localeUtils.inferDeviceLanguage(getApplication());
+        language = localeUtils.inferDeviceLanguage(context);
         if (routeOptions != null) {
             language = routeOptions.language();
         }
@@ -256,7 +250,7 @@ private void initializeLanguage(NavigationUiOptions options) {
 
     private String initializeUnitType(NavigationUiOptions options) {
         RouteOptions routeOptions = options.directionsRoute().routeOptions();
-        String unitType = localeUtils.getUnitTypeForDeviceLocale(getApplication());
+        String unitType = localeUtils.getUnitTypeForDeviceLocale(context);
         if (routeOptions != null) {
             unitType = routeOptions.voiceUnits();
         }
@@ -275,7 +269,7 @@ private int initializeRoundingIncrement(NavigationViewOptions options) {
     private void initializeDistanceFormatter(NavigationViewOptions options) {
         String unitType = initializeUnitType(options);
         int roundingIncrement = initializeRoundingIncrement(options);
-        distanceFormatter = new DistanceFormatter(getApplication(), language, unitType, roundingIncrement);
+        distanceFormatter = new DistanceFormatter(context, language, unitType, roundingIncrement);
     }
 
     private void initializeNavigationSpeechPlayer(NavigationViewOptions options) {
@@ -291,13 +285,13 @@ private void initializeNavigationSpeechPlayer(NavigationViewOptions options) {
 
     @NonNull
     private SpeechPlayerProvider initializeSpeechPlayerProvider(boolean voiceLanguageSupported) {
-        return new SpeechPlayerProvider(getApplication(), language, voiceLanguageSupported);
+        return new SpeechPlayerProvider(context, language, voiceLanguageSupported);
     }
 
     private LocationEngine initializeLocationEngineFrom(NavigationViewOptions options) {
         LocationEngine locationEngine = options.locationEngine();
         boolean shouldReplayRoute = options.shouldSimulateRoute();
-        locationEngineConductor.initializeLocationEngine(getApplication(), locationEngine, shouldReplayRoute);
+        locationEngineConductor.initializeLocationEngine(context, locationEngine, shouldReplayRoute);
         return locationEngineConductor.obtainLocationEngine();
     }
 
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewSubscriber.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewSubscriber.java
index 5958ea12d..a46f7069d 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewSubscriber.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewSubscriber.java
@@ -9,8 +9,8 @@
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.OnLifecycleEvent;
 
-import com.mapbox.services.android.navigation.v5.models.DirectionsRoute;
 import com.mapbox.geojson.Point;
+import com.mapbox.services.android.navigation.v5.models.DirectionsRoute;
 
 class NavigationViewSubscriber implements LifecycleObserver {
 
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/OnNavigationReadyCallback.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/OnNavigationReadyCallback.java
index 5a4a1ce82..0429af378 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/OnNavigationReadyCallback.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/OnNavigationReadyCallback.java
@@ -11,4 +11,6 @@ public interface OnNavigationReadyCallback {
    *                  a configuration change.
    */
   void onNavigationReady(boolean isRunning);
+
+  void onMapReadyCallback();
 }
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCamera.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCamera.java
index 19129cbd2..273859efb 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCamera.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCamera.java
@@ -308,6 +308,10 @@ public void addProgressChangeListener(MapboxNavigation navigation) {
     navigation.addProgressChangeListener(progressChangeListener);
   }
 
+  public void removeProgressChangeListener(MapboxNavigation navigation) {
+    navigation.removeProgressChangeListener(progressChangeListener);
+  }
+
   /**
    * Adds given tracking mode transition listener for receiving notification of camera
    * transition updates.
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractor.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractor.java
index 6279c8700..f0aa31fee 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractor.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractor.java
@@ -16,6 +16,8 @@
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
 import static com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMap.STREETS_LAYER_ID;
 
+import timber.log.Timber;
+
 class MapLayerInteractor {
 
   private static final float DEFAULT_WIDTH = 20f;
@@ -46,7 +48,11 @@ void addStreetsLayer(String sourceId, String sourceLayer) {
         lineColor(Color.WHITE)
       )
       .withSourceLayer(sourceLayer);
-    mapboxMap.getStyle().addLayerAt(streetsLayer, LAST_INDEX);
+    try {
+      mapboxMap.getStyle().addLayerAt(streetsLayer, LAST_INDEX);
+    } catch (Exception e) {
+      Timber.d("Style already exists");
+    }
   }
 
   private void updateLayerWithVisibility(String layerIdentifier, List<Layer> layers, boolean isVisible) {
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteArrow.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteArrow.java
index 0690b98d7..0d131d11e 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteArrow.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteArrow.java
@@ -52,6 +52,7 @@
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_BEARING;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_CASING_LAYER_ID;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_CASING_OFFSET;
+import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_CUSTOM_ID;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_ICON;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_ICON_CASING;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_LAYER_ID;
@@ -59,6 +60,7 @@
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_SOURCE_ID;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HIDDEN_ZOOM_LEVEL;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_SHAFT_CASING_LINE_LAYER_ID;
+import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_SHAFT_CUSTOM_ID;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_SHAFT_LINE_LAYER_ID;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_SHAFT_SOURCE_ID;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.LAYER_ABOVE_UPCOMING_MANEUVER_ARROW;
@@ -78,6 +80,8 @@
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.TRANSPARENT;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.TWO_POINTS;
 
+import timber.log.Timber;
+
 class MapRouteArrow {
 
   @ColorInt
@@ -191,20 +195,28 @@ private void initialize() {
 
   private void initializeArrowShaft() {
     arrowShaftGeoJsonSource = new GeoJsonSource(
-      ARROW_SHAFT_SOURCE_ID,
+            ARROW_SHAFT_CUSTOM_ID,
       FeatureCollection.fromFeatures(new Feature[]{}),
       new GeoJsonOptions().withMaxZoom(16)
     );
-    mapboxMap.getStyle().addSource(arrowShaftGeoJsonSource);
+    try {
+      mapboxMap.getStyle().addSource(arrowShaftGeoJsonSource);
+    } catch (Exception e) {
+      Timber.d("Style already exists");
+    }
   }
 
   private void initializeArrowHead() {
     arrowHeadGeoJsonSource = new GeoJsonSource(
-      ARROW_HEAD_SOURCE_ID,
+            ARROW_HEAD_CUSTOM_ID,
       FeatureCollection.fromFeatures(new Feature[]{}),
       new GeoJsonOptions().withMaxZoom(16)
     );
-    mapboxMap.getStyle().addSource(arrowHeadGeoJsonSource);
+    try {
+      mapboxMap.getStyle().addSource(arrowHeadGeoJsonSource);
+    } catch (Exception e) {
+      Timber.d("Style already exists");
+    }
   }
 
   private void addArrowHeadIcon() {
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java
index e698e73e6..ba4d18ecd 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java
@@ -8,6 +8,7 @@
 import androidx.annotation.ColorInt;
 import androidx.core.content.ContextCompat;
 
+import com.mapbox.services.android.navigation.ui.v5.BuildConfig;
 import com.mapbox.services.android.navigation.v5.models.DirectionsRoute;
 import com.mapbox.services.android.navigation.v5.models.RouteLeg;
 import com.mapbox.geojson.Feature;
@@ -37,11 +38,14 @@
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_LAYER_ID;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_SHIELD_LAYER_ID;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_SOURCE_ID;
+import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_CUSTOM_ID;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_DESTINATION_VALUE;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_ORIGIN_VALUE;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_PROPERTY_KEY;
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_SOURCE_ID;
 
+import timber.log.Timber;
+
 class MapRouteLine {
 
   @ColorInt
@@ -160,13 +164,22 @@ class MapRouteLine {
 
     GeoJsonOptions wayPointGeoJsonOptions = new GeoJsonOptions().withMaxZoom(16);
     drawnWaypointsFeatureCollection = waypointsFeatureCollection;
-    wayPointSource = sourceProvider.build(WAYPOINT_SOURCE_ID, drawnWaypointsFeatureCollection, wayPointGeoJsonOptions);
-    style.addSource(wayPointSource);
+    wayPointSource = sourceProvider.build(WAYPOINT_CUSTOM_ID, drawnWaypointsFeatureCollection, wayPointGeoJsonOptions);
+
 
     GeoJsonOptions routeLineGeoJsonOptions = new GeoJsonOptions().withMaxZoom(16);
     drawnRouteFeatureCollection = routesFeatureCollection;
     routeLineSource = sourceProvider.build(ROUTE_SOURCE_ID, drawnRouteFeatureCollection, routeLineGeoJsonOptions);
-    style.addSource(routeLineSource);
+
+
+    try {
+      style.addSource(wayPointSource);
+      style.addSource(routeLineSource);
+    } catch(Exception e) {
+      if (BuildConfig.DEBUG) {
+        Timber.d("Style Already exists");
+      }
+    }
 
     // Waypoint attributes
     int originWaypointIcon = typedArray.getResourceId(
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/RouteConstants.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/RouteConstants.java
index 2164ae930..07ce0ac4d 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/RouteConstants.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/RouteConstants.java
@@ -7,12 +7,18 @@ class RouteConstants {
   static final String ROUTE_LAYER_ID = "mapbox-navigation-route-layer";
   static final String ROUTE_SHIELD_LAYER_ID = "mapbox-navigation-route-shield-layer";
   static final String WAYPOINT_SOURCE_ID = "mapbox-navigation-waypoint-source";
+
+  static final String WAYPOINT_CUSTOM_ID = "mapbox-waypoint-custom-id";
   static final String WAYPOINT_LAYER_ID = "mapbox-navigation-waypoint-layer";
   static final int TWO_POINTS = 2;
   static final int THIRTY = 30;
   static final String ARROW_BEARING = "mapbox-navigation-arrow-bearing";
   static final String ARROW_SHAFT_SOURCE_ID = "mapbox-navigation-arrow-shaft-source";
+
+  static final String ARROW_SHAFT_CUSTOM_ID = "mapbox-arrow-shaft-custom-id";
   static final String ARROW_HEAD_SOURCE_ID = "mapbox-navigation-arrow-head-source";
+
+  static final String ARROW_HEAD_CUSTOM_ID = "mapbox-arrow-head-custom-id";
   static final String ARROW_SHAFT_CASING_LINE_LAYER_ID = "mapbox-navigation-arrow-shaft-casing-layer";
   static final String ARROW_SHAFT_LINE_LAYER_ID = "mapbox-navigation-arrow-shaft-layer";
   static final String ARROW_HEAD_ICON = "mapbox-navigation-arrow-head-icon";
diff --git a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
index eb473391f..a0a8d15e5 100644
--- a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
@@ -1,53 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/navigationLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@+id/navigationMapView"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:maplibre_uiAttribution="false"
-        app:maplibre_uiCompass="false"/>
+        android:orientation="vertical"
+        >
 
-    <ImageView
-        android:id="@+id/screenshotView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="invisible"/>
+        <com.mapbox.mapboxsdk.maps.MapView
+            android:id="@+id/navigationMapView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:maplibre_uiAttribution="false"
+            app:maplibre_uiCompass="false"
+            app:maplibre_cameraTargetLat="52.039176"
+            app:maplibre_cameraTargetLng="5.550339"
+            app:maplibre_cameraZoom="12"
+            app:maplibre_enableTilePrefetch="true"
+            app:maplibre_enableZMediaOverlay="true"
+            app:maplibre_renderTextureMode="true"
+            app:maplibre_renderTextureTranslucentSurface="true"
+            app:maplibre_uiDoubleTapGestures="true"
+            app:maplibre_uiLogo="false"
+            app:maplibre_uiRotateGestures="true"
+            app:maplibre_uiScrollGestures="true"
+            app:maplibre_uiTiltGestures="true"
+            app:maplibre_uiZoomGestures="true"/>
 
-    <com.mapbox.services.android.navigation.ui.v5.summary.SummaryBottomSheet
-        android:id="@+id/summaryBottomSheet"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"/>
+        <ImageView
+            android:id="@+id/screenshotView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="invisible" />
 
-    <com.mapbox.services.android.navigation.ui.v5.RecenterButton
-        android:id="@+id/recenterBtn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:layout_margin="16dp"
-        android:visibility="invisible"
-        app:layout_anchor="@id/summaryBottomSheet"
-        app:layout_anchorGravity="top|left"/>
-
-    <com.mapbox.services.android.navigation.ui.v5.map.WayNameView
-        android:id="@+id/wayNameView"
+        <com.mapbox.services.android.navigation.ui.v5.summary.SummaryBottomSheet
+            android:id="@+id/summaryBottomSheet"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />
+
+        <com.mapbox.services.android.navigation.ui.v5.RecenterButton
+            android:id="@+id/recenterBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:layout_margin="16dp"
+            android:visibility="invisible"
+            app:layout_anchor="@id/summaryBottomSheet"
+            app:layout_anchorGravity="top|left" />
+
+        <com.mapbox.services.android.navigation.ui.v5.map.WayNameView
+            android:id="@+id/wayNameView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center|top"
+            android:visibility="invisible"
+            app:layout_anchor="@id/summaryBottomSheet"
+            app:layout_anchorGravity="center|top" />
+
+        <com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView
+            android:id="@+id/instructionView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:id="@+id/startRouteLayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center|top"
-        android:visibility="invisible"
-        app:layout_anchor="@id/summaryBottomSheet"
-        app:layout_anchorGravity="center|top"/>
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="60dp"
+        android:background="@drawable/rounded_corners"
+        android:backgroundTint="@color/mapbox_navigation_route_shield_layer_color"
+        android:orientation="horizontal"
+        android:padding="8dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:visibility="visible">
 
-    <com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView
-        android:id="@+id/instructionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/simulateRouteSwitch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="simulate_route"
+            android:textColor="@color/mapbox_navigation_route_upcoming_maneuver_arrow_color"
+            app:switchPadding="4dp" />
+
+        <Button
+            android:id="@+id/routeButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:text="В путь"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml b/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml
index 1c775fc76..1131d51c0 100644
--- a/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml
@@ -31,10 +31,10 @@
         android:focusable="true"
         android:foreground="?attr/selectableItemBackground"
         android:padding="16dp"
-        android:tint="?attr/navigationViewSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/divider"
         app:layout_constraintTop_toTopOf="parent"
+
         tools:src="@drawable/ic_route_preview"/>
 
     <View
diff --git a/libandroid-navigation-ui/src/main/res/values/developer-config.xml b/libandroid-navigation-ui/src/main/res/values/developer-config.xml
new file mode 100644
index 000000000..d7ab7fdb9
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/res/values/developer-config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="base_url" translatable="false">https://graphhopper.com/api/1/navigate/</string>    <!-- Your GraphHopper API key -->
+    <string name="mapbox_access_token" translatable="false">pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a</string>
+    <!-- The "day" style used for navigation, here mapilion is used but you can use maptiler too -->
+    <string name="map_style_light" translatable="false">https://api.maptiler.com/maps/streets-v2/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ</string>
+    <!-- The "night" style used for navigation -->
+    <string name="map_style_dark" translatable="false">https://api.maptiler.com/maps/streets-v2/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ</string>
+</resources>
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/res/values/styles.xml b/libandroid-navigation-ui/src/main/res/values/styles.xml
index e96ecd380..fb53f0974 100644
--- a/libandroid-navigation-ui/src/main/res/values/styles.xml
+++ b/libandroid-navigation-ui/src/main/res/values/styles.xml
@@ -81,4 +81,12 @@
         <item name="navigationViewMapStyle">@string/navigation_guidance_night</item>
     </style>
 
+    <style name="TestNavigationViewLight" parent="NavigationViewLight">
+        <item name="navigationViewMapStyle">@string/map_style_light</item>
+    </style>
+
+    <style name="TestNavigationViewDark" parent="NavigationViewDark">
+        <item name="navigationViewMapStyle">@string/map_style_dark</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/libandroid-navigation/build.gradle b/libandroid-navigation/build.gradle
index e5c87ced2..918962bfa 100644
--- a/libandroid-navigation/build.gradle
+++ b/libandroid-navigation/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
 apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
@@ -12,12 +13,23 @@ kotlin {
     jvmToolchain(17)
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
+}
+
 android {
     namespace 'com.mapbox.services.android.navigation'
 
     compileSdkVersion androidVersions.compileSdkVersion
     buildToolsVersion androidVersions.buildToolsVersion
 
+    namespace 'com.mapbox.services.android'
     defaultConfig {
         minSdkVersion androidVersions.minSdkVersion
         targetSdkVersion androidVersions.targetSdkVersion
@@ -40,6 +52,10 @@ android {
         javadocDeps
     }
 
+    buildFeatures {
+        buildConfig true
+    }
+
     buildTypes {
         debug {
             testCoverageEnabled = true
@@ -55,6 +71,21 @@ android {
         unitTests.includeAndroidResources = true
     }
 
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
+    buildFeatures {
+        buildConfig = true
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     publishing {
         singleVariant("release") {
             withSourcesJar()
diff --git a/libandroid-navigation/proguard-consumer.pro b/libandroid-navigation/proguard-consumer.pro
index 88e133da6..cf741ebf2 100644
--- a/libandroid-navigation/proguard-consumer.pro
+++ b/libandroid-navigation/proguard-consumer.pro
@@ -16,3 +16,4 @@
 # AutoValue annotations are retained but dependency is compileOnly.
 -dontwarn com.google.auto.value.**
 -dontwarn com.ryanharter.auto.value.**
+-dontwarn com.ryanharter.auto.value.**
diff --git a/libandroid-navigation/src/main/AndroidManifest.xml b/libandroid-navigation/src/main/AndroidManifest.xml
index 31b8d5dbf..5c8585df0 100644
--- a/libandroid-navigation/src/main/AndroidManifest.xml
+++ b/libandroid-navigation/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.mapbox.services.android.navigation">
+          >
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotification.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotification.java
index af6c28bf5..c0c8f1bf2 100644
--- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotification.java
+++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotification.java
@@ -1,6 +1,9 @@
 package com.mapbox.services.android.navigation.v5.navigation;
 
-import android.annotation.SuppressLint;
+import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_NOTIFICATION_CHANNEL;
+import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_NOTIFICATION_ID;
+import static com.mapbox.services.android.navigation.v5.utils.time.TimeFormatter.formatTime;
+
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -17,9 +20,10 @@
 
 import androidx.core.app.NotificationCompat;
 
+
+import com.mapbox.services.android.R;
 import com.mapbox.services.android.navigation.v5.models.LegStep;
 import com.mapbox.services.android.navigation.v5.models.RouteOptions;
-import com.mapbox.services.android.navigation.R;
 import com.mapbox.services.android.navigation.v5.navigation.notification.NavigationNotification;
 import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress;
 import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter;
@@ -28,10 +32,6 @@
 
 import java.util.Calendar;
 
-import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_NOTIFICATION_CHANNEL;
-import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_NOTIFICATION_ID;
-import static com.mapbox.services.android.navigation.v5.utils.time.TimeFormatter.formatTime;
-
 /**
  * This is in charge of creating the persistent navigation session notification and updating it.
  */
diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMapRoute.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMapRoute.java
index 3ad50afff..7cf417ff6 100644
--- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMapRoute.java
+++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMapRoute.java
@@ -53,7 +53,7 @@
 import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
 import com.mapbox.mapboxsdk.utils.MathUtils;
-import com.mapbox.services.android.navigation.R;
+import com.mapbox.services.android.R;
 import com.mapbox.services.android.navigation.v5.route.MapRouteProgressChangeListener;
 import com.mapbox.services.android.navigation.v5.route.OnRouteSelectionChangeListener;
 import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener;
diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatter.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatter.java
index af060e947..bef32eab2 100644
--- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatter.java
+++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatter.java
@@ -11,7 +11,7 @@
 import androidx.annotation.NonNull;
 
 import com.mapbox.geojson.Point;
-import com.mapbox.services.android.navigation.R;
+import com.mapbox.services.android.R;
 import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria;
 import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants;
 import com.mapbox.services.android.navigation.v5.routeprogress.MetricsRouteProgress;
diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverMap.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverMap.java
index d17237e0d..93f300f90 100644
--- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverMap.java
+++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverMap.java
@@ -1,6 +1,6 @@
 package com.mapbox.services.android.navigation.v5.utils;
 
-import com.mapbox.services.android.navigation.R;
+import com.mapbox.services.android.R;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverUtils.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverUtils.java
index 03e77a61b..ea3ccbb33 100644
--- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverUtils.java
+++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverUtils.java
@@ -4,7 +4,7 @@
 
 import com.mapbox.services.android.navigation.v5.models.LegStep;
 import com.mapbox.services.android.navigation.v5.models.StepManeuver;
-import com.mapbox.services.android.navigation.R;
+import com.mapbox.services.android.R;
 
 public class ManeuverUtils {
 
diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatter.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatter.java
index edc685bfa..afcb70b4e 100644
--- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatter.java
+++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatter.java
@@ -7,7 +7,7 @@
 import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
 
-import com.mapbox.services.android.navigation.R;
+import com.mapbox.services.android.R;
 import com.mapbox.services.android.navigation.v5.navigation.NavigationTimeFormat;
 import com.mapbox.services.android.navigation.v5.utils.span.SpanItem;
 import com.mapbox.services.android.navigation.v5.utils.span.SpanUtils;
diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatterTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatterTest.java
index 3fdcd18ea..5050cf91b 100644
--- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatterTest.java
+++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatterTest.java
@@ -5,7 +5,7 @@
 import android.content.res.Resources;
 import android.os.LocaleList;
 
-import com.mapbox.services.android.navigation.R;
+import com.mapbox.services.android.R;
 import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria;
 
 import junit.framework.Assert;
diff --git a/settings.gradle b/settings.gradle
index 2c4e0d026..cbec7be97 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,13 @@
+plugins {
+    id("com.gradle.develocity") version("3.17.3")
+}
 include ':app'
 include ':libandroid-navigation'
 include ':libandroid-navigation-ui'
+
+develocity {
+    buildScan {
+        termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
+        termsOfUseAgree.set("yes")
+    }
+}
\ No newline at end of file

From 250a309ab678e6cd8dc1359c0f7a59dcd8a1f5bf Mon Sep 17 00:00:00 2001
From: Zhandr <zhako11@gmail.com>
Date: Mon, 30 Sep 2024 18:34:01 +0500
Subject: [PATCH 02/46] fixed gradle dependencies error

---
 .../testapp/ValhallaNavigationActivity.kt     | 108 +++++++++---------
 gradle/mvn-push-android.gradle                |   2 +-
 libandroid-navigation-ui/build.gradle         |  26 +----
 libandroid-navigation/build.gradle            |  27 +----
 4 files changed, 59 insertions(+), 104 deletions(-)

diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/ValhallaNavigationActivity.kt b/app/src/main/java/com/mapbox/services/android/navigation/testapp/ValhallaNavigationActivity.kt
index fb4960398..60c4ab51b 100644
--- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/ValhallaNavigationActivity.kt
+++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/ValhallaNavigationActivity.kt
@@ -55,47 +55,47 @@ class ValhallaNavigationActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        if (BuildConfig.DEBUG) {
-            Timber.plant(Timber.DebugTree())
-        }
-
-        binding = ActivityNavigationUiBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        binding.mapView.apply {
-            onCreate(savedInstanceState)
-            getMapAsync(this@ValhallaNavigationActivity)
-        }
-
-        binding.startRouteButton.setOnClickListener {
-            route?.let { route ->
-                val userLocation = mapboxMap.locationComponent.lastKnownLocation ?: return@let
-                val options = NavigationLauncherOptions.builder()
-                    .directionsRoute(route)
-                    .shouldSimulateRoute(simulateRoute)
-                    .initialMapCameraPosition(CameraPosition.Builder().target(LatLng(userLocation.latitude, userLocation.longitude)).build())
-                    .lightThemeResId(R.style.TestNavigationViewLight)
-                    .darkThemeResId(R.style.TestNavigationViewDark)
-                    .build()
-                NavigationLauncher.startNavigation(this@ValhallaNavigationActivity, options)
-            }
-        }
-
-        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
-            simulateRoute = checked
-        }
-
-        binding.clearPoints.setOnClickListener {
-            if (::mapboxMap.isInitialized) {
-                mapboxMap.markers.forEach {
-                    mapboxMap.removeMarker(it)
-                }
-            }
-            destination = null
-            it.visibility = View.GONE
-            binding.startRouteLayout.visibility = View.GONE
-
-            navigationMapRoute?.removeRoute()
-        }
+//        if (BuildConfig.DEBUG) {
+//            Timber.plant(Timber.DebugTree())
+//        }
+//
+//        binding = ActivityNavigationUiBinding.inflate(layoutInflater)
+//        setContentView(binding.root)
+//        binding.mapView.apply {
+//            onCreate(savedInstanceState)
+//            getMapAsync(this@ValhallaNavigationActivity)
+//        }
+//
+//        binding.startRouteButton.setOnClickListener {
+//            route?.let { route ->
+//                val userLocation = mapboxMap.locationComponent.lastKnownLocation ?: return@let
+//                val options = NavigationLauncherOptions.builder()
+//                    .directionsRoute(route)
+//                    .shouldSimulateRoute(simulateRoute)
+//                    .initialMapCameraPosition(CameraPosition.Builder().target(LatLng(userLocation.latitude, userLocation.longitude)).build())
+//                    .lightThemeResId(R.style.TestNavigationViewLight)
+//                    .darkThemeResId(R.style.TestNavigationViewDark)
+//                    .build()
+//                NavigationLauncher.startNavigation(this@ValhallaNavigationActivity, options)
+//            }
+//        }
+//
+//        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
+//            simulateRoute = checked
+//        }
+//
+//        binding.clearPoints.setOnClickListener {
+//            if (::mapboxMap.isInitialized) {
+//                mapboxMap.markers.forEach {
+//                    mapboxMap.removeMarker(it)
+//                }
+//            }
+//            destination = null
+//            it.visibility = View.GONE
+//            binding.startRouteLayout.visibility = View.GONE
+//
+//            navigationMapRoute?.removeRoute()
+//        }
     }
 
     override fun onMapReady(mapboxMap: MapboxMap) {
@@ -103,11 +103,11 @@ class ValhallaNavigationActivity :
         mapboxMap.setStyle(Style.Builder().fromUri(getString(R.string.map_style_light))) { style ->
             enableLocationComponent(style)
         }
-
-        navigationMapRoute = NavigationMapRoute(
-            binding.mapView,
-            mapboxMap
-        )
+//
+//        navigationMapRoute = NavigationMapRoute(
+//            binding.mapView,
+//            mapboxMap
+//        )
 
         mapboxMap.addOnMapClickListener(this)
         Snackbar.make(
@@ -143,7 +143,7 @@ class ValhallaNavigationActivity :
         destination = Point.fromLngLat(point.longitude, point.latitude)
 
         mapboxMap.addMarker(MarkerOptions().position(point))
-        binding.clearPoints.visibility = View.VISIBLE
+//        binding.clearPoints.visibility = View.VISIBLE
         calculateRoute()
         return true
     }
@@ -268,27 +268,27 @@ class ValhallaNavigationActivity :
 
     override fun onResume() {
         super.onResume()
-        binding.mapView.onResume()
+//        binding.mapView.onResume()
     }
 
     override fun onPause() {
         super.onPause()
-        binding.mapView.onPause()
+//        binding.mapView.onPause()
     }
 
     override fun onStart() {
         super.onStart()
-        binding.mapView.onStart()
+//        binding.mapView.onStart()
     }
 
     override fun onStop() {
         super.onStop()
-        binding.mapView.onStop()
+//        binding.mapView.onStop()
     }
 
     override fun onLowMemory() {
         super.onLowMemory()
-        binding.mapView.onLowMemory()
+//        binding.mapView.onLowMemory()
     }
 
     override fun onDestroy() {
@@ -296,11 +296,11 @@ class ValhallaNavigationActivity :
         if (::mapboxMap.isInitialized) {
             mapboxMap.removeOnMapClickListener(this)
         }
-        binding.mapView.onDestroy()
+//        binding.mapView.onDestroy()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        binding.mapView.onSaveInstanceState(outState)
+//        binding.mapView.onSaveInstanceState(outState)
     }
 }
diff --git a/gradle/mvn-push-android.gradle b/gradle/mvn-push-android.gradle
index 944263b2a..94d197367 100644
--- a/gradle/mvn-push-android.gradle
+++ b/gradle/mvn-push-android.gradle
@@ -79,4 +79,4 @@ afterEvaluate { project ->
 //TODO: currently not used, while only published with JitPack
 //signing {
 //  sign publishing.publications
-//}
+//}
\ No newline at end of file
diff --git a/libandroid-navigation-ui/build.gradle b/libandroid-navigation-ui/build.gradle
index b4620815a..6dd87ca46 100644
--- a/libandroid-navigation-ui/build.gradle
+++ b/libandroid-navigation-ui/build.gradle
@@ -3,12 +3,6 @@ plugins {
 }
 apply plugin: 'com.android.library'
 
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
-  }
-}
-
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
@@ -16,8 +10,6 @@ java {
 }
 
 android {
-  namespace 'com.mapbox.services.android.navigation.ui.v5'
-
     compileSdkVersion androidVersions.compileSdkVersion
     buildToolsVersion androidVersions.buildToolsVersion
 
@@ -53,10 +45,6 @@ android {
         }
     }
 
-  buildFeatures {
-    buildConfig true
-  }
-
     buildFeatures {
         buildConfig = true
     }
@@ -64,17 +52,10 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
-  publishing {
-    singleVariant("release") {
-      withSourcesJar()
-      withJavadocJar()
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
-  }
 
     publishing {
         singleVariant("release") {
@@ -126,7 +107,6 @@ dependencies {
 }
 
 apply from: 'javadoc.gradle'
-apply from: "${rootDir}/gradle/mvn-push-android.gradle"
 apply from: "${rootDir}/gradle/checkstyle.gradle"
 apply from: "${rootDir}/gradle/dependencies-graph.gradle"
 apply from: "${rootDir}/gradle/dependency-updates.gradle"
diff --git a/libandroid-navigation/build.gradle b/libandroid-navigation/build.gradle
index 918962bfa..733ce3e7b 100644
--- a/libandroid-navigation/build.gradle
+++ b/libandroid-navigation/build.gradle
@@ -1,17 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
-}
-
-kotlin {
-    jvmToolchain(17)
-}
 
 java {
     toolchain {
@@ -24,8 +13,6 @@ kotlin {
 }
 
 android {
-    namespace 'com.mapbox.services.android.navigation'
-
     compileSdkVersion androidVersions.compileSdkVersion
     buildToolsVersion androidVersions.buildToolsVersion
 
@@ -62,21 +49,10 @@ android {
         }
     }
 
-    buildFeatures {
-        buildConfig true
-    }
-
     testOptions {
         unitTests.returnDefaultValues = true
         unitTests.includeAndroidResources = true
     }
-
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-            withJavadocJar()
-        }
-    }
     buildFeatures {
         buildConfig = true
     }
@@ -127,8 +103,7 @@ dependencies {
 }
 
 apply from: 'javadoc.gradle'
-apply from: "${rootDir}/gradle/mvn-push-android.gradle"
 apply from: "${rootDir}/gradle/checkstyle.gradle"
 apply from: "${rootDir}/gradle/dependencies-graph.gradle"
 apply from: "${rootDir}/gradle/dependency-updates.gradle"
-
+apply from: "${rootDir}/gradle/mvn-push-android.gradle"
\ No newline at end of file

From 3c2767dfd538d9d6bd4831baa1d35cc806ce6770 Mon Sep 17 00:00:00 2001
From: Zhandr <zhako11@gmail.com>
Date: Mon, 30 Sep 2024 20:05:20 +0500
Subject: [PATCH 03/46] changing instruction view representation

---
 .../res/layout/instruction_content_layout.xml | 22 +++++++++----------
 .../main/res/layout/instruction_layout.xml    |  2 +-
 .../res/layout/instruction_view_layout.xml    |  3 ++-
 .../res/layout/navigation_view_layout.xml     |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
index 799b4cea6..d6556bf5f 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="96dp"
     tools:background="?navigationViewBannerBackground">
 
@@ -24,9 +24,8 @@
 
         <com.mapbox.services.android.navigation.ui.v5.instruction.maneuver.ManeuverView
             android:id="@+id/maneuverView"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            app:layout_constraintBottom_toTopOf="@+id/stepDistanceText"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -43,11 +42,13 @@
             android:includeFontPadding="false"
             android:maxLines="1"
             android:textColor="?attr/navigationViewBannerSecondaryText"
-            android:textSize="22sp"
+            android:textSize="10sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:text="302 mi"/>
+            app:layout_constraintStart_toEndOf="@id/maneuverView"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="302 mi"
+            tools:ignore="NotSibling" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -60,8 +61,7 @@
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/guideline"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintVertical_bias="0.65">
 
         <TextView
@@ -74,7 +74,7 @@
             android:maxLines="1"
             android:minHeight="35dp"
             android:textColor="?attr/navigationViewBannerPrimaryText"
-            android:textSize="30sp"
+            android:textSize="16sp"
             android:textStyle="bold"
             tools:text="I-580 South"/>
 
@@ -89,7 +89,7 @@
             android:maxLines="1"
             android:minHeight="31dp"
             android:textColor="?attr/navigationViewBannerSecondaryText"
-            android:textSize="26sp"
+            android:textSize="14sp"
             android:textStyle="bold"
             tools:text="San Jose / Cupertino"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
index fe822a7f9..a0b20797d 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="0dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="?attr/navigationViewBannerBackground"
     android:elevation="6dp"
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
index 7dd230543..b6e22c50b 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
@@ -2,7 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/instructionViewLayout"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:keepScreenOn="true">
 
@@ -25,6 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/instructionLayout"
+        android:visibility="gone"
         android:orientation="vertical">
 
         <include
diff --git a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
index a0a8d15e5..923da33a3 100644
--- a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
@@ -66,7 +66,7 @@
 
         <com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView
             android:id="@+id/instructionView"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>

From 3174826f2a184d16f6a15159a387a55d3032f403 Mon Sep 17 00:00:00 2001
From: Zhandr <zhako11@gmail.com>
Date: Wed, 23 Oct 2024 06:05:35 +0500
Subject: [PATCH 04/46] Fixed instruction view crashing, click listener,
 paddings, rerouting

---
 .../navigation/ui/v5/NavigationRouteView.kt   | 24 +++++----
 .../android/navigation/ui/v5/SoundButton.java |  2 +-
 .../ui/v5/instruction/InstructionView.java    | 22 ++++----
 .../v5/instruction/maneuver/ManeuverView.java |  4 +-
 .../res/layout/instruction_content_layout.xml | 54 ++++++++-----------
 .../main/res/layout/instruction_layout.xml    |  6 +--
 .../res/layout/instruction_view_layout.xml    |  3 +-
 .../res/layout/navigation_view_layout.xml     | 17 ++++--
 8 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
index e70584a5e..ba5b2ea06 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
@@ -40,6 +40,7 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Projection
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
+import com.mapbox.services.android.navigation.ui.v5.NavigationContract.View
 import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera
 import com.mapbox.services.android.navigation.ui.v5.instruction.ImageCreator
 import com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView
@@ -326,9 +327,6 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     fun calculateRoute(routeList: List<Pair<Double, Double>>, userLocation: Pair<Double, Double>, accessToken: String) {
-        if (isMapReinitialized) {
-            onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
-        } else {
             val startRouteButton = findViewById<Button>(R.id.routeButton)
 //        startRouteButton.setOnClickListener {
             val destination = Point.fromLngLat(76.930137, 43.230361)
@@ -381,13 +379,17 @@ class NavigationRouteView @JvmOverloads constructor(
                             baseCameraPosition = mapboxMap!!.cameraPosition
                             NavigationLauncher.startNavigation(context, options)
                             route?.let {
-                                isMapReinitialized = true
-                                if (options.initialMapCameraPosition() != null) {
-                                    initialize(
-                                        options.initialMapCameraPosition()!!
-                                    )
+                                if (isMapReinitialized) {
+                                    onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
                                 } else {
-                                    initialize()
+                                    isMapReinitialized = true
+                                    if (options.initialMapCameraPosition() != null) {
+                                        initialize(
+                                            options.initialMapCameraPosition()!!
+                                        )
+                                    } else {
+                                        initialize()
+                                    }
                                 }
                             }
 //                        binding.startRouteLayout.visibility = View.VISIBLE
@@ -400,7 +402,6 @@ class NavigationRouteView @JvmOverloads constructor(
                     Timber.e(throwable, "onFailure: navigation.getRoute()")
                 }
             })
-        }
     }
 
     override fun setSummaryBehaviorState(state: Int) {
@@ -547,6 +548,7 @@ class NavigationRouteView @JvmOverloads constructor(
      */
     @UiThread
     fun stopNavigation() {
+        instructionView!!.visibility = GONE
         navigationPresenter!!.onNavigationStopped()
         navigationViewModel!!.stopNavigation()
         baseCameraPosition?.let {
@@ -561,6 +563,7 @@ class NavigationRouteView @JvmOverloads constructor(
             mapboxMap!!.removeMarker(it)
         }
         navigationMapRoute?.removeRoute()
+
     }
 
     /**
@@ -809,6 +812,7 @@ class NavigationRouteView @JvmOverloads constructor(
             initializeOnCameraTrackingChangedListener()
             subscribeViewModels()
         }
+        instructionView!!.visibility = VISIBLE
     }
 
     private fun initializeClickListeners() {
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/SoundButton.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/SoundButton.java
index 1c3fbcc4a..f420c0f40 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/SoundButton.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/SoundButton.java
@@ -71,7 +71,7 @@ public void hide() {
    */
   @Override
   public void show() {
-    setVisibility(VISIBLE);
+    setVisibility(GONE);
   }
 
   /**
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java
index d09730cc5..3ae8bbd44 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java
@@ -500,17 +500,17 @@ private void initializeButtons() {
    * and use custom animations to hide and show the instructions /sound layout
    */
   private void initializePortraitListListener() {
-    instructionLayout.setOnClickListener(new OnClickListener() {
-      @Override
-      public void onClick(View instructionView) {
-        boolean instructionsVisible = instructionListLayout.getVisibility() == VISIBLE;
-        if (!instructionsVisible) {
-          showInstructionList();
-        } else {
-          hideInstructionList();
-        }
-      }
-    });
+//    instructionLayout.setOnClickListener(new OnClickListener() {
+//      @Override
+//      public void onClick(View instructionView) {
+//        boolean instructionsVisible = instructionListLayout.getVisibility() == VISIBLE;
+//        if (!instructionsVisible) {
+//          showInstructionList();
+//        } else {
+//          hideInstructionList();
+//        }
+//      }
+//    });
   }
 
   /**
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java
index 0e292f47e..d2454a398 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java
@@ -250,9 +250,9 @@ protected void onDraw(Canvas canvas) {
     private void initializeColorFrom(AttributeSet attributeSet) {
         TypedArray typedArray = getContext().obtainStyledAttributes(attributeSet, R.styleable.ManeuverView);
         primaryColor = typedArray.getColor(R.styleable.ManeuverView_maneuverViewPrimaryColor,
-            ContextCompat.getColor(getContext(), R.color.mapbox_navigation_view_color_banner_maneuver_primary));
+            ContextCompat.getColor(getContext(), R.color.mapbox_navigation_route_layer_blue));
         secondaryColor = typedArray.getColor(R.styleable.ManeuverView_maneuverViewSecondaryColor,
-            ContextCompat.getColor(getContext(), R.color.mapbox_navigation_view_color_banner_maneuver_secondary));
+            ContextCompat.getColor(getContext(), R.color.mapbox_navigation_route_layer_blue));
         typedArray.recycle();
     }
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
index d6556bf5f..e13952d52 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
@@ -3,48 +3,41 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:background="#FFFFFF"
     android:layout_width="wrap_content"
-    android:layout_height="96dp"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="16dp"
     tools:background="?navigationViewBannerBackground">
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/maneuver_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_begin="80dp"/>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/guideline"
         app:layout_constraintStart_toStartOf="parent"
+        android:padding="8dp"
         app:layout_constraintTop_toTopOf="parent">
 
         <com.mapbox.services.android.navigation.ui.v5.instruction.maneuver.ManeuverView
             android:id="@+id/maneuverView"
             android:layout_width="30dp"
             android:layout_height="30dp"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.75"
-            app:maneuverViewPrimaryColor="?attr/navigationViewBannerManeuverPrimary"
-            app:maneuverViewSecondaryColor="?attr/navigationViewBannerManeuverSecondary"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:maneuverViewPrimaryColor="@color/mapbox_navigation_route_layer_blue"
+            app:maneuverViewSecondaryColor="@color/mapbox_navigation_route_layer_blue"/>
 
         <TextView
             android:id="@+id/stepDistanceText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="11dp"
-            android:gravity="center"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:textColor="?attr/navigationViewBannerSecondaryText"
-            android:textSize="10sp"
+            android:textColor="#000000"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:layout_marginStart="16dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/maneuverView"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="302 mi"
@@ -54,28 +47,29 @@
 
     <LinearLayout
         android:id="@+id/instructionLayoutText"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
         android:layout_marginEnd="12dp"
         android:layout_marginRight="12dp"
+        android:layout_marginBottom="12dp"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/maneuver_layout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_bias="0.65">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        >
 
         <TextView
             android:id="@+id/stepPrimaryText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:gravity="center_vertical"
             android:includeFontPadding="false"
-            android:maxLines="1"
-            android:minHeight="35dp"
-            android:textColor="?attr/navigationViewBannerPrimaryText"
+            android:layout_marginStart="16dp"
+            android:textColor="#000000"
             android:textSize="16sp"
-            android:textStyle="bold"
             tools:text="I-580 South"/>
 
         <TextView
@@ -83,13 +77,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:gravity="center_vertical"
             android:includeFontPadding="false"
             android:lineSpacingMultiplier="0.8"
-            android:maxLines="1"
-            android:minHeight="31dp"
             android:textColor="?attr/navigationViewBannerSecondaryText"
             android:textSize="14sp"
+            android:visibility="gone"
             android:textStyle="bold"
             tools:text="San Jose / Cupertino"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
index a0b20797d..0ddc204a7 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
@@ -12,8 +12,8 @@
 
     <include
         layout="@layout/instruction_content_layout"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/instruction_layout_height"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,7 +23,7 @@
         android:id="@+id/rerouteLayout"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?attr/navigationViewBannerBackground"
+        android:background="#ffffff"
         android:elevation="4dp"
         android:gravity="center"
         android:orientation="vertical"
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
index b6e22c50b..31070ecb1 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
@@ -9,7 +9,7 @@
     <include
         android:id="@+id/instructionLayout"
         layout="@layout/instruction_layout"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
     <include
@@ -66,6 +66,7 @@
         android:layout_marginBottom="8dp"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
+        android:visibility="gone"
         android:layout_below="@id/extraInstructionContentLayout"/>
 
 </RelativeLayout>
diff --git a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
index 923da33a3..e4025fc77 100644
--- a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
@@ -64,13 +64,20 @@
             app:layout_anchor="@id/summaryBottomSheet"
             app:layout_anchorGravity="center|top" />
 
-        <com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView
-            android:id="@+id/instructionView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
+    <com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView
+        android:id="@+id/instructionView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintVertical_bias="0.2"
+        android:layout_marginStart="24dp"
+        />
+
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/startRouteLayout"
         android:layout_width="wrap_content"

From 1359a5148e045f6fadb832f8610be8233e65a385 Mon Sep 17 00:00:00 2001
From: Zhandr <zhako11@gmail.com>
Date: Fri, 8 Nov 2024 10:11:45 +0500
Subject: [PATCH 05/46] Fixed instruction view crashing, click listener,
 paddings, rerouting

---
 .../android/navigation/ui/v5/MapRouteData.kt  | 14 +++++++++++
 .../navigation/ui/v5/NavigationRouteView.kt   | 24 +++++++++++--------
 .../navigation/ui/v5/ThemeSwitcher.java       | 13 ++++++++++
 .../ui/v5/instruction/InstructionView.java    | 16 +++++++++++++
 .../res/layout/instruction_content_layout.xml |  1 +
 .../src/main/res/values/developer-config.xml  |  2 +-
 6 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapRouteData.kt

diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapRouteData.kt b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapRouteData.kt
new file mode 100644
index 000000000..3079c7415
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapRouteData.kt
@@ -0,0 +1,14 @@
+package com.mapbox.services.android.navigation.ui.v5
+
+data class MapRouteData(
+    val accessToken: String,
+    val mapStyle: String,
+    val routeList: List<Pair<Double, Double>>,
+    val userLocation: Pair<Double, Double>,
+    val mapTheme: String
+) {
+    companion object {
+        const val LIGHT_THEME = "light"
+        const val DARK_THEME = "dark"
+    }
+}
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
index ba5b2ea06..263410d50 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
@@ -123,9 +123,11 @@ class NavigationRouteView @JvmOverloads constructor(
     private var navigationMapRoute: NavigationMapRoute? = null
     private var baseCameraPosition: CameraPosition? = null
     private var isMapReinitialized: Boolean = false
+    private var mapStyle: String? = null
+    private var attrs: AttributeSet? = null
 
     init {
-        ThemeSwitcher.setTheme(context, attrs)
+        this.attrs = attrs
     }
 
     /**
@@ -133,9 +135,10 @@ class NavigationRouteView @JvmOverloads constructor(
      *
      * @param savedInstanceState to restore state if not null
      */
-    fun onCreate(navigationCallback: OnNavigationReadyCallback, savedInstanceState: Bundle?, context: ComponentActivity) {
+    fun onCreate(navigationCallback: OnNavigationReadyCallback, savedInstanceState: Bundle?, context: ComponentActivity, style: String) {
         initializeNavigationViewModel(context)
         initializeView()
+        ThemeSwitcher.setTheme(context, attrs, style)
         mapView?.let {
             it.apply {
                 if (!isMapInitialized) {
@@ -150,6 +153,7 @@ class NavigationRouteView @JvmOverloads constructor(
         lifecycleRegistry = LifecycleRegistry(this)
         lifecycleRegistry!!.markState(Lifecycle.State.CREATED)
         this.onNavigationReadyCallback = navigationCallback
+        instructionView?.setupStyle(style)
     }
 
     /**
@@ -278,7 +282,7 @@ class NavigationRouteView @JvmOverloads constructor(
      */
     override fun onMapReady(mapboxMap: MapboxMap) {
         val builder = Style.Builder().fromUri(
-            context.getString(R.string.map_style_light)
+            mapStyle!!
         )
         this.mapboxMap = mapboxMap
         if (!isMapInitialized) {
@@ -326,13 +330,13 @@ class NavigationRouteView @JvmOverloads constructor(
         }
     }
 
-    fun calculateRoute(routeList: List<Pair<Double, Double>>, userLocation: Pair<Double, Double>, accessToken: String) {
-            val startRouteButton = findViewById<Button>(R.id.routeButton)
+    fun calculateRoute(mapRouteData: MapRouteData) {
+            mapStyle = mapRouteData.mapStyle
 //        startRouteButton.setOnClickListener {
             val destination = Point.fromLngLat(76.930137, 43.230361)
-            val origin = Point.fromLngLat(userLocation.first, userLocation.second)
+            val origin = Point.fromLngLat(mapRouteData.userLocation.first, mapRouteData.userLocation.second)
             val navigationRouteBuilder = NavigationRoute.builder(context).apply {
-                this.accessToken(accessToken)
+                this.accessToken(mapRouteData.accessToken)
                 this.origin(origin)
 
                 this.voiceUnits(DirectionsCriteria.PROFILE_DRIVING)
@@ -342,7 +346,7 @@ class NavigationRouteView @JvmOverloads constructor(
                 this.profile("car")
                 this.baseUrl(context.getString(R.string.base_url))
             }
-            for (point in routeList) {
+            for (point in mapRouteData.routeList) {
                 navigationRouteBuilder.addWaypoint(
                     Point.fromLngLat(point.first, point.second)
                 )
@@ -368,8 +372,8 @@ class NavigationRouteView @JvmOverloads constructor(
                                 .initialMapCameraPosition(
                                     CameraPosition.Builder().target(
                                         LatLng(
-                                            userLocation.first,
-                                            userLocation.second
+                                            mapRouteData.userLocation.first,
+                                            mapRouteData.userLocation.second
                                         )
                                     ).build()
                                 )
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ThemeSwitcher.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ThemeSwitcher.java
index 96e2ef5b3..6e3c5a592 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ThemeSwitcher.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ThemeSwitcher.java
@@ -105,6 +105,19 @@ static void setTheme(Context context, AttributeSet attrs) {
     context.setTheme(nightModeEnabled ? darkTheme : lightTheme);
   }
 
+  static void setTheme(Context context, AttributeSet attrs, String style) {
+    TypedArray styledAttributes = context.obtainStyledAttributes(attrs, R.styleable.NavigationView);
+    int lightTheme = styledAttributes.getResourceId(R.styleable.NavigationView_navigationLightTheme,
+            R.style.NavigationViewLight);
+    int darkTheme = styledAttributes.getResourceId(R.styleable.NavigationView_navigationDarkTheme,
+            R.style.NavigationViewDark);
+    if (style.equals(MapRouteData.LIGHT_THEME)) {
+      context.setTheme(lightTheme);
+    } else {
+      context.setTheme(darkTheme);
+    }
+  }
+
   static String retrieveMapStyle(Context context) {
     TypedValue mapStyleAttr = resolveAttributeFromId(context, R.attr.navigationViewMapStyle);
     return mapStyleAttr.string.toString();
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java
index 3ae8bbd44..0823c1664 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.TextUtils;
@@ -31,6 +32,7 @@
 import androidx.transition.AutoTransition;
 import androidx.transition.TransitionManager;
 
+import com.mapbox.services.android.navigation.ui.v5.MapRouteData;
 import com.mapbox.services.android.navigation.v5.models.BannerComponents;
 import com.mapbox.services.android.navigation.v5.models.BannerInstructions;
 import com.mapbox.services.android.navigation.v5.models.BannerText;
@@ -779,4 +781,18 @@ private void updateInstructionList(InstructionModel model) {
     rvInstructions.stopScroll();
     instructionListAdapter.updateBannerListWith(routeProgress, isListShowing);
   }
+
+  public void setupStyle(String mapStyle) {
+    ConstraintLayout instructionBackground = findViewById(R.id.instructionBackground);
+    if (mapStyle.equals(MapRouteData.DARK_THEME)) {
+      instructionBackground.setBackgroundColor(Color.BLACK);
+      upcomingDistanceText.setTextColor(Color.WHITE);
+      upcomingPrimaryText.setTextColor(Color.WHITE);
+    } else {
+      instructionBackground.setBackgroundColor(Color.WHITE);
+      upcomingDistanceText.setTextColor(Color.BLACK);
+      upcomingPrimaryText.setTextColor(Color.BLACK);
+    }
+  }
+
 }
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
index e13952d52..147a03e1e 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/instructionBackground"
     android:background="#FFFFFF"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/libandroid-navigation-ui/src/main/res/values/developer-config.xml b/libandroid-navigation-ui/src/main/res/values/developer-config.xml
index d7ab7fdb9..4ddab8604 100644
--- a/libandroid-navigation-ui/src/main/res/values/developer-config.xml
+++ b/libandroid-navigation-ui/src/main/res/values/developer-config.xml
@@ -3,7 +3,7 @@
     <string name="base_url" translatable="false">https://graphhopper.com/api/1/navigate/</string>    <!-- Your GraphHopper API key -->
     <string name="mapbox_access_token" translatable="false">pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a</string>
     <!-- The "day" style used for navigation, here mapilion is used but you can use maptiler too -->
-    <string name="map_style_light" translatable="false">https://api.maptiler.com/maps/streets-v2/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ</string>
+    <string name="map_style_light" translatable="false">m</string>
     <!-- The "night" style used for navigation -->
     <string name="map_style_dark" translatable="false">https://api.maptiler.com/maps/streets-v2/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ</string>
 </resources>
\ No newline at end of file

From 5eacb91325c4a1876039921835b74c7bbe1b414f Mon Sep 17 00:00:00 2001
From: Zhandr <zhako11@gmail.com>
Date: Fri, 8 Nov 2024 11:42:22 +0500
Subject: [PATCH 06/46] added configs for map theme

---
 .../android/navigation/testapp/NavigationUIActivity.kt       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
index 202544fde..2f8ae143f 100644
--- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
+++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
@@ -22,6 +22,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.services.android.navigation.testapp.databinding.ActivityNavigationUiBinding
+import com.mapbox.services.android.navigation.ui.v5.MapRouteData
 import com.mapbox.services.android.navigation.ui.v5.NavigationLauncher
 import com.mapbox.services.android.navigation.ui.v5.NavigationLauncherOptions
 import com.mapbox.services.android.navigation.ui.v5.NavigationViewOptions
@@ -66,7 +67,7 @@ class NavigationUIActivity :
 
         binding = ActivityNavigationUiBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.navigationView.onCreate(this, savedInstanceState, this)
+        binding.navigationView.onCreate(this, savedInstanceState, this, MapRouteData.LIGHT_THEME)
 
 //        binding.mapView.apply {
 //            onCreate(savedInstanceState)
@@ -82,7 +83,7 @@ class NavigationUIActivity :
             points.add(Pair(76.930137, 43.230361))
             points.add(Pair(76.928316, 43.236109))
             points.add(Pair(76.920187, 43.236783))
-            binding.navigationView.calculateRoute(points, Pair(76.930137, 43.230361), getString(R.string.mapbox_access_token))
+//            binding.navigationView.calculateRoute(points, Pair(76.930137, 43.230361), getString(R.string.mapbox_access_token))
         }
 //        binding.clearPoints.setOnClickListener {
 //            if (::mapboxMap.isInitialized) {

From 5a2bc0fe2324a7621a89ce74f6d3f176db90f448 Mon Sep 17 00:00:00 2001
From: Zhandr <zhako11@gmail.com>
Date: Thu, 5 Dec 2024 12:16:40 +0500
Subject: [PATCH 07/46] removed bottomsheet

---
 .../testapp/NavigationUIActivity.kt           |  5 ++-
 .../navigation/ui/v5/NavigationRouteView.kt   | 38 +------------------
 .../navigation/ui/v5/NavigationView.java      |  1 -
 .../layout-land/instruction_layout_alt.xml    | 10 +----
 .../layout-land/navigation_view_layout.xml    |  8 ----
 .../src/main/res/layout/alert_view_layout.xml |  3 --
 .../res/layout/instruction_content_layout.xml |  1 -
 .../main/res/layout/instruction_layout.xml    |  3 --
 .../res/layout/instruction_list_layout.xml    |  1 -
 .../layout/instruction_viewholder_layout.xml  |  1 -
 .../res/layout/navigation_view_layout.xml     |  8 ----
 .../main/res/layout/recenter_btn_layout.xml   |  4 +-
 .../src/main/res/layout/sound_layout.xml      |  3 --
 .../res/layout/sub_instruction_layout.xml     |  6 +--
 .../layout/summary_peek_content_layout.xml    |  3 --
 .../main/res/layout/summary_peek_layout.xml   |  6 ---
 .../src/main/res/layout/turn_lane_layout.xml  |  1 -
 .../main/res/layout/wayname_view_layout.xml   |  1 -
 .../src/main/res/values/developer-config.xml  |  4 +-
 19 files changed, 10 insertions(+), 97 deletions(-)

diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
index 2f8ae143f..eb918156b 100644
--- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
+++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
@@ -67,7 +67,7 @@ class NavigationUIActivity :
 
         binding = ActivityNavigationUiBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.navigationView.onCreate(this, savedInstanceState, this, MapRouteData.LIGHT_THEME)
+        binding.navigationView.onCreate(this, savedInstanceState, this, "https://api.maptiler.com/maps/streets-v2-dark/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ")
 
 //        binding.mapView.apply {
 //            onCreate(savedInstanceState)
@@ -83,7 +83,8 @@ class NavigationUIActivity :
             points.add(Pair(76.930137, 43.230361))
             points.add(Pair(76.928316, 43.236109))
             points.add(Pair(76.920187, 43.236783))
-//            binding.navigationView.calculateRoute(points, Pair(76.930137, 43.230361), getString(R.string.mapbox_access_token))
+            binding.navigationView.calculateRoute(MapRouteData(getString(R.string.mapbox_access_token), "getString(R.string.mapbox_access_token)",
+                points, Pair(76.930137, 43.230361), MapRouteData.DARK_THEME))
         }
 //        binding.clearPoints.setOnClickListener {
 //            if (::mapboxMap.isInitialized) {
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
index 263410d50..a88560122 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
@@ -99,12 +99,9 @@ class NavigationRouteView @JvmOverloads constructor(
     NavigationContract.View {
     private var mapView: MapView? = null
     private var instructionView: InstructionView? = null
-    private var summaryBottomSheet: SummaryBottomSheet? = null
     private var summaryBehavior: BottomSheetBehavior<*>? = null
-    private var cancelBtn: ImageButton? = null
     private var recenterBtn: RecenterButton? = null
     private var wayNameView: WayNameView? = null
-    private var routeOverviewBtn: ImageButton? = null
 
     private var navigationPresenter: NavigationPresenter? = null
     private var navigationViewEventDispatcher: NavigationViewEventDispatcher? = null
@@ -139,6 +136,7 @@ class NavigationRouteView @JvmOverloads constructor(
         initializeNavigationViewModel(context)
         initializeView()
         ThemeSwitcher.setTheme(context, attrs, style)
+        mapStyle = style
         mapView?.let {
             it.apply {
                 if (!isMapInitialized) {
@@ -218,7 +216,6 @@ class NavigationRouteView @JvmOverloads constructor(
         wayNameView!!.visibility =
             if (navigationViewInstanceState.isWayNameVisible) VISIBLE else INVISIBLE
         wayNameView!!.updateWayNameText(navigationViewInstanceState.wayNameText)
-        resetBottomSheetState(navigationViewInstanceState.bottomSheetBehaviorState)
         updateInstructionListState(navigationViewInstanceState.isInstructionViewVisible)
         updateInstructionMutedState(navigationViewInstanceState.isMuted)
         mapInstanceState = savedInstanceState.getParcelable(MAP_INSTANCE_STATE_KEY)
@@ -331,14 +328,13 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     fun calculateRoute(mapRouteData: MapRouteData) {
-            mapStyle = mapRouteData.mapStyle
+
 //        startRouteButton.setOnClickListener {
             val destination = Point.fromLngLat(76.930137, 43.230361)
             val origin = Point.fromLngLat(mapRouteData.userLocation.first, mapRouteData.userLocation.second)
             val navigationRouteBuilder = NavigationRoute.builder(context).apply {
                 this.accessToken(mapRouteData.accessToken)
                 this.origin(origin)
-
                 this.voiceUnits(DirectionsCriteria.PROFILE_DRIVING)
                 this.alternatives(true)
                 // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
@@ -676,7 +672,6 @@ class NavigationRouteView @JvmOverloads constructor(
         initializeNavigationEventDispatcher()
         initializeNavigationPresenter()
         initializeInstructionListListener()
-        initializeSummaryBottomSheet()
         initializeClickListeners()
     }
 
@@ -686,11 +681,8 @@ class NavigationRouteView @JvmOverloads constructor(
         instructionView?.let {
             ViewCompat.setElevation(it, 10f)
         }
-        summaryBottomSheet = findViewById(R.id.summaryBottomSheet)
-        cancelBtn = findViewById(R.id.cancelBtn)
         recenterBtn = findViewById(R.id.recenterBtn)
         wayNameView = findViewById(R.id.wayNameView)
-        routeOverviewBtn = findViewById(R.id.routeOverviewBtn)
     }
 
     fun initializeNavigationViewModel(context: ComponentActivity) {
@@ -701,19 +693,6 @@ class NavigationRouteView @JvmOverloads constructor(
         }
     }
 
-    private fun initializeSummaryBottomSheet() {
-        summaryBehavior = BottomSheetBehavior.from(summaryBottomSheet!!)
-        summaryBehavior?.let {
-            it.isHideable = false
-            it.addBottomSheetCallback(
-                SummaryBottomSheetCallback(
-                    navigationPresenter,
-                    navigationViewEventDispatcher
-                )
-            )
-        }
-    }
-
     private fun initializeNavigationEventDispatcher() {
         navigationViewEventDispatcher = NavigationViewEventDispatcher()
         navigationViewModel!!.initializeEventDispatcher(navigationViewEventDispatcher)
@@ -751,14 +730,6 @@ class NavigationRouteView @JvmOverloads constructor(
         }
     }
 
-    private fun resetBottomSheetState(bottomSheetState: Int) {
-        if (bottomSheetState > INVALID_STATE) {
-            val isShowing = bottomSheetState == BottomSheetBehavior.STATE_EXPANDED
-            summaryBehavior!!.isHideable = !isShowing
-            summaryBehavior!!.state = bottomSheetState
-        }
-    }
-
     private fun updateInstructionListState(visible: Boolean) {
         if (visible) {
             instructionView!!.showInstructionList()
@@ -820,9 +791,7 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     private fun initializeClickListeners() {
-        cancelBtn!!.setOnClickListener(CancelBtnClickListener(navigationViewEventDispatcher))
         recenterBtn!!.addOnClickListener(RecenterBtnClickListener(navigationPresenter))
-        routeOverviewBtn!!.setOnClickListener(RouteOverviewBtnClickListener(navigationPresenter))
     }
 
     private fun initializeOnCameraTrackingChangedListener() {
@@ -847,7 +816,6 @@ class NavigationRouteView @JvmOverloads constructor(
         val distanceFormatter = DistanceFormatter(context, language, unitType, roundingIncrement)
 
         instructionView!!.setDistanceFormatter(distanceFormatter)
-        summaryBottomSheet!!.setDistanceFormatter(distanceFormatter)
     }
 
     private fun establishRoundingIncrement(navigationViewOptions: NavigationViewOptions): Int {
@@ -873,7 +841,6 @@ class NavigationRouteView @JvmOverloads constructor(
 
     private fun establishTimeFormat(options: NavigationViewOptions) {
         @NavigationTimeFormat.Type val timeFormatType = options.navigationOptions().timeFormatType()
-        summaryBottomSheet!!.setTimeFormat(timeFormatType)
     }
 
     private fun initializeNavigationListeners(
@@ -900,7 +867,6 @@ class NavigationRouteView @JvmOverloads constructor(
      */
     private fun subscribeViewModels() {
         instructionView!!.subscribe(this, navigationViewModel)
-        summaryBottomSheet!!.subscribe(this, navigationViewModel)
 
         NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).subscribe()
         isSubscribed = true
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java
index f784fe5bc..a55e49259 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java
@@ -520,7 +520,6 @@ private void bind() {
     mapView = findViewById(R.id.navigationMapView);
     instructionView = findViewById(R.id.instructionView);
     ViewCompat.setElevation(instructionView, 10);
-    summaryBottomSheet = findViewById(R.id.summaryBottomSheet);
     cancelBtn = findViewById(R.id.cancelBtn);
     recenterBtn = findViewById(R.id.recenterBtn);
     wayNameView = findViewById(R.id.wayNameView);
diff --git a/libandroid-navigation-ui/src/main/res/layout-land/instruction_layout_alt.xml b/libandroid-navigation-ui/src/main/res/layout-land/instruction_layout_alt.xml
index 07c694e96..ded72a455 100644
--- a/libandroid-navigation-ui/src/main/res/layout-land/instruction_layout_alt.xml
+++ b/libandroid-navigation-ui/src/main/res/layout-land/instruction_layout_alt.xml
@@ -17,7 +17,6 @@
         android:layout_marginBottom="8dp"
         android:background="@drawable/instruction_background"
         android:elevation="4dp"
-        android:foreground="?attr/selectableItemBackground"
         android:gravity="center"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -30,8 +29,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_margin="8dp"
-            app:maneuverViewPrimaryColor="?attr/navigationViewBannerManeuverPrimary"
-            app:maneuverViewSecondaryColor="?attr/navigationViewBannerManeuverSecondary"/>
+            />
 
         <TextView
             android:id="@+id/stepDistanceText"
@@ -39,7 +37,6 @@
             android:layout_height="wrap_content"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:textColor="?attr/navigationViewBannerSecondaryText"
             android:textSize="20sp"
             tools:text="3.2 mi"/>
 
@@ -52,7 +49,6 @@
         android:layout_marginBottom="8dp"
         android:background="?attr/navigationViewBannerBackground"
         android:elevation="4dp"
-        android:foreground="?attr/selectableItemBackground"
         android:gravity="center_vertical"
         app:layout_constraintBottom_toBottomOf="@+id/instructionManeuverLayout"
         app:layout_constraintEnd_toEndOf="parent"
@@ -68,7 +64,6 @@
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:maxLines="1"
-            android:textColor="?attr/navigationViewBannerPrimaryText"
             android:textSize="28sp"
             android:textStyle="bold"
             tools:text="Fulton St."/>
@@ -80,7 +75,6 @@
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:textColor="?attr/navigationViewBannerSecondaryText"
             android:textSize="22sp"
             android:textStyle="bold"
             tools:text="San Jose / Cupertino / Saratoga Montery / SR-1"/>
@@ -120,7 +114,6 @@
         android:id="@+id/rerouteLayout"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?attr/navigationViewSecondary"
         android:elevation="4dp"
         android:gravity="center"
         android:orientation="vertical"
@@ -137,7 +130,6 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:text="@string/rerouting"
-            android:textColor="?attr/navigationViewBannerPrimaryText"
             android:textSize="20sp"
             android:textStyle="bold"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml
index eb473391f..7778b2e80 100644
--- a/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml
@@ -20,12 +20,6 @@
         android:layout_height="match_parent"
         android:visibility="invisible"/>
 
-    <com.mapbox.services.android.navigation.ui.v5.summary.SummaryBottomSheet
-        android:id="@+id/summaryBottomSheet"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"/>
-
     <com.mapbox.services.android.navigation.ui.v5.RecenterButton
         android:id="@+id/recenterBtn"
         android:layout_width="wrap_content"
@@ -33,7 +27,6 @@
         android:layout_gravity="top"
         android:layout_margin="16dp"
         android:visibility="invisible"
-        app:layout_anchor="@id/summaryBottomSheet"
         app:layout_anchorGravity="top|left"/>
 
     <com.mapbox.services.android.navigation.ui.v5.map.WayNameView
@@ -42,7 +35,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center|top"
         android:visibility="invisible"
-        app:layout_anchor="@id/summaryBottomSheet"
         app:layout_anchorGravity="center|top"/>
 
     <com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView
diff --git a/libandroid-navigation-ui/src/main/res/layout/alert_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/alert_view_layout.xml
index 013dcfaea..98d831d3a 100644
--- a/libandroid-navigation-ui/src/main/res/layout/alert_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/alert_view_layout.xml
@@ -5,8 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="56dp"
-    android:foreground="?attr/selectableItemBackground"
-    app:cardBackgroundColor="?attr/navigationViewBannerBackground"
     app:cardUseCompatPadding="true"
     app:cardCornerRadius="8dp"
     app:cardElevation="2dp">
@@ -16,7 +14,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
-        android:textColor="?attr/navigationViewBannerPrimaryText"
         android:textStyle="bold"
         android:textSize="18sp"
         android:maxLines="1"
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
index 147a03e1e..127410d2b 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
@@ -80,7 +80,6 @@
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:lineSpacingMultiplier="0.8"
-            android:textColor="?attr/navigationViewBannerSecondaryText"
             android:textSize="14sp"
             android:visibility="gone"
             android:textStyle="bold"
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
index 0ddc204a7..5eedf03ea 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
@@ -5,9 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?attr/navigationViewBannerBackground"
     android:elevation="6dp"
-    android:foreground="?attr/selectableItemBackground"
     tools:showIn="@layout/instruction_view_layout">
 
     <include
@@ -40,7 +38,6 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:text="@string/rerouting"
-            android:textColor="?attr/navigationViewBannerPrimaryText"
             android:textSize="20sp"
             android:textStyle="bold"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_list_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_list_layout.xml
index dfc847a31..109e61e28 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_list_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_list_layout.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
-    android:background="?attr/navigationViewListBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:elevation="4dp">
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_viewholder_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_viewholder_layout.xml
index c36dd173f..8e07a8e40 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_viewholder_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_viewholder_layout.xml
@@ -4,7 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="96dp"
-    android:background="?attr/navigationViewListBackground"
     android:orientation="vertical">
 
     <include
diff --git a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
index e4025fc77..080265505 100644
--- a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
@@ -39,12 +39,6 @@
             android:layout_height="match_parent"
             android:visibility="invisible" />
 
-        <com.mapbox.services.android.navigation.ui.v5.summary.SummaryBottomSheet
-            android:id="@+id/summaryBottomSheet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />
-
         <com.mapbox.services.android.navigation.ui.v5.RecenterButton
             android:id="@+id/recenterBtn"
             android:layout_width="wrap_content"
@@ -52,7 +46,6 @@
             android:layout_gravity="top"
             android:layout_margin="16dp"
             android:visibility="invisible"
-            app:layout_anchor="@id/summaryBottomSheet"
             app:layout_anchorGravity="top|left" />
 
         <com.mapbox.services.android.navigation.ui.v5.map.WayNameView
@@ -61,7 +54,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center|top"
             android:visibility="invisible"
-            app:layout_anchor="@id/summaryBottomSheet"
             app:layout_anchorGravity="center|top" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/libandroid-navigation-ui/src/main/res/layout/recenter_btn_layout.xml b/libandroid-navigation-ui/src/main/res/layout/recenter_btn_layout.xml
index 414d35df3..26a17bb68 100644
--- a/libandroid-navigation-ui/src/main/res/layout/recenter_btn_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/recenter_btn_layout.xml
@@ -4,7 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    app:cardBackgroundColor="?attr/navigationViewPrimary"
     app:cardElevation="2dp">
 
     <LinearLayout
@@ -16,13 +15,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/ic_navigation"
-            android:tint="?attr/navigationViewAccent"/>
+            />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:textColor="?attr/navigationViewAccent"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:text="@string/re_center"/>
diff --git a/libandroid-navigation-ui/src/main/res/layout/sound_layout.xml b/libandroid-navigation-ui/src/main/res/layout/sound_layout.xml
index f7c48cb37..879b4564a 100644
--- a/libandroid-navigation-ui/src/main/res/layout/sound_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/sound_layout.xml
@@ -16,7 +16,6 @@
         android:paddingStart="12dp"
         android:paddingTop="8dp"
         android:text="@string/muted"
-        android:textColor="?attr/navigationViewSecondary"
         android:textSize="14sp"
         android:textStyle="bold"
         android:visibility="invisible"
@@ -34,8 +33,6 @@
         android:layout_marginRight="16dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
-        android:tint="?attr/navigationViewSecondary"
-        app:backgroundTint="?attr/navigationViewPrimary"
         app:borderWidth="0dp"
         app:fabSize="mini"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml b/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml
index 8322d155f..643ed76cb 100644
--- a/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml
@@ -5,7 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/navigationViewListBackground"
     android:elevation="2dp">
 
     <com.mapbox.services.android.navigation.ui.v5.instruction.maneuver.ManeuverView
@@ -16,9 +15,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/guideline"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:maneuverViewPrimaryColor="?attr/navigationViewBannerManeuverPrimary"
-        app:maneuverViewSecondaryColor="?attr/navigationViewBannerManeuverSecondary"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/subStepText"
@@ -29,7 +26,6 @@
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:textColor="?attr/navigationViewBannerSecondaryText"
         android:textSize="18sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/libandroid-navigation-ui/src/main/res/layout/summary_peek_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout/summary_peek_content_layout.xml
index 4031c0202..42998931b 100644
--- a/libandroid-navigation-ui/src/main/res/layout/summary_peek_content_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/summary_peek_content_layout.xml
@@ -16,7 +16,6 @@
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:textColor="?attr/navigationViewPrimaryText"
         android:textSize="26sp"
         app:autoSizeMaxTextSize="26sp"
         app:autoSizeMinTextSize="20sp"
@@ -36,7 +35,6 @@
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:textColor="?attr/navigationViewSecondaryText"
             android:textSize="18sp"
             tools:text="17 miles"/>
 
@@ -49,7 +47,6 @@
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:textColor="?attr/navigationViewSecondaryText"
             android:textSize="18sp"
             tools:text="10:38am"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml b/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml
index 1131d51c0..7591f35e0 100644
--- a/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml
@@ -5,7 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    android:background="?attr/navigationViewPrimary"
     tools:showIn="@layout/summary_content_layout">
 
     <ProgressBar
@@ -15,7 +14,6 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:indeterminate="true"
-        android:indeterminateTint="?attr/navigationViewAccent"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -29,7 +27,6 @@
         android:background="@android:color/transparent"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="?attr/selectableItemBackground"
         android:padding="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/divider"
@@ -43,7 +40,6 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="16dp"
         android:layout_marginTop="16dp"
-        android:background="?attr/navigationViewDivider"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/cancelBtn"
         app:layout_constraintTop_toTopOf="parent"/>
@@ -55,9 +51,7 @@
         android:background="@android:color/transparent"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="?attr/selectableItemBackground"
         android:padding="16dp"
-        android:tint="?attr/navigationViewSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/libandroid-navigation-ui/src/main/res/layout/turn_lane_layout.xml b/libandroid-navigation-ui/src/main/res/layout/turn_lane_layout.xml
index ede6e28fb..6d9de5ccf 100644
--- a/libandroid-navigation-ui/src/main/res/layout/turn_lane_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/turn_lane_layout.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/navigationViewListBackground"
     android:orientation="vertical"
     android:elevation="2dp">
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/wayname_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/wayname_view_layout.xml
index 9fe7f1d05..f90ccce0b 100644
--- a/libandroid-navigation-ui/src/main/res/layout/wayname_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/wayname_view_layout.xml
@@ -17,7 +17,6 @@
         android:paddingLeft="@dimen/wayname_padding"
         android:paddingRight="@dimen/wayname_padding"
         android:paddingBottom="@dimen/wayname_padding_bottom"
-        android:textColor="?attr/navigationViewAccent"
         android:textStyle="bold"
         tools:text="Wayname Text"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/values/developer-config.xml b/libandroid-navigation-ui/src/main/res/values/developer-config.xml
index 4ddab8604..9afe81dc2 100644
--- a/libandroid-navigation-ui/src/main/res/values/developer-config.xml
+++ b/libandroid-navigation-ui/src/main/res/values/developer-config.xml
@@ -3,7 +3,7 @@
     <string name="base_url" translatable="false">https://graphhopper.com/api/1/navigate/</string>    <!-- Your GraphHopper API key -->
     <string name="mapbox_access_token" translatable="false">pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a</string>
     <!-- The "day" style used for navigation, here mapilion is used but you can use maptiler too -->
-    <string name="map_style_light" translatable="false">m</string>
+    <string name="map_style_light" translatable="false">https://api.maptiler.com/maps/streets-v2/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ</string>
     <!-- The "night" style used for navigation -->
-    <string name="map_style_dark" translatable="false">https://api.maptiler.com/maps/streets-v2/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ</string>
+    <string name="map_style_dark" translatable="false">https://api.maptiler.com/maps/streets-v2-dark/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ</string>
 </resources>
\ No newline at end of file

From 3f760dbb54da1396ecb0932c371b665dad7edce0 Mon Sep 17 00:00:00 2001
From: vizhev <vizhev@gmail.com>
Date: Thu, 26 Dec 2024 18:24:06 +0500
Subject: [PATCH 08/46] release_maplibre_10: Fix start navigation in demo app

---
 .../android/navigation/testapp/NavigationUIActivity.kt        | 2 +-
 .../services/android/navigation/ui/v5/NavigationRouteView.kt  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
index eb918156b..5171e896c 100644
--- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
+++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
@@ -83,7 +83,7 @@ class NavigationUIActivity :
             points.add(Pair(76.930137, 43.230361))
             points.add(Pair(76.928316, 43.236109))
             points.add(Pair(76.920187, 43.236783))
-            binding.navigationView.calculateRoute(MapRouteData(getString(R.string.mapbox_access_token), "getString(R.string.mapbox_access_token)",
+            binding.navigationView.calculateRoute(MapRouteData("pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a", "getString(R.string.mapbox_access_token)",
                 points, Pair(76.930137, 43.230361), MapRouteData.DARK_THEME))
         }
 //        binding.clearPoints.setOnClickListener {
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
index a88560122..2076390d6 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
@@ -332,9 +332,11 @@ class NavigationRouteView @JvmOverloads constructor(
 //        startRouteButton.setOnClickListener {
             val destination = Point.fromLngLat(76.930137, 43.230361)
             val origin = Point.fromLngLat(mapRouteData.userLocation.first, mapRouteData.userLocation.second)
+        val userLocation = mapboxMap!!.locationComponent.lastKnownLocation
+
             val navigationRouteBuilder = NavigationRoute.builder(context).apply {
                 this.accessToken(mapRouteData.accessToken)
-                this.origin(origin)
+                this.origin(Point.fromLngLat(userLocation!!.longitude, userLocation.latitude))
                 this.voiceUnits(DirectionsCriteria.PROFILE_DRIVING)
                 this.alternatives(true)
                 // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.

From 008cd2494720ec6245b33335babd9e7fb69a16a6 Mon Sep 17 00:00:00 2001
From: Zhandr <zhako11@gmail.com>
Date: Fri, 27 Dec 2024 16:57:31 +0500
Subject: [PATCH 09/46] Removed bottomsheet behavior

---
 .../navigation/ui/v5/NavigationContract.java  |  6 ---
 ...gationOnCameraTrackingChangedListener.java |  7 +--
 .../navigation/ui/v5/NavigationPresenter.java | 10 +----
 .../navigation/ui/v5/NavigationRouteView.kt   | 18 +-------
 .../navigation/ui/v5/NavigationView.java      | 43 +------------------
 .../ui/v5/NavigationViewInstanceState.java    | 10 +----
 6 files changed, 6 insertions(+), 88 deletions(-)

diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationContract.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationContract.java
index be0945b31..9b863a173 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationContract.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationContract.java
@@ -10,12 +10,6 @@ public interface NavigationContract {
 
   interface View {
 
-    void setSummaryBehaviorState(int state);
-
-    void setSummaryBehaviorHideable(boolean isHideable);
-
-    boolean isSummaryBottomSheetHidden();
-
     void updateWayNameVisibility(boolean isVisible);
 
     void updateWayNameView(@NonNull String wayName);
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java
index 348042c05..2a86cf7f2 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java
@@ -12,19 +12,14 @@
 class NavigationOnCameraTrackingChangedListener implements OnCameraTrackingChangedListener {
 
   private final NavigationPresenter navigationPresenter;
-  private final BottomSheetBehavior summaryBehavior;
 
-  NavigationOnCameraTrackingChangedListener(NavigationPresenter navigationPresenter,
-                                            BottomSheetBehavior summaryBehavior) {
+  NavigationOnCameraTrackingChangedListener(NavigationPresenter navigationPresenter) {
     this.navigationPresenter = navigationPresenter;
-    this.summaryBehavior = summaryBehavior;
   }
 
   @Override
   public void onCameraTrackingDismissed() {
-    if (summaryBehavior.getState() != BottomSheetBehavior.STATE_HIDDEN) {
       navigationPresenter.onCameraTrackingDismissed();
-    }
   }
 
   @Override
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenter.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenter.java
index 3df468968..77f090e58 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenter.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenter.java
@@ -22,25 +22,17 @@ void updateResumeState(boolean resumeState) {
   }
 
   void onRecenterClick() {
-    view.setSummaryBehaviorHideable(false);
-    view.setSummaryBehaviorState(BottomSheetBehavior.STATE_EXPANDED);
     view.updateWayNameVisibility(true);
     view.resetCameraPosition();
     view.hideRecenterBtn();
   }
 
   void onCameraTrackingDismissed() {
-    if (!view.isSummaryBottomSheetHidden()) {
-      view.setSummaryBehaviorHideable(true);
-      view.setSummaryBehaviorState(BottomSheetBehavior.STATE_HIDDEN);
       view.updateWayNameVisibility(false);
-    }
   }
 
   void onSummaryBottomSheetHidden() {
-    if (view.isSummaryBottomSheetHidden()) {
       view.showRecenterBtn();
-    }
   }
 
   void onRouteUpdate(DirectionsRoute directionsRoute) {
@@ -65,7 +57,7 @@ void onNavigationLocationUpdate(Location location) {
   }
 
   void onWayNameChanged(@NonNull String wayName) {
-    if (TextUtils.isEmpty(wayName) || view.isSummaryBottomSheetHidden()) {
+    if (TextUtils.isEmpty(wayName)) {
       view.updateWayNameVisibility(false);
       return;
     }
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
index 2076390d6..753831c24 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
@@ -99,7 +99,6 @@ class NavigationRouteView @JvmOverloads constructor(
     NavigationContract.View {
     private var mapView: MapView? = null
     private var instructionView: InstructionView? = null
-    private var summaryBehavior: BottomSheetBehavior<*>? = null
     private var recenterBtn: RecenterButton? = null
     private var wayNameView: WayNameView? = null
 
@@ -180,11 +179,8 @@ class NavigationRouteView @JvmOverloads constructor(
      * @param outState to store state variables
      */
     fun onSaveInstanceState(outState: Bundle) {
-        val bottomSheetBehaviorState =
-            if (summaryBehavior == null) INVALID_STATE else summaryBehavior!!.state
         val isWayNameVisible = wayNameView!!.visibility == VISIBLE
         val navigationViewInstanceState = NavigationViewInstanceState(
-            bottomSheetBehaviorState,
             recenterBtn!!.visibility,
             instructionView!!.isShowingInstructionList,
             isWayNameVisible,
@@ -406,18 +402,6 @@ class NavigationRouteView @JvmOverloads constructor(
             })
     }
 
-    override fun setSummaryBehaviorState(state: Int) {
-        summaryBehavior!!.state = state
-    }
-
-    override fun setSummaryBehaviorHideable(isHideable: Boolean) {
-        summaryBehavior!!.isHideable = isHideable
-    }
-
-    override fun isSummaryBottomSheetHidden(): Boolean {
-        return summaryBehavior!!.state == BottomSheetBehavior.STATE_HIDDEN
-    }
-
     override fun resetCameraPosition() {
         if (navigationMap != null) {
             navigationMap!!.resetPadding()
@@ -798,7 +782,7 @@ class NavigationRouteView @JvmOverloads constructor(
 
     private fun initializeOnCameraTrackingChangedListener() {
         onTrackingChangedListener =
-            NavigationOnCameraTrackingChangedListener(navigationPresenter, summaryBehavior)
+            NavigationOnCameraTrackingChangedListener(navigationPresenter)
         navigationMap!!.addOnCameraTrackingChangedListener(onTrackingChangedListener)
     }
 
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java
index a55e49259..bf7607135 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java
@@ -76,8 +76,6 @@ public class NavigationView extends CoordinatorLayout implements LifecycleOwner,
   private static final int INVALID_STATE = 0;
   private MapView mapView;
   private InstructionView instructionView;
-  private SummaryBottomSheet summaryBottomSheet;
-  private BottomSheetBehavior summaryBehavior;
   private ImageButton cancelBtn;
   private RecenterButton recenterBtn;
   private WayNameView wayNameView;
@@ -147,10 +145,8 @@ public boolean onBackPressed() {
    * @param outState to store state variables
    */
   public void onSaveInstanceState(Bundle outState) {
-    int bottomSheetBehaviorState = summaryBehavior == null ? INVALID_STATE : summaryBehavior.getState();
     boolean isWayNameVisible = wayNameView.getVisibility() == VISIBLE;
-    NavigationViewInstanceState navigationViewInstanceState = new NavigationViewInstanceState(
-      bottomSheetBehaviorState, recenterBtn.getVisibility(), instructionView.isShowingInstructionList(),
+    NavigationViewInstanceState navigationViewInstanceState = new NavigationViewInstanceState(recenterBtn.getVisibility(), instructionView.isShowingInstructionList(),
       isWayNameVisible, wayNameView.retrieveWayNameText(), navigationViewModel.isMuted());
     String instanceKey = getContext().getString(R.string.navigation_view_instance_state);
     outState.putParcelable(instanceKey, navigationViewInstanceState);
@@ -172,7 +168,6 @@ public void onRestoreInstanceState(Bundle savedInstanceState) {
     recenterBtn.setVisibility(navigationViewInstanceState.getRecenterButtonVisibility());
     wayNameView.setVisibility(navigationViewInstanceState.isWayNameVisible() ? VISIBLE : INVISIBLE);
     wayNameView.updateWayNameText(navigationViewInstanceState.getWayNameText());
-    resetBottomSheetState(navigationViewInstanceState.getBottomSheetBehaviorState());
     updateInstructionListState(navigationViewInstanceState.isInstructionViewVisible());
     updateInstructionMutedState(navigationViewInstanceState.isMuted());
     mapInstanceState = savedInstanceState.getParcelable(MAP_INSTANCE_STATE_KEY);
@@ -253,21 +248,6 @@ private void calculateRoute() {
 
   }
 
-  @Override
-  public void setSummaryBehaviorState(int state) {
-    summaryBehavior.setState(state);
-  }
-
-  @Override
-  public void setSummaryBehaviorHideable(boolean isHideable) {
-    summaryBehavior.setHideable(isHideable);
-  }
-
-  @Override
-  public boolean isSummaryBottomSheetHidden() {
-    return summaryBehavior.getState() == BottomSheetBehavior.STATE_HIDDEN;
-  }
-
   @Override
   public void resetCameraPosition() {
     if (navigationMap != null) {
@@ -513,7 +493,6 @@ private void initializeView() {
     initializeNavigationEventDispatcher();
     initializeNavigationPresenter();
     initializeInstructionListListener();
-    initializeSummaryBottomSheet();
   }
 
   private void bind() {
@@ -534,13 +513,6 @@ private void initializeNavigationViewModel() {
     }
   }
 
-  private void initializeSummaryBottomSheet() {
-    summaryBehavior = BottomSheetBehavior.from(summaryBottomSheet);
-    summaryBehavior.setHideable(false);
-    summaryBehavior.setBottomSheetCallback(new SummaryBottomSheetCallback(navigationPresenter,
-      navigationViewEventDispatcher));
-  }
-
   private void initializeNavigationEventDispatcher() {
     navigationViewEventDispatcher = new NavigationViewEventDispatcher();
     navigationViewModel.initializeEventDispatcher(navigationViewEventDispatcher);
@@ -574,14 +546,6 @@ private void saveNavigationMapInstanceState(Bundle outState) {
     }
   }
 
-  private void resetBottomSheetState(int bottomSheetState) {
-    if (bottomSheetState > INVALID_STATE) {
-      boolean isShowing = bottomSheetState == BottomSheetBehavior.STATE_EXPANDED;
-      summaryBehavior.setHideable(!isShowing);
-      summaryBehavior.setState(bottomSheetState);
-    }
-  }
-
   private void updateInstructionListState(boolean visible) {
     if (visible) {
       instructionView.showInstructionList();
@@ -645,7 +609,7 @@ private void initializeClickListeners() {
   }
 
   private void initializeOnCameraTrackingChangedListener() {
-    onTrackingChangedListener = new NavigationOnCameraTrackingChangedListener(navigationPresenter, summaryBehavior);
+    onTrackingChangedListener = new NavigationOnCameraTrackingChangedListener(navigationPresenter);
     navigationMap.addOnCameraTrackingChangedListener(onTrackingChangedListener);
   }
 
@@ -662,7 +626,6 @@ private void establishDistanceFormatter(LocaleUtils localeUtils, NavigationViewO
     DistanceFormatter distanceFormatter = new DistanceFormatter(getContext(), language, unitType, roundingIncrement);
 
     instructionView.setDistanceFormatter(distanceFormatter);
-    summaryBottomSheet.setDistanceFormatter(distanceFormatter);
   }
 
   private int establishRoundingIncrement(NavigationViewOptions navigationViewOptions) {
@@ -683,7 +646,6 @@ private String establishUnitType(LocaleUtils localeUtils, NavigationViewOptions
   private void establishTimeFormat(NavigationViewOptions options) {
     @NavigationTimeFormat.Type
     int timeFormatType = options.navigationOptions().timeFormatType();
-    summaryBottomSheet.setTimeFormat(timeFormatType);
   }
 
   private void initializeNavigationListeners(NavigationViewOptions options, NavigationViewModel navigationViewModel) {
@@ -705,7 +667,6 @@ private void setupNavigationMapboxMap(NavigationViewOptions options) {
    */
   private void subscribeViewModels() {
     instructionView.subscribe(this, navigationViewModel);
-    summaryBottomSheet.subscribe(this, navigationViewModel);
 
     new NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).subscribe();
     isSubscribed = true;
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewInstanceState.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewInstanceState.java
index 5332cbf5f..59131ecc2 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewInstanceState.java
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewInstanceState.java
@@ -5,17 +5,15 @@
 
 class NavigationViewInstanceState implements Parcelable {
 
-  private int bottomSheetBehaviorState;
   private int recenterButtonVisibility;
   private boolean instructionViewVisible;
   private boolean isWayNameVisible;
   private boolean isMuted;
   private String wayNameText;
 
-  NavigationViewInstanceState(int bottomSheetBehaviorState, int recenterButtonVisibility,
+  NavigationViewInstanceState(int recenterButtonVisibility,
                               boolean instructionViewVisible, boolean isWayNameVisible, String wayNameText,
                               boolean isMuted) {
-    this.bottomSheetBehaviorState = bottomSheetBehaviorState;
     this.recenterButtonVisibility = recenterButtonVisibility;
     this.instructionViewVisible = instructionViewVisible;
     this.isWayNameVisible = isWayNameVisible;
@@ -23,10 +21,6 @@ class NavigationViewInstanceState implements Parcelable {
     this.isMuted = isMuted;
   }
 
-  int getBottomSheetBehaviorState() {
-    return bottomSheetBehaviorState;
-  }
-
   int getRecenterButtonVisibility() {
     return recenterButtonVisibility;
   }
@@ -48,7 +42,6 @@ boolean isMuted() {
   }
 
   private NavigationViewInstanceState(Parcel in) {
-    bottomSheetBehaviorState = in.readInt();
     recenterButtonVisibility = in.readInt();
     instructionViewVisible = in.readByte() != 0;
     isWayNameVisible = in.readByte() != 0;
@@ -58,7 +51,6 @@ private NavigationViewInstanceState(Parcel in) {
 
   @Override
   public void writeToParcel(Parcel dest, int flags) {
-    dest.writeInt(bottomSheetBehaviorState);
     dest.writeInt(recenterButtonVisibility);
     dest.writeByte((byte) (instructionViewVisible ? 1 : 0));
     dest.writeByte((byte) (isWayNameVisible ? 1 : 0));

From 5034b16b92d2019dd6705aa3bde1db6670834f84 Mon Sep 17 00:00:00 2001
From: Zhandr <zhako11@gmail.com>
Date: Sat, 25 Jan 2025 17:50:29 +0500
Subject: [PATCH 10/46] Temporarily hided instructionview, zoom fixes, route
 updates

---
 .../testapp/NavigationUIActivity.kt           | 38 ++++++++++++++-----
 .../navigation/ui/v5/NavigationRouteView.kt   | 33 +++++-----------
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
index 5171e896c..0f17417f9 100644
--- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
+++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
@@ -57,6 +57,8 @@ class NavigationUIActivity :
 
     private var simulateRoute = false
 
+    private var isStarted = false
+
     @SuppressLint("MissingPermission")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -74,18 +76,36 @@ class NavigationUIActivity :
 //            getMapAsync(this@NavigationUIActivity)
 //        }
 
-//        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
-//            simulateRoute = checked
-//        }
+        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
+            if (checked) {
+                binding.navigationView.resetCameraPosition()
+            } else {
+                binding.navigationView.updateCameraRouteOverview()
+            }
+        }
 
         binding.startRouteButton.setOnClickListener {
-            val points = mutableListOf<Pair<Double, Double>>()
-            points.add(Pair(76.930137, 43.230361))
-            points.add(Pair(76.928316, 43.236109))
-            points.add(Pair(76.920187, 43.236783))
-            binding.navigationView.calculateRoute(MapRouteData("pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a", "getString(R.string.mapbox_access_token)",
-                points, Pair(76.930137, 43.230361), MapRouteData.DARK_THEME))
+            if (isStarted) {
+                binding.navigationView.stopNavigation()
+                isStarted = false
+            } else {
+                val points = mutableListOf<Pair<Double, Double>>()
+                points.add(Pair(76.930137, 43.230361))
+                points.add(Pair(76.928316, 43.236109))
+                points.add(Pair(76.920187, 43.236783))
+                binding.navigationView.calculateRoute(
+                    MapRouteData(
+                        "pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a",
+                        "getString(R.string.mapbox_access_token)",
+                        points,
+                        Pair(76.930137, 43.230361),
+                        MapRouteData.DARK_THEME
+                    )
+                )
+                isStarted = true
+            }
         }
+
 //        binding.clearPoints.setOnClickListener {
 //            if (::mapboxMap.isInitialized) {
 //                mapboxMap.markers.forEach {
diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
index 753831c24..cde097620 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
@@ -3,30 +3,20 @@ package com.mapbox.services.android.navigation.ui.v5
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
-import android.graphics.BitmapFactory
-import android.graphics.drawable.Drawable
 import android.location.Location
 import android.os.Bundle
 import android.util.AttributeSet
-import android.util.Log
-import android.widget.Button
-import android.widget.ImageButton
-import androidx.activity.ComponentActivity
 import androidx.annotation.UiThread
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.graphics.drawable.toBitmap
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.ViewModelProvider
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.mapbox.api.directions.v5.DirectionsCriteria
 import com.mapbox.api.directions.v5.models.DirectionsResponse
 import com.mapbox.core.utils.TextUtils
 import com.mapbox.geojson.Point
-import com.mapbox.mapboxsdk.annotations.Icon
 import com.mapbox.mapboxsdk.annotations.MarkerOptions
 import com.mapbox.mapboxsdk.camera.CameraPosition
 import com.mapbox.mapboxsdk.geometry.LatLng
@@ -39,8 +29,6 @@ import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Projection
 import com.mapbox.mapboxsdk.maps.Style
-import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
-import com.mapbox.services.android.navigation.ui.v5.NavigationContract.View
 import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera
 import com.mapbox.services.android.navigation.ui.v5.instruction.ImageCreator
 import com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView
@@ -131,7 +119,7 @@ class NavigationRouteView @JvmOverloads constructor(
      *
      * @param savedInstanceState to restore state if not null
      */
-    fun onCreate(navigationCallback: OnNavigationReadyCallback, savedInstanceState: Bundle?, context: ComponentActivity, style: String) {
+    fun onCreate(navigationCallback: OnNavigationReadyCallback, savedInstanceState: Bundle?, context: Context, style: String) {
         initializeNavigationViewModel(context)
         initializeView()
         ThemeSwitcher.setTheme(context, attrs, style)
@@ -282,6 +270,7 @@ class NavigationRouteView @JvmOverloads constructor(
             mapboxMap.setStyle((builder)) {
                 isMapInitialized = true
                 enableLocationComponent(it)
+                mapboxMap.cameraPosition = CameraPosition.Builder().zoom(16.0).build()
                 baseCameraPosition?.let {
                     mapboxMap.cameraPosition = it
                 }
@@ -289,6 +278,7 @@ class NavigationRouteView @JvmOverloads constructor(
         } else {
             mapboxMap.getStyle {
                 enableLocationComponent(it)
+                mapboxMap.cameraPosition = CameraPosition.Builder().zoom(16.0).build()
                 baseCameraPosition?.let {
                     mapboxMap.cameraPosition = it
                 }
@@ -324,10 +314,6 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     fun calculateRoute(mapRouteData: MapRouteData) {
-
-//        startRouteButton.setOnClickListener {
-            val destination = Point.fromLngLat(76.930137, 43.230361)
-            val origin = Point.fromLngLat(mapRouteData.userLocation.first, mapRouteData.userLocation.second)
         val userLocation = mapboxMap!!.locationComponent.lastKnownLocation
 
             val navigationRouteBuilder = NavigationRoute.builder(context).apply {
@@ -362,7 +348,6 @@ class NavigationRouteView @JvmOverloads constructor(
 
                             val options = NavigationLauncherOptions.builder()
                                 .directionsRoute(route)
-//                    .shouldSimulateRoute(simulateRoute)
                                 .initialMapCameraPosition(
                                     CameraPosition.Builder().target(
                                         LatLng(
@@ -390,7 +375,6 @@ class NavigationRouteView @JvmOverloads constructor(
                                     }
                                 }
                             }
-//                        binding.startRouteLayout.visibility = View.VISIBLE
                         }
                     }
 
@@ -404,6 +388,8 @@ class NavigationRouteView @JvmOverloads constructor(
 
     override fun resetCameraPosition() {
         if (navigationMap != null) {
+            updateWayNameVisibility(true);
+            hideRecenterBtn()
             navigationMap!!.resetPadding()
             navigationMap!!.resetCameraPositionWith(NavigationCamera.NAVIGATION_TRACKING_MODE_GPS)
         }
@@ -532,6 +518,7 @@ class NavigationRouteView @JvmOverloads constructor(
      *
      * @since 0.16.0
      */
+    @SuppressLint("MissingPermission")
     @UiThread
     fun stopNavigation() {
         instructionView!!.visibility = GONE
@@ -540,6 +527,7 @@ class NavigationRouteView @JvmOverloads constructor(
         baseCameraPosition?.let {
             mapboxMap!!.cameraPosition = it
         }
+
         if (navigationMap != null) {
             navigationMap!!.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
             navigationMap!!.removeRoute()
@@ -548,6 +536,7 @@ class NavigationRouteView @JvmOverloads constructor(
         mapboxMap!!.markers.forEach {
             mapboxMap!!.removeMarker(it)
         }
+        route = null
         navigationMapRoute?.removeRoute()
 
     }
@@ -671,7 +660,7 @@ class NavigationRouteView @JvmOverloads constructor(
         wayNameView = findViewById(R.id.wayNameView)
     }
 
-    fun initializeNavigationViewModel(context: ComponentActivity) {
+    fun initializeNavigationViewModel(context: Context) {
         try {
             navigationViewModel = NavigationViewModel(context)
         } catch (exception: ClassCastException) {
@@ -773,7 +762,7 @@ class NavigationRouteView @JvmOverloads constructor(
             initializeOnCameraTrackingChangedListener()
             subscribeViewModels()
         }
-        instructionView!!.visibility = VISIBLE
+        instructionView!!.visibility = GONE
     }
 
     private fun initializeClickListeners() {
@@ -931,8 +920,6 @@ class NavigationRouteView @JvmOverloads constructor(
 //        val markerOptions = MarkerOptions()
 //            .position(position)
 //            .icon(icon)
-//        mapboxMap!!.setOnMarkerClickListener {
-//        }
     }
 
     companion object {

From d3d4dac2e2fdb3d8e34bab2bbf0fc1a36f969a6e Mon Sep 17 00:00:00 2001
From: Zhandr <zhako11@gmail.com>
Date: Sat, 25 Jan 2025 19:38:57 +0500
Subject: [PATCH 11/46] getting user position from args

---
 .../services/android/navigation/ui/v5/NavigationRouteView.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
index cde097620..aad908920 100644
--- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
@@ -318,7 +318,7 @@ class NavigationRouteView @JvmOverloads constructor(
 
             val navigationRouteBuilder = NavigationRoute.builder(context).apply {
                 this.accessToken(mapRouteData.accessToken)
-                this.origin(Point.fromLngLat(userLocation!!.longitude, userLocation.latitude))
+                this.origin(Point.fromLngLat(mapRouteData.userLocation.first, mapRouteData.userLocation.second))
                 this.voiceUnits(DirectionsCriteria.PROFILE_DRIVING)
                 this.alternatives(true)
                 // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.

From 5e97c018663a6b73c073421982f0f700954f344f Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Tue, 13 May 2025 10:48:35 +0200
Subject: [PATCH 12/46] fix after merge

---
 .../android/example/NavigationUIActivity.kt   |  56 +-
 .../example/ValhallaNavigationActivity.kt     |   2 +-
 .../res/layout/activity_navigation_ui.xml     |   6 +-
 .../android/navigation/ui/v5/MapRouteData.kt  |  14 +
 .../navigation/ui/v5/NavigationRouteView.kt   | 956 ++++++++++++++++++
 .../navigation/ui/v5/NavigationView.java      |  28 +-
 .../navigation/ui/v5/ThemeSwitcher.java       |   2 +-
 .../ui/v5/camera/NavigationCamera.java        |   2 +-
 .../ui/v5/instruction/InstructionView.java    |   3 +-
 .../v5/instruction/maneuver/ManeuverView.java |   4 +-
 .../navigation/ui/v5/route/MapRouteLine.java  |   4 +-
 .../res/layout/instruction_content_layout.xml |   4 +-
 .../res/layout/navigation_view_layout.xml     |  10 +-
 13 files changed, 1020 insertions(+), 71 deletions(-)
 create mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt
 create mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index fe3b6eacb..c4a2ef926 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -2,52 +2,36 @@ package org.maplibre.navigation.android.example
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.os.Parcelable
 import android.preference.PreferenceManager
-import android.widget.Toast
 import androidx.activity.ComponentActivity
-import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.snackbar.Snackbar
-import com.mapbox.api.directions.v5.DirectionsCriteria
-import com.mapbox.api.directions.v5.models.DirectionsResponse
-import com.mapbox.geojson.Point
-import com.mapbox.mapboxsdk.annotations.MarkerOptions
-import com.mapbox.mapboxsdk.camera.CameraPosition
-import com.mapbox.mapboxsdk.geometry.LatLng
-import com.mapbox.mapboxsdk.location.LocationComponent
-import com.mapbox.mapboxsdk.location.LocationComponentActivationOptions
-import com.mapbox.mapboxsdk.location.modes.CameraMode
-import com.mapbox.mapboxsdk.location.modes.RenderMode
-import com.mapbox.mapboxsdk.maps.MapboxMap
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
-import com.mapbox.mapboxsdk.maps.Style
-import com.mapbox.services.android.navigation.testapp.databinding.ActivityNavigationUiBinding
-import com.mapbox.services.android.navigation.ui.v5.MapRouteData
-import com.mapbox.services.android.navigation.ui.v5.NavigationLauncher
-import com.mapbox.services.android.navigation.ui.v5.NavigationLauncherOptions
-import com.mapbox.services.android.navigation.ui.v5.NavigationViewOptions
-import com.mapbox.services.android.navigation.ui.v5.OnNavigationReadyCallback
-import com.mapbox.services.android.navigation.ui.v5.listeners.NavigationListener
-import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute
-import com.mapbox.services.android.navigation.v5.models.DirectionsRoute
-import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions
-import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants
-import com.mapbox.services.android.navigation.v5.navigation.NavigationMapRoute
-import com.mapbox.turf.TurfConstants
-import com.mapbox.turf.TurfMeasurement
 import okhttp3.Request
+import org.maplibre.android.geometry.LatLng
+import org.maplibre.android.location.LocationComponent
+import org.maplibre.android.location.LocationComponentActivationOptions
+import org.maplibre.android.location.modes.CameraMode
+import org.maplibre.android.location.modes.RenderMode
+import org.maplibre.android.maps.MapLibreMap
+import org.maplibre.android.maps.Style
+import org.maplibre.geojson.Point
 import org.maplibre.navigation.android.example.databinding.ActivityNavigationUiBinding
+import org.maplibre.navigation.android.navigation.ui.v5.MapRouteData
+import org.maplibre.navigation.android.navigation.ui.v5.NavigationLauncher
+import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewOptions
+import org.maplibre.navigation.android.navigation.ui.v5.OnNavigationReadyCallback
+import org.maplibre.navigation.android.navigation.ui.v5.listeners.NavigationListener
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute
+import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute
+import org.maplibre.navigation.core.models.DirectionsResponse
+import org.maplibre.navigation.core.models.DirectionsRoute
 import org.maplibre.navigation.core.models.UnitType
+import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions
+import org.maplibre.navigation.core.navigation.NavigationConstants
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import timber.log.Timber
 
-class NavigationUIActivity :
-    ComponentActivity(),
-    MapboxMap.OnMapClickListener, OnNavigationReadyCallback,
-    NavigationListener {
+class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener, OnNavigationReadyCallback, NavigationListener {
 
     // Navigation related variables
     private var route: DirectionsRoute? = null
@@ -279,7 +263,7 @@ class NavigationUIActivity :
         options.navigationListener(this)
         extractRoute(options)
         extractConfiguration(options)
-        options.navigationOptions(MapboxNavigationOptions.builder().build())
+        options.navigationOptions(MapLibreNavigationOptions.Builder().build())
         binding.navigationView.startNavigation(options.build())
     }
 
diff --git a/app/src/main/java/org/maplibre/navigation/android/example/ValhallaNavigationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/ValhallaNavigationActivity.kt
index 974999ff3..41289e2f8 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/ValhallaNavigationActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/ValhallaNavigationActivity.kt
@@ -112,7 +112,7 @@ class ValhallaNavigationActivity :
 //            mapboxMap
 //        )
 
-        mapboxMap.addOnMapClickListener(this)
+        mapLibreMap.addOnMapClickListener(this)
         Snackbar.make(
             findViewById(R.id.container),
             "Tap map to place destination",
diff --git a/app/src/main/res/layout/activity_navigation_ui.xml b/app/src/main/res/layout/activity_navigation_ui.xml
index a9593b15f..b527db070 100644
--- a/app/src/main/res/layout/activity_navigation_ui.xml
+++ b/app/src/main/res/layout/activity_navigation_ui.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.mapbox.services.android.navigation.ui.v5.NavigationRouteView
+    <org.maplibre.navigation.android.navigation.ui.v5.NavigationRouteView
         android:id="@+id/navigationView"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -25,7 +25,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="160dp"
         android:background="@drawable/rounded_corners"
-        android:backgroundTint="@color/mapbox_navigation_route_shield_layer_color"
+        android:backgroundTint="@color/maplibre_navigation_route_shield_layer_color"
         android:orientation="horizontal"
         android:padding="8dp"
         android:visibility="visible"
@@ -38,7 +38,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="simulate_route"
-            android:textColor="@color/mapbox_navigation_route_upcoming_maneuver_arrow_color"
+            android:textColor="@color/maplibre_navigation_route_upcoming_maneuver_arrow_color"
             app:switchPadding="4dp" />
 
         <Button
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt
new file mode 100644
index 000000000..099d2bdd5
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt
@@ -0,0 +1,14 @@
+package org.maplibre.navigation.android.navigation.ui.v5
+
+data class MapRouteData(
+    val accessToken: String,
+    val mapStyle: String,
+    val routeList: List<Pair<Double, Double>>,
+    val userLocation: Pair<Double, Double>,
+    val mapTheme: String
+) {
+    companion object {
+        const val LIGHT_THEME = "light"
+        const val DARK_THEME = "dark"
+    }
+}
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
new file mode 100644
index 000000000..8937cadf9
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -0,0 +1,956 @@
+package org.maplibre.navigation.android.navigation.ui.v5
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Context
+import android.os.Bundle
+import android.util.AttributeSet
+import androidx.annotation.UiThread
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.lifecycleScope
+import com.mapbox.core.utils.TextUtils
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import okhttp3.Request
+import org.maplibre.android.annotations.MarkerOptions
+import org.maplibre.android.camera.CameraPosition
+import org.maplibre.android.geometry.LatLng
+import org.maplibre.android.location.LocationComponent
+import org.maplibre.android.location.LocationComponentActivationOptions
+import org.maplibre.android.location.modes.CameraMode
+import org.maplibre.android.location.modes.RenderMode
+import org.maplibre.android.maps.MapLibreMap
+import org.maplibre.android.maps.MapView
+import org.maplibre.android.maps.OnMapReadyCallback
+import org.maplibre.android.maps.Projection
+import org.maplibre.android.maps.Style
+import org.maplibre.geojson.Point
+import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera
+import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator
+import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView
+import org.maplibre.navigation.android.navigation.ui.v5.instruction.NavigationAlertView
+import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMap
+import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMapInstanceState
+import org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView
+import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute
+import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute
+import org.maplibre.navigation.android.navigation.ui.v5.utils.DistanceFormatter
+import org.maplibre.navigation.android.navigation.ui.v5.utils.LocaleUtils
+import org.maplibre.navigation.core.location.Location
+import org.maplibre.navigation.core.models.DirectionsResponse
+import org.maplibre.navigation.core.models.DirectionsRoute
+import org.maplibre.navigation.core.models.UnitType
+import org.maplibre.navigation.core.navigation.MapLibreNavigation
+import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import timber.log.Timber
+
+/**
+ * View that creates the drop-in UI.
+ *
+ *
+ * Once started, this view will check if the [Activity] that inflated
+ * it was launched with a [DirectionsRoute].
+ *
+ *
+ * Or, if not found, this view will look for a set of [Point] coordinates.
+ * In the latter case, a new [DirectionsRoute] will be retrieved from [NavigationRoute].
+ *
+ *
+ * Once valid data is obtained, this activity will immediately begin navigation
+ * with [MapLibreNavigation].
+ *
+ *
+ * If launched with the simulation boolean set to true, a [ReplayRouteLocationEngine]
+ * will be initialized and begin pushing updates.
+ *
+ *
+ * This activity requires user permissions ACCESS_FINE_LOCATION
+ * and ACCESS_COARSE_LOCATION have already been granted.
+ *
+ *
+ * A MapLibre access token must also be set by the developer (to initialize navigation).
+ *
+ * @since 0.7.0
+ */
+class NavigationRouteView @JvmOverloads constructor(
+    context: Context?,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = -1
+) :
+    CoordinatorLayout(context!!, attrs, defStyleAttr), LifecycleOwner, OnMapReadyCallback,
+    NavigationContract.View {
+    private var mapView: MapView? = null
+    private var instructionView: InstructionView? = null
+    private var recenterBtn: RecenterButton? = null
+    private var wayNameView: WayNameView? = null
+
+    private var navigationPresenter: NavigationPresenter? = null
+    private var navigationViewEventDispatcher: NavigationViewEventDispatcher? = null
+    private var navigationViewModel: NavigationViewModel? = null
+    private var navigationMap: NavigationMapLibreMap? = null
+    private var onNavigationReadyCallback: OnNavigationReadyCallback? = null
+    private var onTrackingChangedListener: NavigationOnCameraTrackingChangedListener? = null
+    private var mapInstanceState: NavigationMapLibreMapInstanceState? = null
+    private var initialMapCameraPosition: CameraPosition? = null
+    private var isMapInitialized = false
+    private var isSubscribed = false
+    private var lifecycleRegistry: LifecycleRegistry? = null
+    public var mapLibreMap: MapLibreMap? = null
+    private var locationComponent: LocationComponent? = null
+    private var route: DirectionsRoute? = null
+    private var navigationMapRoute: NavigationMapRoute? = null
+    private var baseCameraPosition: CameraPosition? = null
+    private var isMapReinitialized: Boolean = false
+    private var mapStyle: String? = null
+    private var attrs: AttributeSet? = null
+
+    init {
+        this.attrs = attrs
+    }
+
+    /**
+     * Uses savedInstanceState as a cue to restore state (if not null).
+     *
+     * @param savedInstanceState to restore state if not null
+     */
+    fun onCreate(
+        navigationCallback: OnNavigationReadyCallback,
+        savedInstanceState: Bundle?,
+        context: Context,
+        style: String
+    ) {
+        initializeNavigationViewModel(context)
+        initializeView()
+        ThemeSwitcher.setTheme(context, attrs, style)
+        mapStyle = style
+        mapView?.let {
+            it.apply {
+                if (!isMapInitialized) {
+                    it.getMapAsync(this@NavigationRouteView)
+                    it.onCreate(savedInstanceState)
+                } else {
+                    onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
+                }
+            }
+        }
+        updatePresenterState(savedInstanceState)
+        lifecycleRegistry = LifecycleRegistry(this)
+        lifecycleRegistry!!.markState(Lifecycle.State.CREATED)
+        this.onNavigationReadyCallback = navigationCallback
+        instructionView?.setupStyle(style)
+    }
+
+    /**
+     * Low memory must be reported so the [MapView]
+     * can react appropriately.
+     */
+    fun onLowMemory() {
+        mapView!!.onLowMemory()
+    }
+
+    /**
+     * If the instruction list is showing and onBackPressed is called,
+     * hide the instruction list and do not hide the activity or fragment.
+     *
+     * @return true if back press handled, false if not
+     */
+    fun onBackPressed(): Boolean {
+        return instructionView!!.handleBackPressed()
+    }
+
+    /**
+     * Used to store the bottomsheet state and re-center
+     * button visibility.  As well as anything the [MapView]
+     * needs to store in the bundle.
+     *
+     * @param outState to store state variables
+     */
+    fun onSaveInstanceState(outState: Bundle) {
+        val isWayNameVisible = wayNameView!!.visibility == VISIBLE
+        val navigationViewInstanceState = NavigationViewInstanceState(
+            recenterBtn!!.visibility,
+            instructionView!!.isShowingInstructionList,
+            isWayNameVisible,
+            wayNameView!!.retrieveWayNameText(),
+            navigationViewModel!!.isMuted
+        )
+        val instanceKey = context.getString(R.string.navigation_view_instance_state)
+        outState.putParcelable(instanceKey, navigationViewInstanceState)
+        outState.putBoolean(
+            context.getString(R.string.navigation_running),
+            navigationViewModel!!.isRunning
+        )
+        mapView!!.onSaveInstanceState(outState)
+        saveNavigationMapInstanceState(outState)
+    }
+
+    /**
+     * Used to restore the bottomsheet state and re-center
+     * button visibility.  As well as the [MapView]
+     * position prior to rotation.
+     *
+     * @param savedInstanceState to extract state variables
+     */
+    fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        val instanceKey = context.getString(R.string.navigation_view_instance_state)
+        val navigationViewInstanceState =
+            savedInstanceState.getParcelable<NavigationViewInstanceState>(instanceKey)
+        recenterBtn!!.visibility = navigationViewInstanceState!!.recenterButtonVisibility
+        wayNameView!!.visibility =
+            if (navigationViewInstanceState.isWayNameVisible) VISIBLE else INVISIBLE
+        wayNameView!!.updateWayNameText(navigationViewInstanceState.wayNameText)
+        updateInstructionListState(navigationViewInstanceState.isInstructionViewVisible)
+        updateInstructionMutedState(navigationViewInstanceState.isMuted)
+        mapInstanceState = savedInstanceState.getParcelable(MAP_INSTANCE_STATE_KEY)
+    }
+
+    /**
+     * Called to ensure the [MapView] is destroyed
+     * properly.
+     *
+     *
+     * In an [Activity] this should be in [Activity.onDestroy].
+     *
+     *
+     * In a [Fragment], this should
+     * be in [Fragment.onDestroyView].
+     */
+    @UiThread
+    fun onDestroy() {
+//        shutdown()
+        stopNavigation()
+        lifecycleRegistry!!.markState(Lifecycle.State.DESTROYED)
+    }
+
+    fun onDestroy2() {
+        shutdown()
+    }
+
+    fun onStart() {
+        mapView!!.onStart()
+        if (navigationMap != null) {
+            navigationMap!!.onStart()
+        }
+        lifecycleRegistry!!.markState(Lifecycle.State.STARTED)
+    }
+
+    fun onResume() {
+        mapView!!.onResume()
+        lifecycleRegistry!!.markState(Lifecycle.State.RESUMED)
+    }
+
+    fun onPause() {
+        mapView!!.onPause()
+    }
+
+    fun onStop() {
+        mapView!!.onStop()
+        if (navigationMap != null) {
+            navigationMap!!.onStop()
+        }
+    }
+
+    /**
+     * Fired after the map is ready, this is our cue to finish
+     * setting up the rest of the plugins / location engine.
+     *
+     *
+     * Also, we check for launch data (coordinates or route).
+     *
+     * @param mapLibreMap used for route, camera, and location UI
+     * @since 0.6.0
+     */
+    override fun onMapReady(mapLibreMap: MapLibreMap) {
+        lifecycleScope.launch {
+            val mutex = Mutex(locked = true)
+            val builder = Style.Builder().fromUri(
+                mapStyle!!
+            )
+            this@NavigationRouteView.mapLibreMap = mapLibreMap
+            Timber.d("RegionLog: onMapReady: $isMapInitialized")
+            if (!isMapInitialized) {
+
+                Timber.d("RegionLog: onMapReady: initializing")
+                mapLibreMap.setStyle(builder) {
+                    Timber.d("RegionLog: onMapReady: initialized")
+                    isMapInitialized = true
+                    enableLocationComponent(it)
+                    mapLibreMap.cameraPosition = CameraPosition.Builder().zoom(16.0).build()
+                    baseCameraPosition?.let {
+                        mapLibreMap.cameraPosition = it
+                    }
+                    mutex.unlock()
+                }
+                mutex.lock()
+            } else {
+                mapLibreMap.getStyle {
+                    enableLocationComponent(it)
+                    mapLibreMap.cameraPosition = CameraPosition.Builder().zoom(16.0).build()
+                    baseCameraPosition?.let {
+                        mapLibreMap.cameraPosition = it
+                    }
+                }
+            }
+            Timber.d("RegionLog: onMapReady: ${mapLibreMap.getStyle()}")
+
+            navigationMapRoute = NavigationMapRoute(
+                mapView!!,
+                mapLibreMap
+            )
+            onNavigationReadyCallback!!.onMapReadyCallback()
+        }
+    }
+
+    @SuppressWarnings("MissingPermission")
+    private fun enableLocationComponent(style: Style) {
+        // Get an instance of the component
+        locationComponent = mapLibreMap!!.locationComponent
+
+        locationComponent?.let {
+            // Activate with a built LocationComponentActivationOptions object
+            it.activateLocationComponent(
+                LocationComponentActivationOptions.builder(context, style).build(),
+            )
+
+            // Enable to make component visible
+            it.isLocationComponentEnabled = true
+
+            // Set the component's camera mode
+            it.cameraMode = CameraMode.TRACKING_GPS_NORTH
+
+            // Set the component's render mode
+            it.renderMode = RenderMode.NORMAL
+        }
+    }
+
+    fun calculateRoute(mapRouteData: MapRouteData) {
+        val userLocation = mapLibreMap!!.locationComponent.lastKnownLocation
+
+        val navigationRouteBuilder = NavigationRoute.builder(context).apply {
+            this.accessToken(mapRouteData.accessToken)
+            this.origin(
+                Point.fromLngLat(
+                    mapRouteData.userLocation.first,
+                    mapRouteData.userLocation.second
+                )
+            )
+            this.voiceUnits(UnitType.METRIC)
+            this.alternatives(true)
+            // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
+            this.user("gh")
+            this.profile("car")
+            this.baseUrl(context.getString(R.string.base_url))
+        }
+        for (point in mapRouteData.routeList) {
+            navigationRouteBuilder.addWaypoint(
+                Point.fromLngLat(point.first, point.second)
+            )
+        }
+        navigationRouteBuilder.build().getRoute(object : Callback<DirectionsResponse> {
+            override fun onResponse(
+                call: Call<DirectionsResponse>,
+                response: Response<DirectionsResponse>,
+            ) {
+                Timber.d("Url: %s", (call.request() as Request).url.toString())
+                response.body()?.let { response ->
+                    if (response.routes.isNotEmpty()) {
+                        val maplibreResponse =
+                            DirectionsResponse.fromJson(
+                                response.toJson()
+                            );
+                        this@NavigationRouteView.route = maplibreResponse.routes.first()
+                        navigationMapRoute?.addRoutes(maplibreResponse.routes)
+
+                        val options = NavigationLauncherOptions.builder()
+                            .directionsRoute(route)
+                            .initialMapCameraPosition(
+                                CameraPosition.Builder().target(
+                                    LatLng(
+                                        mapRouteData.userLocation.first,
+                                        mapRouteData.userLocation.second
+                                    )
+                                ).build()
+                            )
+                            .lightThemeResId(R.style.TestNavigationViewLight)
+                            .darkThemeResId(R.style.TestNavigationViewDark)
+                            .build()
+                        baseCameraPosition = mapLibreMap!!.cameraPosition
+                        NavigationLauncher.startNavigation(context, options)
+                        route?.let {
+                            if (isMapReinitialized) {
+                                onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
+                            } else {
+                                isMapReinitialized = true
+                                if (options.initialMapCameraPosition() != null) {
+                                    initialize(
+                                        options.initialMapCameraPosition()!!
+                                    )
+                                } else {
+                                    initialize()
+                                }
+                            }
+                        }
+                    }
+                }
+
+            }
+
+            override fun onFailure(call: Call<DirectionsResponse>, throwable: Throwable) {
+                Timber.e(throwable, "onFailure: navigation.getRoute()")
+            }
+        })
+    }
+
+    override fun resetCameraPosition() {
+        if (navigationMap != null) {
+            updateWayNameVisibility(true);
+            hideRecenterBtn()
+            navigationMap!!.resetPadding()
+            navigationMap!!.resetCameraPositionWith(NavigationCamera.NAVIGATION_TRACKING_MODE_GPS)
+        }
+    }
+
+    override fun showRecenterBtn() {
+        recenterBtn!!.show()
+    }
+
+    override fun hideRecenterBtn() {
+        recenterBtn!!.hide()
+    }
+
+    override fun isRecenterButtonVisible(): Boolean {
+        return recenterBtn!!.visibility == VISIBLE
+    }
+
+    override fun drawRoute(directionsRoute: DirectionsRoute) {
+        if (navigationMap != null) {
+            navigationMap!!.drawRoute(directionsRoute)
+        }
+    }
+
+    override fun addMarker(position: Point) {
+        if (navigationMap != null) {
+            navigationMap!!.addDestinationMarker(position)
+        }
+    }
+
+    val isWayNameVisible: Boolean
+        /**
+         * Provides the current visibility of the way name view.
+         *
+         * @return true if visible, false if not visible
+         */
+        get() = wayNameView!!.visibility == VISIBLE
+
+    /**
+     * Updates the text of the way name view below the
+     * navigation icon.
+     *
+     *
+     * If you'd like to use this method without being overridden by the default way names
+     * values we provide, please disabled auto-query with
+     * [NavigationMapLibreMap.updateWaynameQueryMap].
+     *
+     * @param wayName to update the view
+     */
+    override fun updateWayNameView(wayName: String) {
+        wayNameView!!.updateWayNameText(wayName)
+    }
+
+    /**
+     * Updates the visibility of the way name view that is show below
+     * the navigation icon.
+     *
+     *
+     * If you'd like to use this method without being overridden by the default visibility values
+     * values we provide, please disabled auto-query with
+     * [NavigationMapLibreMap.updateWaynameQueryMap].
+     *
+     * @param isVisible true to show, false to hide
+     */
+    override fun updateWayNameVisibility(isVisible: Boolean) {
+        var isVisible = isVisible
+        if (TextUtils.isEmpty(wayNameView!!.retrieveWayNameText())) {
+            isVisible = false
+        }
+        wayNameView!!.updateVisibility(isVisible)
+        if (navigationMap != null) {
+            navigationMap!!.updateWaynameQueryMap(isVisible)
+        }
+    }
+
+    /**
+     * Used when starting this [android.app.Activity]
+     * for the first time.
+     *
+     *
+     * Zooms to the beginning of the [DirectionsRoute].
+     *
+     * @param directionsRoute where camera should move to
+     */
+    override fun startCamera(directionsRoute: DirectionsRoute) {
+        if (navigationMap != null) {
+            navigationMap!!.startCamera(directionsRoute)
+        }
+    }
+
+    /**
+     * Used after configuration changes to resume the camera
+     * to the last location update from the Navigation SDK.
+     *
+     * @param location where the camera should move to
+     */
+    override fun resumeCamera(location: Location) {
+        if (navigationMap != null) {
+            navigationMap!!.resumeCamera(location)
+        }
+    }
+
+    override fun updateNavigationMap(location: Location) {
+        if (navigationMap != null) {
+            navigationMap!!.updateLocation(location)
+        }
+    }
+
+    override fun updateCameraRouteOverview() {
+        if (navigationMap != null) {
+            val padding = buildRouteOverviewPadding(context)
+            navigationMap!!.showRouteOverview(padding)
+        }
+    }
+
+    /**
+     * Should be called when this view is completely initialized.
+     *
+     * @param options with containing route / coordinate data
+     */
+    fun startNavigation(options: NavigationViewOptions) {
+        initializeNavigation(options)
+    }
+
+    /**
+     * Call this when the navigation session needs to end navigation without finishing the whole view
+     *
+     * @since 0.16.0
+     */
+    @SuppressLint("MissingPermission")
+    @UiThread
+    fun stopNavigation() {
+        instructionView!!.visibility = GONE
+        navigationPresenter!!.onNavigationStopped()
+        navigationViewModel!!.stopNavigation()
+        baseCameraPosition?.let {
+            mapLibreMap!!.cameraPosition = it
+        }
+
+        if (navigationMap != null) {
+            navigationMap!!.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
+            navigationMap!!.removeRoute()
+            navigationMap!!.clearMarkers()
+        }
+        mapLibreMap!!.markers.forEach {
+            mapLibreMap!!.removeMarker(it)
+        }
+        route = null
+        navigationMapRoute?.removeRoute()
+
+    }
+
+    /**
+     * Should be called after [NavigationView.onCreate].
+     *
+     *
+     * This method adds the [OnNavigationReadyCallback],
+     * which will fire the ready events for this view.
+     *
+     * @param onNavigationReadyCallback to be set to this view
+     */
+    fun initialize() {
+        if (!isMapInitialized) {
+            mapView!!.getMapAsync(this)
+        } else {
+            initializeNavigationMap(mapView, mapLibreMap!!)
+            initializeWayNameListener()
+            onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
+        }
+    }
+
+    /**
+     * Should be called after [NavigationView.onCreate].
+     *
+     *
+     * This method adds the [OnNavigationReadyCallback],
+     * which will fire the ready events for this view.
+     *
+     *
+     * This method also accepts a [CameraPosition] that will be set as soon as the map is
+     * ready.  Note, this position is ignored during rotation in favor of the last known map position.
+     *
+     * @param onNavigationReadyCallback to be set to this view
+     * @param initialMapCameraPosition  to be shown once the map is ready
+     */
+    fun initialize(
+        initialMapCameraPosition: CameraPosition
+    ) {
+        this.initialMapCameraPosition = initialMapCameraPosition
+        if (!isMapInitialized) {
+            mapView!!.getMapAsync(this)
+        } else {
+            initializeNavigationMap(mapView, mapLibreMap!!)
+            initializeWayNameListener()
+            onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
+        }
+    }
+
+    /**
+     * Gives the ability to manipulate the map directly for anything that might not currently be
+     * supported. This returns null until the view is initialized.
+     *
+     *
+     * The [NavigationMapLibreMap] gives direct access to the map UI (location marker, route, etc.).
+     *
+     * @return navigation mapbox map object, or null if view has not been initialized
+     */
+    fun retrieveNavigationMapLibreMap(): NavigationMapLibreMap? {
+        return navigationMap
+    }
+
+    /**
+     * Returns the instance of [MapLibreNavigation] powering the [NavigationView]
+     * once navigation has started.  Will return null if navigation has not been started with
+     * [NavigationView.startNavigation].
+     *
+     * @return mapbox navigation, or null if navigation has not started
+     */
+    fun retrieveMapLibreNavigation(): MapLibreNavigation? {
+        return navigationViewModel!!.retrieveNavigation()
+    }
+
+    /**
+     * Returns the sound button used for muting instructions
+     *
+     * @return sound button
+     */
+    fun retrieveSoundButton(): NavigationButton {
+        return instructionView!!.retrieveSoundButton()
+    }
+
+
+    /**
+     * Returns the re-center button for recentering on current location
+     *
+     * @return recenter button
+     */
+    fun retrieveRecenterButton(): NavigationButton? {
+        return recenterBtn
+    }
+
+    /**
+     * Returns the [NavigationAlertView] that is shown during off-route events with
+     * "Report a Problem" text.
+     *
+     * @return alert view that is used in the instruction view
+     */
+    fun retrieveAlertView(): NavigationAlertView {
+        return instructionView!!.retrieveAlertView()
+    }
+
+    private fun initializeView() {
+        inflate(context, R.layout.navigation_view_layout, this)
+        bind()
+//        initializeNavigationViewModel()
+        initializeNavigationEventDispatcher()
+        initializeNavigationPresenter()
+        initializeInstructionListListener()
+        initializeClickListeners()
+    }
+
+    private fun bind() {
+        mapView = findViewById(R.id.navigationMapView)
+        instructionView = findViewById(R.id.instructionView)
+        instructionView?.let {
+            ViewCompat.setElevation(it, 10f)
+        }
+        recenterBtn = findViewById(R.id.recenterBtn)
+        wayNameView = findViewById(R.id.wayNameView)
+    }
+
+    fun initializeNavigationViewModel(context: Context) {
+        try {
+            navigationViewModel = NavigationViewModel(context)
+        } catch (exception: ClassCastException) {
+            throw ClassCastException("Please ensure that the provided Context is a valid FragmentActivity")
+        }
+    }
+
+    private fun initializeNavigationEventDispatcher() {
+        navigationViewEventDispatcher = NavigationViewEventDispatcher()
+        navigationViewModel!!.initializeEventDispatcher(navigationViewEventDispatcher)
+    }
+
+    private fun initializeInstructionListListener() {
+        instructionView!!.setInstructionListListener(
+            NavigationInstructionListListener(
+                navigationPresenter,
+                navigationViewEventDispatcher
+            )
+        )
+    }
+
+    private fun initializeNavigationMap(mapView: MapView?, map: MapLibreMap) {
+        if (initialMapCameraPosition != null) {
+            map.cameraPosition = initialMapCameraPosition!!
+        }
+        navigationMap = NavigationMapLibreMap(mapView!!, map)
+        navigationMap!!.updateLocationLayerRenderMode(RenderMode.GPS)
+        if (mapInstanceState != null) {
+            navigationMap!!.restoreFrom(mapInstanceState)
+            return
+        }
+    }
+
+    private fun initializeWayNameListener() {
+        val wayNameListener = NavigationViewWayNameListener(navigationPresenter)
+        navigationMap!!.addOnWayNameChangedListener(wayNameListener)
+    }
+
+    private fun saveNavigationMapInstanceState(outState: Bundle) {
+        if (navigationMap != null) {
+            navigationMap!!.saveStateWith(MAP_INSTANCE_STATE_KEY, outState)
+        }
+    }
+
+    private fun updateInstructionListState(visible: Boolean) {
+        if (visible) {
+            instructionView!!.showInstructionList()
+        } else {
+            instructionView!!.hideInstructionList()
+        }
+    }
+
+    private fun updateInstructionMutedState(isMuted: Boolean) {
+        if (isMuted) {
+            (instructionView!!.retrieveSoundButton() as SoundButton).soundFabOff()
+        }
+    }
+
+    private fun buildRouteOverviewPadding(context: Context): IntArray {
+        val resources = context.resources
+        val leftRightPadding =
+            resources.getDimension(R.dimen.route_overview_left_right_padding).toInt()
+        val paddingBuffer = resources.getDimension(R.dimen.route_overview_buffer_padding).toInt()
+        val instructionHeight =
+            (resources.getDimension(R.dimen.instruction_layout_height) + paddingBuffer).toInt()
+        val summaryHeight = resources.getDimension(R.dimen.summary_bottomsheet_height).toInt()
+        return intArrayOf(leftRightPadding, instructionHeight, leftRightPadding, summaryHeight)
+    }
+
+    private val isChangingConfigurations: Boolean
+        get() {
+            try {
+                return (context as FragmentActivity).isChangingConfigurations
+            } catch (exception: ClassCastException) {
+                throw ClassCastException("Please ensure that the provided Context is a valid FragmentActivity")
+            }
+        }
+
+    private fun initializeNavigationPresenter() {
+        navigationPresenter = NavigationPresenter(this)
+    }
+
+    private fun updatePresenterState(savedInstanceState: Bundle?) {
+        if (savedInstanceState != null) {
+            val navigationRunningKey = context.getString(R.string.navigation_running)
+            val resumeState = savedInstanceState.getBoolean(navigationRunningKey)
+            navigationPresenter!!.updateResumeState(resumeState)
+        }
+    }
+
+    private fun initializeNavigation(options: NavigationViewOptions) {
+        establish(options)
+        navigationViewModel!!.initialize(options)
+        initializeNavigationListeners(options, navigationViewModel)
+        setupNavigationMapLibreMap(options)
+
+        if (!isSubscribed) {
+            initializeClickListeners()
+            initializeOnCameraTrackingChangedListener()
+            subscribeViewModels()
+        }
+        instructionView!!.visibility = GONE
+    }
+
+    private fun initializeClickListeners() {
+        recenterBtn!!.addOnClickListener(RecenterBtnClickListener(navigationPresenter))
+    }
+
+    private fun initializeOnCameraTrackingChangedListener() {
+        onTrackingChangedListener =
+            NavigationOnCameraTrackingChangedListener(navigationPresenter)
+        navigationMap!!.addOnCameraTrackingChangedListener(onTrackingChangedListener)
+    }
+
+    private fun establish(options: NavigationViewOptions) {
+        val localeUtils = LocaleUtils()
+        establishDistanceFormatter(localeUtils, options)
+        establishTimeFormat(options)
+    }
+
+    private fun establishDistanceFormatter(
+        localeUtils: LocaleUtils,
+        options: NavigationViewOptions
+    ) {
+        val unitType = establishUnitType(localeUtils, options)
+        val language = establishLanguage(localeUtils, options)
+        val roundingIncrement = establishRoundingIncrement(options)
+        val distanceFormatter = DistanceFormatter(context, language, unitType, roundingIncrement)
+
+        instructionView!!.setDistanceFormatter(distanceFormatter)
+    }
+
+    private fun establishRoundingIncrement(navigationViewOptions: NavigationViewOptions): MapLibreNavigationOptions.RoundingIncrement {
+        val mapboxNavigationOptions = navigationViewOptions.navigationOptions()
+        return mapboxNavigationOptions.roundingIncrement
+    }
+
+    private fun establishLanguage(
+        localeUtils: LocaleUtils,
+        options: NavigationViewOptions
+    ): String {
+        return localeUtils.getNonEmptyLanguage(context, options.directionsRoute().voiceLanguage)
+    }
+
+    private fun establishUnitType(
+        localeUtils: LocaleUtils,
+        options: NavigationViewOptions
+    ): UnitType {
+        val routeOptions = options.directionsRoute().routeOptions
+        val voiceUnits = routeOptions?.voiceUnits
+        return localeUtils.retrieveNonNullUnitType(context, voiceUnits)
+    }
+
+    private fun establishTimeFormat(options: NavigationViewOptions) {
+        val timeFormatType = options.navigationOptions().timeFormatType
+    }
+
+    private fun initializeNavigationListeners(
+        options: NavigationViewOptions,
+        navigationViewModel: NavigationViewModel?
+    ) {
+        navigationMap!!.addProgressChangeListener(navigationViewModel!!.retrieveNavigation()!!)
+        navigationViewEventDispatcher!!.initializeListeners(options, navigationViewModel)
+    }
+
+    private fun setupNavigationMapLibreMap(options: NavigationViewOptions) {
+        navigationMap!!.updateWaynameQueryMap(options.waynameChipEnabled())
+    }
+
+    /**
+     * Subscribes the [InstructionView] and [SummaryBottomSheet] to the [NavigationViewModel].
+     *
+     *
+     * Then, creates an instance of [NavigationViewSubscriber], which takes a presenter.
+     *
+     *
+     * The subscriber then subscribes to the view models, setting up the appropriate presenter / listener
+     * method calls based on the [androidx.lifecycle.LiveData] updates.
+     */
+    private fun subscribeViewModels() {
+        instructionView!!.subscribe(this, navigationViewModel)
+
+        NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).subscribe()
+        isSubscribed = true
+    }
+
+    @SuppressLint("MissingPermission")
+    private fun shutdown() {
+        if (navigationMap != null) {
+            navigationMap!!.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
+            navigationMap!!.removeRoute()
+        }
+//        navigationViewModel?.let {
+//            it.isOffRoute.removeObservers(this)
+//            it.instructionModel.removeObservers(this)
+//            it.bannerInstructionModel.removeObservers(this)
+//            it.summaryModel.removeObservers(this)
+//            it.retrieveNavigationLocation().removeObservers(this)
+//            it.retrieveRoute().removeObservers(this)
+//            it.retrieveShouldRecordScreenshot().removeObservers(this)
+//            it.retrieveDestination().removeObservers(this)
+//        }
+        isMapInitialized = false
+        NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).unsubscribe()
+        navigationViewModel!!.stopNavigation()
+        mapLibreMap!!.markers.forEach {
+            mapLibreMap!!.removeMarker(it)
+        }
+        navigationViewEventDispatcher!!.onDestroy(navigationViewModel!!.retrieveNavigation())
+        mapLibreMap!!.getStyle {
+            mapLibreMap!!.locationComponent.isLocationComponentEnabled = false
+        }
+//        mapView!!.onDestroy()
+//        mapView!!.getMapAsync(this)
+
+        baseCameraPosition?.let {
+            mapLibreMap!!.cameraPosition = it
+        }
+
+        navigationViewModel!!.onDestroy(false)
+        ImageCreator.getInstance().shutdown()
+        navigationMap = null
+
+        navigationMapRoute?.removeRoute()
+
+        isSubscribed = false
+    }
+
+    private fun shutDown2() {
+        if (navigationMap != null) {
+            navigationMap!!.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
+        }
+        NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).unsubscribe()
+        navigationViewEventDispatcher!!.onDestroy(navigationViewModel!!.retrieveNavigation())
+//        mapView!!.onDestroy()
+        navigationViewModel!!.onDestroy(false)
+        ImageCreator.getInstance().shutdown()
+        navigationMap = null
+    }
+
+    fun setMinZoomLevel(minZoomLevel: Double) {
+        mapLibreMap!!.setMinZoomPreference(minZoomLevel)
+    }
+
+    fun setMaxZoomLevel(maxZoomLevel: Double) {
+        mapLibreMap!!.setMaxZoomPreference(maxZoomLevel)
+    }
+
+    fun getProjection(): Projection {
+        return mapLibreMap!!.projection
+    }
+
+    fun addMarker(icon: Int, latitude: Double, longitude: Double, id: String) {
+        mapLibreMap!!.addMarker(MarkerOptions())
+        val position = LatLng(latitude, longitude)
+//        val icon = Icon(id, BitmapFactory.decodeResource(resources, icon))
+//        val markerOptions = MarkerOptions()
+//            .position(position)
+//            .icon(icon)
+    }
+
+    companion object {
+        private const val MAP_INSTANCE_STATE_KEY = "navgation_mapbox_map_instance_state"
+        private const val INVALID_STATE = 0
+    }
+
+    override val lifecycle: Lifecycle
+        get() = lifecycleRegistry!!
+
+}
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
index 361c8e516..9e0a34e6c 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
@@ -19,34 +19,31 @@
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LifecycleRegistry;
-import androidx.lifecycle.ViewModelProvider;
-
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
+import org.maplibre.android.camera.CameraPosition;
+import org.maplibre.android.location.modes.RenderMode;
+import org.maplibre.android.maps.MapLibreMap;
+import org.maplibre.android.maps.MapView;
+import org.maplibre.android.maps.OnMapReadyCallback;
+import org.maplibre.android.maps.Style;
+import org.maplibre.geojson.Point;
 import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera;
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator;
+import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView;
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.NavigationAlertView;
 import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMap;
 import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMapInstanceState;
 import org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView;
 import org.maplibre.navigation.android.navigation.ui.v5.summary.SummaryBottomSheet;
+import org.maplibre.navigation.android.navigation.ui.v5.utils.DistanceFormatter;
+import org.maplibre.navigation.android.navigation.ui.v5.utils.LocaleUtils;
 import org.maplibre.navigation.core.location.Location;
+import org.maplibre.navigation.core.location.replay.ReplayRouteLocationEngine;
 import org.maplibre.navigation.core.models.DirectionsRoute;
 import org.maplibre.navigation.core.models.RouteOptions;
-import org.maplibre.geojson.Point;
-import org.maplibre.android.camera.CameraPosition;
-import org.maplibre.android.location.modes.RenderMode;
-import org.maplibre.android.maps.MapView;
-import org.maplibre.android.maps.MapLibreMap;
-import org.maplibre.android.maps.OnMapReadyCallback;
-import org.maplibre.android.maps.Style;
-import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView;
-import org.maplibre.navigation.core.location.replay.ReplayRouteLocationEngine;
 import org.maplibre.navigation.core.models.UnitType;
 import org.maplibre.navigation.core.navigation.MapLibreNavigation;
 import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions;
-import org.maplibre.navigation.android.navigation.ui.v5.utils.DistanceFormatter;
-import org.maplibre.navigation.android.navigation.ui.v5.utils.LocaleUtils;
 
 /**
  * View that creates the drop-in UI.
@@ -644,8 +641,7 @@ private UnitType establishUnitType(LocaleUtils localeUtils, NavigationViewOption
     }
 
     private void establishTimeFormat(NavigationViewOptions options) {
-    @NavigationTimeFormat.Type
-    int timeFormatType = options.navigationOptions().timeFormatType();
+        int timeFormatType = options.navigationOptions().getTimeFormatType().getId();
     }
 
     private void initializeNavigationListeners(NavigationViewOptions options, NavigationViewModel navigationViewModel) {
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
index cf051985e..02727540c 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
@@ -111,7 +111,7 @@ static void setTheme(Context context, AttributeSet attrs, String style) {
             R.style.NavigationViewLight);
     int darkTheme = styledAttributes.getResourceId(R.styleable.NavigationView_navigationDarkTheme,
             R.style.NavigationViewDark);
-    if (style.equals(MapRouteData.LIGHT_THEME)) {
+    if (style.equals(NavigationConstants.NAVIGATION_VIEW_DARK_THEME)) {
       context.setTheme(lightTheme);
     } else {
       context.setTheme(darkTheme);
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java
index b43b59f92..d3063b64b 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java
@@ -310,7 +310,7 @@ public void addProgressChangeListener(MapLibreNavigation navigation) {
     navigation.addProgressChangeListener(progressChangeListener);
   }
 
-  public void removeProgressChangeListener(MapboxNavigation navigation) {
+  public void removeProgressChangeListener(MapLibreNavigation navigation) {
     navigation.removeProgressChangeListener(progressChangeListener);
   }
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
index 720382846..ce57f3f64 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
@@ -32,7 +32,6 @@
 import androidx.transition.AutoTransition;
 import androidx.transition.TransitionManager;
 
-import com.mapbox.services.android.navigation.ui.v5.MapRouteData;
 import org.maplibre.navigation.android.navigation.ui.v5.NavigationButton;
 import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel;
 import org.maplibre.navigation.android.navigation.ui.v5.SoundButton;
@@ -787,7 +786,7 @@ private void updateInstructionList(InstructionModel model) {
 
   public void setupStyle(String mapStyle) {
     ConstraintLayout instructionBackground = findViewById(R.id.instructionBackground);
-    if (mapStyle.equals(MapRouteData.DARK_THEME)) {
+    if (mapStyle.equals(NavigationConstants.NAVIGATION_VIEW_DARK_THEME)) {
       instructionBackground.setBackgroundColor(Color.BLACK);
       upcomingDistanceText.setTextColor(Color.WHITE);
       upcomingPrimaryText.setTextColor(Color.WHITE);
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java
index 626389005..8f34e0b05 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java
@@ -235,9 +235,9 @@ protected void onDraw(Canvas canvas) {
     private void initializeColorFrom(AttributeSet attributeSet) {
         TypedArray typedArray = getContext().obtainStyledAttributes(attributeSet, R.styleable.ManeuverView);
         primaryColor = typedArray.getColor(R.styleable.ManeuverView_maneuverViewPrimaryColor,
-            ContextCompat.getColor(getContext(), R.color.mapbox_navigation_route_layer_blue));
+            ContextCompat.getColor(getContext(), R.color.maplibre_navigation_route_layer_blue));
         secondaryColor = typedArray.getColor(R.styleable.ManeuverView_maneuverViewSecondaryColor,
-            ContextCompat.getColor(getContext(), R.color.mapbox_navigation_route_layer_blue));
+            ContextCompat.getColor(getContext(), R.color.maplibre_navigation_route_layer_blue));
         typedArray.recycle();
     }
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLine.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLine.java
index b9a90eb70..75a026892 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLine.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLine.java
@@ -8,7 +8,7 @@
 import androidx.annotation.ColorInt;
 import androidx.core.content.ContextCompat;
 
-import com.mapbox.services.android.navigation.ui.v5.BuildConfig;
+import org.maplibre.navigation.android.navigation.ui.v5.BuildConfig;
 import org.maplibre.navigation.android.navigation.ui.v5.R;
 import org.maplibre.navigation.android.navigation.ui.v5.utils.MapUtils;
 import org.maplibre.navigation.core.models.DirectionsRoute;
@@ -38,10 +38,10 @@
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_LAYER_ID;
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_SHIELD_LAYER_ID;
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_SOURCE_ID;
+import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_CUSTOM_ID;
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_DESTINATION_VALUE;
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_ORIGIN_VALUE;
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_PROPERTY_KEY;
-import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_SOURCE_ID;
 
 import timber.log.Timber;
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
index bd8fb1722..89277139c 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
@@ -25,8 +25,8 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:maneuverViewPrimaryColor="@color/mapbox_navigation_route_layer_blue"
-            app:maneuverViewSecondaryColor="@color/mapbox_navigation_route_layer_blue"/>
+            app:maneuverViewPrimaryColor="@color/maplibre_navigation_route_layer_blue"
+            app:maneuverViewSecondaryColor="@color/maplibre_navigation_route_layer_blue"/>
 
         <TextView
             android:id="@+id/stepDistanceText"
diff --git a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
index 806cf47e2..67aabe015 100644
--- a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
@@ -13,7 +13,7 @@
         android:orientation="vertical"
         >
 
-        <com.mapbox.mapboxsdk.maps.MapView
+        <org.maplibre.android.maps.MapView
             android:id="@+id/navigationMapView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -39,7 +39,7 @@
             android:layout_height="match_parent"
             android:visibility="invisible" />
 
-        <com.mapbox.services.android.navigation.ui.v5.RecenterButton
+        <org.maplibre.navigation.android.navigation.ui.v5.RecenterButton
             android:id="@+id/recenterBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView
+    <org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView
         android:id="@+id/instructionView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="60dp"
         android:background="@drawable/rounded_corners"
-        android:backgroundTint="@color/mapbox_navigation_route_shield_layer_color"
+        android:backgroundTint="@color/maplibre_navigation_route_shield_layer_color"
         android:orientation="horizontal"
         android:padding="8dp"
         android:visibility="gone"
@@ -91,7 +91,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="simulate_route"
-            android:textColor="@color/mapbox_navigation_route_upcoming_maneuver_arrow_color"
+            android:textColor="@color/maplibre_navigation_route_upcoming_maneuver_arrow_color"
             app:switchPadding="4dp" />
 
         <Button

From 10c5a2c2da6886993e653122392958d3a3665230 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 16 May 2025 12:09:27 +0200
Subject: [PATCH 13/46] check mapbox request

---
 .../android/example/NavigationUIActivity.kt   |  66 ++-
 ...ithCustomForegroundNotificationActivity.kt |   3 +
 ...ationWithForegroundNotificationActivity.kt |   9 +-
 .../res/layout/activity_navigation_ui.xml     |   2 +-
 .../ui/v5/MapLibreNavigationActivity.java     |   5 -
 .../android/navigation/ui/v5/MapRouteData.kt  |   9 +-
 .../navigation/ui/v5/NavigationRouteView.kt   | 496 ++++++------------
 .../ui/v5/OnNavigationReadyCallback.java      |   2 -
 .../instruction/BannerInstructionModel.java   |   5 +-
 .../ui/v5/instruction/InstructionView.java    |   8 +-
 .../res/layout/navigation_view_layout.xml     |   1 +
 .../src/main/res/values/developer-config.xml  |   4 +-
 12 files changed, 238 insertions(+), 372 deletions(-)

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index c4a2ef926..6b5cdc965 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -31,7 +31,8 @@ import retrofit2.Callback
 import retrofit2.Response
 import timber.log.Timber
 
-class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener, OnNavigationReadyCallback, NavigationListener {
+class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener,
+    OnNavigationReadyCallback, NavigationListener {
 
     // Navigation related variables
     private var route: DirectionsRoute? = null
@@ -56,7 +57,12 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
 
         binding = ActivityNavigationUiBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.navigationView.onCreate(this, savedInstanceState, this, "https://api.maptiler.com/maps/streets-v2-dark/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ")
+        binding.navigationView.apply {
+            mapStyleUri =
+                "https://api.maptiler.com/maps/streets-v2-dark/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ"
+            onCreate(savedInstanceState)
+            initialize(this@NavigationUIActivity)
+        }
 
 //        binding.mapView.apply {
 //            onCreate(savedInstanceState)
@@ -70,26 +76,38 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
                 binding.navigationView.updateCameraRouteOverview()
             }
         }
+        val points = mutableListOf<Point>()
+//        points.add(Pair(76.928316, 43.236109))
+        points.add(Point.fromLngLat(76.933810, 43.230633))
+        points.add(Point.fromLngLat(76.920187, 43.236783))
+//        points.add(Pair(76.930137, 43.230361))
+
 
         binding.startRouteButton.setOnClickListener {
             if (isStarted) {
                 binding.navigationView.stopNavigation()
                 isStarted = false
             } else {
-                val points = mutableListOf<Pair<Double, Double>>()
-                points.add(Pair(76.930137, 43.230361))
-                points.add(Pair(76.928316, 43.236109))
-                points.add(Pair(76.920187, 43.236783))
+                isStarted = true
                 binding.navigationView.calculateRoute(
                     MapRouteData(
-                        "pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a",
-                        "getString(R.string.mapbox_access_token)",
-                        points,
-                        Pair(76.930137, 43.230361),
-                        MapRouteData.DARK_THEME
-                    )
+                        "sk.eyJ1IjoicmVnaW9ubGxjIiwiYSI6ImNsZHNrM3MxbjF4cDIzcG4wcXp2MmR1c3kifQ.Sk6779T0lDSXEjt_SxqXaQ",
+                        userLocation = Point.fromLngLat(76.930137, 43.230361),
+                        stops = points,
+                        destination = Point.fromLngLat(76.930137, 43.230361),
+                    ),
+                    successCallback = {
+                        val options = NavigationViewOptions.builder()
+                        options.navigationListener(this)
+                        extractRoute(options)
+                        extractConfiguration(options)
+                        options.shouldSimulateRoute(true)
+                        options.navigationOptions(
+                            MapLibreNavigationOptions.Builder().withSnapToRoute(true).build()
+                        )
+                        binding.navigationView.startNavigation(options.build())
+                    }
                 )
-                isStarted = true
             }
         }
 
@@ -259,12 +277,12 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
     }
 
     override fun onNavigationReady(isRunning: Boolean) {
-        val options = NavigationViewOptions.builder()
-        options.navigationListener(this)
-        extractRoute(options)
-        extractConfiguration(options)
-        options.navigationOptions(MapLibreNavigationOptions.Builder().build())
-        binding.navigationView.startNavigation(options.build())
+//        val options = NavigationViewOptions.builder()
+//        options.navigationListener(this)
+//        extractRoute(options)
+//        extractConfiguration(options)
+//        options.navigationOptions(MapLibreNavigationOptions.Builder().build())
+//        binding.navigationView.startNavigation(options.build())
     }
 
     override fun onCancelNavigation() {
@@ -279,10 +297,6 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
         // Intentionally empty
     }
 
-    override fun onMapReadyCallback() {
-        // Intentionally empty
-    }
-
     private fun extractRoute(options: NavigationViewOptions.Builder) {
         val route = NavigationLauncher.extractRoute(this)
         options.directionsRoute(route)
@@ -299,8 +313,8 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
     }
 
     private fun finishNavigation() {
-//        NavigationLauncher.cleanUpPreferences(this)
-        binding.navigationView.onDestroy()
-//        finish()
+        NavigationLauncher.cleanUpPreferences(this)
+//        binding.navigationView.stopNavigation()
+        finish()
     }
 }
diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithCustomForegroundNotificationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithCustomForegroundNotificationActivity.kt
index 03146e514..c24c374da 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithCustomForegroundNotificationActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithCustomForegroundNotificationActivity.kt
@@ -145,6 +145,9 @@ class NavigationWithCustomForegroundNotificationActivity : AppCompatActivity(),
             this.destination(Point.fromLngLat(9.756259, 52.342620))
             this.voiceUnits(UnitType.METRIC)
             this.alternatives(true)
+            // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
+            this.user("gh")
+            this.profile("car")
             this.baseUrl(getString(R.string.base_url))
         }
 
diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithForegroundNotificationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithForegroundNotificationActivity.kt
index 4c7538922..f16b79b58 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithForegroundNotificationActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithForegroundNotificationActivity.kt
@@ -140,11 +140,14 @@ class NavigationWithForegroundNotificationActivity : AppCompatActivity(), OnMapR
     private fun calculateRouteAndStartNavigation() {
         val navigationRouteBuilder = NavigationRoute.builder(this).apply {
             this.accessToken(getString(R.string.mapbox_access_token))
-            this.origin(Point.fromLngLat(9.7536318, 52.3717979))
-            this.addWaypoint(Point.fromLngLat(9.741052, 52.360496))
-            this.destination(Point.fromLngLat(9.756259, 52.342620))
+            this.origin(Point.fromLngLat( 10.246249, 50.055795))
+            this.destination(Point.fromLngLat( 10.245291,50.056129))
+            this.addWaypoint(Point.fromLngLat(10.243814,50.055662))
             this.voiceUnits(UnitType.METRIC)
             this.alternatives(true)
+            // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
+            this.user("gh")
+            this.profile("car")
             this.baseUrl(getString(R.string.base_url))
         }
 
diff --git a/app/src/main/res/layout/activity_navigation_ui.xml b/app/src/main/res/layout/activity_navigation_ui.xml
index b527db070..ba97ad0fa 100644
--- a/app/src/main/res/layout/activity_navigation_ui.xml
+++ b/app/src/main/res/layout/activity_navigation_ui.xml
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="160dp"
+        android:layout_marginBottom="32dp"
         android:background="@drawable/rounded_corners"
         android:backgroundTint="@color/maplibre_navigation_route_shield_layer_color"
         android:orientation="horizontal"
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapLibreNavigationActivity.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapLibreNavigationActivity.java
index 9e2a519a3..5735ad9b7 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapLibreNavigationActivity.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapLibreNavigationActivity.java
@@ -113,11 +113,6 @@ public void onNavigationRunning() {
     // Intentionally empty
   }
 
-  @Override
-  public void onMapReadyCallback() {
-    // Intentionally empty
-  }
-
   private void initialize() {
     Parcelable position = getIntent().getParcelableExtra(NavigationConstants.NAVIGATION_VIEW_INITIAL_MAP_POSITION);
     if (position != null) {
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt
index 099d2bdd5..72285590e 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt
@@ -1,11 +1,12 @@
 package org.maplibre.navigation.android.navigation.ui.v5
 
+import org.maplibre.geojson.Point
+
 data class MapRouteData(
     val accessToken: String,
-    val mapStyle: String,
-    val routeList: List<Pair<Double, Double>>,
-    val userLocation: Pair<Double, Double>,
-    val mapTheme: String
+    val userLocation: Point,
+    val stops: List<Point>?,
+    val destination: Point
 ) {
     companion object {
         const val LIGHT_THEME = "light"
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index 8937cadf9..ebf3bfebf 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -5,30 +5,28 @@ import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import android.util.AttributeSet
+import android.view.View
 import androidx.annotation.UiThread
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.ViewCompat
+import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.lifecycleScope
 import com.mapbox.core.utils.TextUtils
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
 import okhttp3.Request
 import org.maplibre.android.annotations.MarkerOptions
 import org.maplibre.android.camera.CameraPosition
 import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.location.LocationComponent
-import org.maplibre.android.location.LocationComponentActivationOptions
-import org.maplibre.android.location.modes.CameraMode
 import org.maplibre.android.location.modes.RenderMode
 import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.MapView
 import org.maplibre.android.maps.OnMapReadyCallback
 import org.maplibre.android.maps.Projection
 import org.maplibre.android.maps.Style
+import org.maplibre.android.maps.Style.OnStyleLoaded
 import org.maplibre.geojson.Point
 import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator
@@ -37,7 +35,6 @@ import org.maplibre.navigation.android.navigation.ui.v5.instruction.NavigationAl
 import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMap
 import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMapInstanceState
 import org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView
-import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute
 import org.maplibre.navigation.android.navigation.ui.v5.utils.DistanceFormatter
 import org.maplibre.navigation.android.navigation.ui.v5.utils.LocaleUtils
@@ -51,69 +48,48 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import timber.log.Timber
+import java.util.Locale
+
 
-/**
- * View that creates the drop-in UI.
- *
- *
- * Once started, this view will check if the [Activity] that inflated
- * it was launched with a [DirectionsRoute].
- *
- *
- * Or, if not found, this view will look for a set of [Point] coordinates.
- * In the latter case, a new [DirectionsRoute] will be retrieved from [NavigationRoute].
- *
- *
- * Once valid data is obtained, this activity will immediately begin navigation
- * with [MapLibreNavigation].
- *
- *
- * If launched with the simulation boolean set to true, a [ReplayRouteLocationEngine]
- * will be initialized and begin pushing updates.
- *
- *
- * This activity requires user permissions ACCESS_FINE_LOCATION
- * and ACCESS_COARSE_LOCATION have already been granted.
- *
- *
- * A MapLibre access token must also be set by the developer (to initialize navigation).
- *
- * @since 0.7.0
- */
 class NavigationRouteView @JvmOverloads constructor(
-    context: Context?,
-    attrs: AttributeSet? = null,
+    context: Context,
+    private val attrs: AttributeSet? = null,
     defStyleAttr: Int = -1
-) :
-    CoordinatorLayout(context!!, attrs, defStyleAttr), LifecycleOwner, OnMapReadyCallback,
+) : CoordinatorLayout(context, attrs, defStyleAttr), LifecycleOwner, OnMapReadyCallback,
     NavigationContract.View {
-    private var mapView: MapView? = null
-    private var instructionView: InstructionView? = null
-    private var recenterBtn: RecenterButton? = null
-    private var wayNameView: WayNameView? = null
+    private lateinit var mapView: MapView
+    private lateinit var instructionView: InstructionView
+    private lateinit var recenterBtn: RecenterButton
+    private lateinit var wayNameView: WayNameView
 
     private var navigationPresenter: NavigationPresenter? = null
     private var navigationViewEventDispatcher: NavigationViewEventDispatcher? = null
-    private var navigationViewModel: NavigationViewModel? = null
+    private lateinit var navigationViewModel: NavigationViewModel
     private var navigationMap: NavigationMapLibreMap? = null
-    private var onNavigationReadyCallback: OnNavigationReadyCallback? = null
     private var onTrackingChangedListener: NavigationOnCameraTrackingChangedListener? = null
     private var mapInstanceState: NavigationMapLibreMapInstanceState? = null
     private var initialMapCameraPosition: CameraPosition? = null
     private var isMapInitialized = false
     private var isSubscribed = false
-    private var lifecycleRegistry: LifecycleRegistry? = null
-    public var mapLibreMap: MapLibreMap? = null
+    private lateinit var lifecycleRegistry: LifecycleRegistry
+    private var onNavigationReadyCallback: OnNavigationReadyCallback? = null
+
+    var mapLibreMap: MapLibreMap? = null
+        private set
+
+    var mapStyleUri: String? = null
+        set(value) {
+            ThemeSwitcher.setTheme(context, attrs, value)
+            instructionView.setupStyle(value)
+            field = value
+        }
+
     private var locationComponent: LocationComponent? = null
-    private var route: DirectionsRoute? = null
-    private var navigationMapRoute: NavigationMapRoute? = null
     private var baseCameraPosition: CameraPosition? = null
     private var isMapReinitialized: Boolean = false
-    private var mapStyle: String? = null
-    private var attrs: AttributeSet? = null
 
     init {
-        this.attrs = attrs
+        initializeView()
     }
 
     /**
@@ -122,30 +98,12 @@ class NavigationRouteView @JvmOverloads constructor(
      * @param savedInstanceState to restore state if not null
      */
     fun onCreate(
-        navigationCallback: OnNavigationReadyCallback,
         savedInstanceState: Bundle?,
-        context: Context,
-        style: String
     ) {
-        initializeNavigationViewModel(context)
-        initializeView()
-        ThemeSwitcher.setTheme(context, attrs, style)
-        mapStyle = style
-        mapView?.let {
-            it.apply {
-                if (!isMapInitialized) {
-                    it.getMapAsync(this@NavigationRouteView)
-                    it.onCreate(savedInstanceState)
-                } else {
-                    onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
-                }
-            }
-        }
+        mapView.onCreate(savedInstanceState)
         updatePresenterState(savedInstanceState)
         lifecycleRegistry = LifecycleRegistry(this)
-        lifecycleRegistry!!.markState(Lifecycle.State.CREATED)
-        this.onNavigationReadyCallback = navigationCallback
-        instructionView?.setupStyle(style)
+        lifecycleRegistry.currentState = Lifecycle.State.CREATED
     }
 
     /**
@@ -153,7 +111,7 @@ class NavigationRouteView @JvmOverloads constructor(
      * can react appropriately.
      */
     fun onLowMemory() {
-        mapView!!.onLowMemory()
+        mapView.onLowMemory()
     }
 
     /**
@@ -163,7 +121,7 @@ class NavigationRouteView @JvmOverloads constructor(
      * @return true if back press handled, false if not
      */
     fun onBackPressed(): Boolean {
-        return instructionView!!.handleBackPressed()
+        return instructionView.handleBackPressed()
     }
 
     /**
@@ -174,26 +132,26 @@ class NavigationRouteView @JvmOverloads constructor(
      * @param outState to store state variables
      */
     fun onSaveInstanceState(outState: Bundle) {
-        val isWayNameVisible = wayNameView!!.visibility == VISIBLE
+        val isWayNameVisible = wayNameView.isVisible
         val navigationViewInstanceState = NavigationViewInstanceState(
-            recenterBtn!!.visibility,
-            instructionView!!.isShowingInstructionList,
+            recenterBtn.visibility,
+            instructionView.isShowingInstructionList,
             isWayNameVisible,
-            wayNameView!!.retrieveWayNameText(),
-            navigationViewModel!!.isMuted
+            wayNameView.retrieveWayNameText(),
+            navigationViewModel.isMuted
         )
         val instanceKey = context.getString(R.string.navigation_view_instance_state)
         outState.putParcelable(instanceKey, navigationViewInstanceState)
         outState.putBoolean(
             context.getString(R.string.navigation_running),
-            navigationViewModel!!.isRunning
+            navigationViewModel.isRunning
         )
-        mapView!!.onSaveInstanceState(outState)
+        mapView.onSaveInstanceState(outState)
         saveNavigationMapInstanceState(outState)
     }
 
     /**
-     * Used to restore the bottomsheet state and re-center
+     * Used to re-center
      * button visibility.  As well as the [MapView]
      * position prior to rotation.
      *
@@ -203,12 +161,12 @@ class NavigationRouteView @JvmOverloads constructor(
         val instanceKey = context.getString(R.string.navigation_view_instance_state)
         val navigationViewInstanceState =
             savedInstanceState.getParcelable<NavigationViewInstanceState>(instanceKey)
-        recenterBtn!!.visibility = navigationViewInstanceState!!.recenterButtonVisibility
-        wayNameView!!.visibility =
-            if (navigationViewInstanceState.isWayNameVisible) VISIBLE else INVISIBLE
-        wayNameView!!.updateWayNameText(navigationViewInstanceState.wayNameText)
-        updateInstructionListState(navigationViewInstanceState.isInstructionViewVisible)
-        updateInstructionMutedState(navigationViewInstanceState.isMuted)
+        recenterBtn.visibility = navigationViewInstanceState?.recenterButtonVisibility ?: View.GONE
+        wayNameView.visibility =
+            if (navigationViewInstanceState?.isWayNameVisible == true) VISIBLE else INVISIBLE
+        wayNameView.updateWayNameText(navigationViewInstanceState?.wayNameText)
+        updateInstructionListState(navigationViewInstanceState?.isInstructionViewVisible ?: false)
+        updateInstructionMutedState(navigationViewInstanceState?.isMuted ?: true)
         mapInstanceState = savedInstanceState.getParcelable(MAP_INSTANCE_STATE_KEY)
     }
 
@@ -227,7 +185,7 @@ class NavigationRouteView @JvmOverloads constructor(
     fun onDestroy() {
 //        shutdown()
         stopNavigation()
-        lifecycleRegistry!!.markState(Lifecycle.State.DESTROYED)
+        lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
     }
 
     fun onDestroy2() {
@@ -235,27 +193,23 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     fun onStart() {
-        mapView!!.onStart()
-        if (navigationMap != null) {
-            navigationMap!!.onStart()
-        }
-        lifecycleRegistry!!.markState(Lifecycle.State.STARTED)
+        mapView.onStart()
+        navigationMap?.onStart()
+        lifecycleRegistry.currentState = Lifecycle.State.STARTED
     }
 
     fun onResume() {
-        mapView!!.onResume()
-        lifecycleRegistry!!.markState(Lifecycle.State.RESUMED)
+        mapView.onResume()
+        lifecycleRegistry.currentState = Lifecycle.State.RESUMED
     }
 
     fun onPause() {
-        mapView!!.onPause()
+        mapView.onPause()
     }
 
     fun onStop() {
-        mapView!!.onStop()
-        if (navigationMap != null) {
-            navigationMap!!.onStop()
-        }
+        mapView.onStop()
+        navigationMap?.onStop()
     }
 
     /**
@@ -269,135 +223,68 @@ class NavigationRouteView @JvmOverloads constructor(
      * @since 0.6.0
      */
     override fun onMapReady(mapLibreMap: MapLibreMap) {
-        lifecycleScope.launch {
-            val mutex = Mutex(locked = true)
-            val builder = Style.Builder().fromUri(
-                mapStyle!!
-            )
-            this@NavigationRouteView.mapLibreMap = mapLibreMap
-            Timber.d("RegionLog: onMapReady: $isMapInitialized")
-            if (!isMapInitialized) {
-
-                Timber.d("RegionLog: onMapReady: initializing")
-                mapLibreMap.setStyle(builder) {
-                    Timber.d("RegionLog: onMapReady: initialized")
-                    isMapInitialized = true
-                    enableLocationComponent(it)
-                    mapLibreMap.cameraPosition = CameraPosition.Builder().zoom(16.0).build()
-                    baseCameraPosition?.let {
-                        mapLibreMap.cameraPosition = it
-                    }
-                    mutex.unlock()
-                }
-                mutex.lock()
-            } else {
-                mapLibreMap.getStyle {
-                    enableLocationComponent(it)
-                    mapLibreMap.cameraPosition = CameraPosition.Builder().zoom(16.0).build()
-                    baseCameraPosition?.let {
-                        mapLibreMap.cameraPosition = it
-                    }
-                }
-            }
-            Timber.d("RegionLog: onMapReady: ${mapLibreMap.getStyle()}")
+        this.mapLibreMap = mapLibreMap
 
-            navigationMapRoute = NavigationMapRoute(
-                mapView!!,
-                mapLibreMap
-            )
-            onNavigationReadyCallback!!.onMapReadyCallback()
-        }
-    }
-
-    @SuppressWarnings("MissingPermission")
-    private fun enableLocationComponent(style: Style) {
-        // Get an instance of the component
-        locationComponent = mapLibreMap!!.locationComponent
-
-        locationComponent?.let {
-            // Activate with a built LocationComponentActivationOptions object
-            it.activateLocationComponent(
-                LocationComponentActivationOptions.builder(context, style).build(),
-            )
-
-            // Enable to make component visible
-            it.isLocationComponentEnabled = true
+        val onStyleLoaded = OnStyleLoaded { style ->
+            initializeNavigationMap(mapView, mapLibreMap)
+            initializeWayNameListener()
 
-            // Set the component's camera mode
-            it.cameraMode = CameraMode.TRACKING_GPS_NORTH
+            onNavigationReadyCallback?.onNavigationReady(navigationViewModel.isRunning)
 
-            // Set the component's render mode
-            it.renderMode = RenderMode.NORMAL
+            isMapInitialized = true
         }
+
+        mapStyleUri?.let { mapLibreMap.setStyle(Style.Builder().fromUri(it), onStyleLoaded) }
+            ?: mapLibreMap.setStyle(ThemeSwitcher.retrieveMapStyle(context), onStyleLoaded)
     }
 
-    fun calculateRoute(mapRouteData: MapRouteData) {
-        val userLocation = mapLibreMap!!.locationComponent.lastKnownLocation
 
+    fun calculateRoute(mapRouteData: MapRouteData, successCallback: () -> Unit) {
         val navigationRouteBuilder = NavigationRoute.builder(context).apply {
             this.accessToken(mapRouteData.accessToken)
-            this.origin(
-                Point.fromLngLat(
-                    mapRouteData.userLocation.first,
-                    mapRouteData.userLocation.second
-                )
-            )
+            this.origin(mapRouteData.userLocation)
+            this.destination( mapRouteData.destination)
+            mapRouteData.stops?.forEach { this.addWaypoint(it) }
             this.voiceUnits(UnitType.METRIC)
+            this.language(Locale.forLanguageTag("ru"))
             this.alternatives(true)
             // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
-            this.user("gh")
-            this.profile("car")
+//            this.user("gh")
+//            this.profile("car")
             this.baseUrl(context.getString(R.string.base_url))
         }
-        for (point in mapRouteData.routeList) {
-            navigationRouteBuilder.addWaypoint(
-                Point.fromLngLat(point.first, point.second)
-            )
-        }
         navigationRouteBuilder.build().getRoute(object : Callback<DirectionsResponse> {
             override fun onResponse(
                 call: Call<DirectionsResponse>,
                 response: Response<DirectionsResponse>,
             ) {
                 Timber.d("Url: %s", (call.request() as Request).url.toString())
-                response.body()?.let { response ->
-                    if (response.routes.isNotEmpty()) {
+                response.body()?.let { responseBody ->
+                    if (responseBody.routes.isNotEmpty()) {
                         val maplibreResponse =
                             DirectionsResponse.fromJson(
-                                response.toJson()
+                                responseBody.toJson()
                             );
-                        this@NavigationRouteView.route = maplibreResponse.routes.first()
-                        navigationMapRoute?.addRoutes(maplibreResponse.routes)
+                       val route = maplibreResponse.routes.first()
+
+                        navigationMap?.drawRoutes(maplibreResponse.routes)
 
                         val options = NavigationLauncherOptions.builder()
                             .directionsRoute(route)
                             .initialMapCameraPosition(
                                 CameraPosition.Builder().target(
                                     LatLng(
-                                        mapRouteData.userLocation.first,
-                                        mapRouteData.userLocation.second
+                                        mapRouteData.userLocation.latitude(),
+                                        mapRouteData.userLocation.longitude()
                                     )
                                 ).build()
                             )
                             .lightThemeResId(R.style.TestNavigationViewLight)
                             .darkThemeResId(R.style.TestNavigationViewDark)
                             .build()
-                        baseCameraPosition = mapLibreMap!!.cameraPosition
                         NavigationLauncher.startNavigation(context, options)
-                        route?.let {
-                            if (isMapReinitialized) {
-                                onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
-                            } else {
-                                isMapReinitialized = true
-                                if (options.initialMapCameraPosition() != null) {
-                                    initialize(
-                                        options.initialMapCameraPosition()!!
-                                    )
-                                } else {
-                                    initialize()
-                                }
-                            }
-                        }
+
+                        successCallback.invoke()
                     }
                 }
 
@@ -410,36 +297,30 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     override fun resetCameraPosition() {
-        if (navigationMap != null) {
-            updateWayNameVisibility(true);
-            hideRecenterBtn()
-            navigationMap!!.resetPadding()
-            navigationMap!!.resetCameraPositionWith(NavigationCamera.NAVIGATION_TRACKING_MODE_GPS)
-        }
+        updateWayNameVisibility(true);
+        hideRecenterBtn()
+        navigationMap?.resetPadding()
+        navigationMap?.resetCameraPositionWith(NavigationCamera.NAVIGATION_TRACKING_MODE_GPS)
     }
 
     override fun showRecenterBtn() {
-        recenterBtn!!.show()
+        recenterBtn.show()
     }
 
     override fun hideRecenterBtn() {
-        recenterBtn!!.hide()
+        recenterBtn.hide()
     }
 
     override fun isRecenterButtonVisible(): Boolean {
-        return recenterBtn!!.visibility == VISIBLE
+        return recenterBtn.isVisible
     }
 
     override fun drawRoute(directionsRoute: DirectionsRoute) {
-        if (navigationMap != null) {
-            navigationMap!!.drawRoute(directionsRoute)
-        }
+        navigationMap?.drawRoute(directionsRoute)
     }
 
     override fun addMarker(position: Point) {
-        if (navigationMap != null) {
-            navigationMap!!.addDestinationMarker(position)
-        }
+        navigationMap?.addDestinationMarker(position)
     }
 
     val isWayNameVisible: Boolean
@@ -448,7 +329,7 @@ class NavigationRouteView @JvmOverloads constructor(
          *
          * @return true if visible, false if not visible
          */
-        get() = wayNameView!!.visibility == VISIBLE
+        get() = wayNameView.isVisible
 
     /**
      * Updates the text of the way name view below the
@@ -462,7 +343,7 @@ class NavigationRouteView @JvmOverloads constructor(
      * @param wayName to update the view
      */
     override fun updateWayNameView(wayName: String) {
-        wayNameView!!.updateWayNameText(wayName)
+        wayNameView.updateWayNameText(wayName)
     }
 
     /**
@@ -477,14 +358,12 @@ class NavigationRouteView @JvmOverloads constructor(
      * @param isVisible true to show, false to hide
      */
     override fun updateWayNameVisibility(isVisible: Boolean) {
-        var isVisible = isVisible
-        if (TextUtils.isEmpty(wayNameView!!.retrieveWayNameText())) {
-            isVisible = false
-        }
-        wayNameView!!.updateVisibility(isVisible)
-        if (navigationMap != null) {
-            navigationMap!!.updateWaynameQueryMap(isVisible)
+        var visible = isVisible
+        if (TextUtils.isEmpty(wayNameView.retrieveWayNameText())) {
+            visible = false
         }
+        wayNameView.updateVisibility(visible)
+        navigationMap?.updateWaynameQueryMap(visible)
     }
 
     /**
@@ -497,9 +376,7 @@ class NavigationRouteView @JvmOverloads constructor(
      * @param directionsRoute where camera should move to
      */
     override fun startCamera(directionsRoute: DirectionsRoute) {
-        if (navigationMap != null) {
-            navigationMap!!.startCamera(directionsRoute)
-        }
+        navigationMap?.startCamera(directionsRoute)
     }
 
     /**
@@ -509,22 +386,16 @@ class NavigationRouteView @JvmOverloads constructor(
      * @param location where the camera should move to
      */
     override fun resumeCamera(location: Location) {
-        if (navigationMap != null) {
-            navigationMap!!.resumeCamera(location)
-        }
+        navigationMap?.resumeCamera(location)
     }
 
     override fun updateNavigationMap(location: Location) {
-        if (navigationMap != null) {
-            navigationMap!!.updateLocation(location)
-        }
+        navigationMap?.updateLocation(location)
     }
 
     override fun updateCameraRouteOverview() {
-        if (navigationMap != null) {
-            val padding = buildRouteOverviewPadding(context)
-            navigationMap!!.showRouteOverview(padding)
-        }
+        val padding = buildRouteOverviewPadding(context)
+        navigationMap?.showRouteOverview(padding)
     }
 
     /**
@@ -544,44 +415,22 @@ class NavigationRouteView @JvmOverloads constructor(
     @SuppressLint("MissingPermission")
     @UiThread
     fun stopNavigation() {
-        instructionView!!.visibility = GONE
-        navigationPresenter!!.onNavigationStopped()
-        navigationViewModel!!.stopNavigation()
+        instructionView.visibility = GONE
+        navigationPresenter?.onNavigationStopped()
+        navigationViewModel.stopNavigation()
         baseCameraPosition?.let {
-            mapLibreMap!!.cameraPosition = it
+            mapLibreMap?.cameraPosition = it
         }
 
-        if (navigationMap != null) {
-            navigationMap!!.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
-            navigationMap!!.removeRoute()
-            navigationMap!!.clearMarkers()
+        navigationMap?.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
+        navigationMap?.removeRoute()
+        navigationMap?.clearMarkers()
+        mapLibreMap?.markers?.forEach {
+            mapLibreMap?.removeMarker(it)
         }
-        mapLibreMap!!.markers.forEach {
-            mapLibreMap!!.removeMarker(it)
-        }
-        route = null
-        navigationMapRoute?.removeRoute()
-
+        navigationMap?.removeRoute()
     }
 
-    /**
-     * Should be called after [NavigationView.onCreate].
-     *
-     *
-     * This method adds the [OnNavigationReadyCallback],
-     * which will fire the ready events for this view.
-     *
-     * @param onNavigationReadyCallback to be set to this view
-     */
-    fun initialize() {
-        if (!isMapInitialized) {
-            mapView!!.getMapAsync(this)
-        } else {
-            initializeNavigationMap(mapView, mapLibreMap!!)
-            initializeWayNameListener()
-            onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
-        }
-    }
 
     /**
      * Should be called after [NavigationView.onCreate].
@@ -598,15 +447,14 @@ class NavigationRouteView @JvmOverloads constructor(
      * @param initialMapCameraPosition  to be shown once the map is ready
      */
     fun initialize(
-        initialMapCameraPosition: CameraPosition
+        onNavigationReadyCallback: OnNavigationReadyCallback,
+        initialMapCameraPosition: CameraPosition? = null
     ) {
         this.initialMapCameraPosition = initialMapCameraPosition
         if (!isMapInitialized) {
-            mapView!!.getMapAsync(this)
+            mapView.getMapAsync(this)
         } else {
-            initializeNavigationMap(mapView, mapLibreMap!!)
-            initializeWayNameListener()
-            onNavigationReadyCallback!!.onNavigationReady(navigationViewModel!!.isRunning)
+            onNavigationReadyCallback.onNavigationReady(navigationViewModel.isRunning)
         }
     }
 
@@ -631,7 +479,7 @@ class NavigationRouteView @JvmOverloads constructor(
      * @return mapbox navigation, or null if navigation has not started
      */
     fun retrieveMapLibreNavigation(): MapLibreNavigation? {
-        return navigationViewModel!!.retrieveNavigation()
+        return navigationViewModel.retrieveNavigation()
     }
 
     /**
@@ -640,7 +488,7 @@ class NavigationRouteView @JvmOverloads constructor(
      * @return sound button
      */
     fun retrieveSoundButton(): NavigationButton {
-        return instructionView!!.retrieveSoundButton()
+        return instructionView.retrieveSoundButton()
     }
 
 
@@ -660,13 +508,13 @@ class NavigationRouteView @JvmOverloads constructor(
      * @return alert view that is used in the instruction view
      */
     fun retrieveAlertView(): NavigationAlertView {
-        return instructionView!!.retrieveAlertView()
+        return instructionView.retrieveAlertView()
     }
 
     private fun initializeView() {
         inflate(context, R.layout.navigation_view_layout, this)
         bind()
-//        initializeNavigationViewModel()
+        initializeNavigationViewModel(context)
         initializeNavigationEventDispatcher()
         initializeNavigationPresenter()
         initializeInstructionListListener()
@@ -676,14 +524,14 @@ class NavigationRouteView @JvmOverloads constructor(
     private fun bind() {
         mapView = findViewById(R.id.navigationMapView)
         instructionView = findViewById(R.id.instructionView)
-        instructionView?.let {
+        instructionView.let {
             ViewCompat.setElevation(it, 10f)
         }
         recenterBtn = findViewById(R.id.recenterBtn)
         wayNameView = findViewById(R.id.wayNameView)
     }
 
-    fun initializeNavigationViewModel(context: Context) {
+    private fun initializeNavigationViewModel(context: Context) {
         try {
             navigationViewModel = NavigationViewModel(context)
         } catch (exception: ClassCastException) {
@@ -693,11 +541,11 @@ class NavigationRouteView @JvmOverloads constructor(
 
     private fun initializeNavigationEventDispatcher() {
         navigationViewEventDispatcher = NavigationViewEventDispatcher()
-        navigationViewModel!!.initializeEventDispatcher(navigationViewEventDispatcher)
+        navigationViewModel.initializeEventDispatcher(navigationViewEventDispatcher)
     }
 
     private fun initializeInstructionListListener() {
-        instructionView!!.setInstructionListListener(
+        instructionView.setInstructionListListener(
             NavigationInstructionListListener(
                 navigationPresenter,
                 navigationViewEventDispatcher
@@ -705,40 +553,36 @@ class NavigationRouteView @JvmOverloads constructor(
         )
     }
 
-    private fun initializeNavigationMap(mapView: MapView?, map: MapLibreMap) {
-        if (initialMapCameraPosition != null) {
-            map.cameraPosition = initialMapCameraPosition!!
-        }
-        navigationMap = NavigationMapLibreMap(mapView!!, map)
-        navigationMap!!.updateLocationLayerRenderMode(RenderMode.GPS)
+    private fun initializeNavigationMap(mapView: MapView, map: MapLibreMap) {
+        initialMapCameraPosition?.let { map.cameraPosition = it }
+        navigationMap = NavigationMapLibreMap(mapView, map)
+        navigationMap?.updateLocationLayerRenderMode(RenderMode.GPS)
         if (mapInstanceState != null) {
-            navigationMap!!.restoreFrom(mapInstanceState)
+            navigationMap?.restoreFrom(mapInstanceState)
             return
         }
     }
 
     private fun initializeWayNameListener() {
         val wayNameListener = NavigationViewWayNameListener(navigationPresenter)
-        navigationMap!!.addOnWayNameChangedListener(wayNameListener)
+        navigationMap?.addOnWayNameChangedListener(wayNameListener)
     }
 
     private fun saveNavigationMapInstanceState(outState: Bundle) {
-        if (navigationMap != null) {
-            navigationMap!!.saveStateWith(MAP_INSTANCE_STATE_KEY, outState)
-        }
+        navigationMap?.saveStateWith(MAP_INSTANCE_STATE_KEY, outState)
     }
 
     private fun updateInstructionListState(visible: Boolean) {
         if (visible) {
-            instructionView!!.showInstructionList()
+            instructionView.showInstructionList()
         } else {
-            instructionView!!.hideInstructionList()
+            instructionView.hideInstructionList()
         }
     }
 
     private fun updateInstructionMutedState(isMuted: Boolean) {
         if (isMuted) {
-            (instructionView!!.retrieveSoundButton() as SoundButton).soundFabOff()
+            (instructionView.retrieveSoundButton() as SoundButton).soundFabOff()
         }
     }
 
@@ -770,13 +614,13 @@ class NavigationRouteView @JvmOverloads constructor(
         if (savedInstanceState != null) {
             val navigationRunningKey = context.getString(R.string.navigation_running)
             val resumeState = savedInstanceState.getBoolean(navigationRunningKey)
-            navigationPresenter!!.updateResumeState(resumeState)
+            navigationPresenter?.updateResumeState(resumeState)
         }
     }
 
     private fun initializeNavigation(options: NavigationViewOptions) {
         establish(options)
-        navigationViewModel!!.initialize(options)
+        navigationViewModel.initialize(options)
         initializeNavigationListeners(options, navigationViewModel)
         setupNavigationMapLibreMap(options)
 
@@ -785,17 +629,18 @@ class NavigationRouteView @JvmOverloads constructor(
             initializeOnCameraTrackingChangedListener()
             subscribeViewModels()
         }
-        instructionView!!.visibility = GONE
+
+        instructionView.visibility = VISIBLE
     }
 
     private fun initializeClickListeners() {
-        recenterBtn!!.addOnClickListener(RecenterBtnClickListener(navigationPresenter))
+        recenterBtn.addOnClickListener(RecenterBtnClickListener(navigationPresenter))
     }
 
     private fun initializeOnCameraTrackingChangedListener() {
         onTrackingChangedListener =
             NavigationOnCameraTrackingChangedListener(navigationPresenter)
-        navigationMap!!.addOnCameraTrackingChangedListener(onTrackingChangedListener)
+        navigationMap?.addOnCameraTrackingChangedListener(onTrackingChangedListener)
     }
 
     private fun establish(options: NavigationViewOptions) {
@@ -813,7 +658,7 @@ class NavigationRouteView @JvmOverloads constructor(
         val roundingIncrement = establishRoundingIncrement(options)
         val distanceFormatter = DistanceFormatter(context, language, unitType, roundingIncrement)
 
-        instructionView!!.setDistanceFormatter(distanceFormatter)
+        instructionView.setDistanceFormatter(distanceFormatter)
     }
 
     private fun establishRoundingIncrement(navigationViewOptions: NavigationViewOptions): MapLibreNavigationOptions.RoundingIncrement {
@@ -845,12 +690,12 @@ class NavigationRouteView @JvmOverloads constructor(
         options: NavigationViewOptions,
         navigationViewModel: NavigationViewModel?
     ) {
-        navigationMap!!.addProgressChangeListener(navigationViewModel!!.retrieveNavigation()!!)
-        navigationViewEventDispatcher!!.initializeListeners(options, navigationViewModel)
+        navigationMap?.addProgressChangeListener(navigationViewModel?.retrieveNavigation()!!)
+        navigationViewEventDispatcher?.initializeListeners(options, navigationViewModel)
     }
 
     private fun setupNavigationMapLibreMap(options: NavigationViewOptions) {
-        navigationMap!!.updateWaynameQueryMap(options.waynameChipEnabled())
+        navigationMap?.updateWaynameQueryMap(options.waynameChipEnabled())
     }
 
     /**
@@ -864,7 +709,7 @@ class NavigationRouteView @JvmOverloads constructor(
      * method calls based on the [androidx.lifecycle.LiveData] updates.
      */
     private fun subscribeViewModels() {
-        instructionView!!.subscribe(this, navigationViewModel)
+        instructionView.subscribe(this, navigationViewModel)
 
         NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).subscribe()
         isSubscribed = true
@@ -872,10 +717,8 @@ class NavigationRouteView @JvmOverloads constructor(
 
     @SuppressLint("MissingPermission")
     private fun shutdown() {
-        if (navigationMap != null) {
-            navigationMap!!.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
-            navigationMap!!.removeRoute()
-        }
+        navigationMap?.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
+        navigationMap?.removeRoute()
 //        navigationViewModel?.let {
 //            it.isOffRoute.removeObservers(this)
 //            it.instructionModel.removeObservers(this)
@@ -888,56 +731,55 @@ class NavigationRouteView @JvmOverloads constructor(
 //        }
         isMapInitialized = false
         NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).unsubscribe()
-        navigationViewModel!!.stopNavigation()
-        mapLibreMap!!.markers.forEach {
-            mapLibreMap!!.removeMarker(it)
+        navigationViewModel.stopNavigation()
+        mapLibreMap?.markers?.forEach {
+            mapLibreMap?.removeMarker(it)
         }
-        navigationViewEventDispatcher!!.onDestroy(navigationViewModel!!.retrieveNavigation())
-        mapLibreMap!!.getStyle {
-            mapLibreMap!!.locationComponent.isLocationComponentEnabled = false
+        navigationViewEventDispatcher?.onDestroy(navigationViewModel.retrieveNavigation())
+        mapLibreMap?.getStyle {
+            mapLibreMap?.locationComponent?.isLocationComponentEnabled = false
         }
-//        mapView!!.onDestroy()
-//        mapView!!.getMapAsync(this)
+//        mapView.onDestroy()
+//        mapView.getMapAsync(this)
 
         baseCameraPosition?.let {
-            mapLibreMap!!.cameraPosition = it
+            mapLibreMap?.cameraPosition = it
         }
 
-        navigationViewModel!!.onDestroy(false)
+        navigationViewModel.onDestroy(false)
         ImageCreator.getInstance().shutdown()
-        navigationMap = null
 
-        navigationMapRoute?.removeRoute()
+        navigationMap?.removeRoute()
+        navigationMap = null
 
         isSubscribed = false
     }
 
     private fun shutDown2() {
-        if (navigationMap != null) {
-            navigationMap!!.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
-        }
+        navigationMap?.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
         NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).unsubscribe()
-        navigationViewEventDispatcher!!.onDestroy(navigationViewModel!!.retrieveNavigation())
-//        mapView!!.onDestroy()
-        navigationViewModel!!.onDestroy(false)
+        navigationViewEventDispatcher?.onDestroy(navigationViewModel.retrieveNavigation())
+//        mapView.onDestroy()
+        navigationViewModel.onDestroy(false)
         ImageCreator.getInstance().shutdown()
         navigationMap = null
     }
 
     fun setMinZoomLevel(minZoomLevel: Double) {
-        mapLibreMap!!.setMinZoomPreference(minZoomLevel)
+        mapLibreMap?.setMinZoomPreference(minZoomLevel)
     }
 
     fun setMaxZoomLevel(maxZoomLevel: Double) {
-        mapLibreMap!!.setMaxZoomPreference(maxZoomLevel)
+        mapLibreMap?.setMaxZoomPreference(maxZoomLevel)
     }
 
-    fun getProjection(): Projection {
-        return mapLibreMap!!.projection
+    fun getProjection(): Projection? {
+        return mapLibreMap?.projection
     }
 
     fun addMarker(icon: Int, latitude: Double, longitude: Double, id: String) {
-        mapLibreMap!!.addMarker(MarkerOptions())
+//        MarkerOptions().icon(Utils.drawableToIcon(context, icon))
+        mapLibreMap?.addMarker(MarkerOptions())
         val position = LatLng(latitude, longitude)
 //        val icon = Icon(id, BitmapFactory.decodeResource(resources, icon))
 //        val markerOptions = MarkerOptions()
@@ -951,6 +793,6 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     override val lifecycle: Lifecycle
-        get() = lifecycleRegistry!!
+        get() = lifecycleRegistry
 
 }
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/OnNavigationReadyCallback.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/OnNavigationReadyCallback.java
index 61311bfe4..d7159361f 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/OnNavigationReadyCallback.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/OnNavigationReadyCallback.java
@@ -11,6 +11,4 @@ public interface OnNavigationReadyCallback {
    *                  a configuration change.
    */
   void onNavigationReady(boolean isRunning);
-
-  void onMapReadyCallback();
 }
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerInstructionModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerInstructionModel.java
index fde5c8819..4455b5fc1 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerInstructionModel.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerInstructionModel.java
@@ -4,6 +4,7 @@
 
 import org.maplibre.navigation.core.models.BannerInstructions;
 import org.maplibre.navigation.core.models.BannerText;
+import org.maplibre.navigation.core.models.ManeuverModifier;
 import org.maplibre.navigation.core.routeprogress.RouteProgress;
 import org.maplibre.navigation.android.navigation.ui.v5.utils.DistanceFormatter;
 
@@ -38,7 +39,9 @@ String retrievePrimaryManeuverType() {
   }
 
   String retrievePrimaryManeuverModifier() {
-    return primaryBannerText.getModifier().getText();
+    ManeuverModifier.Type modifier = primaryBannerText.getModifier();
+    if (modifier == null) return null;
+    return modifier.getText();
   }
 
   @Nullable
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
index ce57f3f64..2beba24b2 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
@@ -50,6 +50,7 @@
 import org.maplibre.navigation.core.milestone.BannerInstructionMilestone;
 import org.maplibre.navigation.core.milestone.Milestone;
 import org.maplibre.navigation.core.milestone.MilestoneEventListener;
+import org.maplibre.navigation.core.models.ManeuverModifier;
 import org.maplibre.navigation.core.models.UnitType;
 import org.maplibre.navigation.core.navigation.MapLibreNavigation;
 import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions;
@@ -584,8 +585,11 @@ private boolean newStep(RouteProgress routeProgress) {
   private void updateSubStep(BannerText subText, String primaryManeuverModifier) {
     if (shouldShowSubStep(subText)) {
       String maneuverType = subText.getType().getText();
-      String maneuverModifier = subText.getModifier().getText();
-      subManeuverView.setManeuverTypeAndModifier(maneuverType, maneuverModifier);
+      ManeuverModifier.Type maneuverModifier = subText.getModifier();
+      String maneuverModifierText;
+      if (maneuverModifier == null) maneuverModifierText = null;
+      else maneuverModifierText = maneuverModifier.getText();
+      subManeuverView.setManeuverTypeAndModifier(maneuverType, maneuverModifierText);
       Double roundaboutAngle = subText.getDegrees();
       if (roundaboutAngle != null) {
         subManeuverView.setRoundaboutAngle(roundaboutAngle.floatValue());
diff --git a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
index 67aabe015..de9fef60e 100644
--- a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
@@ -68,6 +68,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintVertical_bias="0.2"
         android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
         />
 
     <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/libandroid-navigation-ui/src/main/res/values/developer-config.xml b/libandroid-navigation-ui/src/main/res/values/developer-config.xml
index 9afe81dc2..3556fcfc8 100644
--- a/libandroid-navigation-ui/src/main/res/values/developer-config.xml
+++ b/libandroid-navigation-ui/src/main/res/values/developer-config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="base_url" translatable="false">https://graphhopper.com/api/1/navigate/</string>    <!-- Your GraphHopper API key -->
+<!--    <string name="base_url" translatable="false">https://graphhopper.com/api/1/navigate/</string>    &lt;!&ndash; Your GraphHopper API key &ndash;&gt;-->
+    <string name="base_url" translatable="false">https://api.mapbox.com/</string>    <!-- Your GraphHopper API key -->
+<!--    <string name="mapbox_access_token" translatable="false">pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a</string>-->
     <string name="mapbox_access_token" translatable="false">pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a</string>
     <!-- The "day" style used for navigation, here mapilion is used but you can use maptiler too -->
     <string name="map_style_light" translatable="false">https://api.maptiler.com/maps/streets-v2/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ</string>

From 0acc87d3e9ddb2bbf8209ef4fe06ddc8f1f60ef9 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 16 May 2025 16:31:00 +0200
Subject: [PATCH 14/46] mapbox request

---
 .../navigation/android/example/NavigationUIActivity.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index 6b5cdc965..f1644d139 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -59,7 +59,7 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
         setContentView(binding.root)
         binding.navigationView.apply {
             mapStyleUri =
-                "https://api.maptiler.com/maps/streets-v2-dark/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ"
+                "https://api.maptiler.com/maps/streets-v2-dark/style.json?key=sda"
             onCreate(savedInstanceState)
             initialize(this@NavigationUIActivity)
         }
@@ -91,7 +91,7 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
                 isStarted = true
                 binding.navigationView.calculateRoute(
                     MapRouteData(
-                        "sk.eyJ1IjoicmVnaW9ubGxjIiwiYSI6ImNsZHNrM3MxbjF4cDIzcG4wcXp2MmR1c3kifQ.Sk6779T0lDSXEjt_SxqXaQ",
+                        getString(R.string.mapbox_access_token),
                         userLocation = Point.fromLngLat(76.930137, 43.230361),
                         stops = points,
                         destination = Point.fromLngLat(76.930137, 43.230361),

From b5289d75ca6d3f60f464a6e24518d8e33d1ea5d2 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Mon, 19 May 2025 13:37:21 +0200
Subject: [PATCH 15/46] test publish

---
 libandroid-navigation-ui/build.gradle.kts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libandroid-navigation-ui/build.gradle.kts b/libandroid-navigation-ui/build.gradle.kts
index aecf0b818..18ba5801a 100644
--- a/libandroid-navigation-ui/build.gradle.kts
+++ b/libandroid-navigation-ui/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
 
 apply {
     from(file("${rootDir}/gradle/artifact-settings.gradle"))
+    from(file("javadoc.gradle"))
+    from(file("${rootDir}/gradle/publish-android.gradle"))
 }
 
 java {
@@ -117,8 +119,3 @@ configurations {
         exclude(group = "org.maplibre.gl", module = "android-sdk-turf")
     }
 }
-
-apply {
-    from(file("javadoc.gradle"))
-    from(file("${rootDir}/gradle/publish-android.gradle"))
-}

From be1c783104e5db96beb4d988c9f4c52578c97761 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Mon, 19 May 2025 14:05:50 +0200
Subject: [PATCH 16/46] add aar

---
 gradle/publish-android.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/publish-android.gradle b/gradle/publish-android.gradle
index 757320ac7..bac5f192a 100644
--- a/gradle/publish-android.gradle
+++ b/gradle/publish-android.gradle
@@ -40,6 +40,7 @@ afterEvaluate {
 
                 artifactId "${artifactId.replace("libandroid-", "")}-android"
 
+                artifact("$buildDir/outputs/aar/${project.getName()}-release.aar") // ✅ Add this
                 artifact tasks.androidJavadocsJar
                 artifact tasks.androidSourcesJar
 

From e9df10f3a41a895a60761a985c19254df544f9eb Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Mon, 19 May 2025 14:17:08 +0200
Subject: [PATCH 17/46] fix aar

---
 gradle/publish-android.gradle | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gradle/publish-android.gradle b/gradle/publish-android.gradle
index bac5f192a..9b5080fc0 100644
--- a/gradle/publish-android.gradle
+++ b/gradle/publish-android.gradle
@@ -40,7 +40,12 @@ afterEvaluate {
 
                 artifactId "${artifactId.replace("libandroid-", "")}-android"
 
-                artifact("$buildDir/outputs/aar/${project.getName()}-release.aar") // ✅ Add this
+                afterEvaluate {
+                    artifact(bundleReleaseAar) {
+                        builtBy bundleReleaseAar
+                    }
+                }
+
                 artifact tasks.androidJavadocsJar
                 artifact tasks.androidSourcesJar
 

From 485f7b0be3fab8292f3212ced654c0969bed6a93 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Tue, 20 May 2025 14:42:04 +0200
Subject: [PATCH 18/46] remove mapboxes TextUtils

---
 .../navigation/android/navigation/ui/v5/NavigationRouteView.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index ebf3bfebf..e30d438e0 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -14,7 +14,6 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
-import com.mapbox.core.utils.TextUtils
 import okhttp3.Request
 import org.maplibre.android.annotations.MarkerOptions
 import org.maplibre.android.camera.CameraPosition
@@ -359,7 +358,7 @@ class NavigationRouteView @JvmOverloads constructor(
      */
     override fun updateWayNameVisibility(isVisible: Boolean) {
         var visible = isVisible
-        if (TextUtils.isEmpty(wayNameView.retrieveWayNameText())) {
+        if (wayNameView.retrieveWayNameText().isEmpty()) {
             visible = false
         }
         wayNameView.updateVisibility(visible)

From e4baee81df15d726e2c58128c05e6dbf3a095ab4 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Tue, 20 May 2025 15:43:48 +0200
Subject: [PATCH 19/46] republish

---
 .../navigation/android/navigation/ui/v5/NavigationViewModel.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
index 87224dd11..939aaf2ee 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
@@ -6,7 +6,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.MutableLiveData;
 
 import org.maplibre.geojson.Point;

From fcef55064d5f4fc93f9481401a5ca817917b947b Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Wed, 21 May 2025 15:07:17 +0200
Subject: [PATCH 20/46] removed onNavigationReadyCallback, useless functions
 and variables changed initialize function

---
 .../android/example/NavigationUIActivity.kt   |  43 +++--
 .../res/layout/activity_navigation_ui.xml     |  12 ++
 .../navigation/ui/v5/NavigationRouteView.kt   | 164 +++---------------
 .../navigation/ui/v5/NavigationView.java      |   5 -
 .../navigation/ui/v5/NavigationViewModel.java |   4 +
 .../res/layout/navigation_view_layout.xml     |  36 ----
 ...onOnCameraTrackingChangedListenerTest.java |   4 +-
 .../ui/v5/NavigationPresenterTest.java        |   2 +-
 8 files changed, 73 insertions(+), 197 deletions(-)

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index f1644d139..5edb6154c 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -1,10 +1,11 @@
 package org.maplibre.navigation.android.example
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.preference.PreferenceManager
 import androidx.activity.ComponentActivity
 import okhttp3.Request
+import org.maplibre.android.camera.CameraPosition
+import org.maplibre.android.camera.CameraUpdateFactory
 import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.location.LocationComponent
 import org.maplibre.android.location.LocationComponentActivationOptions
@@ -44,10 +45,10 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
     private lateinit var binding: ActivityNavigationUiBinding
 
     private var simulateRoute = false
+    var mapLibreMap: MapLibreMap? = null
 
     private var isStarted = false
 
-    @SuppressLint("MissingPermission")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -58,10 +59,30 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
         binding = ActivityNavigationUiBinding.inflate(layoutInflater)
         setContentView(binding.root)
         binding.navigationView.apply {
-            mapStyleUri =
-                "https://api.maptiler.com/maps/streets-v2-dark/style.json?key=sda"
-            onCreate(savedInstanceState)
-            initialize(this@NavigationUIActivity)
+            onCreate(savedInstanceState, mapStyleUri = "https://api.maptiler.com/maps/streets-v2/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ")
+            initialize(
+                onMapReadyCallback = {
+                    val initialMapCameraPosition =
+                        CameraPosition.Builder()
+                            .target(LatLng(43.230633, 76.933810))
+                            .zoom(16.0)
+                            .build()
+                    it.cameraPosition = initialMapCameraPosition
+                    it.setMaxZoomPreference(18.0)
+                    it.setMinZoomPreference(5.0)
+                    this@NavigationUIActivity.mapLibreMap = it
+                }
+            )
+
+        }
+
+        binding.locate.setOnClickListener {
+            val initialMapCameraPosition =
+                CameraPosition.Builder()
+                    .target(LatLng(43.230633, 76.933810))
+                    .zoom(16.0)
+                    .build()
+            mapLibreMap?.animateCamera(CameraUpdateFactory.newCameraPosition(initialMapCameraPosition))
         }
 
 //        binding.mapView.apply {
@@ -69,13 +90,6 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
 //            getMapAsync(this@NavigationUIActivity)
 //        }
 
-        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
-            if (checked) {
-                binding.navigationView.resetCameraPosition()
-            } else {
-                binding.navigationView.updateCameraRouteOverview()
-            }
-        }
         val points = mutableListOf<Point>()
 //        points.add(Pair(76.928316, 43.236109))
         points.add(Point.fromLngLat(76.933810, 43.230633))
@@ -97,11 +111,12 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
                         destination = Point.fromLngLat(76.930137, 43.230361),
                     ),
                     successCallback = {
+
                         val options = NavigationViewOptions.builder()
                         options.navigationListener(this)
+//                        options.shouldSimulateRoute(true)
                         extractRoute(options)
                         extractConfiguration(options)
-                        options.shouldSimulateRoute(true)
                         options.navigationOptions(
                             MapLibreNavigationOptions.Builder().withSnapToRoute(true).build()
                         )
diff --git a/app/src/main/res/layout/activity_navigation_ui.xml b/app/src/main/res/layout/activity_navigation_ui.xml
index ba97ad0fa..3b6643380 100644
--- a/app/src/main/res/layout/activity_navigation_ui.xml
+++ b/app/src/main/res/layout/activity_navigation_ui.xml
@@ -17,6 +17,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
+    <ImageButton
+        android:id="@+id/locate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:contentDescription="locateme"
+        android:src="@drawable/ic_new_location"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/startRouteLayout"
         android:layout_width="wrap_content"
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index e30d438e0..5fc6ca4c8 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -1,6 +1,5 @@
 package org.maplibre.navigation.android.navigation.ui.v5
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.os.Bundle
@@ -10,20 +9,16 @@ import androidx.annotation.UiThread
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
-import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import okhttp3.Request
-import org.maplibre.android.annotations.MarkerOptions
 import org.maplibre.android.camera.CameraPosition
 import org.maplibre.android.geometry.LatLng
-import org.maplibre.android.location.LocationComponent
 import org.maplibre.android.location.modes.RenderMode
 import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.MapView
 import org.maplibre.android.maps.OnMapReadyCallback
-import org.maplibre.android.maps.Projection
 import org.maplibre.android.maps.Style
 import org.maplibre.android.maps.Style.OnStyleLoaded
 import org.maplibre.geojson.Point
@@ -67,25 +62,12 @@ class NavigationRouteView @JvmOverloads constructor(
     private var navigationMap: NavigationMapLibreMap? = null
     private var onTrackingChangedListener: NavigationOnCameraTrackingChangedListener? = null
     private var mapInstanceState: NavigationMapLibreMapInstanceState? = null
-    private var initialMapCameraPosition: CameraPosition? = null
     private var isMapInitialized = false
     private var isSubscribed = false
     private lateinit var lifecycleRegistry: LifecycleRegistry
-    private var onNavigationReadyCallback: OnNavigationReadyCallback? = null
+    private var onMapReadyCallback: OnMapReadyCallback? = null
 
-    var mapLibreMap: MapLibreMap? = null
-        private set
-
-    var mapStyleUri: String? = null
-        set(value) {
-            ThemeSwitcher.setTheme(context, attrs, value)
-            instructionView.setupStyle(value)
-            field = value
-        }
-
-    private var locationComponent: LocationComponent? = null
-    private var baseCameraPosition: CameraPosition? = null
-    private var isMapReinitialized: Boolean = false
+    private var mapStyleUri: String? = null
 
     init {
         initializeView()
@@ -98,11 +80,17 @@ class NavigationRouteView @JvmOverloads constructor(
      */
     fun onCreate(
         savedInstanceState: Bundle?,
+        mapStyleUri: String
     ) {
         mapView.onCreate(savedInstanceState)
         updatePresenterState(savedInstanceState)
         lifecycleRegistry = LifecycleRegistry(this)
         lifecycleRegistry.currentState = Lifecycle.State.CREATED
+
+        if (mapStyleUri != null) {
+            this.mapStyleUri = mapStyleUri
+            ThemeSwitcher.setTheme(context, attrs, mapStyleUri)
+        }
     }
 
     /**
@@ -182,15 +170,11 @@ class NavigationRouteView @JvmOverloads constructor(
      */
     @UiThread
     fun onDestroy() {
-//        shutdown()
+        shutdown()
         stopNavigation()
         lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
     }
 
-    fun onDestroy2() {
-        shutdown()
-    }
-
     fun onStart() {
         mapView.onStart()
         navigationMap?.onStart()
@@ -222,14 +206,10 @@ class NavigationRouteView @JvmOverloads constructor(
      * @since 0.6.0
      */
     override fun onMapReady(mapLibreMap: MapLibreMap) {
-        this.mapLibreMap = mapLibreMap
-
-        val onStyleLoaded = OnStyleLoaded { style ->
+        val onStyleLoaded = OnStyleLoaded { _ ->
             initializeNavigationMap(mapView, mapLibreMap)
             initializeWayNameListener()
-
-            onNavigationReadyCallback?.onNavigationReady(navigationViewModel.isRunning)
-
+            onMapReadyCallback?.onMapReady(mapLibreMap)
             isMapInitialized = true
         }
 
@@ -296,8 +276,6 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     override fun resetCameraPosition() {
-        updateWayNameVisibility(true);
-        hideRecenterBtn()
         navigationMap?.resetPadding()
         navigationMap?.resetCameraPositionWith(NavigationCamera.NAVIGATION_TRACKING_MODE_GPS)
     }
@@ -411,49 +389,22 @@ class NavigationRouteView @JvmOverloads constructor(
      *
      * @since 0.16.0
      */
-    @SuppressLint("MissingPermission")
     @UiThread
     fun stopNavigation() {
-        instructionView.visibility = GONE
         navigationPresenter?.onNavigationStopped()
         navigationViewModel.stopNavigation()
-        baseCameraPosition?.let {
-            mapLibreMap?.cameraPosition = it
-        }
-
-        navigationMap?.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
-        navigationMap?.removeRoute()
-        navigationMap?.clearMarkers()
-        mapLibreMap?.markers?.forEach {
-            mapLibreMap?.removeMarker(it)
-        }
-        navigationMap?.removeRoute()
     }
 
 
     /**
      * Should be called after [NavigationView.onCreate].
-     *
-     *
-     * This method adds the [OnNavigationReadyCallback],
-     * which will fire the ready events for this view.
-     *
-     *
-     * This method also accepts a [CameraPosition] that will be set as soon as the map is
-     * ready.  Note, this position is ignored during rotation in favor of the last known map position.
-     *
-     * @param onNavigationReadyCallback to be set to this view
-     * @param initialMapCameraPosition  to be shown once the map is ready
      */
     fun initialize(
-        onNavigationReadyCallback: OnNavigationReadyCallback,
-        initialMapCameraPosition: CameraPosition? = null
+        onMapReadyCallback: OnMapReadyCallback,
     ) {
-        this.initialMapCameraPosition = initialMapCameraPosition
+        this.onMapReadyCallback = onMapReadyCallback
         if (!isMapInitialized) {
             mapView.getMapAsync(this)
-        } else {
-            onNavigationReadyCallback.onNavigationReady(navigationViewModel.isRunning)
         }
     }
 
@@ -496,7 +447,7 @@ class NavigationRouteView @JvmOverloads constructor(
      *
      * @return recenter button
      */
-    fun retrieveRecenterButton(): NavigationButton? {
+    fun retrieveRecenterButton(): NavigationButton {
         return recenterBtn
     }
 
@@ -510,6 +461,10 @@ class NavigationRouteView @JvmOverloads constructor(
         return instructionView.retrieveAlertView()
     }
 
+    fun onRecenterClick() {
+        navigationPresenter?.onRecenterClick()
+    }
+
     private fun initializeView() {
         inflate(context, R.layout.navigation_view_layout, this)
         bind()
@@ -553,7 +508,6 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     private fun initializeNavigationMap(mapView: MapView, map: MapLibreMap) {
-        initialMapCameraPosition?.let { map.cameraPosition = it }
         navigationMap = NavigationMapLibreMap(mapView, map)
         navigationMap?.updateLocationLayerRenderMode(RenderMode.GPS)
         if (mapInstanceState != null) {
@@ -598,10 +552,10 @@ class NavigationRouteView @JvmOverloads constructor(
 
     private val isChangingConfigurations: Boolean
         get() {
-            try {
-                return (context as FragmentActivity).isChangingConfigurations
+            return try {
+                (context as Activity).isChangingConfigurations
             } catch (exception: ClassCastException) {
-                throw ClassCastException("Please ensure that the provided Context is a valid FragmentActivity")
+                false
             }
         }
 
@@ -628,8 +582,6 @@ class NavigationRouteView @JvmOverloads constructor(
             initializeOnCameraTrackingChangedListener()
             subscribeViewModels()
         }
-
-        instructionView.visibility = VISIBLE
     }
 
     private fun initializeClickListeners() {
@@ -645,7 +597,6 @@ class NavigationRouteView @JvmOverloads constructor(
     private fun establish(options: NavigationViewOptions) {
         val localeUtils = LocaleUtils()
         establishDistanceFormatter(localeUtils, options)
-        establishTimeFormat(options)
     }
 
     private fun establishDistanceFormatter(
@@ -681,10 +632,6 @@ class NavigationRouteView @JvmOverloads constructor(
         return localeUtils.retrieveNonNullUnitType(context, voiceUnits)
     }
 
-    private fun establishTimeFormat(options: NavigationViewOptions) {
-        val timeFormatType = options.navigationOptions().timeFormatType
-    }
-
     private fun initializeNavigationListeners(
         options: NavigationViewOptions,
         navigationViewModel: NavigationViewModel?
@@ -714,80 +661,19 @@ class NavigationRouteView @JvmOverloads constructor(
         isSubscribed = true
     }
 
-    @SuppressLint("MissingPermission")
     private fun shutdown() {
         navigationMap?.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
-        navigationMap?.removeRoute()
-//        navigationViewModel?.let {
-//            it.isOffRoute.removeObservers(this)
-//            it.instructionModel.removeObservers(this)
-//            it.bannerInstructionModel.removeObservers(this)
-//            it.summaryModel.removeObservers(this)
-//            it.retrieveNavigationLocation().removeObservers(this)
-//            it.retrieveRoute().removeObservers(this)
-//            it.retrieveShouldRecordScreenshot().removeObservers(this)
-//            it.retrieveDestination().removeObservers(this)
-//        }
-        isMapInitialized = false
-        NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).unsubscribe()
-        navigationViewModel.stopNavigation()
-        mapLibreMap?.markers?.forEach {
-            mapLibreMap?.removeMarker(it)
-        }
-        navigationViewEventDispatcher?.onDestroy(navigationViewModel.retrieveNavigation())
-        mapLibreMap?.getStyle {
-            mapLibreMap?.locationComponent?.isLocationComponentEnabled = false
-        }
-//        mapView.onDestroy()
-//        mapView.getMapAsync(this)
-
-        baseCameraPosition?.let {
-            mapLibreMap?.cameraPosition = it
-        }
-
-        navigationViewModel.onDestroy(false)
-        ImageCreator.getInstance().shutdown()
-
-        navigationMap?.removeRoute()
-        navigationMap = null
-
-        isSubscribed = false
-    }
+        navigationMap?.onDestroy()
 
-    private fun shutDown2() {
-        navigationMap?.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
-        NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).unsubscribe()
         navigationViewEventDispatcher?.onDestroy(navigationViewModel.retrieveNavigation())
-//        mapView.onDestroy()
-        navigationViewModel.onDestroy(false)
+        mapView.onDestroy()
+        navigationViewModel.onDestroy(isChangingConfigurations)
         ImageCreator.getInstance().shutdown()
         navigationMap = null
     }
 
-    fun setMinZoomLevel(minZoomLevel: Double) {
-        mapLibreMap?.setMinZoomPreference(minZoomLevel)
-    }
-
-    fun setMaxZoomLevel(maxZoomLevel: Double) {
-        mapLibreMap?.setMaxZoomPreference(maxZoomLevel)
-    }
-
-    fun getProjection(): Projection? {
-        return mapLibreMap?.projection
-    }
-
-    fun addMarker(icon: Int, latitude: Double, longitude: Double, id: String) {
-//        MarkerOptions().icon(Utils.drawableToIcon(context, icon))
-        mapLibreMap?.addMarker(MarkerOptions())
-        val position = LatLng(latitude, longitude)
-//        val icon = Icon(id, BitmapFactory.decodeResource(resources, icon))
-//        val markerOptions = MarkerOptions()
-//            .position(position)
-//            .icon(icon)
-    }
-
     companion object {
-        private const val MAP_INSTANCE_STATE_KEY = "navgation_mapbox_map_instance_state"
+        private const val MAP_INSTANCE_STATE_KEY = "navigation_maplibre_map_instance_state"
         private const val INVALID_STATE = 0
     }
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
index 9e0a34e6c..c743545c3 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
@@ -238,11 +238,6 @@ public void onStyleLoaded(@NonNull Style style) {
                 isMapInitialized = true;
             }
         });
-        calculateRoute();
-    }
-
-    private void calculateRoute() {
-
     }
 
     @Override
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
index 939aaf2ee..00b816488 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
@@ -346,6 +346,10 @@ private void updateReplayEngine(DirectionsRoute route) {
         }
     }
 
+    void onCleared() {
+        destroyRouter();
+    }
+
     private void destroyRouter() {
         if (router != null) {
             router.onDestroy();
diff --git a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
index de9fef60e..34f14e355 100644
--- a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
@@ -71,40 +71,4 @@
         android:layout_marginEnd="24dp"
         />
 
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:id="@+id/startRouteLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="60dp"
-        android:background="@drawable/rounded_corners"
-        android:backgroundTint="@color/maplibre_navigation_route_shield_layer_color"
-        android:orientation="horizontal"
-        android:padding="8dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:visibility="visible">
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/simulateRouteSwitch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="simulate_route"
-            android:textColor="@color/maplibre_navigation_route_upcoming_maneuver_arrow_color"
-            app:switchPadding="4dp" />
-
-        <Button
-            android:id="@+id/routeButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:text="В путь"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java
index 17fda9dab..0c52422ef 100644
--- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java
+++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java
@@ -19,7 +19,7 @@ public void onCameraTrackingDismissed_presenterNotifiedWithVisibleBottomsheet()
     BottomSheetBehavior behavior = mock(BottomSheetBehavior.class);
     when(behavior.getState()).thenReturn(BottomSheetBehavior.STATE_EXPANDED);
     NavigationOnCameraTrackingChangedListener listener = new NavigationOnCameraTrackingChangedListener(
-      presenter, behavior
+      presenter
     );
 
     listener.onCameraTrackingDismissed();
@@ -33,7 +33,7 @@ public void onCameraTrackingDismissed_ignoredWithHiddenBottomsheet() {
     BottomSheetBehavior behavior = mock(BottomSheetBehavior.class);
     when(behavior.getState()).thenReturn(BottomSheetBehavior.STATE_HIDDEN);
     NavigationOnCameraTrackingChangedListener listener = new NavigationOnCameraTrackingChangedListener(
-      presenter, behavior
+      presenter
     );
 
     listener.onCameraTrackingDismissed();
diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenterTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenterTest.java
index 4678449c5..428aabfe0 100644
--- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenterTest.java
+++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenterTest.java
@@ -115,7 +115,7 @@ public void onWayNameChanged_mapWayNameIsHidden() {
   @Test
   public void onWayNameChanged_mapWayNameIsHiddenWithCollapsedBottomsheet() {
     NavigationContract.View view = mock(NavigationContract.View.class);
-    when(view.isSummaryBottomSheetHidden()).thenReturn(true);
+//    when(view.isSummaryBottomSheetHidden()).thenReturn(true);
     NavigationPresenter presenter = new NavigationPresenter(view);
 
     presenter.onWayNameChanged("some valid way name");

From 39f7265454379e67ad2f52a7a30ef3b203179d11 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Thu, 22 May 2025 12:38:04 +0200
Subject: [PATCH 21/46] add function to add symbols

---
 .../android/navigation/ui/v5/NavigationRouteView.kt        | 6 ++++++
 .../navigation/ui/v5/map/NavigationMapLibreMap.java        | 5 +++--
 .../navigation/ui/v5/map/NavigationSymbolManager.java      | 7 ++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index 5fc6ca4c8..dcde55af9 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -21,6 +21,8 @@ import org.maplibre.android.maps.MapView
 import org.maplibre.android.maps.OnMapReadyCallback
 import org.maplibre.android.maps.Style
 import org.maplibre.android.maps.Style.OnStyleLoaded
+import org.maplibre.android.plugins.annotation.Symbol
+import org.maplibre.android.plugins.annotation.SymbolOptions
 import org.maplibre.geojson.Point
 import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator
@@ -300,6 +302,10 @@ class NavigationRouteView @JvmOverloads constructor(
         navigationMap?.addDestinationMarker(position)
     }
 
+    fun addCustomMarker(symbolOptions: SymbolOptions): Symbol {
+        return navigationMap?.addCustomMarker(symbolOptions) ?: throw RuntimeException("Navigation map is null")
+    }
+
     val isWayNameVisible: Boolean
         /**
          * Provides the current visibility of the way name view.
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
index bf124cbdc..efe01a2bf 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
@@ -16,6 +16,7 @@
 import androidx.annotation.UiThread;
 import androidx.fragment.app.FragmentActivity;
 
+import org.maplibre.android.plugins.annotation.Symbol;
 import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera;
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute;
 import org.maplibre.navigation.android.navigation.ui.v5.route.OnRouteSelectionChangeListener;
@@ -180,8 +181,8 @@ public void addDestinationMarker(Point position) {
    *
    * @param options for the custom {@link org.maplibre.android.plugins.annotation.Symbol}
    */
-  public void addCustomMarker(SymbolOptions options) {
-    navigationSymbolManager.addCustomSymbolFor(options);
+  public Symbol addCustomMarker(SymbolOptions options) {
+    return navigationSymbolManager.addCustomSymbolFor(options);
   }
 
   /**
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java
index 0c356d3ab..106bdd529 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java
@@ -29,8 +29,8 @@ void addDestinationMarkerFor(Point position) {
     createSymbolFrom(options);
   }
 
-  void addCustomSymbolFor(SymbolOptions options) {
-    createSymbolFrom(options);
+  Symbol addCustomSymbolFor(SymbolOptions options) {
+    return createSymbolFrom(options);
   }
 
   void removeAllMarkerSymbols() {
@@ -49,9 +49,10 @@ private SymbolOptions createSymbolOptionsFor(Point position) {
       .withIconImage(MAPLIBRE_NAVIGATION_MARKER_NAME);
   }
 
-  private void createSymbolFrom(SymbolOptions options) {
+  private Symbol createSymbolFrom(SymbolOptions options) {
     Symbol symbol = symbolManager.create(options);
     mapMarkersSymbols.add(symbol);
+    return symbol;
   }
 
   @UiThread

From ae05f10732776dd1e23d13d673c8c1007249c2d6 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Thu, 22 May 2025 15:14:25 +0200
Subject: [PATCH 22/46] add update function, and initializing changes

---
 .../android/example/NavigationUIActivity.kt   |  24 ++--
 .../navigation/ui/v5/NavigationPresenter.java | 121 +++++++++---------
 .../navigation/ui/v5/NavigationRouteView.kt   |  87 +++++++------
 .../navigation/ui/v5/NavigationView.java      |   2 +-
 .../navigation/ui/v5/NavigationViewModel.java |  26 ++--
 .../ui/v5/SummaryBottomSheetCallback.java     |  27 ----
 .../ui/v5/instruction/InstructionView.java    |  13 --
 .../ui/v5/map/NavigationMapLibreMap.java      |   5 +-
 .../ui/v5/map/NavigationSymbolManager.java    |   9 +-
 .../res/layout/navigation_view_layout.xml     |  10 +-
 10 files changed, 139 insertions(+), 185 deletions(-)
 delete mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SummaryBottomSheetCallback.java

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index 5edb6154c..e6a9a7779 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -44,7 +44,7 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
 
     private lateinit var binding: ActivityNavigationUiBinding
 
-    private var simulateRoute = false
+    private var simulateRoute = true
     var mapLibreMap: MapLibreMap? = null
 
     private var isStarted = false
@@ -58,9 +58,11 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
 
         binding = ActivityNavigationUiBinding.inflate(layoutInflater)
         setContentView(binding.root)
+
         binding.navigationView.apply {
             onCreate(savedInstanceState, mapStyleUri = "https://api.maptiler.com/maps/streets-v2/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ")
             initialize(
+                simulateRoute,
                 onMapReadyCallback = {
                     val initialMapCameraPosition =
                         CameraPosition.Builder()
@@ -96,6 +98,10 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
         points.add(Point.fromLngLat(76.920187, 43.236783))
 //        points.add(Pair(76.930137, 43.230361))
 
+        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, isChecked ->
+            binding.navigationView.onRecenterClick()
+        }
+
 
         binding.startRouteButton.setOnClickListener {
             if (isStarted) {
@@ -103,25 +109,13 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
                 isStarted = false
             } else {
                 isStarted = true
-                binding.navigationView.calculateRoute(
+                binding.navigationView.calculateRouteAndStartNavigation(
                     MapRouteData(
                         getString(R.string.mapbox_access_token),
                         userLocation = Point.fromLngLat(76.930137, 43.230361),
                         stops = points,
                         destination = Point.fromLngLat(76.930137, 43.230361),
-                    ),
-                    successCallback = {
-
-                        val options = NavigationViewOptions.builder()
-                        options.navigationListener(this)
-//                        options.shouldSimulateRoute(true)
-                        extractRoute(options)
-                        extractConfiguration(options)
-                        options.navigationOptions(
-                            MapLibreNavigationOptions.Builder().withSnapToRoute(true).build()
-                        )
-                        binding.navigationView.startNavigation(options.build())
-                    }
+                    )
                 )
             }
         }
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java
index cb31a47aa..abd4412cf 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java
@@ -1,78 +1,77 @@
 package org.maplibre.navigation.android.navigation.ui.v5;
 
-import org.maplibre.navigation.core.location.Location;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
-import org.maplibre.navigation.core.models.DirectionsRoute;
 import org.maplibre.geojson.Point;
+import org.maplibre.navigation.core.location.Location;
+import org.maplibre.navigation.core.models.DirectionsRoute;
 
 class NavigationPresenter {
 
-  private NavigationContract.View view;
-  private boolean resumeState;
-
-  NavigationPresenter(NavigationContract.View view) {
-    this.view = view;
-  }
-
-  void updateResumeState(boolean resumeState) {
-    this.resumeState = resumeState;
-  }
-
-  void onRecenterClick() {
-    view.updateWayNameVisibility(true);
-    view.resetCameraPosition();
-    view.hideRecenterBtn();
-  }
-
-  void onCameraTrackingDismissed() {
-      view.updateWayNameVisibility(false);
-  }
-
-  void onSummaryBottomSheetHidden() {
-      view.showRecenterBtn();
-  }
-
-  void onRouteUpdate(DirectionsRoute directionsRoute) {
-    view.drawRoute(directionsRoute);
-    if (resumeState && view.isRecenterButtonVisible()) {
-      view.updateCameraRouteOverview();
-    } else {
-      view.startCamera(directionsRoute);
+    private NavigationContract.View view;
+    private boolean resumeState;
+    private boolean isTrackingCamera = false;
+
+    NavigationPresenter(NavigationContract.View view) {
+        this.view = view;
     }
-  }
 
-  void onDestinationUpdate(Point point) {
-    view.addMarker(point);
-  }
+    void updateResumeState(boolean resumeState) {
+        this.resumeState = resumeState;
+    }
+
+    void onRecenterClick() {
+        view.updateWayNameVisibility(true);
+        view.resetCameraPosition();
+        view.hideRecenterBtn();
+        isTrackingCamera = true;
+    }
+
+    void onCameraTrackingDismissed() {
+        view.updateWayNameVisibility(false);
+        isTrackingCamera = false;
+    }
+
+
+    void onRouteUpdate(DirectionsRoute directionsRoute) {
+        view.drawRoute(directionsRoute);
+        if (resumeState && isTrackingCamera) {
+            view.updateCameraRouteOverview();
+        } else {
+            view.startCamera(directionsRoute);
+        }
+    }
+
+    void onDestinationUpdate(Point point) {
+        view.addMarker(point);
+    }
+
+    void onNavigationLocationUpdate(Location location) {
+        if (resumeState && !isTrackingCamera) {
+            view.resumeCamera(location);
+            resumeState = false;
+        }
+        view.updateNavigationMap(location);
+    }
+
+    void onWayNameChanged(@NonNull String wayName) {
+        if (TextUtils.isEmpty(wayName)) {
+            view.updateWayNameVisibility(false);
+            return;
+        }
+        view.updateWayNameView(wayName);
+        view.updateWayNameVisibility(true);
+    }
 
-  void onNavigationLocationUpdate(Location location) {
-    if (resumeState && !view.isRecenterButtonVisible()) {
-      view.resumeCamera(location);
-      resumeState = false;
+    void onNavigationStopped() {
+        view.updateWayNameVisibility(false);
     }
-    view.updateNavigationMap(location);
-  }
 
-  void onWayNameChanged(@NonNull String wayName) {
-    if (TextUtils.isEmpty(wayName)) {
-      view.updateWayNameVisibility(false);
-      return;
+    void onRouteOverviewClick() {
+        view.updateWayNameVisibility(false);
+        view.updateCameraRouteOverview();
+        view.showRecenterBtn();
     }
-    view.updateWayNameView(wayName);
-    view.updateWayNameVisibility(true);
-  }
-
-  void onNavigationStopped() {
-    view.updateWayNameVisibility(false);
-  }
-
-  void onRouteOverviewClick() {
-    view.updateWayNameVisibility(false);
-    view.updateCameraRouteOverview();
-    view.showRecenterBtn();
-  }
 }
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index dcde55af9..b605a659f 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -13,16 +13,17 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import okhttp3.Request
-import org.maplibre.android.camera.CameraPosition
-import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.location.modes.RenderMode
 import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.MapView
 import org.maplibre.android.maps.OnMapReadyCallback
 import org.maplibre.android.maps.Style
 import org.maplibre.android.maps.Style.OnStyleLoaded
+import org.maplibre.android.plugins.annotation.OnSymbolClickListener
 import org.maplibre.android.plugins.annotation.Symbol
+import org.maplibre.android.plugins.annotation.SymbolManager
 import org.maplibre.android.plugins.annotation.SymbolOptions
+import org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_VIEWPORT
 import org.maplibre.geojson.Point
 import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator
@@ -58,7 +59,7 @@ class NavigationRouteView @JvmOverloads constructor(
     private lateinit var recenterBtn: RecenterButton
     private lateinit var wayNameView: WayNameView
 
-    private var navigationPresenter: NavigationPresenter? = null
+    private lateinit var navigationPresenter: NavigationPresenter
     private var navigationViewEventDispatcher: NavigationViewEventDispatcher? = null
     private lateinit var navigationViewModel: NavigationViewModel
     private var navigationMap: NavigationMapLibreMap? = null
@@ -68,6 +69,7 @@ class NavigationRouteView @JvmOverloads constructor(
     private var isSubscribed = false
     private lateinit var lifecycleRegistry: LifecycleRegistry
     private var onMapReadyCallback: OnMapReadyCallback? = null
+    private var symbolManager: SymbolManager? = null
 
     private var mapStyleUri: String? = null
 
@@ -208,7 +210,8 @@ class NavigationRouteView @JvmOverloads constructor(
      * @since 0.6.0
      */
     override fun onMapReady(mapLibreMap: MapLibreMap) {
-        val onStyleLoaded = OnStyleLoaded { _ ->
+        val onStyleLoaded = OnStyleLoaded { style ->
+            initializeSymbolManager(mapView, mapLibreMap, style)
             initializeNavigationMap(mapView, mapLibreMap)
             initializeWayNameListener()
             onMapReadyCallback?.onMapReady(mapLibreMap)
@@ -219,12 +222,11 @@ class NavigationRouteView @JvmOverloads constructor(
             ?: mapLibreMap.setStyle(ThemeSwitcher.retrieveMapStyle(context), onStyleLoaded)
     }
 
-
-    fun calculateRoute(mapRouteData: MapRouteData, successCallback: () -> Unit) {
+    fun calculateRouteAndStartNavigation(mapRouteData: MapRouteData) {
         val navigationRouteBuilder = NavigationRoute.builder(context).apply {
             this.accessToken(mapRouteData.accessToken)
             this.origin(mapRouteData.userLocation)
-            this.destination( mapRouteData.destination)
+            this.destination(mapRouteData.destination)
             mapRouteData.stops?.forEach { this.addWaypoint(it) }
             this.voiceUnits(UnitType.METRIC)
             this.language(Locale.forLanguageTag("ru"))
@@ -246,26 +248,15 @@ class NavigationRouteView @JvmOverloads constructor(
                             DirectionsResponse.fromJson(
                                 responseBody.toJson()
                             );
-                       val route = maplibreResponse.routes.first()
-
+                        val route = maplibreResponse.routes.first()
                         navigationMap?.drawRoutes(maplibreResponse.routes)
 
-                        val options = NavigationLauncherOptions.builder()
-                            .directionsRoute(route)
-                            .initialMapCameraPosition(
-                                CameraPosition.Builder().target(
-                                    LatLng(
-                                        mapRouteData.userLocation.latitude(),
-                                        mapRouteData.userLocation.longitude()
-                                    )
-                                ).build()
-                            )
-                            .lightThemeResId(R.style.TestNavigationViewLight)
-                            .darkThemeResId(R.style.TestNavigationViewDark)
-                            .build()
-                        NavigationLauncher.startNavigation(context, options)
-
-                        successCallback.invoke()
+                        val options = NavigationViewOptions.builder()
+                        options.directionsRoute(route)
+                        options.navigationOptions(
+                            MapLibreNavigationOptions.Builder().withSnapToRoute(true).build()
+                        )
+                        initializeNavigation(options.build())
                     }
                 }
 
@@ -302,8 +293,21 @@ class NavigationRouteView @JvmOverloads constructor(
         navigationMap?.addDestinationMarker(position)
     }
 
-    fun addCustomMarker(symbolOptions: SymbolOptions): Symbol {
-        return navigationMap?.addCustomMarker(symbolOptions) ?: throw RuntimeException("Navigation map is null")
+    fun addSymbol(symbolOptions: SymbolOptions): Symbol {
+        return symbolManager?.create(symbolOptions)
+            ?: throw RuntimeException("Map is not initialized")
+    }
+
+    fun removeSymbol(symbol: Symbol) {
+        symbolManager?.delete(symbol)
+    }
+
+    fun addOnSymbolClickListener(listener: OnSymbolClickListener) {
+        symbolManager?.addClickListener(listener)
+    }
+
+    fun updateSymbol(symbol: Symbol) {
+        symbolManager?.update(symbol)
     }
 
     val isWayNameVisible: Boolean
@@ -381,15 +385,6 @@ class NavigationRouteView @JvmOverloads constructor(
         navigationMap?.showRouteOverview(padding)
     }
 
-    /**
-     * Should be called when this view is completely initialized.
-     *
-     * @param options with containing route / coordinate data
-     */
-    fun startNavigation(options: NavigationViewOptions) {
-        initializeNavigation(options)
-    }
-
     /**
      * Call this when the navigation session needs to end navigation without finishing the whole view
      *
@@ -397,7 +392,7 @@ class NavigationRouteView @JvmOverloads constructor(
      */
     @UiThread
     fun stopNavigation() {
-        navigationPresenter?.onNavigationStopped()
+        navigationPresenter.onNavigationStopped()
         navigationViewModel.stopNavigation()
     }
 
@@ -406,11 +401,13 @@ class NavigationRouteView @JvmOverloads constructor(
      * Should be called after [NavigationView.onCreate].
      */
     fun initialize(
+        shouldSimulateRoute: Boolean,
         onMapReadyCallback: OnMapReadyCallback,
     ) {
         this.onMapReadyCallback = onMapReadyCallback
         if (!isMapInitialized) {
             mapView.getMapAsync(this)
+            navigationViewModel.initialize(shouldSimulateRoute)
         }
     }
 
@@ -468,7 +465,7 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     fun onRecenterClick() {
-        navigationPresenter?.onRecenterClick()
+        navigationPresenter.onRecenterClick()
     }
 
     private fun initializeView() {
@@ -522,6 +519,13 @@ class NavigationRouteView @JvmOverloads constructor(
         }
     }
 
+    private fun initializeSymbolManager(mapView: MapView, mapLibreMap: MapLibreMap, style: Style) {
+        symbolManager = SymbolManager(mapView, mapLibreMap, style).apply {
+            iconAllowOverlap = true
+            iconRotationAlignment = ICON_ROTATION_ALIGNMENT_VIEWPORT
+        }
+    }
+
     private fun initializeWayNameListener() {
         val wayNameListener = NavigationViewWayNameListener(navigationPresenter)
         navigationMap?.addOnWayNameChangedListener(wayNameListener)
@@ -573,13 +577,14 @@ class NavigationRouteView @JvmOverloads constructor(
         if (savedInstanceState != null) {
             val navigationRunningKey = context.getString(R.string.navigation_running)
             val resumeState = savedInstanceState.getBoolean(navigationRunningKey)
-            navigationPresenter?.updateResumeState(resumeState)
+            navigationPresenter.updateResumeState(resumeState)
         }
     }
 
     private fun initializeNavigation(options: NavigationViewOptions) {
+        instructionView.isVisible = true
         establish(options)
-        navigationViewModel.initialize(options)
+        navigationViewModel.initializeNavigation(options)
         initializeNavigationListeners(options, navigationViewModel)
         setupNavigationMapLibreMap(options)
 
@@ -651,7 +656,7 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     /**
-     * Subscribes the [InstructionView] and [SummaryBottomSheet] to the [NavigationViewModel].
+     * Subscribes the [InstructionView] to the [NavigationViewModel].
      *
      *
      * Then, creates an instance of [NavigationViewSubscriber], which takes a presenter.
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
index c743545c3..67fd1e06c 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
@@ -583,7 +583,7 @@ private void updatePresenterState(@Nullable Bundle savedInstanceState) {
 
     private void initializeNavigation(NavigationViewOptions options) {
         establish(options);
-        navigationViewModel.initialize(options);
+        navigationViewModel.initializeNavigation(options);
         initializeNavigationListeners(options, navigationViewModel);
         setupNavigationmapLibreMap(options);
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
index 00b816488..8646db7be 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
@@ -132,20 +132,26 @@ void initializeEventDispatcher(NavigationViewEventDispatcher navigationViewEvent
         this.navigationViewEventDispatcher = navigationViewEventDispatcher;
     }
 
+    /**
+     * This method used to initialize {@link MapLibreNavigation}.
+     */
+    void initialize(boolean shouldSimulateRoute) {
+        LocationEngine locationEngine = initializeLocationEngineFrom(shouldSimulateRoute);
+        initializeNavigation(locationEngine);
+    }
+
     /**
      * This method will pass {@link MapLibreNavigationOptions} from the {@link NavigationViewOptions}
      * to this view model to be used to initialize {@link MapLibreNavigation}.
      *
      * @param options to init NavigationView
      */
-    void initialize(NavigationViewOptions options) {
+    void initializeNavigation(NavigationViewOptions options) {
         MapLibreNavigationOptions navigationOptions = options.navigationOptions();
         initializeLanguage(options);
         initializeTimeFormat(navigationOptions);
         initializeDistanceFormatter(options);
         if (!isRunning()) {
-            LocationEngine locationEngine = initializeLocationEngineFrom(options);
-            initializeNavigation(context, navigationOptions, locationEngine);
             addMilestones(options);
             initializeNavigationSpeechPlayer(options);
         }
@@ -180,7 +186,7 @@ boolean isOffRoute() {
     void updateRoute(DirectionsRoute route) {
         this.route.setValue(route);
         if (!isChangingConfigurations) {
-            startNavigation(route);
+            startMapLibreNavigation(route);
             updateReplayEngine(route);
             sendEventOnRerouteAlong(route);
             isOffRoute.setValue(false);
@@ -280,15 +286,13 @@ private SpeechPlayerProvider initializeSpeechPlayerProvider(boolean voiceLanguag
         return new SpeechPlayerProvider(context, language, voiceLanguageSupported);
     }
 
-    private LocationEngine initializeLocationEngineFrom(NavigationViewOptions options) {
-        LocationEngine locationEngine = options.locationEngine();
-        boolean shouldReplayRoute = options.shouldSimulateRoute();
-        locationEngineConductor.initializeLocationEngine(context, locationEngine, shouldReplayRoute);
+    private LocationEngine initializeLocationEngineFrom(boolean shouldSimulateRoute) {
+        locationEngineConductor.initializeLocationEngine(context, null, shouldSimulateRoute);
         return locationEngineConductor.obtainLocationEngine();
     }
 
-    private void initializeNavigation(Context context, MapLibreNavigationOptions options, LocationEngine locationEngine) {
-        navigation = new MapLibreNavigation(options, locationEngine);
+    private void initializeNavigation(LocationEngine locationEngine) {
+        navigation = new MapLibreNavigation(locationEngine);
         addNavigationListeners();
     }
 
@@ -332,7 +336,7 @@ public void userOffRoute(Location location) {
 
     private ViewRouteListener routeEngineListener = new NavigationViewRouteEngineListener(this);
 
-    private void startNavigation(DirectionsRoute route) {
+    private void startMapLibreNavigation(DirectionsRoute route) {
         if (route != null) {
             navigation.startNavigation(route);
             voiceInstructionsToAnnounce = 0;
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SummaryBottomSheetCallback.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SummaryBottomSheetCallback.java
deleted file mode 100644
index 4757a78c8..000000000
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SummaryBottomSheetCallback.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.maplibre.navigation.android.navigation.ui.v5;
-
-import androidx.annotation.NonNull;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import android.view.View;
-
-class SummaryBottomSheetCallback extends BottomSheetBehavior.BottomSheetCallback {
-
-  private NavigationPresenter presenter;
-  private NavigationViewEventDispatcher dispatcher;
-
-  SummaryBottomSheetCallback(NavigationPresenter presenter, NavigationViewEventDispatcher dispatcher) {
-    this.presenter = presenter;
-    this.dispatcher = dispatcher;
-  }
-
-  @Override
-  public void onStateChanged(@NonNull View bottomSheet, int newState) {
-    dispatcher.onBottomSheetStateChanged(bottomSheet, newState);
-    presenter.onSummaryBottomSheetHidden();
-  }
-
-  @Override
-  public void onSlide(@NonNull View bottomSheet, float slideOffset) {
-    // No-op
-  }
-}
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
index 2beba24b2..9527c5af2 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
@@ -788,17 +788,4 @@ private void updateInstructionList(InstructionModel model) {
     instructionListAdapter.updateBannerListWith(routeProgress, isListShowing);
   }
 
-  public void setupStyle(String mapStyle) {
-    ConstraintLayout instructionBackground = findViewById(R.id.instructionBackground);
-    if (mapStyle.equals(NavigationConstants.NAVIGATION_VIEW_DARK_THEME)) {
-      instructionBackground.setBackgroundColor(Color.BLACK);
-      upcomingDistanceText.setTextColor(Color.WHITE);
-      upcomingPrimaryText.setTextColor(Color.WHITE);
-    } else {
-      instructionBackground.setBackgroundColor(Color.WHITE);
-      upcomingDistanceText.setTextColor(Color.BLACK);
-      upcomingPrimaryText.setTextColor(Color.BLACK);
-    }
-  }
-
 }
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
index efe01a2bf..bf124cbdc 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
@@ -16,7 +16,6 @@
 import androidx.annotation.UiThread;
 import androidx.fragment.app.FragmentActivity;
 
-import org.maplibre.android.plugins.annotation.Symbol;
 import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera;
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute;
 import org.maplibre.navigation.android.navigation.ui.v5.route.OnRouteSelectionChangeListener;
@@ -181,8 +180,8 @@ public void addDestinationMarker(Point position) {
    *
    * @param options for the custom {@link org.maplibre.android.plugins.annotation.Symbol}
    */
-  public Symbol addCustomMarker(SymbolOptions options) {
-    return navigationSymbolManager.addCustomSymbolFor(options);
+  public void addCustomMarker(SymbolOptions options) {
+    navigationSymbolManager.addCustomSymbolFor(options);
   }
 
   /**
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java
index 106bdd529..e88efd471 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java
@@ -1,5 +1,7 @@
 package org.maplibre.navigation.android.navigation.ui.v5.map;
 
+import static org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_VIEWPORT;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
 
@@ -29,8 +31,8 @@ void addDestinationMarkerFor(Point position) {
     createSymbolFrom(options);
   }
 
-  Symbol addCustomSymbolFor(SymbolOptions options) {
-    return createSymbolFrom(options);
+  void addCustomSymbolFor(SymbolOptions options) {
+    createSymbolFrom(options);
   }
 
   void removeAllMarkerSymbols() {
@@ -49,10 +51,9 @@ private SymbolOptions createSymbolOptionsFor(Point position) {
       .withIconImage(MAPLIBRE_NAVIGATION_MARKER_NAME);
   }
 
-  private Symbol createSymbolFrom(SymbolOptions options) {
+  private void createSymbolFrom(SymbolOptions options) {
     Symbol symbol = symbolManager.create(options);
     mapMarkersSymbols.add(symbol);
-    return symbol;
   }
 
   @UiThread
diff --git a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
index 34f14e355..d4f492dd2 100644
--- a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
@@ -33,19 +33,12 @@
             app:maplibre_uiTiltGestures="true"
             app:maplibre_uiZoomGestures="true"/>
 
-        <ImageView
-            android:id="@+id/screenshotView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="invisible" />
-
         <org.maplibre.navigation.android.navigation.ui.v5.RecenterButton
             android:id="@+id/recenterBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top"
             android:layout_margin="16dp"
-            android:visibility="invisible"
             app:layout_anchorGravity="top|left" />
 
         <org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView
@@ -53,7 +46,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center|top"
-            android:visibility="invisible"
             app:layout_anchorGravity="center|top" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
@@ -62,7 +54,7 @@
         android:id="@+id/instructionView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"
+        android:visibility="invisible"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From 65522895dd19cb46f78836d57c29aec58224a4bc Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Thu, 22 May 2025 17:09:25 +0200
Subject: [PATCH 23/46] enable location component

---
 .../android/example/NavigationUIActivity.kt   | 23 ++++++++++--
 .../navigation/ui/v5/NavigationRouteView.kt   | 37 +++++++++++++++----
 .../navigation/ui/v5/NavigationView.java      |  2 +-
 .../navigation/ui/v5/NavigationViewModel.java |  4 +-
 4 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index e6a9a7779..b8a118097 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -13,6 +13,8 @@ import org.maplibre.android.location.modes.CameraMode
 import org.maplibre.android.location.modes.RenderMode
 import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.Style
+import org.maplibre.android.plugins.annotation.SymbolOptions
+import org.maplibre.android.style.layers.Property.ICON_ANCHOR_CENTER
 import org.maplibre.geojson.Point
 import org.maplibre.navigation.android.example.databinding.ActivityNavigationUiBinding
 import org.maplibre.navigation.android.navigation.ui.v5.MapRouteData
@@ -44,7 +46,7 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
 
     private lateinit var binding: ActivityNavigationUiBinding
 
-    private var simulateRoute = true
+    private var simulateRoute = false
     var mapLibreMap: MapLibreMap? = null
 
     private var isStarted = false
@@ -64,6 +66,7 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
             initialize(
                 simulateRoute,
                 onMapReadyCallback = {
+                    this@NavigationUIActivity.mapLibreMap = it
                     val initialMapCameraPosition =
                         CameraPosition.Builder()
                             .target(LatLng(43.230633, 76.933810))
@@ -72,7 +75,18 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
                     it.cameraPosition = initialMapCameraPosition
                     it.setMaxZoomPreference(18.0)
                     it.setMinZoomPreference(5.0)
-                    this@NavigationUIActivity.mapLibreMap = it
+                    getDrawable(R.drawable.ic_car_top)?.let {
+                        mapLibreMap?.style?.addImage("DRIVER_MARKER_ICON_ID",
+                            it
+                        )
+                    }
+                    val symbolOptions = SymbolOptions()
+                        .withLatLng(LatLng(43.230361,76.930137))
+                        .withIconImage("DRIVER_MARKER_ICON_ID")
+                        .withIconAnchor(ICON_ANCHOR_CENTER)
+
+
+                    binding.navigationView.addSymbol(symbolOptions)
                 }
             )
 
@@ -99,13 +113,14 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
 //        points.add(Pair(76.930137, 43.230361))
 
         binding.simulateRouteSwitch.setOnCheckedChangeListener { _, isChecked ->
-            binding.navigationView.onRecenterClick()
+            mapLibreMap?.locationComponent?.cameraMode = CameraMode.TRACKING
         }
 
-
         binding.startRouteButton.setOnClickListener {
             if (isStarted) {
                 binding.navigationView.stopNavigation()
+                binding.navigationView.retrieveNavigationMapLibreMap()?.removeRoute()
+
                 isStarted = false
             } else {
                 isStarted = true
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index b605a659f..a7db89743 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -1,5 +1,6 @@
 package org.maplibre.navigation.android.navigation.ui.v5
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.os.Bundle
@@ -13,6 +14,8 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import okhttp3.Request
+import org.maplibre.android.location.LocationComponentActivationOptions
+import org.maplibre.android.location.modes.CameraMode
 import org.maplibre.android.location.modes.RenderMode
 import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.MapView
@@ -23,7 +26,7 @@ import org.maplibre.android.plugins.annotation.OnSymbolClickListener
 import org.maplibre.android.plugins.annotation.Symbol
 import org.maplibre.android.plugins.annotation.SymbolManager
 import org.maplibre.android.plugins.annotation.SymbolOptions
-import org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_VIEWPORT
+import org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_MAP
 import org.maplibre.geojson.Point
 import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator
@@ -211,6 +214,7 @@ class NavigationRouteView @JvmOverloads constructor(
      */
     override fun onMapReady(mapLibreMap: MapLibreMap) {
         val onStyleLoaded = OnStyleLoaded { style ->
+            enableLocationComponent(mapLibreMap, style)
             initializeSymbolManager(mapView, mapLibreMap, style)
             initializeNavigationMap(mapView, mapLibreMap)
             initializeWayNameListener()
@@ -222,6 +226,27 @@ class NavigationRouteView @JvmOverloads constructor(
             ?: mapLibreMap.setStyle(ThemeSwitcher.retrieveMapStyle(context), onStyleLoaded)
     }
 
+    @SuppressLint("MissingPermission")
+    private fun enableLocationComponent(mapLibreMap: MapLibreMap, style: Style) {
+        // Get an instance of the component
+        val locationComponent = mapLibreMap.locationComponent
+
+        locationComponent.let {
+            // Activate with a built LocationComponentActivationOptions object
+            it.activateLocationComponent(
+                LocationComponentActivationOptions.builder(context, style).build(),
+            )
+
+            // Enable to make component visible
+            it.isLocationComponentEnabled = true
+
+            // Set the component's camera mode
+            it.cameraMode = CameraMode.TRACKING_GPS
+
+            // Set the component's render mode
+            it.renderMode = RenderMode.NORMAL
+        }
+    }
     fun calculateRouteAndStartNavigation(mapRouteData: MapRouteData) {
         val navigationRouteBuilder = NavigationRoute.builder(context).apply {
             this.accessToken(mapRouteData.accessToken)
@@ -407,7 +432,7 @@ class NavigationRouteView @JvmOverloads constructor(
         this.onMapReadyCallback = onMapReadyCallback
         if (!isMapInitialized) {
             mapView.getMapAsync(this)
-            navigationViewModel.initialize(shouldSimulateRoute)
+            navigationViewModel.initializeNavigation(shouldSimulateRoute)
         }
     }
 
@@ -464,10 +489,6 @@ class NavigationRouteView @JvmOverloads constructor(
         return instructionView.retrieveAlertView()
     }
 
-    fun onRecenterClick() {
-        navigationPresenter.onRecenterClick()
-    }
-
     private fun initializeView() {
         inflate(context, R.layout.navigation_view_layout, this)
         bind()
@@ -522,7 +543,7 @@ class NavigationRouteView @JvmOverloads constructor(
     private fun initializeSymbolManager(mapView: MapView, mapLibreMap: MapLibreMap, style: Style) {
         symbolManager = SymbolManager(mapView, mapLibreMap, style).apply {
             iconAllowOverlap = true
-            iconRotationAlignment = ICON_ROTATION_ALIGNMENT_VIEWPORT
+            iconRotationAlignment = ICON_ROTATION_ALIGNMENT_MAP
         }
     }
 
@@ -584,7 +605,7 @@ class NavigationRouteView @JvmOverloads constructor(
     private fun initializeNavigation(options: NavigationViewOptions) {
         instructionView.isVisible = true
         establish(options)
-        navigationViewModel.initializeNavigation(options)
+        navigationViewModel.initialize(options)
         initializeNavigationListeners(options, navigationViewModel)
         setupNavigationMapLibreMap(options)
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
index 67fd1e06c..c743545c3 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
@@ -583,7 +583,7 @@ private void updatePresenterState(@Nullable Bundle savedInstanceState) {
 
     private void initializeNavigation(NavigationViewOptions options) {
         establish(options);
-        navigationViewModel.initializeNavigation(options);
+        navigationViewModel.initialize(options);
         initializeNavigationListeners(options, navigationViewModel);
         setupNavigationmapLibreMap(options);
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
index 8646db7be..e2ff7a55a 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
@@ -135,7 +135,7 @@ void initializeEventDispatcher(NavigationViewEventDispatcher navigationViewEvent
     /**
      * This method used to initialize {@link MapLibreNavigation}.
      */
-    void initialize(boolean shouldSimulateRoute) {
+    void initializeNavigation(boolean shouldSimulateRoute) {
         LocationEngine locationEngine = initializeLocationEngineFrom(shouldSimulateRoute);
         initializeNavigation(locationEngine);
     }
@@ -146,7 +146,7 @@ void initialize(boolean shouldSimulateRoute) {
      *
      * @param options to init NavigationView
      */
-    void initializeNavigation(NavigationViewOptions options) {
+    void initialize(NavigationViewOptions options) {
         MapLibreNavigationOptions navigationOptions = options.navigationOptions();
         initializeLanguage(options);
         initializeTimeFormat(navigationOptions);

From 05d9da7a2f5f913288de1dbc131d91b9aec6e5f5 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 23 May 2025 13:53:17 +0200
Subject: [PATCH 24/46] enable follow location

---
 .../android/example/NavigationUIActivity.kt   | 27 +++++++++++------
 .../navigation/ui/v5/NavigationRouteView.kt   | 29 ++-----------------
 .../navigation/ui/v5/ThemeSwitcher.java       | 12 --------
 .../ui/v5/map/NavigationMapLibreMap.java      |  2 +-
 .../src/main/res/values/colors.xml            |  1 +
 .../src/main/res/values/styles.xml            |  2 +-
 6 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index b8a118097..595a379c5 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -5,7 +5,6 @@ import android.preference.PreferenceManager
 import androidx.activity.ComponentActivity
 import okhttp3.Request
 import org.maplibre.android.camera.CameraPosition
-import org.maplibre.android.camera.CameraUpdateFactory
 import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.location.LocationComponent
 import org.maplibre.android.location.LocationComponentActivationOptions
@@ -21,13 +20,13 @@ import org.maplibre.navigation.android.navigation.ui.v5.MapRouteData
 import org.maplibre.navigation.android.navigation.ui.v5.NavigationLauncher
 import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewOptions
 import org.maplibre.navigation.android.navigation.ui.v5.OnNavigationReadyCallback
+import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera
 import org.maplibre.navigation.android.navigation.ui.v5.listeners.NavigationListener
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute
 import org.maplibre.navigation.core.models.DirectionsResponse
 import org.maplibre.navigation.core.models.DirectionsRoute
 import org.maplibre.navigation.core.models.UnitType
-import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions
 import org.maplibre.navigation.core.navigation.NavigationConstants
 import retrofit2.Call
 import retrofit2.Callback
@@ -93,12 +92,13 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
         }
 
         binding.locate.setOnClickListener {
-            val initialMapCameraPosition =
-                CameraPosition.Builder()
-                    .target(LatLng(43.230633, 76.933810))
-                    .zoom(16.0)
-                    .build()
-            mapLibreMap?.animateCamera(CameraUpdateFactory.newCameraPosition(initialMapCameraPosition))
+//            val initialMapCameraPosition =
+//                CameraPosition.Builder()
+//                    .target(LatLng(43.230633, 76.933810))
+//                    .zoom(16.0)
+//                    .build()
+//            mapLibreMap?.animateCamera(CameraUpdateFactory.newCameraPosition(initialMapCameraPosition))
+            mapLibreMap?.locationComponent?.cameraMode = CameraMode.TRACKING_GPS
         }
 
 //        binding.mapView.apply {
@@ -113,7 +113,16 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
 //        points.add(Pair(76.930137, 43.230361))
 
         binding.simulateRouteSwitch.setOnCheckedChangeListener { _, isChecked ->
-            mapLibreMap?.locationComponent?.cameraMode = CameraMode.TRACKING
+//            mapLibreMap?.locationComponent?.cameraMode = CameraMode.TRACKING
+            mapLibreMap?.locationComponent?.cameraMode = CameraMode.NONE
+            mapLibreMap?.locationComponent?.isLocationComponentEnabled = false
+            binding.navigationView.retrieveNavigationMapLibreMap()?.apply {
+                updateLocationVisibilityTo(isChecked)
+                resetCameraPositionWith(
+                    NavigationCamera.NAVIGATION_TRACKING_MODE_GPS
+                )
+            }
+
         }
 
         binding.startRouteButton.setOnClickListener {
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index a7db89743..bb80d2652 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -1,6 +1,5 @@
 package org.maplibre.navigation.android.navigation.ui.v5
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.os.Bundle
@@ -14,8 +13,6 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import okhttp3.Request
-import org.maplibre.android.location.LocationComponentActivationOptions
-import org.maplibre.android.location.modes.CameraMode
 import org.maplibre.android.location.modes.RenderMode
 import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.MapView
@@ -53,7 +50,7 @@ import java.util.Locale
 
 class NavigationRouteView @JvmOverloads constructor(
     context: Context,
-    private val attrs: AttributeSet? = null,
+    attrs: AttributeSet? = null,
     defStyleAttr: Int = -1
 ) : CoordinatorLayout(context, attrs, defStyleAttr), LifecycleOwner, OnMapReadyCallback,
     NavigationContract.View {
@@ -77,6 +74,7 @@ class NavigationRouteView @JvmOverloads constructor(
     private var mapStyleUri: String? = null
 
     init {
+        ThemeSwitcher.setTheme(context, attrs)
         initializeView()
     }
 
@@ -96,7 +94,6 @@ class NavigationRouteView @JvmOverloads constructor(
 
         if (mapStyleUri != null) {
             this.mapStyleUri = mapStyleUri
-            ThemeSwitcher.setTheme(context, attrs, mapStyleUri)
         }
     }
 
@@ -214,7 +211,6 @@ class NavigationRouteView @JvmOverloads constructor(
      */
     override fun onMapReady(mapLibreMap: MapLibreMap) {
         val onStyleLoaded = OnStyleLoaded { style ->
-            enableLocationComponent(mapLibreMap, style)
             initializeSymbolManager(mapView, mapLibreMap, style)
             initializeNavigationMap(mapView, mapLibreMap)
             initializeWayNameListener()
@@ -226,27 +222,6 @@ class NavigationRouteView @JvmOverloads constructor(
             ?: mapLibreMap.setStyle(ThemeSwitcher.retrieveMapStyle(context), onStyleLoaded)
     }
 
-    @SuppressLint("MissingPermission")
-    private fun enableLocationComponent(mapLibreMap: MapLibreMap, style: Style) {
-        // Get an instance of the component
-        val locationComponent = mapLibreMap.locationComponent
-
-        locationComponent.let {
-            // Activate with a built LocationComponentActivationOptions object
-            it.activateLocationComponent(
-                LocationComponentActivationOptions.builder(context, style).build(),
-            )
-
-            // Enable to make component visible
-            it.isLocationComponentEnabled = true
-
-            // Set the component's camera mode
-            it.cameraMode = CameraMode.TRACKING_GPS
-
-            // Set the component's render mode
-            it.renderMode = RenderMode.NORMAL
-        }
-    }
     fun calculateRouteAndStartNavigation(mapRouteData: MapRouteData) {
         val navigationRouteBuilder = NavigationRoute.builder(context).apply {
             this.accessToken(mapRouteData.accessToken)
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
index 02727540c..1288bba5d 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
@@ -105,18 +105,6 @@ static void setTheme(Context context, AttributeSet attrs) {
     context.setTheme(nightModeEnabled ? darkTheme : lightTheme);
   }
 
-  static void setTheme(Context context, AttributeSet attrs, String style) {
-    TypedArray styledAttributes = context.obtainStyledAttributes(attrs, R.styleable.NavigationView);
-    int lightTheme = styledAttributes.getResourceId(R.styleable.NavigationView_navigationLightTheme,
-            R.style.NavigationViewLight);
-    int darkTheme = styledAttributes.getResourceId(R.styleable.NavigationView_navigationDarkTheme,
-            R.style.NavigationViewDark);
-    if (style.equals(NavigationConstants.NAVIGATION_VIEW_DARK_THEME)) {
-      context.setTheme(lightTheme);
-    } else {
-      context.setTheme(darkTheme);
-    }
-  }
 
   static String retrieveMapStyle(Context context) {
     TypedValue mapStyleAttr = resolveAttributeFromId(context, R.attr.navigationViewMapStyle);
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
index bf124cbdc..329b60e23 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
@@ -619,7 +619,7 @@ private void initializeLocationComponent(MapView mapView, MapLibreMap map) {
     LocationComponentOptions options = LocationComponentOptions.createFromAttributes(context, locationLayerStyleRes);
     LocationComponentActivationOptions activationOptions = LocationComponentActivationOptions.builder(context, style)
       .locationComponentOptions(options)
-      .useDefaultLocationEngine(false)
+//      .useDefaultLocationEngine(false)
       .build();
     locationComponent.activateLocationComponent(activationOptions);
     locationComponent.setLocationComponentEnabled(true);
diff --git a/libandroid-navigation-ui/src/main/res/values/colors.xml b/libandroid-navigation-ui/src/main/res/values/colors.xml
index 5028bd0bd..8e11c9980 100644
--- a/libandroid-navigation-ui/src/main/res/values/colors.xml
+++ b/libandroid-navigation-ui/src/main/res/values/colors.xml
@@ -61,5 +61,6 @@
   <color name="md_grey_700">#616161</color>
   <color name="md_grey_800">#424242</color>
   <color name="md_grey_900">#212121</color>
+  <color name="transparent">#00FFFFFF</color>
 </resources>
 
diff --git a/libandroid-navigation-ui/src/main/res/values/styles.xml b/libandroid-navigation-ui/src/main/res/values/styles.xml
index e7c00198d..5d20f062f 100644
--- a/libandroid-navigation-ui/src/main/res/values/styles.xml
+++ b/libandroid-navigation-ui/src/main/res/values/styles.xml
@@ -92,7 +92,7 @@
         <item name="roundedLineCap">true</item>
     </style>
 
-    <style name="NavigationLocationLayerStyle" parent="@style/maplibre_LocationComponent">
+    <style name="NavigationLocationLayerStyle" parent="maplibre_LocationLayer">
         <item name="maplibre_trackingAnimationDurationMultiplier">2.0</item>
         <item name="maplibre_trackingGesturesManagement">true</item>
     </style>

From 352bf4f44ca1ba701920104c27ded8af2f6790de Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Tue, 27 May 2025 11:47:41 +0200
Subject: [PATCH 25/46] remove adding default destination marker, and updates
 to view

---
 .../navigation/ui/v5/NavigationContract.java  |  3 ---
 .../navigation/ui/v5/NavigationPresenter.java |  3 ++-
 .../navigation/ui/v5/NavigationRouteView.kt   | 14 +++++++------
 .../navigation/ui/v5/NavigationView.java      |  7 -------
 .../res/layout/navigation_view_layout.xml     | 21 +++++++++----------
 5 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationContract.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationContract.java
index ff426efda..769e15fc3 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationContract.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationContract.java
@@ -4,7 +4,6 @@
 
 import org.maplibre.navigation.core.location.Location;
 import org.maplibre.navigation.core.models.DirectionsRoute;
-import org.maplibre.geojson.Point;
 
 public interface NavigationContract {
 
@@ -22,8 +21,6 @@ interface View {
 
     void drawRoute(DirectionsRoute directionsRoute);
 
-    void addMarker(Point point);
-
     void startCamera(DirectionsRoute directionsRoute);
 
     void resumeCamera(Location location);
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java
index abd4412cf..1315de6c4 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java
@@ -45,7 +45,8 @@ void onRouteUpdate(DirectionsRoute directionsRoute) {
     }
 
     void onDestinationUpdate(Point point) {
-        view.addMarker(point);
+        // Disabled adding destination marker
+//        view.addMarker(point);
     }
 
     void onNavigationLocationUpdate(Location location) {
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index bb80d2652..78faf94b2 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -24,7 +24,6 @@ import org.maplibre.android.plugins.annotation.Symbol
 import org.maplibre.android.plugins.annotation.SymbolManager
 import org.maplibre.android.plugins.annotation.SymbolOptions
 import org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_MAP
-import org.maplibre.geojson.Point
 import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView
@@ -289,10 +288,6 @@ class NavigationRouteView @JvmOverloads constructor(
         navigationMap?.drawRoute(directionsRoute)
     }
 
-    override fun addMarker(position: Point) {
-        navigationMap?.addDestinationMarker(position)
-    }
-
     fun addSymbol(symbolOptions: SymbolOptions): Symbol {
         return symbolManager?.create(symbolOptions)
             ?: throw RuntimeException("Map is not initialized")
@@ -464,6 +459,14 @@ class NavigationRouteView @JvmOverloads constructor(
         return instructionView.retrieveAlertView()
     }
 
+    fun showInstructionList() {
+        instructionView.showInstructionList()
+    }
+
+    fun hideInstructionList() {
+        instructionView.hideInstructionList()
+    }
+
     private fun initializeView() {
         inflate(context, R.layout.navigation_view_layout, this)
         bind()
@@ -578,7 +581,6 @@ class NavigationRouteView @JvmOverloads constructor(
     }
 
     private fun initializeNavigation(options: NavigationViewOptions) {
-        instructionView.isVisible = true
         establish(options)
         navigationViewModel.initialize(options)
         initializeNavigationListeners(options, navigationViewModel)
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
index c743545c3..a12dbef4f 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
@@ -270,13 +270,6 @@ public void drawRoute(DirectionsRoute directionsRoute) {
         }
     }
 
-    @Override
-    public void addMarker(Point position) {
-        if (navigationMap != null) {
-            navigationMap.addDestinationMarker(position);
-        }
-    }
-
     /**
      * Provides the current visibility of the way name view.
      *
diff --git a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
index d4f492dd2..2441b366c 100644
--- a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/navigationLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,15 +9,12 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        >
+        android:orientation="vertical">
 
         <org.maplibre.android.maps.MapView
             android:id="@+id/navigationMapView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:maplibre_uiAttribution="false"
-            app:maplibre_uiCompass="false"
             app:maplibre_cameraTargetLat="52.039176"
             app:maplibre_cameraTargetLng="5.550339"
             app:maplibre_cameraZoom="12"
@@ -26,12 +22,14 @@
             app:maplibre_enableZMediaOverlay="true"
             app:maplibre_renderTextureMode="true"
             app:maplibre_renderTextureTranslucentSurface="true"
+            app:maplibre_uiAttribution="false"
+            app:maplibre_uiCompass="false"
             app:maplibre_uiDoubleTapGestures="true"
             app:maplibre_uiLogo="false"
             app:maplibre_uiRotateGestures="true"
             app:maplibre_uiScrollGestures="true"
             app:maplibre_uiTiltGestures="true"
-            app:maplibre_uiZoomGestures="true"/>
+            app:maplibre_uiZoomGestures="true" />
 
         <org.maplibre.navigation.android.navigation.ui.v5.RecenterButton
             android:id="@+id/recenterBtn"
@@ -39,6 +37,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="top"
             android:layout_margin="16dp"
+            android:visibility="gone"
             app:layout_anchorGravity="top|left" />
 
         <org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView
@@ -46,6 +45,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center|top"
+            android:visibility="gone"
             app:layout_anchorGravity="center|top" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
@@ -54,13 +54,12 @@
         android:id="@+id/instructionView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
         android:visibility="invisible"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_bias="0.2"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.2" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 1c47b50d581bbe4a5e4463c54d5f525854fc4e6a Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Tue, 27 May 2025 12:08:07 +0200
Subject: [PATCH 26/46] instructionView visibility

---
 .../android/navigation/ui/v5/NavigationRouteView.kt       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index 78faf94b2..69c6f417a 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -459,6 +459,14 @@ class NavigationRouteView @JvmOverloads constructor(
         return instructionView.retrieveAlertView()
     }
 
+    fun showInstructionView() {
+        instructionView.isVisible = true
+    }
+
+    fun hideInstructionView() {
+        instructionView.isVisible = false
+    }
+
     fun showInstructionList() {
         instructionView.showInstructionList()
     }

From 2f5dcf6efb48dd2c42259db03137cc9e57d660b4 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Tue, 27 May 2025 12:15:38 +0200
Subject: [PATCH 27/46] add rotating markers

---
 .../android/navigation/ui/v5/NavigationRouteView.kt           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index 69c6f417a..d0cc45a0c 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -23,7 +23,7 @@ import org.maplibre.android.plugins.annotation.OnSymbolClickListener
 import org.maplibre.android.plugins.annotation.Symbol
 import org.maplibre.android.plugins.annotation.SymbolManager
 import org.maplibre.android.plugins.annotation.SymbolOptions
-import org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_MAP
+import org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_VIEWPORT
 import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView
@@ -529,7 +529,7 @@ class NavigationRouteView @JvmOverloads constructor(
     private fun initializeSymbolManager(mapView: MapView, mapLibreMap: MapLibreMap, style: Style) {
         symbolManager = SymbolManager(mapView, mapLibreMap, style).apply {
             iconAllowOverlap = true
-            iconRotationAlignment = ICON_ROTATION_ALIGNMENT_MAP
+            iconRotationAlignment = ICON_ROTATION_ALIGNMENT_VIEWPORT
         }
     }
 

From 2e516fdd56760a4e84836722205e4db4d5b5e4da Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Wed, 28 May 2025 12:27:33 +0200
Subject: [PATCH 28/46] fix instruction listeners, low fps crash, and styling
 banner

---
 .../android/example/NavigationUIActivity.kt   |   1 +
 .../navigation/ui/v5/NavigationRouteView.kt   |   8 -
 .../navigation/ui/v5/NavigationViewModel.java |   2 +-
 .../ui/v5/instruction/InstructionView.java    |   2 +-
 .../navigation/ui/v5/map/MapFpsDelegate.java  | 201 +++++++++---------
 .../res/layout/instruction_content_layout.xml |   6 +-
 6 files changed, 109 insertions(+), 111 deletions(-)

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index 595a379c5..90296280e 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -124,6 +124,7 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
             }
 
         }
+        binding.navigationView.showInstructionView()
 
         binding.startRouteButton.setOnClickListener {
             if (isStarted) {
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index d0cc45a0c..65fdcecc1 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -467,14 +467,6 @@ class NavigationRouteView @JvmOverloads constructor(
         instructionView.isVisible = false
     }
 
-    fun showInstructionList() {
-        instructionView.showInstructionList()
-    }
-
-    fun hideInstructionList() {
-        instructionView.hideInstructionList()
-    }
-
     private fun initializeView() {
         inflate(context, R.layout.navigation_view_layout, this)
         bind()
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
index e2ff7a55a..73bd57f8d 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
@@ -152,6 +152,7 @@ void initialize(NavigationViewOptions options) {
         initializeTimeFormat(navigationOptions);
         initializeDistanceFormatter(options);
         if (!isRunning()) {
+            addNavigationListeners();
             addMilestones(options);
             initializeNavigationSpeechPlayer(options);
         }
@@ -293,7 +294,6 @@ private LocationEngine initializeLocationEngineFrom(boolean shouldSimulateRoute)
 
     private void initializeNavigation(LocationEngine locationEngine) {
         navigation = new MapLibreNavigation(locationEngine);
-        addNavigationListeners();
     }
 
     private void addNavigationListeners() {
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
index 9527c5af2..4c49f704e 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
@@ -197,7 +197,7 @@ public void onChanged(@Nullable Boolean isOffRoute) {
             showRerouteState();
           } else if (isRerouting) {
             hideRerouteState();
-            alertView.showReportProblem();
+//            alertView.showReportProblem();
           }
           isRerouting = isOffRoute;
         }
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java
index 7653ba792..1b61d9685 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java
@@ -6,6 +6,7 @@
 import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera;
 import org.maplibre.navigation.android.navigation.ui.v5.camera.OnTrackingModeChangedListener;
 import org.maplibre.navigation.android.navigation.ui.v5.camera.OnTrackingModeTransitionListener;
+import org.maplibre.navigation.core.models.ManeuverModifier;
 import org.maplibre.navigation.core.navigation.MapLibreNavigation;
 import org.maplibre.navigation.core.navigation.NavigationConstants;
 import org.maplibre.navigation.core.routeprogress.ProgressChangeListener;
@@ -14,115 +15,119 @@
 
 class MapFpsDelegate implements OnTrackingModeChangedListener, OnTrackingModeTransitionListener {
 
-  static final int DEFAULT_MAX_FPS_THRESHOLD = 20;
-  private static final double VALID_DURATION_IN_SECONDS_UNTIL_NEXT_MANEUVER = 7d;
-  private static final double VALID_DURATION_IN_SECONDS_SINCE_PREVIOUS_MANEUVER = 5d;
-  private static final int DEVICE_MAX_FPS = Integer.MAX_VALUE;
-  private static final int LOW_POWER_MAX_FPS = 30;
-
-  private final MapView mapView;
-  private final MapBatteryMonitor batteryMonitor;
-  private final ProgressChangeListener fpsProgressListener = new FpsDelegateProgressChangeListener(this);
-  private MapLibreNavigation navigation;
-  private int maxFpsThreshold = DEFAULT_MAX_FPS_THRESHOLD;
-  private boolean isTracking = true;
-  private boolean isEnabled = true;
-
-  MapFpsDelegate(MapView mapView, MapBatteryMonitor batteryMonitor) {
-    this.mapView = mapView;
-    this.batteryMonitor = batteryMonitor;
-  }
-
-  @Override
-  public void onTrackingModeChanged(int trackingMode) {
-    int trackingModeNone = NavigationCamera.NAVIGATION_TRACKING_MODE_NONE;
-    if (trackingMode == trackingModeNone) {
-      updateCameraTracking(trackingModeNone);
+    static final int DEFAULT_MAX_FPS_THRESHOLD = 20;
+    private static final double VALID_DURATION_IN_SECONDS_UNTIL_NEXT_MANEUVER = 7d;
+    private static final double VALID_DURATION_IN_SECONDS_SINCE_PREVIOUS_MANEUVER = 5d;
+    private static final int DEVICE_MAX_FPS = Integer.MAX_VALUE;
+    private static final int LOW_POWER_MAX_FPS = 30;
+
+    private final MapView mapView;
+    private final MapBatteryMonitor batteryMonitor;
+    private final ProgressChangeListener fpsProgressListener = new FpsDelegateProgressChangeListener(this);
+    private MapLibreNavigation navigation;
+    private int maxFpsThreshold = DEFAULT_MAX_FPS_THRESHOLD;
+    private boolean isTracking = true;
+    private boolean isEnabled = true;
+
+    MapFpsDelegate(MapView mapView, MapBatteryMonitor batteryMonitor) {
+        this.mapView = mapView;
+        this.batteryMonitor = batteryMonitor;
     }
-  }
-
-  @Override
-  public void onTransitionFinished(int trackingMode) {
-    updateCameraTracking(trackingMode);
-  }
-
-  @Override
-  public void onTransitionCancelled(int trackingMode) {
-    updateCameraTracking(trackingMode);
-  }
-
-  void addProgressChangeListener(MapLibreNavigation navigation) {
-    this.navigation = navigation;
-    navigation.addProgressChangeListener(fpsProgressListener);
-  }
-
-  void onStart() {
-    if (navigation != null) {
-      navigation.addProgressChangeListener(fpsProgressListener);
+
+    @Override
+    public void onTrackingModeChanged(int trackingMode) {
+        int trackingModeNone = NavigationCamera.NAVIGATION_TRACKING_MODE_NONE;
+        if (trackingMode == trackingModeNone) {
+            updateCameraTracking(trackingModeNone);
+        }
     }
-  }
 
-  void onStop() {
-    if (navigation != null) {
-      navigation.removeProgressChangeListener(fpsProgressListener);
+    @Override
+    public void onTransitionFinished(int trackingMode) {
+        updateCameraTracking(trackingMode);
     }
-  }
 
-  void updateEnabled(boolean isEnabled) {
-    this.isEnabled = isEnabled;
-    resetMaxFps(!isEnabled);
-  }
+    @Override
+    public void onTransitionCancelled(int trackingMode) {
+        updateCameraTracking(trackingMode);
+    }
 
-  void updateMaxFpsThreshold(int maxFps) {
-    this.maxFpsThreshold = maxFps;
-  }
+    void addProgressChangeListener(MapLibreNavigation navigation) {
+        this.navigation = navigation;
+        navigation.addProgressChangeListener(fpsProgressListener);
+    }
 
-  void adjustFpsFor(RouteProgress routeProgress) {
-    if (!isEnabled || !isTracking) {
-      return;
+    void onStart() {
+        if (navigation != null) {
+            navigation.addProgressChangeListener(fpsProgressListener);
+        }
     }
 
-    int maxFps = determineMaxFpsFrom(routeProgress, mapView.getContext());
-    mapView.setMaximumFps(maxFps);
-  }
+    void onStop() {
+        if (navigation != null) {
+            navigation.removeProgressChangeListener(fpsProgressListener);
+        }
+    }
 
-  private void updateCameraTracking(@NavigationCamera.TrackingMode int trackingMode) {
-    isTracking = trackingMode != NavigationCamera.NAVIGATION_TRACKING_MODE_NONE;
-    resetMaxFps(!isTracking);
-  }
+    void updateEnabled(boolean isEnabled) {
+        this.isEnabled = isEnabled;
+        resetMaxFps(!isEnabled);
+    }
 
-  private void resetMaxFps(boolean shouldReset) {
-    if (shouldReset) {
-      mapView.setMaximumFps(DEVICE_MAX_FPS);
+    void updateMaxFpsThreshold(int maxFps) {
+        this.maxFpsThreshold = maxFps;
     }
-  }
-
-  private int determineMaxFpsFrom(RouteProgress routeProgress, Context context) {
-    final boolean isPluggedIn = batteryMonitor.isPluggedIn(context);
-    RouteLegProgress routeLegProgress = routeProgress.getCurrentLegProgress();
-
-    if (isPluggedIn) {
-      return LOW_POWER_MAX_FPS;
-    } else if (validLowFpsManeuver(routeLegProgress) || validLowFpsDuration(routeLegProgress)) {
-      return maxFpsThreshold;
-    } else {
-      return LOW_POWER_MAX_FPS;
+
+    void adjustFpsFor(RouteProgress routeProgress) {
+        if (!isEnabled || !isTracking) {
+            return;
+        }
+
+        int maxFps = determineMaxFpsFrom(routeProgress, mapView.getContext());
+        mapView.setMaximumFps(maxFps);
+    }
+
+    private void updateCameraTracking(@NavigationCamera.TrackingMode int trackingMode) {
+        isTracking = trackingMode != NavigationCamera.NAVIGATION_TRACKING_MODE_NONE;
+        resetMaxFps(!isTracking);
+    }
+
+    private void resetMaxFps(boolean shouldReset) {
+        if (shouldReset) {
+            mapView.setMaximumFps(DEVICE_MAX_FPS);
+        }
+    }
+
+    private int determineMaxFpsFrom(RouteProgress routeProgress, Context context) {
+        final boolean isPluggedIn = batteryMonitor.isPluggedIn(context);
+        RouteLegProgress routeLegProgress = routeProgress.getCurrentLegProgress();
+
+        if (isPluggedIn) {
+            return LOW_POWER_MAX_FPS;
+        } else if (validLowFpsManeuver(routeLegProgress) || validLowFpsDuration(routeLegProgress)) {
+            return maxFpsThreshold;
+        } else {
+            return LOW_POWER_MAX_FPS;
+        }
+    }
+
+    private boolean validLowFpsManeuver(RouteLegProgress routeLegProgress) {
+        String maneuverModifier = null;
+        ManeuverModifier.Type type = routeLegProgress.getCurrentStep().getManeuver().getModifier();
+        if (type != null) {
+            maneuverModifier = type.getText();
+        }
+        return maneuverModifier != null
+                && (maneuverModifier.equals(NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT)
+                || maneuverModifier.equals(NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT)
+                || maneuverModifier.equals(NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT));
+    }
+
+    private boolean validLowFpsDuration(RouteLegProgress routeLegProgress) {
+        final double expectedStepDuration = routeLegProgress.getCurrentStep().getDuration();
+        final double durationUntilNextManeuver = routeLegProgress.getCurrentStepProgress().getDurationRemaining();
+        final double durationSincePreviousManeuver = expectedStepDuration - durationUntilNextManeuver;
+        return durationUntilNextManeuver > VALID_DURATION_IN_SECONDS_UNTIL_NEXT_MANEUVER
+                && durationSincePreviousManeuver > VALID_DURATION_IN_SECONDS_SINCE_PREVIOUS_MANEUVER;
     }
-  }
-
-  private boolean validLowFpsManeuver(RouteLegProgress routeLegProgress) {
-    final String maneuverModifier = routeLegProgress.getCurrentStep().getManeuver().getModifier().getText();
-    return maneuverModifier != null
-      && (maneuverModifier.equals(NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT)
-      || maneuverModifier.equals(NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT)
-      || maneuverModifier.equals(NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT));
-  }
-
-  private boolean validLowFpsDuration(RouteLegProgress routeLegProgress) {
-    final double expectedStepDuration = routeLegProgress.getCurrentStep().getDuration();
-    final double durationUntilNextManeuver = routeLegProgress.getCurrentStepProgress().getDurationRemaining();
-    final double durationSincePreviousManeuver = expectedStepDuration - durationUntilNextManeuver;
-    return durationUntilNextManeuver > VALID_DURATION_IN_SECONDS_UNTIL_NEXT_MANEUVER
-      && durationSincePreviousManeuver > VALID_DURATION_IN_SECONDS_SINCE_PREVIOUS_MANEUVER;
-  }
 }
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
index 89277139c..b889475be 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
@@ -4,7 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/instructionBackground"
-    android:background="#FFFFFF"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
@@ -34,7 +33,7 @@
             android:layout_height="wrap_content"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:textColor="#000000"
+            android:textColor="?attr/navigationViewBannerSecondaryText"
             android:textSize="24sp"
             android:textStyle="bold"
             android:layout_marginStart="16dp"
@@ -69,7 +68,7 @@
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:layout_marginStart="16dp"
-            android:textColor="#000000"
+            android:textColor="?attr/navigationViewBannerPrimaryText"
             android:textSize="16sp"
             tools:text="I-580 South"/>
 
@@ -82,6 +81,7 @@
             android:lineSpacingMultiplier="0.8"
             android:textSize="14sp"
             android:visibility="gone"
+            android:textColor="?attr/navigationViewBannerSecondaryText"
             android:textStyle="bold"
             tools:text="San Jose / Cupertino"/>
 

From 4e7722bf6c0e6badb50f080fa0afc150b05e4ffb Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Thu, 29 May 2025 12:30:14 +0200
Subject: [PATCH 29/46] fix instruction background

---
 .../src/main/res/layout/instruction_content_layout.xml          | 2 +-
 .../src/main/res/layout/instruction_layout.xml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
index b889475be..e609bede1 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
@@ -7,7 +7,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
-    tools:background="?navigationViewBannerBackground">
+    android:background="?attr/navigationViewBannerBackground">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/maneuver_layout"
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
index 5eedf03ea..35a8f4ded 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
@@ -21,7 +21,7 @@
         android:id="@+id/rerouteLayout"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="#ffffff"
+        android:background="?attr/navigationViewBannerBackground"
         android:elevation="4dp"
         android:gravity="center"
         android:orientation="vertical"

From cd95f3fe25c8d9f40bce3f726888e2f702755b52 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Thu, 29 May 2025 13:44:43 +0200
Subject: [PATCH 30/46] fix check night mode in AppCompatDelegate

---
 .../android/navigation/ui/v5/ThemeSwitcher.java          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
index 1288bba5d..b5474c8e5 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
@@ -8,6 +8,7 @@
 import android.graphics.drawable.Drawable;
 import android.preference.PreferenceManager;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
 import androidx.appcompat.content.res.AppCompatResources;
 import android.util.AttributeSet;
@@ -84,7 +85,7 @@ public static int retrieveNavigationViewStyle(Context context, int styleResId) {
    * @param attrs   holding custom styles if any are set
    */
   static void setTheme(Context context, AttributeSet attrs) {
-    boolean nightModeEnabled = isNightModeEnabled(context);
+    boolean nightModeEnabled = isNightModeEnabled();
 
     if (shouldSetThemeFromPreferences(context)) {
       int prefLightTheme = retrieveThemeResIdFromPreferences(context, NavigationConstants.NAVIGATION_VIEW_LIGHT_THEME);
@@ -111,10 +112,14 @@ static String retrieveMapStyle(Context context) {
     return mapStyleAttr.string.toString();
   }
 
+  private static boolean isNightModeEnabled() {
+    return AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES;
+  }
+
   /**
    * Returns true if the current UI_MODE_NIGHT is enabled, false otherwise.
    */
-  private static boolean isNightModeEnabled(Context context) {
+  private static boolean isDevicesNightModeEnabled(Context context) {
     int currentNightMode = retrieveCurrentUiMode(context);
     return currentNightMode == Configuration.UI_MODE_NIGHT_YES;
   }

From 40cdb26bd66e609bce8e670c2565e3466b64b3af Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Mon, 2 Jun 2025 12:23:29 +0200
Subject: [PATCH 31/46] dont use default location engine

---
 gradle/libs.versions.toml                                       | 2 +-
 .../android/navigation/ui/v5/map/NavigationMapLibreMap.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e289dd576..8017116c6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ kotlinx-coroutines = "1.10.1"
 kotlin-dokka = "2.0.0"
 nexus = "2.0.0"
 kermit = "2.0.5"
-maplibre = "11.8.1"
+maplibre = "11.9.0"
 maplibre-annotation = "3.0.1"
 maplibre-geojson = "7.0.0-pre0"
 play-services-location = "21.3.0"
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
index 329b60e23..bf124cbdc 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java
@@ -619,7 +619,7 @@ private void initializeLocationComponent(MapView mapView, MapLibreMap map) {
     LocationComponentOptions options = LocationComponentOptions.createFromAttributes(context, locationLayerStyleRes);
     LocationComponentActivationOptions activationOptions = LocationComponentActivationOptions.builder(context, style)
       .locationComponentOptions(options)
-//      .useDefaultLocationEngine(false)
+      .useDefaultLocationEngine(false)
       .build();
     locationComponent.activateLocationComponent(activationOptions);
     locationComponent.setLocationComponentEnabled(true);

From 175647dc3fb3f0b28ffb724e88b73ca5cff1fee8 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Tue, 3 Jun 2025 12:22:46 +0200
Subject: [PATCH 32/46] add pre navigation location engine

---
 .../navigation/ui/v5/NavigationRouteView.kt   | 40 +++++++++-----
 .../ui/v5/PreNavigationLocationEngine.kt      | 54 +++++++++++++++++++
 2 files changed, 80 insertions(+), 14 deletions(-)
 create mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/PreNavigationLocationEngine.kt

diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index 65fdcecc1..22d9a8504 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -62,6 +62,7 @@ class NavigationRouteView @JvmOverloads constructor(
     private var navigationViewEventDispatcher: NavigationViewEventDispatcher? = null
     private lateinit var navigationViewModel: NavigationViewModel
     private var navigationMap: NavigationMapLibreMap? = null
+    private var preNavigationLocationEngine: PreNavigationLocationEngine? = null
     private var onTrackingChangedListener: NavigationOnCameraTrackingChangedListener? = null
     private var mapInstanceState: NavigationMapLibreMapInstanceState? = null
     private var isMapInitialized = false
@@ -213,6 +214,7 @@ class NavigationRouteView @JvmOverloads constructor(
             initializeSymbolManager(mapView, mapLibreMap, style)
             initializeNavigationMap(mapView, mapLibreMap)
             initializeWayNameListener()
+            initializePreNavigationLocationEngine(mapLibreMap)
             onMapReadyCallback?.onMapReady(mapLibreMap)
             isMapInitialized = true
         }
@@ -243,22 +245,10 @@ class NavigationRouteView @JvmOverloads constructor(
                 Timber.d("Url: %s", (call.request() as Request).url.toString())
                 response.body()?.let { responseBody ->
                     if (responseBody.routes.isNotEmpty()) {
-                        val maplibreResponse =
-                            DirectionsResponse.fromJson(
-                                responseBody.toJson()
-                            );
-                        val route = maplibreResponse.routes.first()
-                        navigationMap?.drawRoutes(maplibreResponse.routes)
-
-                        val options = NavigationViewOptions.builder()
-                        options.directionsRoute(route)
-                        options.navigationOptions(
-                            MapLibreNavigationOptions.Builder().withSnapToRoute(true).build()
-                        )
-                        initializeNavigation(options.build())
+                        val maplibreResponse = DirectionsResponse.fromJson(responseBody.toJson())
+                        startNavigation(maplibreResponse.routes)
                     }
                 }
-
             }
 
             override fun onFailure(call: Call<DirectionsResponse>, throwable: Throwable) {
@@ -267,6 +257,19 @@ class NavigationRouteView @JvmOverloads constructor(
         })
     }
 
+    private fun startNavigation(routes: List<DirectionsRoute>) {
+        preNavigationLocationEngine?.stop()
+
+        val route = routes.first()
+        navigationMap?.drawRoutes(routes)
+        val options = NavigationViewOptions.builder()
+        options.directionsRoute(route)
+        options.navigationOptions(
+            MapLibreNavigationOptions.Builder().withSnapToRoute(true).build()
+        )
+        initializeNavigation(options.build())
+    }
+
     override fun resetCameraPosition() {
         navigationMap?.resetPadding()
         navigationMap?.resetCameraPositionWith(NavigationCamera.NAVIGATION_TRACKING_MODE_GPS)
@@ -387,6 +390,7 @@ class NavigationRouteView @JvmOverloads constructor(
      */
     @UiThread
     fun stopNavigation() {
+        preNavigationLocationEngine?.start()
         navigationPresenter.onNavigationStopped()
         navigationViewModel.stopNavigation()
     }
@@ -530,6 +534,13 @@ class NavigationRouteView @JvmOverloads constructor(
         navigationMap?.addOnWayNameChangedListener(wayNameListener)
     }
 
+    private fun initializePreNavigationLocationEngine(map: MapLibreMap) {
+        val locationEngine = navigationViewModel.retrieveNavigation()?.locationEngine ?: return
+        preNavigationLocationEngine = PreNavigationLocationEngine(locationEngine = locationEngine, locationComponent = map.locationComponent)
+        preNavigationLocationEngine?.start()
+    }
+
+
     private fun saveNavigationMapInstanceState(outState: Bundle) {
         navigationMap?.saveStateWith(MAP_INSTANCE_STATE_KEY, outState)
     }
@@ -673,6 +684,7 @@ class NavigationRouteView @JvmOverloads constructor(
     private fun shutdown() {
         navigationMap?.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
         navigationMap?.onDestroy()
+        preNavigationLocationEngine?.stop()
 
         navigationViewEventDispatcher?.onDestroy(navigationViewModel.retrieveNavigation())
         mapView.onDestroy()
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/PreNavigationLocationEngine.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/PreNavigationLocationEngine.kt
new file mode 100644
index 000000000..b34fa1e92
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/PreNavigationLocationEngine.kt
@@ -0,0 +1,54 @@
+package org.maplibre.navigation.android.navigation.ui.v5
+
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import org.maplibre.android.location.LocationComponent
+import org.maplibre.navigation.core.location.Location
+import org.maplibre.navigation.core.location.LocationValidator
+import org.maplibre.navigation.core.location.engine.LocationEngine
+import org.maplibre.navigation.core.location.toAndroidLocation
+import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions.Defaults
+import org.maplibre.navigation.core.navigation.engine.MapLibreNavigationEngine.Companion.LOCATION_ENGINE_INTERVAL
+
+class PreNavigationLocationEngine(
+    private val locationEngine: LocationEngine,
+    private val locationComponent: LocationComponent,
+    private val locationValidator: LocationValidator = LocationValidator(Defaults.LOCATION_ACCEPTABLE_ACCURACY_IN_METERS_THRESHOLD),//todo maybe provide accuracyThreshold through options
+    private val backgroundScope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    private val mainScope: CoroutineScope = CoroutineScope(Dispatchers.Main)
+) {
+
+    private var collectLocationJob: Job? = null
+
+    fun start() {
+        collectLocationJob?.cancel() // Cancel previous started run
+
+        collectLocationJob = backgroundScope.launch {
+            locationEngine.getLastLocation()?.let { processLocationUpdate(it) }
+
+            locationEngine.listenToLocation(
+                LocationEngine.Request(
+                    minIntervalMilliseconds = LOCATION_ENGINE_INTERVAL,
+                    maxIntervalMilliseconds = LOCATION_ENGINE_INTERVAL,
+                )
+            ).collect(::processLocationUpdate)
+        }
+    }
+
+    fun stop() {
+        collectLocationJob?.cancel()
+        collectLocationJob = null
+    }
+
+    private fun processLocationUpdate(rawLocation: Location) {
+        if (!locationValidator.isValidUpdate(rawLocation)) {
+            return
+        }
+        mainScope.launch {
+            locationComponent.forceLocationUpdate(rawLocation.toAndroidLocation())
+        }
+    }
+}

From 533a0be22e0ecbb2cc917f228699b26fa8925323 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 27 Jun 2025 13:54:05 +0200
Subject: [PATCH 33/46] fix instructionView paddings

---
 app/build.gradle.kts                          |  2 +-
 .../android/example/NavigationUIActivity.kt   | 12 ++++++--
 gradle/libs.versions.toml                     | 28 +++++++++----------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 libandroid-navigation-ui/build.gradle.kts     |  2 +-
 .../res/layout/instruction_content_layout.xml |  9 ++----
 .../main/res/layout/instruction_layout.xml    |  4 +--
 .../res/layout/instruction_view_layout.xml    |  4 +--
 .../res/layout/navigation_view_layout.xml     |  6 ++--
 9 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1717932b7..e5f4b3c75 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,7 +27,7 @@ android {
 
     defaultConfig {
         applicationId = "org.maplibre.navigation.android.example"
-        compileSdk = 34
+        compileSdk = 35
         minSdk = 21
 
         versionCode = 1
diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index 90296280e..bba423cfd 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -98,7 +98,16 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
 //                    .zoom(16.0)
 //                    .build()
 //            mapLibreMap?.animateCamera(CameraUpdateFactory.newCameraPosition(initialMapCameraPosition))
-            mapLibreMap?.locationComponent?.cameraMode = CameraMode.TRACKING_GPS
+            mapLibreMap?.locationComponent?.setCameraMode(
+                CameraMode.TRACKING_GPS,
+                100,
+                16.0,
+                null,
+                null,
+                null
+            )
+
+            mapLibreMap?.locationComponent?.renderMode = RenderMode.GPS
         }
 
 //        binding.mapView.apply {
@@ -130,7 +139,6 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
             if (isStarted) {
                 binding.navigationView.stopNavigation()
                 binding.navigationView.retrieveNavigationMapLibreMap()?.removeRoute()
-
                 isStarted = false
             } else {
                 isStarted = true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8017116c6..0bc8342a6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,30 +1,30 @@
 [versions]
-android-gradle-plugin = "8.6.1"
-kotlin = "2.1.0"
-kotlinx-serialization-json = "1.8.0"
-kotlinx-coroutines = "1.10.1"
+android-gradle-plugin = "8.11.0"
+kotlin = "2.2.0"
+kotlinx-serialization-json = "1.8.1"
+kotlinx-coroutines = "1.10.2"
 kotlin-dokka = "2.0.0"
 nexus = "2.0.0"
-kermit = "2.0.5"
-maplibre = "11.9.0"
-maplibre-annotation = "3.0.1"
+kermit = "2.0.6"
+maplibre = "11.11.0"
+maplibre-annotation = "3.0.2"
 maplibre-geojson = "7.0.0-pre0"
 play-services-location = "21.3.0"
-kotlin-test = "2.1.0"
-mockk = "1.13.13"
-robolectric = "4.14.1"
+kotlin-test = "2.1.20"
+mockk = "1.14.4"
+robolectric = "4.15.1"
 material = "1.12.0"
-androidx-recyclerview = "1.3.0"
+androidx-recyclerview = "1.4.0"
 androidx-constraintlayout = "2.2.1"
 androidx-cardview = "1.0.0"
-androidx-lifecycle-viewmodel = "2.8.7"
+androidx-lifecycle-viewmodel = "2.9.1"
 androidx-multidex = "2.0.1"
 picasso = "2.71828"
-json = "20240303"
+json = "20250517"
 timber = "5.0.1"
 autovalue = "1.11.0"
 mapbox-geojson = "5.8.0"
-mockito = "5.14.1"
+mockito = "5.18.0"
 junit = "4.13.2"
 leakcanary = "2.14"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 814d3950d..2849c02ab 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Aug 14 12:06:20 QYZT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libandroid-navigation-ui/build.gradle.kts b/libandroid-navigation-ui/build.gradle.kts
index 18ba5801a..d4238af5d 100644
--- a/libandroid-navigation-ui/build.gradle.kts
+++ b/libandroid-navigation-ui/build.gradle.kts
@@ -23,7 +23,7 @@ android {
     namespace = "org.maplibre.navigation.android.navigation.ui.v5"
 
     defaultConfig {
-        compileSdk = 34
+        compileSdk = 35
         minSdk = 21
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
index e609bede1..6061c11f6 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
@@ -4,9 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/instructionBackground"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="16dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="?attr/navigationViewBannerBackground">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -51,11 +50,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="12dp"
-        android:layout_marginRight="12dp"
         android:layout_marginBottom="12dp"
         android:orientation="vertical"
         app:layout_constraintTop_toBottomOf="@id/maneuver_layout"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintVertical_bias="0.0"
@@ -67,7 +64,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:includeFontPadding="false"
-            android:layout_marginStart="16dp"
+            android:layout_marginHorizontal="16dp"
             android:textColor="?attr/navigationViewBannerPrimaryText"
             android:textSize="16sp"
             tools:text="I-580 South"/>
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
index 35a8f4ded..56d1453f2 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
@@ -5,15 +5,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:paddingHorizontal="16dp"
     android:elevation="6dp"
     tools:showIn="@layout/instruction_view_layout">
 
     <include
         layout="@layout/instruction_content_layout"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
index 756182f0d..22ba66a04 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
@@ -2,14 +2,14 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/instructionViewLayout"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:keepScreenOn="true">
 
     <include
         android:id="@+id/instructionLayout"
         layout="@layout/instruction_layout"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 
     <include
diff --git a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
index 2441b366c..6789ba5ac 100644
--- a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
@@ -54,12 +54,12 @@
         android:id="@+id/instructionView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.2" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintVertical_bias="0.2"
+        />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From c95d3ecc67cd1d72b15bd45af05de5665705983e Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 27 Jun 2025 14:27:28 +0200
Subject: [PATCH 34/46] add mute configuration

---
 .../android/example/NavigationUIActivity.kt          |  3 ++-
 .../android/navigation/ui/v5/NavigationRouteView.kt  |  5 +++++
 .../navigation/ui/v5/NavigationViewModel.java        | 12 +++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index bba423cfd..97fa57b19 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -84,7 +84,6 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
                         .withIconImage("DRIVER_MARKER_ICON_ID")
                         .withIconAnchor(ICON_ANCHOR_CENTER)
 
-
                     binding.navigationView.addSymbol(symbolOptions)
                 }
             )
@@ -150,6 +149,8 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
                         destination = Point.fromLngLat(76.930137, 43.230361),
                     )
                 )
+                binding.navigationView.enableNavigatorSound(false)
+
             }
         }
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index 22d9a8504..e7821abdd 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -410,6 +410,11 @@ class NavigationRouteView @JvmOverloads constructor(
         }
     }
 
+
+    fun enableNavigatorSound(enabled: Boolean) {
+        navigationViewModel.isMuted = !enabled
+    }
+
     /**
      * Gives the ability to manipulate the map directly for anything that might not currently be
      * supported. This returns null until the view is initialized.
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
index 73bd57f8d..348b34338 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
@@ -62,6 +62,7 @@ public class NavigationViewModel {
     private LocationEngineConductor locationEngineConductor;
     private NavigationViewEventDispatcher navigationViewEventDispatcher;
     private SpeechPlayer speechPlayer;
+    private boolean isMuted = false;
     private int voiceInstructionsToAnnounce = 0;
     private RouteProgress routeProgress;
 
@@ -114,7 +115,10 @@ public void onDestroy(boolean isChangingConfigurations) {
     }
 
     public void setMuted(boolean isMuted) {
-        speechPlayer.setMuted(isMuted);
+        this.isMuted = isMuted;
+        if (speechPlayer != null) {
+            speechPlayer.setMuted(isMuted);
+        }
     }
 
 
@@ -243,7 +247,7 @@ private void initializeLanguage(NavigationUiOptions options) {
         RouteOptions routeOptions = options.directionsRoute().getRouteOptions();
         language = localeUtils.inferDeviceLanguage(context);
         if (routeOptions != null) {
-            language = routeOptions.getLanguage();
+            language = String.valueOf(routeOptions.getLanguage());
         }
     }
 
@@ -322,7 +326,9 @@ public void userOffRoute(Location location) {
 
     private MilestoneEventListener milestoneEventListener = (routeProgress, instruction, milestone) -> {
         NavigationViewModel.this.milestone = milestone;
-        playVoiceAnnouncement(milestone);
+        if (!isMuted) {
+            playVoiceAnnouncement(milestone);
+        }
         updateBannerInstruction(routeProgress, milestone);
         sendEventArrival(routeProgress, milestone);
     };

From 2301d83e93c1662ffa2de241260389bfb85d3f38 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 27 Jun 2025 15:13:43 +0200
Subject: [PATCH 35/46] downgrade the versions

---
 gradle/libs.versions.toml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0bc8342a6..6d4bd08d6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,30 +1,30 @@
 [versions]
-android-gradle-plugin = "8.11.0"
-kotlin = "2.2.0"
-kotlinx-serialization-json = "1.8.1"
-kotlinx-coroutines = "1.10.2"
+android-gradle-plugin = "8.6.1"
+kotlin = "2.1.0"
+kotlinx-serialization-json = "1.8.0"
+kotlinx-coroutines = "1.10.1"
 kotlin-dokka = "2.0.0"
 nexus = "2.0.0"
-kermit = "2.0.6"
+kermit = "2.0.5"
 maplibre = "11.11.0"
-maplibre-annotation = "3.0.2"
+maplibre-annotation = "3.0.1"
 maplibre-geojson = "7.0.0-pre0"
 play-services-location = "21.3.0"
-kotlin-test = "2.1.20"
-mockk = "1.14.4"
-robolectric = "4.15.1"
+kotlin-test = "2.1.0"
+mockk = "1.13.13"
+robolectric = "4.14.1"
 material = "1.12.0"
-androidx-recyclerview = "1.4.0"
+androidx-recyclerview = "1.3.0"
 androidx-constraintlayout = "2.2.1"
 androidx-cardview = "1.0.0"
-androidx-lifecycle-viewmodel = "2.9.1"
+androidx-lifecycle-viewmodel = "2.8.7"
 androidx-multidex = "2.0.1"
 picasso = "2.71828"
-json = "20250517"
+json = "20240303"
 timber = "5.0.1"
 autovalue = "1.11.0"
 mapbox-geojson = "5.8.0"
-mockito = "5.18.0"
+mockito = "5.14.1"
 junit = "4.13.2"
 leakcanary = "2.14"
 

From 9408f07f235729c686267dcadddc9eedd1aad49d Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Thu, 3 Jul 2025 12:29:25 +0200
Subject: [PATCH 36/46] update camera tilt, to optimize map performance

---
 .../android/example/NavigationUIActivity.kt   | 16 ++++++-------
 .../ui/v5/camera/DynamicCamera.java           | 24 +++++++++++--------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index 97fa57b19..42799f7ab 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -99,7 +99,7 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
 //            mapLibreMap?.animateCamera(CameraUpdateFactory.newCameraPosition(initialMapCameraPosition))
             mapLibreMap?.locationComponent?.setCameraMode(
                 CameraMode.TRACKING_GPS,
-                100,
+                750,
                 16.0,
                 null,
                 null,
@@ -122,15 +122,13 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
 
         binding.simulateRouteSwitch.setOnCheckedChangeListener { _, isChecked ->
 //            mapLibreMap?.locationComponent?.cameraMode = CameraMode.TRACKING
-            mapLibreMap?.locationComponent?.cameraMode = CameraMode.NONE
-            mapLibreMap?.locationComponent?.isLocationComponentEnabled = false
-            binding.navigationView.retrieveNavigationMapLibreMap()?.apply {
-                updateLocationVisibilityTo(isChecked)
-                resetCameraPositionWith(
-                    NavigationCamera.NAVIGATION_TRACKING_MODE_GPS
-                )
-            }
+            simulateRoute = isChecked
+            if (simulateRoute) {
 
+            } else {
+
+            }
+            mapLibreMap?.locationComponent?.setCameraMode(CameraMode.TRACKING_GPS, 100, 16.0, null, null, null)
         }
         binding.navigationView.showInstructionView()
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java
index 899bc9f3e..e487efcc9 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java
@@ -25,6 +25,7 @@ public class DynamicCamera extends SimpleCamera {
 
   private static final double MAX_CAMERA_TILT = 60d;
   private static final double MIN_CAMERA_TILT = 45d;
+  private static final double CAMERA_TILT_ZERO = 0d;
   private static final double MAX_CAMERA_ZOOM = 16d;
   private static final double MIN_CAMERA_ZOOM = 12d;
 
@@ -42,16 +43,19 @@ public DynamicCamera(@NonNull MapLibreMap mapLibreMap) {
 
   @Override
   public double tilt(RouteInformation routeInformation) {
-    if (isShutdown) {
-      return DEFAULT_TILT;
-    }
-
-    RouteProgress progress = routeInformation.getRouteProgress();
-    if (progress != null) {
-      double distanceRemaining = progress.getCurrentLegProgress().getCurrentStepProgress().getDistanceRemaining();
-      return createTilt(distanceRemaining);
-    }
-    return super.tilt(routeInformation);
+    // 0 tilt to optimize map performance
+    return CAMERA_TILT_ZERO;
+
+//    if (isShutdown) {
+//      return DEFAULT_TILT;
+//    }
+//
+//    RouteProgress progress = routeInformation.getRouteProgress();
+//    if (progress != null) {
+//      double distanceRemaining = progress.getCurrentLegProgress().getCurrentStepProgress().getDistanceRemaining();
+//      return createTilt(distanceRemaining);
+//    }
+//    return super.tilt(routeInformation);
   }
 
   @Override

From 4e588355d39eb46a254bfaaf393390ec872f2b09 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 11 Jul 2025 11:58:59 +0200
Subject: [PATCH 37/46] fix infinite rerouting, add RoutingService

---
 .../android/example/NavigationUIActivity.kt   | 17 +++++-----
 .../android/navigation/ui/v5/MapRouteData.kt  | 15 ---------
 .../navigation/ui/v5/NavigationRequest.kt     | 12 +++++++
 .../navigation/ui/v5/NavigationRouteView.kt   | 31 ++++++++++++-------
 .../navigation/ui/v5/RoutingService.kt        |  7 +++++
 .../core/offroute/OffRouteDetector.kt         |  6 ++--
 6 files changed, 50 insertions(+), 38 deletions(-)
 delete mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt
 create mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRequest.kt
 create mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RoutingService.kt

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index 42799f7ab..74b6c905f 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -16,11 +16,11 @@ import org.maplibre.android.plugins.annotation.SymbolOptions
 import org.maplibre.android.style.layers.Property.ICON_ANCHOR_CENTER
 import org.maplibre.geojson.Point
 import org.maplibre.navigation.android.example.databinding.ActivityNavigationUiBinding
-import org.maplibre.navigation.android.navigation.ui.v5.MapRouteData
+import org.maplibre.navigation.android.navigation.ui.v5.NavigationRequest
 import org.maplibre.navigation.android.navigation.ui.v5.NavigationLauncher
+import org.maplibre.navigation.android.navigation.ui.v5.RoutingService
 import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewOptions
 import org.maplibre.navigation.android.navigation.ui.v5.OnNavigationReadyCallback
-import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera
 import org.maplibre.navigation.android.navigation.ui.v5.listeners.NavigationListener
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute
@@ -32,6 +32,7 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import timber.log.Timber
+import java.util.Locale
 
 class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener,
     OnNavigationReadyCallback, NavigationListener {
@@ -131,7 +132,6 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
             mapLibreMap?.locationComponent?.setCameraMode(CameraMode.TRACKING_GPS, 100, 16.0, null, null, null)
         }
         binding.navigationView.showInstructionView()
-
         binding.startRouteButton.setOnClickListener {
             if (isStarted) {
                 binding.navigationView.stopNavigation()
@@ -140,11 +140,12 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
             } else {
                 isStarted = true
                 binding.navigationView.calculateRouteAndStartNavigation(
-                    MapRouteData(
-                        getString(R.string.mapbox_access_token),
-                        userLocation = Point.fromLngLat(76.930137, 43.230361),
-                        stops = points,
-                        destination = Point.fromLngLat(76.930137, 43.230361),
+                    NavigationRequest(
+                        origin = Point.fromLngLat(76.93312659859657, 43.2283288597314),
+//                        stops = points,
+                        destination = Point.fromLngLat(76.92803341895342,43.23938818876529,),
+                        routingService = RoutingService.Mapbox(getString(R.string.base_url), getString(R.string.mapbox_access_token)),
+                        language = Locale.getDefault()
                     )
                 )
                 binding.navigationView.enableNavigatorSound(false)
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt
deleted file mode 100644
index 72285590e..000000000
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapRouteData.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.maplibre.navigation.android.navigation.ui.v5
-
-import org.maplibre.geojson.Point
-
-data class MapRouteData(
-    val accessToken: String,
-    val userLocation: Point,
-    val stops: List<Point>?,
-    val destination: Point
-) {
-    companion object {
-        const val LIGHT_THEME = "light"
-        const val DARK_THEME = "dark"
-    }
-}
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRequest.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRequest.kt
new file mode 100644
index 000000000..19a23b36e
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRequest.kt
@@ -0,0 +1,12 @@
+package org.maplibre.navigation.android.navigation.ui.v5
+
+import org.maplibre.geojson.Point
+import java.util.Locale
+
+data class NavigationRequest(
+    val origin: Point,
+    val stops: List<Point>? = null,
+    val destination: Point,
+    val routingService: RoutingService,
+    val language: Locale
+)
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index e7821abdd..342d59fcb 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -44,7 +44,6 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import timber.log.Timber
-import java.util.Locale
 
 
 class NavigationRouteView @JvmOverloads constructor(
@@ -223,19 +222,22 @@ class NavigationRouteView @JvmOverloads constructor(
             ?: mapLibreMap.setStyle(ThemeSwitcher.retrieveMapStyle(context), onStyleLoaded)
     }
 
-    fun calculateRouteAndStartNavigation(mapRouteData: MapRouteData) {
+    fun calculateRouteAndStartNavigation(request: NavigationRequest) {
+        val navigationSource = request.routingService
         val navigationRouteBuilder = NavigationRoute.builder(context).apply {
-            this.accessToken(mapRouteData.accessToken)
-            this.origin(mapRouteData.userLocation)
-            this.destination(mapRouteData.destination)
-            mapRouteData.stops?.forEach { this.addWaypoint(it) }
+            this.origin(request.origin)
+            this.destination(request.destination)
+            request.stops?.forEach { this.addWaypoint(it) }
             this.voiceUnits(UnitType.METRIC)
-            this.language(Locale.forLanguageTag("ru"))
+            this.language(request.language)
             this.alternatives(true)
             // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
-//            this.user("gh")
-//            this.profile("car")
-            this.baseUrl(context.getString(R.string.base_url))
+            if (navigationSource is RoutingService.GraphHopper) {
+                this.user("gh")
+                this.profile("car")
+            }
+            this.accessToken(navigationSource.accessToken)
+            this.baseUrl(navigationSource.baseUrl)
         }
         navigationRouteBuilder.build().getRoute(object : Callback<DirectionsResponse> {
             override fun onResponse(
@@ -265,7 +267,9 @@ class NavigationRouteView @JvmOverloads constructor(
         val options = NavigationViewOptions.builder()
         options.directionsRoute(route)
         options.navigationOptions(
-            MapLibreNavigationOptions.Builder().withSnapToRoute(true).build()
+            MapLibreNavigationOptions.Builder()
+                .withSnapToRoute(true)
+                .build()
         )
         initializeNavigation(options.build())
     }
@@ -541,7 +545,10 @@ class NavigationRouteView @JvmOverloads constructor(
 
     private fun initializePreNavigationLocationEngine(map: MapLibreMap) {
         val locationEngine = navigationViewModel.retrieveNavigation()?.locationEngine ?: return
-        preNavigationLocationEngine = PreNavigationLocationEngine(locationEngine = locationEngine, locationComponent = map.locationComponent)
+        preNavigationLocationEngine = PreNavigationLocationEngine(
+            locationEngine = locationEngine,
+            locationComponent = map.locationComponent
+        )
         preNavigationLocationEngine?.start()
     }
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RoutingService.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RoutingService.kt
new file mode 100644
index 000000000..de68d6a1e
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RoutingService.kt
@@ -0,0 +1,7 @@
+package org.maplibre.navigation.android.navigation.ui.v5
+
+sealed class RoutingService(open val baseUrl: String, open val accessToken: String) {
+    class GraphHopper(override val baseUrl: String, override val accessToken: String) : RoutingService(baseUrl, accessToken)
+    class Mapbox(override val baseUrl: String, override val accessToken: String) : RoutingService(baseUrl, accessToken)
+    class Other(override val baseUrl: String, override val accessToken: String) : RoutingService(baseUrl, accessToken)
+}
\ No newline at end of file
diff --git a/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/offroute/OffRouteDetector.kt b/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/offroute/OffRouteDetector.kt
index 02ad0e363..6fa996f28 100644
--- a/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/offroute/OffRouteDetector.kt
+++ b/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/offroute/OffRouteDetector.kt
@@ -69,9 +69,9 @@ open class OffRouteDetector(
         routeProgress: RouteProgress,
         options: MapLibreNavigationOptions
     ): Boolean {
-        if (checkDistanceRemaining(routeProgress)) {
-            return true
-        }
+//        if (checkDistanceRemaining(routeProgress)) {
+//            return true
+//        }
 
         if (!validOffRoute(location, options)) {
             return false

From 121de6cabaa8e2ba72d47249c0bc1c6dad7b540c Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 11 Jul 2025 12:54:09 +0200
Subject: [PATCH 38/46] fix crash

---
 .../example/GraphHopperNavigationActivity.kt  | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/GraphHopperNavigationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/GraphHopperNavigationActivity.kt
index 7d9d8f310..210ec6fd7 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/GraphHopperNavigationActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/GraphHopperNavigationActivity.kt
@@ -60,9 +60,9 @@ class GraphHopperNavigationActivity :
 
         binding = ActivityNavigationUiBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.mapView.apply {
+        binding.navigationView.apply {
             onCreate(savedInstanceState)
-            getMapAsync(this@GraphHopperNavigationActivity)
+//            getMapAsync(this@GraphHopperNavigationActivity)
         }
 
         binding.startRouteButton.setOnClickListener {
@@ -86,18 +86,18 @@ class GraphHopperNavigationActivity :
             simulateRoute = checked
         }
 
-        binding.clearPoints.setOnClickListener {
-            if (::mapLibreMap.isInitialized) {
-                mapLibreMap.markers.forEach {
-                    mapLibreMap.removeMarker(it)
-                }
-            }
-            destination = null
-            it.visibility = View.GONE
-            binding.startRouteLayout.visibility = View.GONE
-
-            navigationMapRoute?.removeRoute()
-        }
+//        binding.clearPoints.setOnClickListener {
+//            if (::mapLibreMap.isInitialized) {
+//                mapLibreMap.markers.forEach {
+//                    mapLibreMap.removeMarker(it)
+//                }
+//            }
+//            destination = null
+//            it.visibility = View.GONE
+//            binding.startRouteLayout.visibility = View.GONE
+//
+//            navigationMapRoute?.removeRoute()
+//        }
     }
 
     override fun onMapReady(mapLibreMap: MapLibreMap) {
@@ -106,7 +106,7 @@ class GraphHopperNavigationActivity :
             Style.Builder().fromUri(getString(R.string.map_style_light))
         ) { style ->
             enableLocationComponent(style)
-            navigationMapRoute = NavigationMapRoute(binding.mapView, mapLibreMap)
+//            navigationMapRoute = NavigationMapRoute(binding.mapView, mapLibreMap)
             mapLibreMap.addOnMapClickListener(this)
 
             Snackbar.make(
@@ -143,7 +143,7 @@ class GraphHopperNavigationActivity :
         destination = Point(point.longitude, point.latitude)
 
         mapLibreMap.addMarker(MarkerOptions().position(point))
-        binding.clearPoints.visibility = View.VISIBLE
+//        binding.clearPoints.visibility = View.VISIBLE
         calculateRoute()
         return true
     }
@@ -187,7 +187,7 @@ class GraphHopperNavigationActivity :
         // Create request object. Requires graphhopper_url to be set in developer-config.xml
         val request = Request.Builder()
             .header("User-Agent", "MapLibre Android Navigation SDK Demo App")
-            .url(getString(R.string.graphhopper_url))
+//            .url(getString(R.string.graphhopper_url))
             .post(requestBodyJson.toRequestBody("application/json; charset=utf-8".toMediaType()))
             .build()
 
@@ -246,27 +246,27 @@ class GraphHopperNavigationActivity :
 
     override fun onResume() {
         super.onResume()
-        binding.mapView.onResume()
+//        binding.mapView.onResume()
     }
 
     override fun onPause() {
         super.onPause()
-        binding.mapView.onPause()
+//        binding.mapView.onPause()
     }
 
     override fun onStart() {
         super.onStart()
-        binding.mapView.onStart()
+//        binding.mapView.onStart()
     }
 
     override fun onStop() {
         super.onStop()
-        binding.mapView.onStop()
+//        binding.mapView.onStop()
     }
 
     override fun onLowMemory() {
         super.onLowMemory()
-        binding.mapView.onLowMemory()
+//        binding.mapView.onLowMemory()
     }
 
     override fun onDestroy() {
@@ -274,11 +274,11 @@ class GraphHopperNavigationActivity :
         if (::mapLibreMap.isInitialized) {
             mapLibreMap.removeOnMapClickListener(this)
         }
-        binding.mapView.onDestroy()
+//        binding.mapView.onDestroy()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        binding.mapView.onSaveInstanceState(outState)
+//        binding.mapView.onSaveInstanceState(outState)
     }
 }

From 3525e4a8b299bebe89111933745412afd9b93c2d Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 11 Jul 2025 13:16:26 +0200
Subject: [PATCH 39/46] try fix publication

---
 gradle/publish-android.gradle | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/gradle/publish-android.gradle b/gradle/publish-android.gradle
index 8c5fece6e..88ee54874 100644
--- a/gradle/publish-android.gradle
+++ b/gradle/publish-android.gradle
@@ -42,15 +42,10 @@ afterEvaluate {
 
                 artifactId "${artifactId.replace("libandroid-", "")}-android"
 
-                afterEvaluate {
-                    artifact(bundleReleaseAar) {
-                        builtBy bundleReleaseAar
-                    }
+                artifact(bundleReleaseAar) {
+                    builtBy bundleReleaseAar
                 }
 
-                artifact tasks.androidJavadocsJar
-                artifact tasks.androidSourcesJar
-
                 pom {
                     name = project.ext.navigationArtifactTitle
                     description = project.ext.navigationArtifactTitle

From 62f7b983b5a1352ceef2ff420eb33d41de8ac5b6 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 11 Jul 2025 13:28:15 +0200
Subject: [PATCH 40/46] try fix publication

---
 gradle/publish-android.gradle | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gradle/publish-android.gradle b/gradle/publish-android.gradle
index 88ee54874..8b66fd9c7 100644
--- a/gradle/publish-android.gradle
+++ b/gradle/publish-android.gradle
@@ -42,9 +42,12 @@ afterEvaluate {
 
                 artifactId "${artifactId.replace("libandroid-", "")}-android"
 
-                artifact(bundleReleaseAar) {
-                    builtBy bundleReleaseAar
-                }
+//                artifact(bundleReleaseAar) {
+//                    builtBy bundleReleaseAar
+//                }
+//
+//                artifact tasks.androidJavadocsJar
+//                artifact tasks.androidSourcesJar
 
                 pom {
                     name = project.ext.navigationArtifactTitle

From 4f23099d978658f1021d913c5ddc61ddca51621e Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 11 Jul 2025 13:41:01 +0200
Subject: [PATCH 41/46] try fix publication

---
 gradle/publish-android.gradle | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/gradle/publish-android.gradle b/gradle/publish-android.gradle
index 8b66fd9c7..6cf6cd087 100644
--- a/gradle/publish-android.gradle
+++ b/gradle/publish-android.gradle
@@ -35,19 +35,17 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
-                from components.release
-
                 groupId project.ext.navigationArtifactGroupId
                 version project.ext.versionName
 
                 artifactId "${artifactId.replace("libandroid-", "")}-android"
 
-//                artifact(bundleReleaseAar) {
-//                    builtBy bundleReleaseAar
-//                }
-//
-//                artifact tasks.androidJavadocsJar
-//                artifact tasks.androidSourcesJar
+                artifact(bundleReleaseAar) {
+                    builtBy bundleReleaseAar
+                }
+
+                artifact tasks.androidJavadocsJar
+                artifact tasks.androidSourcesJar
 
                 pom {
                     name = project.ext.navigationArtifactTitle

From 584775816d29cea13bbf9656554550afd49bbdef Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Fri, 11 Jul 2025 16:25:59 +0200
Subject: [PATCH 42/46] expose navigation options

---
 .../android/example/NavigationUIActivity.kt      |  2 +-
 .../navigation/ui/v5/NavigationRequest.kt        |  4 +++-
 .../navigation/ui/v5/NavigationRouteView.kt      | 16 +++++++---------
 .../navigation/ui/v5/NavigationViewModel.java    |  1 +
 .../core/navigation/MapLibreNavigation.kt        |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index 74b6c905f..ff4f72280 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -142,7 +142,7 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
                 binding.navigationView.calculateRouteAndStartNavigation(
                     NavigationRequest(
                         origin = Point.fromLngLat(76.93312659859657, 43.2283288597314),
-//                        stops = points,
+                        stops = points,
                         destination = Point.fromLngLat(76.92803341895342,43.23938818876529,),
                         routingService = RoutingService.Mapbox(getString(R.string.base_url), getString(R.string.mapbox_access_token)),
                         language = Locale.getDefault()
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRequest.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRequest.kt
index 19a23b36e..9ca0c2f11 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRequest.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRequest.kt
@@ -1,6 +1,7 @@
 package org.maplibre.navigation.android.navigation.ui.v5
 
 import org.maplibre.geojson.Point
+import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions
 import java.util.Locale
 
 data class NavigationRequest(
@@ -8,5 +9,6 @@ data class NavigationRequest(
     val stops: List<Point>? = null,
     val destination: Point,
     val routingService: RoutingService,
-    val language: Locale
+    val language: Locale,
+    val navigationOptions: MapLibreNavigationOptions = MapLibreNavigationOptions()
 )
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index 342d59fcb..4e2cacec9 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -244,11 +244,11 @@ class NavigationRouteView @JvmOverloads constructor(
                 call: Call<DirectionsResponse>,
                 response: Response<DirectionsResponse>,
             ) {
-                Timber.d("Url: %s", (call.request() as Request).url.toString())
+                Timber.d("Response: $response")
                 response.body()?.let { responseBody ->
                     if (responseBody.routes.isNotEmpty()) {
                         val maplibreResponse = DirectionsResponse.fromJson(responseBody.toJson())
-                        startNavigation(maplibreResponse.routes)
+                        startNavigation(maplibreResponse.routes, request.navigationOptions)
                     }
                 }
             }
@@ -259,18 +259,16 @@ class NavigationRouteView @JvmOverloads constructor(
         })
     }
 
-    private fun startNavigation(routes: List<DirectionsRoute>) {
+    private fun startNavigation(
+        routes: List<DirectionsRoute>,
+        navigationOptions: MapLibreNavigationOptions
+    ) {
         preNavigationLocationEngine?.stop()
-
         val route = routes.first()
         navigationMap?.drawRoutes(routes)
         val options = NavigationViewOptions.builder()
         options.directionsRoute(route)
-        options.navigationOptions(
-            MapLibreNavigationOptions.Builder()
-                .withSnapToRoute(true)
-                .build()
-        )
+        options.navigationOptions(navigationOptions)
         initializeNavigation(options.build())
     }
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
index 348b34338..0351e494a 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
@@ -155,6 +155,7 @@ void initialize(NavigationViewOptions options) {
         initializeLanguage(options);
         initializeTimeFormat(navigationOptions);
         initializeDistanceFormatter(options);
+        navigation.setOptions(navigationOptions);
         if (!isRunning()) {
             addNavigationListeners();
             addMilestones(options);
diff --git a/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/navigation/MapLibreNavigation.kt b/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/navigation/MapLibreNavigation.kt
index eea61dd94..6bc190504 100644
--- a/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/navigation/MapLibreNavigation.kt
+++ b/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/navigation/MapLibreNavigation.kt
@@ -58,7 +58,7 @@ import kotlin.jvm.JvmOverloads
  * @see MapLibreNavigationOptions
  */
 open class MapLibreNavigation @JvmOverloads constructor(
-    val options: MapLibreNavigationOptions = MapLibreNavigationOptions(),
+    var options: MapLibreNavigationOptions = MapLibreNavigationOptions(),
     /**
      * Navigation needs an instance of location engine in order to acquire user location information
      * and handle events based off of the current information. By default, a LOST location engine is

From 525cd2d2de9c30769d526d15e0772a9438e0e9b0 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Tue, 22 Jul 2025 14:33:45 +0200
Subject: [PATCH 43/46] fix cancel route request on stopNavigation, fix
 textToSpeech leak

---
 .../navigation/android/example/NavigationUIActivity.kt       | 3 +--
 .../android/navigation/ui/v5/NavigationRouteView.kt          | 5 ++++-
 .../android/navigation/ui/v5/NavigationViewModel.java        | 5 ++---
 .../android/navigation/ui/v5/route/NavigationRoute.java      | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index ff4f72280..8e0526139 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -120,7 +120,6 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
         points.add(Point.fromLngLat(76.933810, 43.230633))
         points.add(Point.fromLngLat(76.920187, 43.236783))
 //        points.add(Pair(76.930137, 43.230361))
-
         binding.simulateRouteSwitch.setOnCheckedChangeListener { _, isChecked ->
 //            mapLibreMap?.locationComponent?.cameraMode = CameraMode.TRACKING
             simulateRoute = isChecked
@@ -310,7 +309,7 @@ class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener
 //        if (::mapboxMap.isInitialized) {
 //            mapboxMap.removeOnMapClickListener(this)
 //        }
-//        binding.navigationView.onDestroy()
+        binding.navigationView.onDestroy()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
index 4e2cacec9..28fe35ee7 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -62,6 +62,7 @@ class NavigationRouteView @JvmOverloads constructor(
     private lateinit var navigationViewModel: NavigationViewModel
     private var navigationMap: NavigationMapLibreMap? = null
     private var preNavigationLocationEngine: PreNavigationLocationEngine? = null
+    private var navigationRoute: NavigationRoute? = null
     private var onTrackingChangedListener: NavigationOnCameraTrackingChangedListener? = null
     private var mapInstanceState: NavigationMapLibreMapInstanceState? = null
     private var isMapInitialized = false
@@ -239,7 +240,8 @@ class NavigationRouteView @JvmOverloads constructor(
             this.accessToken(navigationSource.accessToken)
             this.baseUrl(navigationSource.baseUrl)
         }
-        navigationRouteBuilder.build().getRoute(object : Callback<DirectionsResponse> {
+        navigationRoute = navigationRouteBuilder.build()
+        navigationRoute?.getRoute(object : Callback<DirectionsResponse> {
             override fun onResponse(
                 call: Call<DirectionsResponse>,
                 response: Response<DirectionsResponse>,
@@ -393,6 +395,7 @@ class NavigationRouteView @JvmOverloads constructor(
     @UiThread
     fun stopNavigation() {
         preNavigationLocationEngine?.start()
+        navigationRoute?.cancelCall()
         navigationPresenter.onNavigationStopped()
         navigationViewModel.stopNavigation()
     }
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
index 0351e494a..f09f41de9 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
@@ -176,9 +176,8 @@ boolean isMuted() {
     }
 
     void stopNavigation() {
-        navigation.removeProgressChangeListener(null);
-        navigation.removeMilestoneEventListener(null);
-        navigation.stopNavigation();
+        navigation.onDestroy();
+        deactivateInstructionPlayer();
     }
 
     boolean isOffRoute() {
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java
index b57619944..c9e412a06 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java
@@ -158,7 +158,7 @@ public Call<DirectionsResponse> getCall() {
     }
 
     public void cancelCall() {
-        getCall().cancel();
+        mapboxDirections.cancelCall();
     }
 
     /**

From 0b416345dfb731f6a2ff75035d1b8197d9bbf167 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Wed, 23 Jul 2025 11:48:09 +0200
Subject: [PATCH 44/46] fix min zoom

---
 .../android/navigation/ui/v5/camera/DynamicCamera.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java
index e487efcc9..950a33e94 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java
@@ -27,7 +27,7 @@ public class DynamicCamera extends SimpleCamera {
   private static final double MIN_CAMERA_TILT = 45d;
   private static final double CAMERA_TILT_ZERO = 0d;
   private static final double MAX_CAMERA_ZOOM = 16d;
-  private static final double MIN_CAMERA_ZOOM = 12d;
+  private static final double MIN_CAMERA_ZOOM = 14.5d;
 
   private MapLibreMap mapLibreMap;
   private LegStep currentStep;

From 54f14c42d27cc96cb55b6098e8694e97983912ad Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Tue, 23 Sep 2025 10:54:26 +0200
Subject: [PATCH 45/46] update versions

---
 gradle/libs.versions.toml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ade96cb54..98b02103c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,30 +1,30 @@
 [versions]
-android-gradle-plugin = "8.6.1"
-kotlin = "2.1.0"
-kotlinx-serialization-json = "1.8.0"
-kotlinx-coroutines = "1.10.1"
+android-gradle-plugin = "8.13.0"
+kotlin = "2.2.20"
+kotlinx-serialization-json = "1.9.0"
+kotlinx-coroutines = "1.10.2"
 kotlin-dokka = "2.0.0"
 nexus = "2.0.0"
-kermit = "2.0.5"
-maplibre = "11.12.1"
-maplibre-annotation = "3.0.1"
+kermit = "2.0.8"
+maplibre = "11.13.5"
+maplibre-annotation = "3.0.2"
 maplibre-geojson = "7.0.0-pre0"
 play-services-location = "21.3.0"
-kotlin-test = "2.1.0"
-mockk = "1.13.13"
-robolectric = "4.14.1"
-material = "1.12.0"
-androidx-recyclerview = "1.3.0"
+kotlin-test = "2.1.21"
+mockk = "1.14.5"
+robolectric = "4.16"
+material = "1.13.0"
+androidx-recyclerview = "1.4.0"
 androidx-constraintlayout = "2.2.1"
 androidx-cardview = "1.0.0"
-androidx-lifecycle-viewmodel = "2.8.7"
+androidx-lifecycle-viewmodel = "2.9.4"
 androidx-multidex = "2.0.1"
 picasso = "2.71828"
-json = "20240303"
+json = "20250517"
 timber = "5.0.1"
 autovalue = "1.11.0"
 mapbox-geojson = "5.8.0"
-mockito = "5.14.1"
+mockito = "5.20.0"
 junit = "4.13.2"
 leakcanary = "2.14"
 

From 340b269155f9ebfa558d81c8a396226b21afc7a9 Mon Sep 17 00:00:00 2001
From: takhirbro <takhir.004@gmail.com>
Date: Tue, 14 Oct 2025 12:01:32 +0200
Subject: [PATCH 46/46] update versions

---
 app/build.gradle.kts                      | 2 +-
 gradle/libs.versions.toml                 | 4 ++--
 libandroid-navigation-ui/build.gradle.kts | 2 +-
 maplibre-navigation-core/build.gradle.kts | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e5f4b3c75..0d8a94c2a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,7 +28,7 @@ android {
     defaultConfig {
         applicationId = "org.maplibre.navigation.android.example"
         compileSdk = 35
-        minSdk = 21
+        minSdk = 23
 
         versionCode = 1
         versionName = project.properties.get("versionName") as String? ?: "0.0.0"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index eb6ca2afc..afdfb400b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,11 +6,11 @@ kotlinx-coroutines = "1.10.2"
 kotlin-dokka = "2.0.0"
 nexus = "2.0.0"
 kermit = "2.0.8"
-maplibre = "11.13.5"
+maplibre = "12.0.0"
 maplibre-annotation = "3.0.2"
 maplibre-geojson = "7.0.0-pre0"
 play-services-location = "21.3.0"
-mockk = "1.14.5"
+mockk = "1.14.6"
 robolectric = "4.16"
 material = "1.13.0"
 androidx-recyclerview = "1.4.0"
diff --git a/libandroid-navigation-ui/build.gradle.kts b/libandroid-navigation-ui/build.gradle.kts
index d4238af5d..94218f207 100644
--- a/libandroid-navigation-ui/build.gradle.kts
+++ b/libandroid-navigation-ui/build.gradle.kts
@@ -24,7 +24,7 @@ android {
 
     defaultConfig {
         compileSdk = 35
-        minSdk = 21
+        minSdk = 23
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/maplibre-navigation-core/build.gradle.kts b/maplibre-navigation-core/build.gradle.kts
index 17bf66911..28914e483 100644
--- a/maplibre-navigation-core/build.gradle.kts
+++ b/maplibre-navigation-core/build.gradle.kts
@@ -86,7 +86,7 @@ android {
 
     defaultConfig {
         compileSdk = 35
-        minSdk = 21
+        minSdk = 23
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"