refactor rename map view id included in navigation view from mapView …

…to navigationMapView to avoid clashes when including navigation view and map view in the same layout (#1087)
mapbox · Jul 5, 2018 · d09ec1f · d09ec1f
1 parent 468a931
commit d09ec1f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...in/java/com/mapbox/services/android/navigation/ui/v5/NavigationSnapshotReadyCallback.java b/...in/java/com/mapbox/services/android/navigation/ui/v5/NavigationSnapshotReadyCallback.java
@@ -35,7 +35,7 @@ private ImageView updateScreenshotViewWithSnapshot(Bitmap snapshot) {
   }
 
   private void updateFeedbackScreenshot() {
-    MapView mapView = navigationView.findViewById(R.id.mapView);
+    MapView mapView = navigationView.findViewById(R.id.navigationMapView);
     mapView.setVisibility(View.INVISIBLE);
     Bitmap capture = ViewUtils.captureView(mapView);
     String encoded = ViewUtils.encodeView(capture);
@@ -44,7 +44,7 @@ private void updateFeedbackScreenshot() {
 
   private void resetViewVisibility(ImageView screenshotView) {
     screenshotView.setVisibility(View.INVISIBLE);
-    MapView mapView = navigationView.findViewById(R.id.mapView);
+    MapView mapView = navigationView.findViewById(R.id.navigationMapView);
     mapView.setVisibility(View.VISIBLE);
   }
 }
diff --git a/...igation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java b/...igation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java
@@ -400,7 +400,7 @@ private void initializeView() {
   }
 
   private void bind() {
-    mapView = findViewById(R.id.mapView);
+    mapView = findViewById(R.id.navigationMapView);
     instructionView = findViewById(R.id.instructionView);
     summaryBottomSheet = findViewById(R.id.summaryBottomSheet);
     cancelBtn = findViewById(R.id.cancelBtn);

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
@@ -8,7 +8,7 @@
     android:orientation="vertical">
 
     <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@+id/mapView"
+        android:id="@+id/navigationMapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:mapbox_uiAttribution="false"

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
@@ -8,7 +8,7 @@
     android:orientation="vertical">
 
     <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@+id/mapView"
+        android:id="@+id/navigationMapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:mapbox_uiAttribution="false"