Commit f3974d4
committed
fix(ui): honor the v2 amount gap, cross-fade the accessory token
The gap above the v2 amount was never rendering. heightIn(max=) only
lifts the max constraint, and a bare Spacer has no intrinsic size, so it
measured to the minimum and collapsed — grid.x4 and grid.x8 produced an
identical 32dp, all of it AmountArea's own row. height() fixes both
bounds while still coercing into the incoming constraints, so the spacer
contributes its 40dp and continues to give way on a short screen.
The token chip in the accessory row also cross-fades now, with a size
transform to carry the width change between currency names, so returning
from the picker reads as the control changing rather than a hard cut.1 parent 38d2a07 commit f3974d4
2 files changed
Lines changed: 35 additions & 12 deletions
File tree
- apps/flipcash
- core-ui/src/main/kotlin/com/flipcash/app/core/ui
- features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal
Lines changed: 7 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
129 | 129 | | |
130 | 130 | | |
131 | 131 | | |
132 | | - | |
133 | | - | |
134 | | - | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
135 | 137 | | |
136 | 138 | | |
137 | 139 | | |
138 | | - | |
| 140 | + | |
139 | 141 | | |
140 | 142 | | |
141 | 143 | | |
| |||
apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenSelectorRow.kt
Lines changed: 28 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
3 | 9 | | |
4 | 10 | | |
5 | 11 | | |
| |||
52 | 58 | | |
53 | 59 | | |
54 | 60 | | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
62 | 83 | | |
63 | 84 | | |
64 | 85 | | |
| |||
0 commit comments