From 93aa5bc081649d9c049a491cd5f76e62a3767979 Mon Sep 17 00:00:00 2001 From: Acclorite <140836141+Acclorite@users.noreply.github.com> Date: Sun, 6 Oct 2024 11:15:57 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Primary=20scrollbar=20i?= =?UTF-8?q?n=20ModalDrawer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Replaced Secondary scrollbar with Primary in ModalDrawer --- .../core/components/custom_drawer/CustomModalDrawer.kt | 2 ++ .../custom_drawer/CustomModalDrawerSelectableItem.kt | 2 +- .../book_story/presentation/core/constants/Constants.kt | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_drawer/CustomModalDrawer.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_drawer/CustomModalDrawer.kt index 19fd8f20..6578249e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_drawer/CustomModalDrawer.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_drawer/CustomModalDrawer.kt @@ -33,6 +33,7 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.constants.Constants import ua.acclorite.book_story.presentation.core.util.noRippleClickable /** @@ -126,6 +127,7 @@ fun CustomModalDrawer( CustomLazyColumn( state = rememberLazyListState(startIndex), modifier = Modifier.fillMaxSize(), + scrollbarSettings = Constants.PRIMARY_SCROLLBAR, contentPadding = PaddingValues(vertical = 9.dp) ) { content() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_drawer/CustomModalDrawerSelectableItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_drawer/CustomModalDrawerSelectableItem.kt index ba86c762..500a14af 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_drawer/CustomModalDrawerSelectableItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_drawer/CustomModalDrawerSelectableItem.kt @@ -38,7 +38,7 @@ fun CustomModalDrawerSelectableItem( ) { Row( modifier = modifier - .padding(horizontal = 8.dp) + .padding(horizontal = 12.dp) .fillMaxWidth() .clip(CircleShape) .background( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/Constants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/Constants.kt index 2405ac1d..0a773ab2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/Constants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/Constants.kt @@ -664,9 +664,10 @@ private fun provideEmptyChapter() = Chapter( @Composable private fun providePrimaryScrollbar() = ScrollbarSettings( thumbUnselectedColor = MaterialTheme.colorScheme.primary, + thumbSelectedColor = MaterialTheme.colorScheme.primary.copy(0.8f), hideDelayMillis = 2000, durationAnimationMillis = 300, - selectionMode = ScrollbarSelectionMode.Disabled, + selectionMode = ScrollbarSelectionMode.Thumb, thumbThickness = 8.dp, scrollbarPadding = 4.dp )