From 685160b87456dc54aba5f35d5ca119521203d846 Mon Sep 17 00:00:00 2001 From: Dzmitry Strekha Date: Thu, 3 Oct 2024 10:12:34 +0300 Subject: [PATCH 1/2] [Android] Fix insets handling for the case, when the action button is hidden Signed-off-by: Dzmitry Strekha --- .../java/app/organicmaps/downloader/BottomPanel.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java index a2916df4b9..960be963aa 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java +++ b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java @@ -75,10 +75,20 @@ class BottomPanel ViewGroup.MarginLayoutParams fabParams = (ViewGroup.MarginLayoutParams) mFab.getLayoutParams(); ViewGroup.MarginLayoutParams buttonParams = (ViewGroup.MarginLayoutParams) mButton.getLayoutParams(); + final boolean isButtonVisible = UiUtils.isVisible(mButton); + buttonParams.bottomMargin = safeInsets.bottom; mButton.setPadding(safeInsets.left, mButton.getPaddingTop(), safeInsets.right, mButton.getPaddingBottom()); fabParams.rightMargin = safeInsets.right + baseMargin; + if (isButtonVisible) + { + fabParams.bottomMargin = baseMargin; + } + else + { + fabParams.bottomMargin = safeInsets.bottom + baseMargin; + } mFab.requestLayout(); mButton.requestLayout(); -- 2.45.3 From 0142f1ab920921b004324f3bbb8051950f9d8537 Mon Sep 17 00:00:00 2001 From: Dzmitry Strekha Date: Thu, 3 Oct 2024 12:26:50 +0300 Subject: [PATCH 2/2] [Android] Fix formatting Signed-off-by: Dzmitry Strekha --- .../src/main/java/app/organicmaps/downloader/BottomPanel.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java index 960be963aa..a8ccf099b4 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java +++ b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java @@ -82,13 +82,9 @@ class BottomPanel fabParams.rightMargin = safeInsets.right + baseMargin; if (isButtonVisible) - { fabParams.bottomMargin = baseMargin; - } else - { fabParams.bottomMargin = safeInsets.bottom + baseMargin; - } mFab.requestLayout(); mButton.requestLayout(); -- 2.45.3