From 6f87afc1bf2730739e2b871cf34f5090f8f12f13 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Tue, 28 Nov 2023 23:18:44 +0800
Subject: [PATCH] Fix navigation drawer padding

---
 .../kotlin/com/hippo/ehviewer/ui/MainActivity.kt    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt
index 111ca8b9d..8a79a6499 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt
@@ -35,11 +35,11 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.verticalScroll
@@ -146,7 +146,7 @@ private val navItems = arrayOf(
 )
 
 class MainActivity : EhActivity() {
-    private var sideSheet = mutableStateListOf<@Composable ColumnScope.(DrawerState2) -> Unit>()
+    private val sideSheet = mutableStateListOf<@Composable ColumnScope.(DrawerState2) -> Unit>()
 
     @Composable
     fun ProvideSideSheetContent(content: @Composable ColumnScope.(DrawerState2) -> Unit) {
@@ -188,8 +188,8 @@ class MainActivity : EhActivity() {
         intentFlow.tryEmit(intent)
     }
 
-    private var tipFlow = MutableSharedFlow<String>(extraBufferCapacity = 1)
-    private var intentFlow = MutableSharedFlow<Intent>(extraBufferCapacity = 4)
+    private val tipFlow = MutableSharedFlow<String>(extraBufferCapacity = 1)
+    private val intentFlow = MutableSharedFlow<Intent>(extraBufferCapacity = 4)
 
     @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -321,11 +321,12 @@ class MainActivity : EhActivity() {
                             drawerContent = {
                                 ModalDrawerSheet(
                                     modifier = Modifier.widthIn(max = (configuration.screenWidthDp - 56).dp),
-                                    windowInsets = WindowInsets(0, 0, 0, 0),
+                                    windowInsets = WindowInsets.systemBars.only(WindowInsetsSides.Start),
                                 ) {
                                     val scrollState = rememberScrollState()
                                     Column(
-                                        modifier = Modifier.verticalScroll(scrollState).navigationBarsPadding(),
+                                        modifier = Modifier.verticalScroll(scrollState)
+                                            .windowInsetsPadding(WindowInsets.systemBars.only(WindowInsetsSides.Bottom)),
                                     ) {
                                         Image(
                                             painter = painterResource(id = R.drawable.sadpanda_low_poly),