* Less intrusive collapsing implementation In order for a screen to implement collapsingTopBar, it had to define a specific set of style properties such as drawUnderTabBar or drawUnderNavBar. This commit aims to make implementing collapsingTopBar less intrusive by inferring these properties from hideTitleBarOnScroll. This commit introduces a few fixes and changes related to the collapsingTopBar mechanism. 1. Screens are now drawn under bottomTabs if titleBarHideOnScroll is true. 2. TitleBarHideOnScroll can be passed in AppStyle. 3. ScrollView is detected properly after it gets detached due to large diff in render. 4. Take BottomTabs height into account when measuring collapsing screens.
|
|
||
12 |
|
12 |
|
13 |
|
13 |
|
14 |
|
14 |
|
|
15 |
|
|
|
16 |
|
|
15 |
|
17 |
|
16 |
|
|
|
|
18 |
|
|
17 |
|
19 |
|
|
20 |
|
|
|
21 |
|
|
18 |
|
22 |
|
19 |
|
23 |
|
20 |
|
24 |
|
21 |
|
|
|
|
25 |
|
|
22 |
|
26 |
|
23 |
|
27 |
|
24 |
|
28 |
|
|
|
||
35 |
|
39 |
|
36 |
|
40 |
|
37 |
|
41 |
|
38 |
|
|
|
|
42 |
|
|
39 |
|
43 |
|
40 |
|
44 |
|
41 |
|
45 |
|
|
|
||
44 |
|
48 |
|
45 |
|
49 |
|
46 |
|
50 |
|
47 |
|
|
|
48 |
|
|
|
49 |
|
|
|
50 |
|
|
|
51 |
|
51 |
|
|
|
||
14 |
|
14 |
|
15 |
|
15 |
|
16 |
|
16 |
|
17 |
|
|
|
18 |
|
17 |
|
19 |
|
|
|
20 |
|
|
|
21 |
|
|
|
|
18 |
|
|
22 |
|
19 |
|
23 |
|
20 |
|
|
21 |
|
|
24 |
|
22 |
|
25 |
|
23 |
|
26 |
|
24 |
|
27 |
|
25 |
|
28 |
|
26 |
|
29 |
|
27 |
|
30 |
|
|
|
31 |
|
|
|
|
28 |
|
|
32 |
|
29 |
|
|
30 |
|
|
|
31 |
|
|
|
32 |
|
|
|
33 |
|
|
|
34 |
|
|
|
35 |
|
|
33 |
|
36 |
|
34 |
|
37 |
|
35 |
|
38 |
|
36 |
|
|
|
37 |
|
39 |
|
38 |
|
40 |
|
39 |
|
41 |
|
|
|
||
46 |
|
48 |
|
47 |
|
49 |
|
48 |
|
50 |
|
49 |
|
|
|
50 |
|
|
|
51 |
|
|
|
52 |
|
|
|
53 |
|
|
|
54 |
|
51 |
|
55 |
|
52 |
|
56 |
|
53 |
|
57 |
|
54 |
|
58 |
|
55 |
|
59 |
|
|
|
60 |
|
|
|
|
56 |
|
|
|
57 |
|
|
61 |
|
58 |
|
62 |
|
59 |
|
63 |
|
60 |
|
|
|
||
71 |
|
68 |
|
72 |
|
69 |
|
73 |
|
70 |
|
|
71 |
|
|
|
72 |
|
|
|
73 |
|
|
|
74 |
|
|
|
75 |
|
|
|
76 |
|
|
|
77 |
|
|
|
78 |
|
|
|
79 |
|
|
|
80 |
|
|
|
81 |
|
|
|
82 |
|
|
74 |
|
83 |
|
75 |
|
84 |
|
76 |
|
85 |
|
|
|
||
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
40 |
|
41 |
|
|
|
42 |
|
|
|
43 |
|
|
|
|
41 |
|
|
44 |
|
42 |
|
45 |
|
43 |
|
46 |
|
44 |
|
47 |
|
45 |
|
|
46 |
|
|
|
47 |
|
|
|
48 |
|
|
|
49 |
|
|
|
50 |
|
|
|
51 |
|
|
48 |
|
52 |
|
49 |
|
53 |
|
50 |
|
54 |
|
|
|
||
1 |
|
1 |
|
2 |
|
2 |
|
|
3 |
|
|
3 |
|
4 |
|
4 |
|
5 |
|
5 |
|
6 |
|
|
|
||
19 |
|
20 |
|
20 |
|
21 |
|
21 |
|
22 |
|
|
23 |
|
|
22 |
|
24 |
|
23 |
|
25 |
|
24 |
|
26 |
|
25 |
|
27 |
|
26 |
|
28 |
|
|
29 |
|
|
27 |
|
30 |
|
28 |
|
|
|
29 |
|
31 |
|
30 |
|
32 |
|
31 |
|
33 |
|
|
|
||
49 |
|
51 |
|
50 |
|
52 |
|
51 |
|
53 |
|
52 |
|
|
|
|
54 |
|
|
53 |
|
55 |
|
54 |
|
56 |
|
55 |
|
57 |
|
|
|
||
1 |
|
1 |
|
2 |
|
2 |
|
|
3 |
|
|
3 |
|
4 |
|
4 |
|
5 |
|
5 |
|
6 |
|
|
|
||
15 |
|
16 |
|
16 |
|
17 |
|
17 |
|
18 |
|
|
19 |
|
|
18 |
|
20 |
|
19 |
|
21 |
|
20 |
|
22 |
|
|
|
||
46 |
|
48 |
|
47 |
|
49 |
|
48 |
|
50 |
|
49 |
|
|
|
|
51 |
|
|
50 |
|
52 |
|
51 |
|
53 |
|
52 |
|
54 |
|
|
|
||
1 |
|
1 |
|
2 |
|
2 |
|
|
3 |
|
|
3 |
|
4 |
|
4 |
|
5 |
|
5 |
|
6 |
|
6 |
|
7 |
|
7 |
|
8 |
|
8 |
|
|
|
9 |
|
|
|
10 |
|
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
|
|
|
12 |
|
|
|
13 |
|
|
|
14 |
|
|
|
15 |
|
|
|
16 |
|
|
|
17 |
|
|
|
18 |
|
|
|
19 |
|
|
|
20 |
|
|
11 |
|
21 |
|
12 |
|
22 |
|
13 |
|
23 |
|
14 |
|
24 |
|
15 |
|
25 |
|
16 |
|
26 |
|
17 |
|
|
|
|
27 |
|
|
18 |
|
28 |
|
19 |
|
29 |
|
20 |
|
30 |
|
|
|
||
27 |
|
37 |
|
28 |
|
38 |
|
29 |
|
39 |
|
30 |
|
|
|
|
40 |
|
|
31 |
|
41 |
|
32 |
|
42 |
|
33 |
|
43 |
|
34 |
|
44 |
|
35 |
|
|
|
|
45 |
|
|
36 |
|
46 |
|
37 |
|
47 |
|
|
|
||
|
1 |
|
|
|
2 |
|
|
|
3 |
|
|
|
4 |
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
|
|
|
8 |
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
|
|
|
12 |
|
|
|
13 |
|
|
|
14 |
|
|
|
15 |
|
|
|
16 |
|
|
|
||
2 |
|
2 |
|
3 |
|
3 |
|
4 |
|
4 |
|
|
5 |
|
|
5 |
|
6 |
|
6 |
|
7 |
|
7 |
|
8 |
|
|
|
||
10 |
|
11 |
|
11 |
|
12 |
|
12 |
|
13 |
|
|
14 |
|
|
|
15 |
|
|
13 |
|
16 |
|
14 |
|
17 |
|
15 |
|
|
|
|
18 |
|
|
|
19 |
|
|
16 |
|
20 |
|
17 |
|
|
|
18 |
|
|
|
19 |
|
|
|
|
21 |
|
|
|
22 |
|
|
20 |
|
23 |
|
21 |
|
24 |
|
22 |
|
|
|
23 |
|
|
|
24 |
|
|
|
25 |
|
|
|
26 |
|
|
|
|
25 |
|
|
|
26 |
|
|
27 |
|
27 |
|
|
28 |
|
|
|
29 |
|
|
28 |
|
30 |
|
29 |
|
|
|
|
31 |
|
|
30 |
|
32 |
|
31 |
|
33 |
|
32 |
|
|
|
33 |
|
|
|
34 |
|
|
|
35 |
|
|
|
|
34 |
|
|
|
35 |
|
|
|
36 |
|
|
|
37 |
|
|
|
38 |
|
|
|
39 |
|
|
|
40 |
|
|
|
41 |
|
|
|
42 |
|
|
|
43 |
|
|
|
44 |
|
|
|
45 |
|
|
36 |
|
46 |
|
37 |
|
|
|
|
47 |
|
|
38 |
|
48 |
|
39 |
|
49 |
|
|
50 |
|
|
40 |
|
51 |
|
41 |
|
52 |
|
42 |
|
|
|
|
53 |
|
|
43 |
|
54 |
|
44 |
|
|
|
|
55 |
|
|
|
56 |
|
|
45 |
|
57 |
|
46 |
|
58 |
|
47 |
|
59 |
|
48 |
|
|
|
|
60 |
|
|
|
61 |
|
|
49 |
|
62 |
|
50 |
|
63 |
|
|
64 |
|
|
51 |
|
65 |
|
52 |
|
66 |
|
53 |
|
|
|
|
67 |
|
|
54 |
|
68 |
|
55 |
|
69 |
|
56 |
|
70 |
|
57 |
|
|
|
|
71 |
|
|
58 |
|
72 |
|
59 |
|
73 |
|
60 |
|
74 |
|
61 |
|
75 |
|
62 |
|
76 |
|
63 |
|
|
|
|
77 |
|
|
64 |
|
78 |
|
65 |
|
79 |
|
66 |
|
80 |
|
|
|
||
|
1 |
|
|
|
2 |
|
|
|
3 |
|
|
|
4 |
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
|
|
|
8 |
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
|
|
|
12 |
|
|
|
13 |
|
|
|
14 |
|
|
|
15 |
|