From 991caf73f42e0354ca5a416215b10eb6fbab61a5 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Thu, 14 Dec 2023 20:01:11 +0800
Subject: [PATCH] Fix ReaderPageSheet padding and ripple

---
 .../kotlin/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt  | 6 ++++++
 .../kotlin/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 5e961b451..3983425d2 100644
--- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -43,6 +43,9 @@ import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
 import androidx.activity.viewModels
 import androidx.annotation.ChecksSdkIntAtLeast
 import androidx.annotation.RequiresApi
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheetFix
@@ -53,6 +56,7 @@ import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.BlendMode
 import androidx.core.content.FileProvider
 import androidx.core.graphics.ColorUtils
@@ -745,10 +749,12 @@ class ReaderActivity : EhActivity() {
                 ModalBottomSheetFix(
                     onDismissRequest = { dismiss() },
                     sheetState = sheetState,
+                    windowInsets = WindowInsets(0),
                 ) {
                     ReaderPageSheet(page) {
                         coroutineScope.launch { sheetState.hide() }
                     }
+                    Spacer(modifier = Modifier.navigationBarsPadding())
                 }
             }
         }
diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
index 939a9bff7..321b03f3c 100644
--- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
+++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
@@ -31,11 +31,11 @@ import moe.tarsin.kt.andThen
 @Composable
 fun ReaderPageSheet(page: ReaderPage, dismiss: () -> Unit) {
     val activity = LocalContext.current.run { remember { findActivity<ReaderActivity>() } }
-    val modifier = Modifier.fillMaxWidth().height(56.dp).padding(horizontal = 16.dp)
 
     @Composable
     fun Item(icon: ImageVector, @StringRes text: Int, onClick: () -> Unit) = Row(
-        modifier = modifier.clickable(onClick = onClick andThen dismiss),
+        modifier = Modifier.fillMaxWidth().height(56.dp)
+            .clickable(onClick = onClick andThen dismiss).padding(horizontal = 16.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Icon(imageVector = icon, contentDescription = null)