diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
index 7ca7e557f..ec9752264 100644
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -102,7 +102,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
final View navigationBarBackground = mFrame.findViewById(R.id.nav_bottom_sheet_nav_bar);
final View nextTurnContainer = mFrame.findViewById(R.id.nav_next_turn_container);
ViewCompat.setOnApplyWindowInsetsListener(mStreetFrame, (v, windowInsets) -> {
- UiUtils.setViewInsetsPaddingNoBottom(v, windowInsets);
+ UiUtils.setViewNavigationInsetsPaddingNoBottom(v, windowInsets);
final Insets safeDrawingInsets = windowInsets.getInsets(WindowInsetUtils.TYPE_SAFE_DRAWING);
nextTurnContainer.setPadding(safeDrawingInsets.left, nextTurnContainer.getPaddingTop(),
@@ -113,6 +113,10 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
navigationBarBackground.getLayoutParams().width = mFrame.findViewById(R.id.nav_bottom_sheet).getWidth();
return windowInsets;
});
+ ViewCompat.setOnApplyWindowInsetsListener(turnFrame, (v, windowInsets) -> {
+ UiUtils.setViewNavigationInsetsPaddingNoBottom(v, windowInsets);
+ return windowInsets;
+ });
}
private void updateVehicle(@NonNull RoutingInfo info)
diff --git a/android/app/src/main/java/app/organicmaps/util/UiUtils.java b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
index 762973c37..c93df3e3c 100644
--- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
@@ -281,6 +281,12 @@ public final class UiUtils
view.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, view.getPaddingBottom());
}
+ public static void setViewNavigationInsetsPaddingNoBottom(View view, WindowInsetsCompat windowInsets)
+ {
+ final Insets systemInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+ view.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, view.getPaddingBottom());
+ }
+
public static void setupNavigationIcon(@NonNull MaterialToolbar toolbar, @NonNull View.OnClickListener listener)
{
View customNavigationButton = toolbar.findViewById(R.id.back);
diff --git a/android/app/src/main/res/layout-land/layout_nav_top.xml b/android/app/src/main/res/layout-land/layout_nav_top.xml
index 1d7bef433..90560821d 100644
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -11,13 +11,13 @@
diff --git a/android/app/src/main/res/layout/layout_nav_top.xml b/android/app/src/main/res/layout/layout_nav_top.xml
index 4587fc510..8cc7d0307 100644
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -11,13 +11,13 @@