diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheet.kt index f6275d6cf5..d0b6888c00 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheet.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheet.kt @@ -1,7 +1,6 @@ package com.tangem.core.ui.components.bottomsheets.modal import android.content.res.Configuration -import androidx.compose.foundation.LocalOverscrollFactory import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.foundation.rememberScrollState @@ -13,13 +12,18 @@ import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.rememberVectorPainter +import androidx.compose.ui.input.nestedscroll.NestedScrollConnection +import androidx.compose.ui.input.nestedscroll.NestedScrollSource +import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.Velocity import androidx.compose.ui.unit.dp import com.tangem.core.ui.R import com.tangem.core.ui.components.PrimaryButton @@ -31,6 +35,7 @@ import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent import com.tangem.core.ui.components.bottomsheets.internal.ModalBottomSheetWithBackHandling import com.tangem.core.ui.components.bottomsheets.internal.collapse import com.tangem.core.ui.res.LocalBottomSheetAlwaysVisible +import com.tangem.core.ui.res.LocalCanScrollBackward import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview import com.tangem.core.ui.utils.WindowInsetsZero @@ -111,17 +116,13 @@ inline fun DefaultModalBottomSheet( sheetState = sheetState, onBack = onBack, bsContent = { - CompositionLocalProvider( - LocalOverscrollFactory provides null, - ) { - BsContent( - config = config, - containerColor = containerColor, - scrollableContent = scrollableContent, - title = title, - content = content, - ) - } + BsContent( + config = config, + containerColor = containerColor, + scrollableContent = scrollableContent, + title = title, + content = content, + ) }, ) } @@ -178,6 +179,18 @@ inline fun BsContent( val maxHeight = LocalConfiguration.current.screenHeightDp * MODAL_SHEET_MAX_HEIGHT + val canScrollBackward = LocalCanScrollBackward.current + + val nestedScrollConnection = remember(canScrollBackward) { + object : NestedScrollConnection { + override fun onPostScroll(consumed: Offset, available: Offset, source: NestedScrollSource): Offset = + if (canScrollBackward) available else Offset.Zero + + override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity = + if (canScrollBackward) available else Velocity.Zero + } + } + Column( modifier = Modifier .systemBarsPadding() @@ -185,7 +198,8 @@ inline fun BsContent( .clip(TangemTheme.shapes.roundedCornersLarge) .background(containerColor) .heightIn(max = maxHeight.dp) - .fillMaxWidth(), + .fillMaxWidth() + .nestedScroll(nestedScrollConnection), ) { Box(modifier = Modifier.fillMaxWidth()) { title(model) diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt index f61cdd1722..286eda1a58 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt @@ -472,6 +472,8 @@ val LocalMessageEffectAnimation = compositionLocalOf { error("No MessageEffectAnimation provided") } +val LocalCanScrollBackward = compositionLocalOf { false } + /** * Determines whether the dark theme should be used based on the given [AppThemeMode]. * diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContent.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContent.kt index d739e4d5a9..47789d9ebd 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContent.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContent.kt @@ -11,9 +11,11 @@ import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip @@ -30,6 +32,7 @@ import com.tangem.core.ui.extensions.conditional import com.tangem.core.ui.extensions.resolveReference import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.stringReference +import com.tangem.core.ui.res.LocalCanScrollBackward import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview import com.tangem.features.commonfeatures.impl.R @@ -46,51 +49,59 @@ internal fun PortfolioSelectorContent( modifier: Modifier = Modifier, contentPadding: PaddingValues = PaddingValues(), ) { - LazyColumn( - modifier = modifier, - contentPadding = contentPadding, + val lazyListState = rememberLazyListState() + + CompositionLocalProvider( + LocalCanScrollBackward provides + lazyListState.canScrollBackward, ) { - val items = state.items - itemsIndexed( - items = items, - key = { _, item -> item.id }, - ) { index, item -> - val previewItem = items.getOrNull(index.dec()) - val offsetModifier = when { - previewItem == null -> Modifier - item is PortfolioSelectorItemUM.GroupTitle -> Modifier.padding( - top = TangemTheme.dimens.spacing16, - ) - else -> Modifier.padding( - top = TangemTheme.dimens.spacing8, - ) - } + LazyColumn( + state = lazyListState, + modifier = modifier, + contentPadding = contentPadding, + ) { + val items = state.items + itemsIndexed( + items = items, + key = { _, item -> item.id }, + ) { index, item -> + val previewItem = items.getOrNull(index.dec()) + val offsetModifier = when { + previewItem == null -> Modifier + item is PortfolioSelectorItemUM.GroupTitle -> Modifier.padding( + top = TangemTheme.dimens.spacing16, + ) + else -> Modifier.padding( + top = TangemTheme.dimens.spacing8, + ) + } - val portfolioShape = RoundedCornerShape(TangemTheme.dimens.radius14) - val border = BorderStroke( - width = 1.dp, - color = TangemTheme.colors.text.accent, - ) + val portfolioShape = RoundedCornerShape(TangemTheme.dimens.radius14) + val border = BorderStroke( + width = 1.dp, + color = TangemTheme.colors.text.accent, + ) - when (item) { - is PortfolioSelectorItemUM.Portfolio -> UserWalletItemRow( - state = item.item, - modifier = offsetModifier - .fillMaxWidth() - .heightIn(min = TangemTheme.dimens.size68) - .clip(portfolioShape) - .background(TangemTheme.colors.background.action) - .conditional(item.isSelected) { border(border, portfolioShape) } - .clickable(enabled = item.item.isEnabled, onClick = item.item.onClick) - .padding(all = TangemTheme.dimens.spacing12) - .conditional(!item.item.isEnabled) { alpha(DISABLED_WALLET_ALPHA) }, - ) - is PortfolioSelectorItemUM.GroupTitle -> WalletNameRow( - model = item, - modifier = offsetModifier - .fillMaxWidth() - .padding(horizontal = TangemTheme.dimens.spacing16), - ) + when (item) { + is PortfolioSelectorItemUM.Portfolio -> UserWalletItemRow( + state = item.item, + modifier = offsetModifier + .fillMaxWidth() + .heightIn(min = TangemTheme.dimens.size68) + .clip(portfolioShape) + .background(TangemTheme.colors.background.action) + .conditional(item.isSelected) { border(border, portfolioShape) } + .clickable(enabled = item.item.isEnabled, onClick = item.item.onClick) + .padding(all = TangemTheme.dimens.spacing12) + .conditional(!item.item.isEnabled) { alpha(DISABLED_WALLET_ALPHA) }, + ) + is PortfolioSelectorItemUM.GroupTitle -> WalletNameRow( + model = item, + modifier = offsetModifier + .fillMaxWidth() + .padding(horizontal = TangemTheme.dimens.spacing16), + ) + } } } } diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContentV2.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContentV2.kt index 1d7b42931f..e7eb3ef990 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContentV2.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContentV2.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -33,6 +34,7 @@ import com.tangem.core.ui.ds.row.TangemRowContainer import com.tangem.core.ui.ds.row.TangemRowLayoutId import com.tangem.core.ui.extensions.conditional import com.tangem.core.ui.extensions.resolveReference +import com.tangem.core.ui.res.LocalCanScrollBackward import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign @@ -48,20 +50,41 @@ internal fun PortfolioSelectorContentV2( modifier: Modifier = Modifier, contentPadding: PaddingValues = PaddingValues(), ) { - LazyColumn( - modifier = modifier, - contentPadding = contentPadding, + val lazyListState = rememberLazyListState() + + CompositionLocalProvider( + LocalCanScrollBackward provides + lazyListState.canScrollBackward, ) { - val items = state.items - itemsIndexed( - items = items, - key = { _, item -> item.id }, - ) { index, item -> - when (item) { - is PortfolioSelectorItemUM.Portfolio -> - PortfolioSelectorItem( - state = item.item, + LazyColumn( + state = lazyListState, + modifier = modifier, + contentPadding = contentPadding, + ) { + val items = state.items + itemsIndexed( + items = items, + key = { _, item -> item.id }, + ) { index, item -> + when (item) { + is PortfolioSelectorItemUM.Portfolio -> + PortfolioSelectorItem( + state = item.item, + modifier = Modifier + .roundedShapeItemDecoration( + currentIndex = index, + lastIndex = state.items.lastIndex, + backgroundColor = TangemTheme.colors2.surface.level3, + radius = TangemTheme.dimens2.x5, + addDefaultPadding = false, + ) + .clickable(enabled = item.item.isEnabled, onClick = item.item.onClick) + .conditional(!item.item.isEnabled) { alpha(DISABLED_WALLET_ALPHA) }, + ) + is PortfolioSelectorItemUM.GroupTitle -> WalletNameRow( + model = item, modifier = Modifier + .fillMaxWidth() .roundedShapeItemDecoration( currentIndex = index, lastIndex = state.items.lastIndex, @@ -69,22 +92,9 @@ internal fun PortfolioSelectorContentV2( radius = TangemTheme.dimens2.x5, addDefaultPadding = false, ) - .clickable(enabled = item.item.isEnabled, onClick = item.item.onClick) - .conditional(!item.item.isEnabled) { alpha(DISABLED_WALLET_ALPHA) }, + .padding(horizontal = TangemTheme.dimens.spacing16), ) - is PortfolioSelectorItemUM.GroupTitle -> WalletNameRow( - model = item, - modifier = Modifier - .fillMaxWidth() - .roundedShapeItemDecoration( - currentIndex = index, - lastIndex = state.items.lastIndex, - backgroundColor = TangemTheme.colors2.surface.level3, - radius = TangemTheme.dimens2.x5, - addDefaultPadding = false, - ) - .padding(horizontal = TangemTheme.dimens.spacing16), - ) + } } } }