From fd02759a56db06daf5b578a26255b52e3aa2022e Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Wed, 25 Oct 2023 09:21:04 -0400
Subject: [PATCH] Handle reader app bar insets in Compose

(cherry picked from commit 8057f067b964835897a2365cee0307cfdc1472f6)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
---
 .../eu/kanade/presentation/reader/BrightnessOverlay.kt |  2 +-
 .../presentation/reader/appbars/ReaderAppBars.kt       | 10 +++++-----
 .../eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt    |  6 ------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/reader/BrightnessOverlay.kt b/app/src/main/java/eu/kanade/presentation/reader/BrightnessOverlay.kt
index df927a4ba..144b8ea27 100644
--- a/app/src/main/java/eu/kanade/presentation/reader/BrightnessOverlay.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/BrightnessOverlay.kt
@@ -19,7 +19,7 @@ fun BrightnessOverlay(
             .fillMaxSize()
             .graphicsLayer {
                 alpha = abs(value) / 100f
-            }
+            },
     ) {
         drawRect(Color.Black)
     }
diff --git a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
index 72b1fd9e2..a59b033be 100644
--- a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
@@ -117,13 +117,12 @@ fun ReaderAppBars(
         .surfaceColorAtElevation(3.dp)
         .copy(alpha = if (isSystemInDarkTheme()) 0.9f else 0.95f)
 
-    val appBarModifier = if (fullscreen) {
+    val modifierWithInsetsPadding = if (fullscreen) {
         Modifier.systemBarsPadding()
     } else {
         Modifier
     }
 
-
     // SY -->
     BoxIgnoreLayoutDirection(
         Modifier.fillMaxWidth()
@@ -138,7 +137,7 @@ fun ReaderAppBars(
                 targetOffsetX = { -it },
                 animationSpec = animationSpec,
             ),
-            modifier = Modifier
+            modifier = modifierWithInsetsPadding
                 .padding(bottom = 48.dp, top = 120.dp)
                 .align(Alignment.TopStart)
         ) {
@@ -166,7 +165,7 @@ fun ReaderAppBars(
                 targetOffsetX = { it },
                 animationSpec = animationSpec,
             ),
-            modifier = Modifier
+            modifier = modifierWithInsetsPadding
                 .padding(bottom = 48.dp, top = 120.dp)
                 .align(Alignment.TopEnd)
         ) {
@@ -200,7 +199,7 @@ fun ReaderAppBars(
                 ),
             ) {
                 // SY -->
-                Column(appBarModifier) {
+                Column(modifierWithInsetsPadding) {
                     // SY <--
                     AppBar(
                         modifier = /*SY --> */ Modifier /*SY <-- */
@@ -268,6 +267,7 @@ fun ReaderAppBars(
                 ),
             ) {
                 Column(
+                    modifier = modifierWithInsetsPadding,
                     verticalArrangement = Arrangement.spacedBy(8.dp),
                 ) {
                     if (navBarType == NavBarType.Bottom) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index a4877be1f..eb3d37d49 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -339,12 +339,6 @@ class ReaderActivity : BaseActivity() {
      * Initializes the reader menu. It sets up click listeners and the initial visibility.
      */
     private fun initializeMenu() {
-        binding.dialogRoot.applyInsetter {
-            type(navigationBars = true) {
-                margin(vertical = true, horizontal = true)
-            }
-        }
-
         binding.pageNumber.setComposeContent {
             val state by viewModel.state.collectAsState()
             val showPageNumber by viewModel.readerPreferences.showPageNumber().collectAsState()