NavigationView do not allow way name to show in overview mode

mapbox · Jan 15, 2019 · a37df85 · a37df85
1 parent c4a30f2
commit a37df85
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/...on-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenter.java b/...on-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenter.java
@@ -69,7 +69,7 @@ void onNavigationLocationUpdate(Location location) {
   }
 
   void onWayNameChanged(@NonNull String wayName) {
-    if (TextUtils.isEmpty(wayName)) {
+    if (TextUtils.isEmpty(wayName) || view.isSummaryBottomSheetHidden()) {
       view.updateWayNameVisibility(false);
       return;
     }
@@ -86,4 +86,4 @@ void onRouteOverviewClick() {
     view.updateCameraRouteOverview();
     view.showRecenterBtn();
   }
-}
+}
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
@@ -329,6 +329,9 @@ public void updateWayNameView(@NonNull String wayName) {
   @Override
   public void updateWayNameVisibility(boolean isVisible) {
     wayNameView.updateVisibility(isVisible);
+    if (navigationMap != null) {
+      navigationMap.updateWaynameQueryMap(isVisible);
+    }
   }
 
   @Override

diff --git a/...i/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenterTest.java b/...i/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenterTest.java
@@ -4,6 +4,7 @@
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class NavigationPresenterTest {
 
@@ -98,6 +99,17 @@ public void onWayNameChanged_mapWayNameIsHidden() {
     verify(view).updateWayNameVisibility(false);
   }
 
+  @Test
+  public void onWayNameChanged_mapWayNameIsHiddenWithCollapsedBottomsheet() {
+    NavigationContract.View view = mock(NavigationContract.View.class);
+    when(view.isSummaryBottomSheetHidden()).thenReturn(true);
+    NavigationPresenter presenter = new NavigationPresenter(view);
+
+    presenter.onWayNameChanged("some valid way name");
+
+    verify(view).updateWayNameVisibility(false);
+  }
+
   @Test
   public void onNavigationStopped_mapWayNameIsHidden() {
     NavigationContract.View view = mock(NavigationContract.View.class);