Skip to content

fix(wallet): bottom-align labels on Spread TileButtons #1245

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
bmc08gt merged 1 commit into from
Aug 15, 2026
Merged

fix(wallet): bottom-align labels on Spread TileButtons #1245

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
2 changes: 2 additions & 0 deletions apps/flipcash/core-ui/src/main/kotlin/com/flipcash/app/core/ui/TileButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ fun TileButton(
modifier = Modifier
.fillMaxWidth()
.fillMaxHeight(),
// Icon pinned to the top, label pinned to the bottom — the tile's height (set by the
// caller) becomes the gap, so single- and multi-line labels bottom-align across tiles.
verticalArrangement = Arrangement.SpaceBetween,
horizontalAlignment = Alignment.Start,
) {
Expand Down
17 changes: 8 additions & 9 deletions ...features/balance/src/main/kotlin/com/flipcash/app/balance/internal/WalletScreenContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ package com.flipcash.app.balance.internal
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.fillMaxWidth
Expand Down Expand Up @@ -149,6 +148,7 @@ internal fun WalletScreenContent(
Row(
modifier = Modifier
.fillMaxWidth()
.padding(top = CodeTheme.dimens.grid.x2)
.clickable {
dispatchEvent(
WalletViewModel.Event.OpenScreen(AppRoute.Sheets.ActivityHistory)
Expand Down Expand Up @@ -189,18 +189,17 @@ internal fun WalletScreenContent(
}

item {
// Equal-height tiles: the taller (wrapping) label drives the row height and the
// shorter tile stretches to match, so each tile can spread its icon/label vertically.
// Fixed, width-proportional height (like iOS) so both tiles are equal height and tall
// enough for the icon (top) and label (bottom) to sit apart — labels bottom-align even
// when one wraps to two lines.
Row(
modifier = Modifier
.fillMaxWidth()
.height(IntrinsicSize.Min),
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2),
) {
TileButton(
modifier = Modifier
.weight(1f)
.fillMaxHeight(),
.aspectRatio(1.45f),
style = TileButtonStyle.Spread,
text = stringResource(R.string.action_addMoney),
icon = rememberVectorPainter(Icons.Outlined.AddCircleOutline),
Expand All @@ -211,7 +210,7 @@ internal fun WalletScreenContent(
TileButton(
modifier = Modifier
.weight(1f)
.fillMaxHeight(),
.aspectRatio(1.45f),
style = TileButtonStyle.Spread,
text = stringResource(R.string.action_discoverCurrencies),
icon = painterResource(R.drawable.ic_globe),
Expand Down
Loading