From 9998cec4c4636927464ccb472f19c884d1bd152d Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 18 Oct 2022 19:32:46 +0200
Subject: [PATCH] Hide System UI upon Hiding the Controller

---
 .../libretube/ui/activities/MainActivity.kt   | 32 +------------------
 .../libretube/ui/views/CustomExoPlayerView.kt |  5 ++-
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
index 064a93168..cb1486619 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
@@ -399,7 +399,7 @@ class MainActivity : BaseActivity() {
         }
     }
 
-    private fun setFullscreen() {
+    fun setFullscreen() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             window.attributes.layoutInDisplayCutoutMode =
                 WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
@@ -454,36 +454,6 @@ class MainActivity : BaseActivity() {
         }
     }
 
-    /**
-     * hide the status bar
-     */
-    fun hideSystemBars() {
-        if (resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE) return
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.insetsController?.hide(WindowInsets.Type.statusBars())
-        } else {
-            @Suppress("DEPRECATION")
-            window.setFlags(
-                WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN
-            )
-        }
-    }
-
-    /**
-     * show the status bar
-     */
-    private fun showSystemBars() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.insetsController?.show(WindowInsets.Type.statusBars())
-        } else {
-            @Suppress("DEPRECATION")
-            window.clearFlags(
-                WindowManager.LayoutParams.FLAG_FULLSCREEN
-            )
-        }
-    }
-
     override fun onUserLeaveHint() {
         super.onUserLeaveHint()
         supportFragmentManager.fragments.forEach { fragment ->
diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
index eee4a48d1..f1a887f41 100644
--- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
@@ -119,7 +119,10 @@ internal class CustomExoPlayerView(
     }
 
     override fun hideController() {
-        (context as? MainActivity)?.hideSystemBars()
+        if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            // hide all the navigation bars that potentially could have been reopened manually ba the user
+            (context as? MainActivity)?.setFullscreen()
+        }
         super.hideController()
     }