From 06fd97bd88df0ebafd3615b84f327fecd83d3bad Mon Sep 17 00:00:00 2001 From: Acclorite <140836141+Acclorite@users.noreply.github.com> Date: Sun, 15 Sep 2024 17:43:13 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Replace=20LazyColumn=20?= =?UTF-8?q?with=20CustomLazyColumn=20in=20BottomSheets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Replaced LazyColumn with CustomLazyColumn, which enables scrollbar --- .../filter_bottom_sheet/BrowseFilterBottomSheet.kt | 8 ++++---- .../settings_bottom_sheet/ReaderSettingsBottomSheet.kt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt index 1a981ce4..7da6f06b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt @@ -3,13 +3,13 @@ package ua.acclorite.book_story.presentation.screens.browse.components.filter_bo import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel import ua.acclorite.book_story.presentation.core.components.custom_bottom_sheet.CustomBottomSheet import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent @@ -55,7 +55,7 @@ fun BrowseFilterBottomSheet() { HorizontalPager(state = pagerState, modifier = Modifier.fillMaxSize()) { page -> when (page) { 0 -> { - LazyColumn(Modifier.fillMaxSize()) { + CustomLazyColumn(Modifier.fillMaxSize()) { BrowseGeneralSubcategory( showTitle = false, showDivider = false, @@ -66,7 +66,7 @@ fun BrowseFilterBottomSheet() { } 1 -> { - LazyColumn(Modifier.fillMaxSize()) { + CustomLazyColumn(Modifier.fillMaxSize()) { BrowseFilterSubcategory( showTitle = false, showDivider = false, @@ -77,7 +77,7 @@ fun BrowseFilterBottomSheet() { } 2 -> { - LazyColumn(Modifier.fillMaxSize()) { + CustomLazyColumn(Modifier.fillMaxSize()) { BrowseSortSubcategory( showTitle = false, showDivider = false, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt index 73703d76..d476a5ba 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt @@ -7,7 +7,6 @@ import androidx.compose.animation.core.tween import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.material3.BottomSheetDefaults @@ -20,6 +19,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.core.components.LocalReaderViewModel import ua.acclorite.book_story.presentation.core.components.custom_bottom_sheet.CustomBottomSheet @@ -86,7 +86,7 @@ fun ReaderSettingsBottomSheet() { HorizontalPager(state = pagerState) { page -> if (page == 0) { - LazyColumn(Modifier.fillMaxSize()) { + CustomLazyColumn(Modifier.fillMaxSize()) { PaddingSubcategory( titleColor = { MaterialTheme.colorScheme.onSurface }, topPadding = 22.dp, @@ -102,7 +102,7 @@ fun ReaderSettingsBottomSheet() { } if (page == 1) { - LazyColumn(Modifier.fillMaxSize()) { + CustomLazyColumn(Modifier.fillMaxSize()) { FontSubcategory( titleColor = { MaterialTheme.colorScheme.onSurface }, topPadding = 16.dp, @@ -123,7 +123,7 @@ fun ReaderSettingsBottomSheet() { } if (page == 2) { - LazyColumn(Modifier.fillMaxSize()) { + CustomLazyColumn(Modifier.fillMaxSize()) { ColorsSubcategory( showTitle = false, showDivider = false,