From 8057f067b964835897a2365cee0307cfdc1472f6 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

---
 .../eu/kanade/presentation/reader/BrightnessOverlay.kt     | 2 +-
 .../eu/kanade/presentation/reader/appbars/ReaderAppBars.kt | 5 +++--
 .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt   | 7 -------
 3 files changed, 4 insertions(+), 10 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 df927a4ba1..144b8ea274 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 55a28e4373..e044d5ccf0 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
@@ -67,7 +67,7 @@ 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
@@ -89,7 +89,7 @@ fun ReaderAppBars(
             ),
         ) {
             AppBar(
-                modifier = appBarModifier
+                modifier = modifierWithInsetsPadding
                     .clickable(onClick = onClickTopAppBar),
                 backgroundColor = backgroundColor,
                 title = mangaTitle,
@@ -135,6 +135,7 @@ fun ReaderAppBars(
             ),
         ) {
             Column(
+                modifier = modifierWithInsetsPadding,
                 verticalArrangement = Arrangement.spacedBy(8.dp),
             ) {
                 ChapterNavigator(
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 9ac903fc3b..1b8784d1a5 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
@@ -92,7 +92,6 @@ import tachiyomi.domain.manga.model.Manga
 import tachiyomi.presentation.core.util.collectAsState
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import kotlin.math.abs
 
 class ReaderActivity : BaseActivity() {
 
@@ -299,12 +298,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()