From 59ae10a81073d986783a4b0475f22c7531601150 Mon Sep 17 00:00:00 2001
From: Dzmitry Strekha <mr.choo96@gmail.com>
Date: Thu, 19 Sep 2024 18:41:37 +0300
Subject: [PATCH] [Android] Fix fullscreen mode after edge-to-edge changes

Signed-off-by: Dzmitry Strekha <mr.choo96@gmail.com>
---
 .../java/app/organicmaps/base/BaseMwmFragmentActivity.java    | 2 +-
 android/app/src/main/res/values-v27/themes.xml                | 4 ++--
 android/app/src/main/res/values/themes-base.xml               | 1 +
 android/app/src/main/res/values/themes.xml                    | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
index ed61649142..16cc5397c1 100644
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
@@ -64,10 +64,10 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
   @Override
   protected final void onCreate(@Nullable Bundle savedInstanceState)
   {
-    EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
     super.onCreate(savedInstanceState);
     mThemeName = Config.getCurrentUiTheme(getApplicationContext());
     setTheme(getThemeResourceId(mThemeName));
+    EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
     RtlUtils.manageRtl(this);
     if (!MwmApplication.from(this).arePlatformAndCoreInitialized())
     {
diff --git a/android/app/src/main/res/values-v27/themes.xml b/android/app/src/main/res/values-v27/themes.xml
index a4c1b3ebf6..49e90150ec 100644
--- a/android/app/src/main/res/values-v27/themes.xml
+++ b/android/app/src/main/res/values-v27/themes.xml
@@ -4,14 +4,14 @@
   <style name="MwmTheme.MainActivity">
     <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
-    <item name="android:windowTranslucentNavigation">true</item>
+    <item name="android:windowTranslucentNavigation">false</item>
     <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
     <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
   </style>
   <style name="MwmTheme.Night.MainActivity">
     <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
-    <item name="android:windowTranslucentNavigation">true</item>
+    <item name="android:windowTranslucentNavigation">false</item>
     <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
     <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
   </style>
diff --git a/android/app/src/main/res/values/themes-base.xml b/android/app/src/main/res/values/themes-base.xml
index 7668525d36..70deb83b37 100644
--- a/android/app/src/main/res/values/themes-base.xml
+++ b/android/app/src/main/res/values/themes-base.xml
@@ -154,6 +154,7 @@
     <item name="android:windowActionBarOverlay">true</item>
     <item name="clickableBackground">?selectableItemBackground</item>
     <item name="android:statusBarColor">?colorPrimary</item>
+    <item name="android:windowTranslucentNavigation">false</item>
 
     <item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
     <item name="windowBackgroundForced">@color/bg_window_night</item>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index f331262fb6..deabcfb5cd 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -21,14 +21,14 @@
   <style name="MwmTheme.MainActivity">
     <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
-    <item name="android:windowTranslucentNavigation">true</item>
+    <item name="android:windowTranslucentNavigation">false</item>
   </style>
 
   <!-- Theme is overridden in v27 folder to handle cutouts -->
   <style name="MwmTheme.Night.MainActivity">
     <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
-    <item name="android:windowTranslucentNavigation">true</item>
+    <item name="android:windowTranslucentNavigation">false</item>
   </style>
 
   <style name="MwmTheme.DownloadResourcesLegacy">