From c0348484fe42628ea6b801c5767a57104cbbd523 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sat, 30 Sep 2023 19:17:23 +0800
Subject: [PATCH] Fix padding for the IME

---
 .../main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt  | 3 +++
 .../java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt     | 8 ++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt
index fddd2023b..f72c7da1c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt
@@ -5,10 +5,12 @@ import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.ui.Modifier
 import androidx.core.view.WindowCompat
 import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
@@ -46,6 +48,7 @@ class ConfigureActivity : EhActivity() {
                     } else {
                         BASE_SETTINGS_SCREEN
                     },
+                    modifier = Modifier.imePadding(),
                     enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up, tween(200)) },
                     exitTransition = { fadeOut(tween(200)) },
                     popEnterTransition = { fadeIn(tween(200)) },
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
index ac0f7718d..2e1a29998 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
@@ -8,14 +8,11 @@ import android.util.AttributeSet
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ElevatedCard
@@ -82,7 +79,7 @@ class SearchLayout @JvmOverloads constructor(
             }
         }
         Mdc3Theme {
-            Column(modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.search_layout_margin_h)).imePadding().verticalScroll(rememberScrollState())) {
+            Column(modifier = Modifier.imePadding().verticalScroll(rememberScrollState()).navigationBarsPadding().padding(horizontal = dimensionResource(id = R.dimen.search_layout_margin_h))) {
                 AnimatedVisibility(visible = vm.isNormalMode) {
                     ElevatedCard(modifier = Modifier.fillMaxWidth().padding(vertical = dimensionResource(id = R.dimen.search_layout_margin_v))) {
                         Column(modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.search_category_padding_h), vertical = dimensionResource(id = R.dimen.search_category_padding_v))) {
@@ -143,7 +140,6 @@ class SearchLayout @JvmOverloads constructor(
                         text = { Text(text = stringResource(id = R.string.search_image)) },
                     )
                 }
-                Spacer(modifier = Modifier.height(WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()))
             }
         }
     }