Skip to content

chore(accounthome): move version info to BottomBar; draw with gradient #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 14, 2024
Merged

chore(accounthome): move version info to BottomBar; draw with gradient #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 130 additions & 0 deletions app/src/main/java/com/getcode/ui/utils/Modifier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.grid.LazyGridState
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
Expand All @@ -27,6 +29,7 @@ import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.drawscope.ContentDrawScope
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.graphics.takeOrElse
import androidx.compose.ui.input.pointer.pointerInteropFilter
import androidx.compose.ui.layout.layout
import androidx.compose.ui.layout.onPlaced
Expand All @@ -37,6 +40,7 @@ import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.offset
import com.getcode.theme.BrandLight
import com.getcode.theme.CodeTheme

inline fun Modifier.addIf(
predicate: Boolean,
Expand Down Expand Up @@ -235,4 +239,130 @@ fun Modifier.drawWithGradient(
blendMode = blendMode
)
}
}

private val gradientSize
@Composable get() = CodeTheme.dimens.staticGrid.x8

fun Modifier.verticalScrollStateGradient(
scrollState: LazyListState,
color: Color = Color.Unspecified,
showAtStart: Boolean = true,
showAtEnd: Boolean = true,
isLongGradient: Boolean = false,
): Modifier = composed {
val backgroundColor = color.takeOrElse { CodeTheme.colors.background }
val gradientSizePx =
with(LocalDensity.current) { gradientSize.toPx() } * if (isLongGradient) 1.5f else 1f
this
.addIf(showAtStart && !scrollState.isScrolledToStart()) {
Modifier.drawWithGradient(
color = backgroundColor,
startY = { gradientSizePx },
endY = { 0f },
)
}
.addIf(showAtEnd && !scrollState.isScrolledToEnd()) {
Modifier.drawWithGradient(
color = backgroundColor,
startY = { size.height - gradientSizePx },
)
}
}

fun Modifier.horizontalScrollStateGradient(
scrollState: LazyListState,
color: Color,
showAtStart: Boolean = true,
showAtEnd: Boolean = true,
): Modifier = composed {
val gradientSizePx =
with(LocalDensity.current) { gradientSize.toPx() }
this
.addIf(showAtStart && !scrollState.isScrolledToStart()) {
Modifier.drawWithContent {
drawContent()
drawRect(
brush = Brush.horizontalGradient(
colors = listOf(
color,
Color.Transparent,
),
startX = 0f,
endX = gradientSizePx,
),
)
}
}
.addIf(showAtEnd && !scrollState.isScrolledToEnd()) {
Modifier.drawWithContent {
drawContent()
drawRect(
brush = Brush.horizontalGradient(
colors = listOf(
Color.Transparent,
color,
),
startX = size.width - gradientSizePx,
endX = size.width,
),
)
}
}
}

fun Modifier.verticalScrollStateGradient(
scrollState: LazyGridState,
color: Color,
showAtStart: Boolean = true,
showAtEnd: Boolean = true,
): Modifier = composed {
val gradientSizePx =
with(LocalDensity.current) { gradientSize.toPx() }
this
.addIf(showAtStart && !scrollState.isVerticallyScrolledToStart()) {
Modifier.drawWithGradient(
color = color,
startY = { gradientSizePx },
endY = { 0f },
)
}
.addIf(showAtEnd && !scrollState.isVerticallyScrolledToEnd()) {
Modifier.drawWithGradient(
color = color,
startY = { size.height - gradientSizePx },
)
}
}

fun LazyListState.isScrolledToEnd(): Boolean {
val lastItem = layoutInfo.visibleItemsInfo.lastOrNull()
return lastItem == null ||
(lastItem.index == layoutInfo.totalItemsCount - 1 && lastItem.size + lastItem.offset <= layoutInfo.viewportEndOffset)
}

fun LazyListState.isScrolledToStart(): Boolean {
val firstItem = layoutInfo.visibleItemsInfo.firstOrNull()
return firstItem == null || firstItem.offset == 0
}

fun LazyGridState.isVerticallyScrolledToEnd(): Boolean {
val lastItem = layoutInfo.visibleItemsInfo.lastOrNull()
return lastItem == null ||
(lastItem.index == layoutInfo.totalItemsCount - 1 && lastItem.size.height + lastItem.offset.y <= layoutInfo.viewportEndOffset)
}

fun LazyGridState.isVerticallyScrolledToStart(): Boolean {
val firstItem = layoutInfo.visibleItemsInfo.firstOrNull()
return firstItem == null || firstItem.offset.y == 0
}

fun Modifier.footerShadow() = this.drawWithContent {
drawContent()
drawRect(
brush = Brush.verticalGradient(
endY = size.height * 0.12f,
colors = listOf(Color(0x10000000), Color.Transparent),
),
)
}
34 changes: 24 additions & 10 deletions app/src/main/java/com/getcode/view/main/account/AccountHome.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.Divider
import androidx.compose.material.Icon
import androidx.compose.material.Text
Expand Down Expand Up @@ -47,11 +48,12 @@ import com.getcode.navigation.screens.BuySellScreen
import com.getcode.navigation.screens.DepositKinScreen
import com.getcode.navigation.screens.FaqScreen
import com.getcode.navigation.screens.WithdrawalAmountScreen
import com.getcode.theme.BrandLight
import com.getcode.theme.CodeTheme
import com.getcode.theme.White10
import com.getcode.ui.components.CodeScaffold
import com.getcode.ui.utils.getActivity
import com.getcode.ui.utils.rememberedClickable
import com.getcode.ui.utils.verticalScrollStateGradient
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch

Expand Down Expand Up @@ -86,6 +88,7 @@ fun AccountHome(
navigator.push(BuySellScreen)
}
}

AccountPage.DEPOSIT -> navigator.push(DepositKinScreen)
AccountPage.WITHDRAW -> navigator.push(WithdrawalAmountScreen)
AccountPage.FAQ -> navigator.push(FaqScreen)
Expand Down Expand Up @@ -120,18 +123,11 @@ fun AccountHome(
}
}

LazyColumn(modifier = Modifier.fillMaxSize()) {
items(dataState.items, key = { it.type }, contentType = { it }) { item ->
ListItem(item = item) {
handleItemClicked(item.type)
}
}

item {
CodeScaffold(
bottomBar = {
Box(modifier = Modifier.fillMaxWidth()) {
Text(
modifier = Modifier
.padding(top = CodeTheme.dimens.grid.x7)
.fillMaxWidth()
.align(Alignment.Center),
text = "Version ${BuildConfig.VERSION_NAME} • Build ${BuildConfig.VERSION_CODE}",
Expand All @@ -142,6 +138,24 @@ fun AccountHome(
)
}
}
) { padding ->
val listState = rememberLazyListState()
LazyColumn(
modifier = Modifier
.fillMaxSize()
.padding(padding)
.verticalScrollStateGradient(
scrollState = listState,
isLongGradient = true,
),
state = listState,
) {
items(dataState.items, key = { it.type }, contentType = { it }) { item ->
ListItem(item = item) {
handleItemClicked(item.type)
}
}
}
}
}

Expand Down