From cac65d9030b7500f236cc3039bbe7af6e0383bb0 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Sat, 30 Sep 2023 23:03:35 +0800 Subject: [PATCH] Fix insets for pre API 30 --- .../main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt | 2 ++ app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt index a5a89d91a..41b1a39a0 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt @@ -27,6 +27,7 @@ import android.view.ViewGroup import android.view.ViewPropertyAnimator import android.widget.TextView import androidx.activity.OnBackPressedCallback +import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.material3.Text import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.res.stringResource @@ -332,6 +333,7 @@ class GalleryListScene : SearchBarScene() { ), ) mViewTransition = BringOutTransition(binding.contentLayout.contentView, binding.searchLayout) + binding.searchLayout.consumeWindowInsets = false binding.searchLayout.setViewTreeViewModelStoreOwner(this) binding.fastScroller.setOnDragHandlerListener(object : OnDragHandlerListener { override fun onStartDragHandler() {} diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt index ed7463132..1f6dfd627 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt @@ -11,6 +11,7 @@ import androidx.annotation.CallSuper import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.asPaddingValues +import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items @@ -82,6 +83,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene { onApplySearch() true } + binding.searchBarList.consumeWindowInsets = false binding.searchBarList.setMD3Content { LazyColumn(contentPadding = WindowInsets.navigationBars.asPaddingValues()) { items(mSuggestionList) {