From c9235df26cbd918dc2c4353ebd4af3c9ae47a4b7 Mon Sep 17 00:00:00 2001
From: haanhvu <haanh6594@gmail.com>
Date: Fri, 7 Feb 2025 09:06:20 +0700
Subject: [PATCH] Keep fullscreen in hamburger menu when exiting fullscreen
 video

---
 app/build.gradle                                         | 7 +++++--
 .../igalia/wolvic/ui/widgets/NavigationBarWidget.java    | 7 +++++++
 .../com/igalia/wolvic/ui/widgets/WindowWidget.java       | 9 +++++++++
 gradle/wrapper/gradle-wrapper.properties                 | 2 +-
 versions.gradle                                          | 2 +-
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b74d955a05..b426cd6a39 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -619,13 +619,16 @@ android {
     lint {
         disable 'ExtraTranslation'
     }
-    androidResources {
+
+    aaptOptions {
+        noCompress 'ja'
+        noCompress 'dat'
+        noCompress 'bin'
         noCompress 'pak'
         noCompress 'ja'
         noCompress 'dat'
         noCompress 'bin'
     }
-
 }
 
 configurations {
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java
index 84ed72d88e..b7235a7681 100644
--- a/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java
+++ b/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java
@@ -365,6 +365,12 @@ private void updateUI() {
             if (mAttachedWindow != null) {
                 mAttachedWindow.setIsFullScreen(false);
             }
+            if (mAttachedWindow.getKeepFullscreenInHamburgerMenu()) {
+                postDelayed(() -> {
+                    mAttachedWindow.setIsFullScreen(true);
+                }, 2000);
+                mAttachedWindow.setKeepFullscreenInHamburgerMenu(false);
+            }
             if (mAudio != null) {
                 mAudio.playSound(AudioEngine.Sound.CLICK);
             }
@@ -1350,6 +1356,7 @@ public void onResize() {
             @Override
             public void onFullScreen() {
                 mAttachedWindow.setIsFullScreen(true);
+                mAttachedWindow.setKeepFullscreenInHamburgerMenu(true);
             }
 
             @Override
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java
index ba3db0c8cc..f05101a2c1 100644
--- a/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java
+++ b/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java
@@ -153,6 +153,7 @@ public class WindowWidget extends UIWidget implements SessionChangeListener,
     private SharedPreferences mPrefs;
     private DownloadsManager mDownloadsManager;
     private float mBrowserDensity;
+    private boolean keepFullscreenInHamburgerMenu;
 
     public interface WindowListener {
         default void onFocusRequest(@NonNull WindowWidget aWindow) {}
@@ -2337,4 +2338,12 @@ private float getBrowserDensity() {
         }
         return mBrowserDensity;
     }
+
+    public boolean getKeepFullscreenInHamburgerMenu() {
+        return keepFullscreenInHamburgerMenu;
+    }
+
+    public void setKeepFullscreenInHamburgerMenu(boolean keepFullscreenInHamburgerMenu) {
+        this.keepFullscreenInHamburgerMenu = keepFullscreenInHamburgerMenu;
+    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7836febc39..7f7ce3dc42 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jul 21 16:13:31 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/versions.gradle b/versions.gradle
index 7d9f33a913..d35d6fc99c 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -45,7 +45,7 @@ versions.atsl_runner = "1.5.2"
 versions.atsl_rules = "1.5.0"
 versions.atsl_junit = "1.1.5"
 versions.espresso = "3.5.1"
-versions.android_gradle_plugin = '8.7.2'
+versions.android_gradle_plugin = "8.2.1"
 versions.kotlin = "1.9.21"
 versions.kotlin_coroutines = "1.7.3"
 versions.snakeyaml = "2.0"