Repository navigation
Commit 5a0d284
authored
fix(ui): restore BottomBar padding after Modal migration (#1170)
* fix(ui): restore BottomBar padding after Modal migration
PR #1128 migrated BottomBarContainer to the shared Modal composable but
inherited Modal's own layout defaults, changing how the bar renders:
- top inset padding was halved (inset -> grid.x2)
- an extra bottom gap was added (grid.x2, on top of the button's own padding)
- item spacing tightened (grid.x3 -> grid.x2)
- title/subtitle became center-aligned instead of start-aligned
Parameterize Modal with contentPadding and horizontalAlignment (defaults
unchanged, so other callers like ReceivedFundsConfirmation are unaffected)
and pass the original BottomBarView values from BottomBarContainer.
* fix(ui): use textLarge for BottomBar title and caption for message
* fix(ui): keep BottomBar content during exit so slide-out animation is visible
The manager clears the active message immediately on close (so other screens
don't re-show it), which set bottomBarMessage to null before the AnimatedContent
exit transition finished. BottomBarView early-returns on a null message, so the
outgoing frame rendered nothing and the bar appeared to vanish instantly instead
of sliding out.
Retain the last non-null message and render that during the transition so the
slide-out animation is visible.1 parent 1b8a7fb commit 5a0d284
2 files changed
Lines changed: 27 additions & 5 deletions
Lines changed: 8 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
24 | 30 | | |
25 | 31 | | |
26 | 32 | | |
| |||
36 | 42 | | |
37 | 43 | | |
38 | 44 | | |
39 | | - | |
| 45 | + | |
40 | 46 | | |
41 | | - | |
| 47 | + | |
42 | 48 | | |
43 | 49 | | |
44 | 50 | | |
| |||
Lines changed: 19 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
| |||
72 | 73 | | |
73 | 74 | | |
74 | 75 | | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
75 | 84 | | |
76 | 85 | | |
77 | 86 | | |
| |||
171 | 180 | | |
172 | 181 | | |
173 | 182 | | |
174 | | - | |
| 183 | + | |
175 | 184 | | |
176 | 185 | | |
177 | 186 | | |
| |||
205 | 214 | | |
206 | 215 | | |
207 | 216 | | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
208 | 224 | | |
209 | 225 | | |
210 | 226 | | |
| |||
213 | 229 | | |
214 | 230 | | |
215 | 231 | | |
216 | | - | |
| 232 | + | |
217 | 233 | | |
218 | 234 | | |
219 | 235 | | |
220 | 236 | | |
221 | | - | |
| 237 | + | |
222 | 238 | | |
223 | 239 | | |
224 | 240 | | |
| |||
0 commit comments