Skip to content

Commit db28032

Browse files
authored
NavigationView do not allow way name to show in overview mode (#1676)
1 parent 55afb23 commit db28032

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void onNavigationLocationUpdate(Location location) {
6969
}
7070

7171
void onWayNameChanged(@NonNull String wayName) {
72-
if (TextUtils.isEmpty(wayName)) {
72+
if (TextUtils.isEmpty(wayName) || view.isSummaryBottomSheetHidden()) {
7373
view.updateWayNameVisibility(false);
7474
return;
7575
}
@@ -86,4 +86,4 @@ void onRouteOverviewClick() {
8686
view.updateCameraRouteOverview();
8787
view.showRecenterBtn();
8888
}
89-
}
89+
}

libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,9 @@ public void updateWayNameView(@NonNull String wayName) {
329329
@Override
330330
public void updateWayNameVisibility(boolean isVisible) {
331331
wayNameView.updateVisibility(isVisible);
332+
if (navigationMap != null) {
333+
navigationMap.updateWaynameQueryMap(isVisible);
334+
}
332335
}
333336

334337
@Override

libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenterTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import static org.mockito.Mockito.mock;
66
import static org.mockito.Mockito.verify;
7+
import static org.mockito.Mockito.when;
78

89
public class NavigationPresenterTest {
910

@@ -98,6 +99,17 @@ public void onWayNameChanged_mapWayNameIsHidden() {
9899
verify(view).updateWayNameVisibility(false);
99100
}
100101

102+
@Test
103+
public void onWayNameChanged_mapWayNameIsHiddenWithCollapsedBottomsheet() {
104+
NavigationContract.View view = mock(NavigationContract.View.class);
105+
when(view.isSummaryBottomSheetHidden()).thenReturn(true);
106+
NavigationPresenter presenter = new NavigationPresenter(view);
107+
108+
presenter.onWayNameChanged("some valid way name");
109+
110+
verify(view).updateWayNameVisibility(false);
111+
}
112+
101113
@Test
102114
public void onNavigationStopped_mapWayNameIsHidden() {
103115
NavigationContract.View view = mock(NavigationContract.View.class);

0 commit comments

Comments
 (0)