From a52ab28534c620d42a8e4c5196343a7b45c882a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <99822064+revonateB0T@users.noreply.github.com> Date: Wed, 25 Sep 2024 08:19:17 +0800 Subject: [PATCH] Revert "Add scroll bar to quick search and download label" This reverts commit 601713d8d793cc2c893691394cb793c660053c29. --- .../kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt | 3 ++- .../kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt | 4 ++-- app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt index c313f2c2c..797f9f1e5 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt @@ -20,6 +20,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.systemBars +import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState @@ -299,7 +300,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) = hapticFeedback.performHapticFeedback(HapticFeedbackType.MOVE) } var fromIndex by remember { mutableIntStateOf(-1) } - FastScrollLazyColumn( + LazyColumn( modifier = Modifier.fillMaxSize(), state = labelsListState, contentPadding = WindowInsets.systemBars.only(WindowInsetsSides.Bottom).asPaddingValues(), diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt index 93a43de92..bf51693ba 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt @@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.systemBars +import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.grid.rememberLazyGridState import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState @@ -126,7 +127,6 @@ import com.hippo.ehviewer.ui.main.ImageSearch import com.hippo.ehviewer.ui.main.SearchFilter import com.hippo.ehviewer.ui.tools.Await import com.hippo.ehviewer.ui.tools.EmptyWindowInsets -import com.hippo.ehviewer.ui.tools.FastScrollLazyColumn import com.hippo.ehviewer.ui.tools.HapticFeedbackType import com.hippo.ehviewer.ui.tools.animateFloatMergePredictiveBackAsState import com.hippo.ehviewer.ui.tools.delegateSnapshotUpdate @@ -375,7 +375,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(lub: ListUrlBuilder, navigator: De hapticFeedback.performHapticFeedback(HapticFeedbackType.MOVE) } var fromIndex by remember { mutableIntStateOf(-1) } - FastScrollLazyColumn( + LazyColumn( modifier = Modifier.fillMaxSize(), state = quickSearchListState, contentPadding = WindowInsets.systemBars.only(WindowInsetsSides.Bottom).asPaddingValues(), diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt index e05cce628..17268d9e8 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt @@ -459,7 +459,7 @@ class DialogState { style = MaterialTheme.typography.headlineSmall, ) } - FastScrollLazyColumn { + LazyColumn { itemsIndexed(items) { index, text -> CheckableItem( text = text, @@ -495,7 +495,7 @@ class DialogState { modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp), style = MaterialTheme.typography.headlineSmall, ) - FastScrollLazyColumn { + LazyColumn { itemsIndexed(items) { index, text -> CheckableItem( text = text,