Commit 89f8ad3
authored
fix(Android): separate transitions of sheet and dimming view (#2542)
## Description
This PR allows the form sheet on Android to be dismissed using
`slide-down` animation. Currently the sheet fades-out together with the
dimming view due to using regular [Tween
animations](https://developer.android.com/guide/topics/resources/animation-resource#Tween),
which apply animation whole view hierarchy from the fragment's root view
down - this does not allow for separate animations for the sheet and
dimming view.
`Transition API` was considered as an implementation measure, however
due to numerous encountered problems, most prominent example being
"disappearing shadows during pop transitions", I rejected it.
The implementation settled on using custom value / object evaluators.
This approach comes with its own series of issues, with the most
prominent one:
* on old architecture the fragment transaction execution (transition)
starts before initial frame for content wrapper is received - I decided
to defer the transaction to the moment of receiving the layout.
> [!caution]
This PR changes current default animation for formsheets on Android.
This is potentially a breaking change. I haven't decided yet whether to
treat is as a fix or hide this new animation behind some prop.
WIP recordings of the changes.
## Changes
* Form Sheet screens use now custom animators instead of tween animation
(`setCustomTransition`) defined in `ScreenStack.onUpdate`.
* Removed `DimmingFragment` as there is no longer "nested fragment
strcuture". Dimming view is now attached directly into hierarchy (under
coordinator layout) w/o hosting it in separate fragment.
* Refactored native dismiss code
> [!note]
During testing I've noticed that for some reason the form sheet screens
do not receive `onWill(dis)appear` events on navigator. This is
something to investigate, however it seems that this is not a
regression.
## Test code and steps to reproduce
`TestFormSheet` / `TestAndroidTransitions` examples
## Checklist
- [x] Included code example that can be used to test this change
- [x] Ensured that CI passes1 parent a8ae962 commit 89f8ad3
14 files changed
Lines changed: 595 additions & 534 deletions
File tree
- android/src/main/java/com/swmansion/rnscreens
- bottomsheet
- events
- transition
- apps/src/tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
| 21 | + | |
20 | 22 | | |
21 | 23 | | |
22 | 24 | | |
23 | 25 | | |
24 | 26 | | |
25 | 27 | | |
26 | 28 | | |
| 29 | + | |
| 30 | + | |
27 | 31 | | |
28 | 32 | | |
| 33 | + | |
29 | 34 | | |
30 | 35 | | |
31 | 36 | | |
32 | 37 | | |
33 | | - | |
| 38 | + | |
34 | 39 | | |
35 | 40 | | |
36 | 41 | | |
| |||
81 | 86 | | |
82 | 87 | | |
83 | 88 | | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
84 | 96 | | |
85 | 97 | | |
86 | 98 | | |
| |||
110 | 122 | | |
111 | 123 | | |
112 | 124 | | |
113 | | - | |
| 125 | + | |
114 | 126 | | |
115 | 127 | | |
116 | 128 | | |
| |||
119 | 131 | | |
120 | 132 | | |
121 | 133 | | |
122 | | - | |
| 134 | + | |
123 | 135 | | |
124 | 136 | | |
125 | 137 | | |
126 | 138 | | |
127 | 139 | | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
128 | 151 | | |
129 | 152 | | |
130 | 153 | | |
| |||
162 | 185 | | |
163 | 186 | | |
164 | 187 | | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
165 | 199 | | |
166 | 200 | | |
167 | 201 | | |
| |||
377 | 411 | | |
378 | 412 | | |
379 | 413 | | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
380 | 436 | | |
381 | 437 | | |
382 | 438 | | |
| |||
407 | 463 | | |
408 | 464 | | |
409 | 465 | | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
410 | 477 | | |
411 | 478 | | |
412 | 479 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
Lines changed: 1 addition & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | 18 | | |
20 | 19 | | |
21 | 20 | | |
| |||
290 | 289 | | |
291 | 290 | | |
292 | 291 | | |
293 | | - | |
294 | | - | |
295 | | - | |
296 | | - | |
297 | | - | |
298 | | - | |
| 292 | + | |
299 | 293 | | |
300 | 294 | | |
301 | 295 | | |
| |||
Lines changed: 8 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | 14 | | |
16 | 15 | | |
17 | 16 | | |
| |||
50 | 49 | | |
51 | 50 | | |
52 | 51 | | |
53 | | - | |
| 52 | + | |
54 | 53 | | |
55 | 54 | | |
56 | 55 | | |
| |||
242 | 241 | | |
243 | 242 | | |
244 | 243 | | |
245 | | - | |
246 | 244 | | |
247 | 245 | | |
248 | 246 | | |
| |||
302 | 300 | | |
303 | 301 | | |
304 | 302 | | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
305 | 309 | | |
306 | 310 | | |
307 | 311 | | |
| |||
0 commit comments