From 536fcef6921c17e6e8c0232f00cfca8b7341711a Mon Sep 17 00:00:00 2001 From: Dzmitry Strekha Date: Sun, 6 Oct 2024 21:32:12 +0300 Subject: [PATCH] [Android] Handle insets on WebView based screens Signed-off-by: Dzmitry Strekha --- .../src/main/java/app/organicmaps/help/CopyrightFragment.java | 4 ++++ .../app/src/main/java/app/organicmaps/help/FaqFragment.java | 4 ++++ .../app/src/main/java/app/organicmaps/help/HelpFragment.java | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java b/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java index a6b3596700..5c12c2f6d4 100644 --- a/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java @@ -8,10 +8,12 @@ import android.view.ViewGroup; import androidx.annotation.Nullable; +import androidx.core.view.ViewCompat; import app.organicmaps.R; import app.organicmaps.WebContainerDelegate; import app.organicmaps.base.BaseMwmFragment; import app.organicmaps.util.Constants; +import app.organicmaps.util.WindowInsetUtils; public class CopyrightFragment extends BaseMwmFragment { @@ -22,6 +24,8 @@ public class CopyrightFragment extends BaseMwmFragment { View root = inflater.inflate(R.layout.fragment_web_view_with_progress, container, false); + ViewCompat.setOnApplyWindowInsetsListener(root, WindowInsetUtils.PaddingInsetsListener.excludeTop()); + mDelegate = new WebContainerDelegate(root, Constants.Url.COPYRIGHT) { @Override diff --git a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java index 91952718e1..b0c329c445 100644 --- a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java @@ -11,12 +11,14 @@ import android.view.ViewGroup; import androidx.activity.result.ActivityResultLauncher; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.view.ViewCompat; import app.organicmaps.R; import app.organicmaps.WebContainerDelegate; import app.organicmaps.base.BaseMwmFragment; import app.organicmaps.util.Constants; import app.organicmaps.util.SharingUtils; import app.organicmaps.util.Utils; +import app.organicmaps.util.WindowInsetUtils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; @@ -53,6 +55,8 @@ public class FaqFragment extends BaseMwmFragment { View root = inflater.inflate(R.layout.fragment_prefs_faq, container, false); + ViewCompat.setOnApplyWindowInsetsListener(root, WindowInsetUtils.PaddingInsetsListener.excludeTop()); + new WebContainerDelegate(root, Constants.Url.FAQ) { @Override diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java index 8d2a9c900c..8c5d3fdfbf 100644 --- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java @@ -23,7 +23,6 @@ import app.organicmaps.util.DateUtils; import app.organicmaps.util.Graphics; import app.organicmaps.util.SharingUtils; import app.organicmaps.util.Utils; -import app.organicmaps.util.WindowInsetUtils; import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener; public class HelpFragment extends BaseMwmFragment implements View.OnClickListener