Revert "Merge branch 'ak-#5302-use-shields-in-maneuvers' into ak-#1336-#1337-refactor-exit"

This reverts commit c1a271e, reversing
changes made to 29618e2.

Author: abhishek1508

examples/src/main/AndroidManifest.xml

@@ -96,14 +96,10 @@
     </activity>
 
     <activity
-        android:name=".MapboxNavigationViewActivity"
-        android:label="@string/title_navigation_view">
+        android:name=".MapboxDropInActivity"
+        android:label="@string/title_drop_in">
     </activity>
 
-    <activity
-        android:name=".MapboxNavigationViewFragmentActivity"
-        android:label="@string/title_navigation_view"/>
-
     <activity
         android:name="com.mapbox.navigation.examples.MainActivity"
         android:exported="true">

examples/src/main/java/com/mapbox/navigation/examples/MainActivity.kt

@@ -13,12 +13,11 @@ import com.mapbox.android.core.permissions.PermissionsListener
 import com.mapbox.navigation.examples.core.IndependentRouteGenerationActivity
 import com.mapbox.navigation.examples.core.MapboxBuildingHighlightActivity
 import com.mapbox.navigation.examples.core.MapboxCustomStyleActivity
+import com.mapbox.navigation.examples.core.MapboxDropInActivity
 import com.mapbox.navigation.examples.core.MapboxJunctionActivity
 import com.mapbox.navigation.examples.core.MapboxManeuverActivity
 import com.mapbox.navigation.examples.core.MapboxMultipleArrowActivity
 import com.mapbox.navigation.examples.core.MapboxNavigationActivity
-import com.mapbox.navigation.examples.core.MapboxNavigationViewActivity
-import com.mapbox.navigation.examples.core.MapboxNavigationViewFragmentActivity
 import com.mapbox.navigation.examples.core.MapboxRouteLineAndArrowActivity
 import com.mapbox.navigation.examples.core.MapboxSignboardActivity
 import com.mapbox.navigation.examples.core.MapboxTripProgressActivity
@@ -142,15 +141,10 @@ class MainActivity : AppCompatActivity(), PermissionsListener {
                 RouteDrawingActivity::class.java
             ),
             SampleItem(
-                getString(R.string.title_navigation_view),
-                getString(R.string.description_navigation_view),
-                MapboxNavigationViewActivity::class.java
-            ),
-            SampleItem(
-                getString(R.string.title_navigation_view_fragment),
-                getString(R.string.description_navigation_view_fragment),
-                MapboxNavigationViewFragmentActivity::class.java
-            ),
+                getString(R.string.title_drop_in),
+                getString(R.string.description_drop_in),
+                MapboxDropInActivity::class.java
+            )
         )
     }
 

examples/src/main/java/com/mapbox/navigation/examples/core/MapboxNavigationViewActivity.kt renamed to examples/src/main/java/com/mapbox/navigation/examples/core/MapboxDropInActivity.kt

@@ -5,18 +5,18 @@ import androidx.appcompat.app.AppCompatActivity
 import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
 import com.mapbox.navigation.dropin.MapboxNavigationViewApi
 import com.mapbox.navigation.dropin.ViewProvider
-import com.mapbox.navigation.examples.core.databinding.LayoutActivityNavigationViewBinding
+import com.mapbox.navigation.examples.core.databinding.LayoutActivityDropInBinding
 
-class MapboxNavigationViewActivity : AppCompatActivity() {
+class MapboxDropInActivity : AppCompatActivity() {
 
     private lateinit var mapboxNavigationViewApi: MapboxNavigationViewApi
 
-    private lateinit var binding: LayoutActivityNavigationViewBinding
+    private lateinit var binding: LayoutActivityDropInBinding
 
     @OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = LayoutActivityNavigationViewBinding.inflate(layoutInflater)
+        binding = LayoutActivityDropInBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
         mapboxNavigationViewApi = binding.navigationView.navigationViewApi

examples/src/main/java/com/mapbox/navigation/examples/core/MapboxNavigationViewFragmentActivity.kt

@@ -36,11 +36,8 @@
     <string name="title_building_highlight" translatable="false">BuildingHighlight Example</string>
     <string name="description_building_highlight" translatable="false">Demonstrates how to highlight and extrude buildings on arrival.</string>
 
-    <string name="title_navigation_view" translatable="false">Navigation View test</string>
-    <string name="description_navigation_view" translatable="false">Utility for testing Drop-In UI.</string>
-
-    <string name="title_navigation_view_fragment" translatable="false">Navigation View in a Fragment test</string>
-    <string name="description_navigation_view_fragment" translatable="false">Utility for testing Drop-In UI in a fragment.</string>
+    <string name="title_drop_in" translatable="false">Drop In Example</string>
+    <string name="description_drop_in" translatable="false">Utility for demonstrating drop in ui.</string>
 
     <string name="label_start_navigation" translatable="false">Start Navigation</string>
     <string name="play_history" translatable="false">Play history</string>

examples/src/main/java/com/mapbox/navigation/examples/core/NavigationViewFragment.kt

@@ -28,7 +28,6 @@ ext {
       mapboxBaseAndroid         : '0.5.0',
       androidXLifecycle         : '2.4.0',
       androidXCoreVersion       : '1.6.0',
-      androidXArchCoreVersion   : '2.1.0',
       androidXAppCompatVersion  : '1.3.1',
       androidXPreferenceVersion : '1.1.0',
       androidXAnnotationVersion : '1.2.0',
@@ -116,13 +115,11 @@ ext {
       androidXPreference        : "androidx.preference:preference-ktx:${version.androidXPreferenceVersion}",
       androidStartup            : "androidx.startup:startup-runtime:${version.androidStartup}",
       androidXFragment          : "androidx.fragment:fragment-ktx:${version.androidXFragmentVersion}",
-      androidXArchCoreTesting   : "androidx.arch.core:core-testing:${version.androidXArchCoreVersion}",
 
       // lifecycle
       androidXLifecycleRuntime  : "androidx.lifecycle:lifecycle-runtime-ktx:${version.androidXLifecycle}",
       androidXLifecycleLivedata : "androidx.lifecycle:lifecycle-livedata-ktx:${version.androidXLifecycle}",
       androidXLifecycleViewmodel: "androidx.lifecycle:lifecycle-viewmodel-ktx:${version.androidXLifecycle}",
-      androidXLifecycleTesting  : "androidx.lifecycle:lifecycle-runtime-testing:${version.androidXLifecycle}",
 
       // square crew
       leakCanaryDebug           : "com.squareup.leakcanary:leakcanary-android:${version.leakCanaryVersion}",