* tabBarItem support * apply tab items on tabController initialization * e2e test * refactored bottomTab item * tests fix * tabItem testID fix * renamed tabBadge to badge * fix merge * BottomTab fix * removed BottomTabs
|
|
||
| 8 |
|
8 |
|
| 9 |
|
9 |
|
| 10 |
|
10 |
|
| 11 |
|
|
|
| 12 |
|
11 |
|
| 13 |
|
12 |
|
| 14 |
|
13 |
|
| 15 |
|
14 |
|
| 16 |
|
15 |
|
|
16 |
|
|
|
||
| 1 |
|
|
|
| 2 |
|
|
|
| 3 |
|
|
|
| 4 |
|
|
|
| 5 |
|
|
|
| 6 |
|
|
|
| 7 |
|
|
|
| 8 |
|
|
|
|
||
| 6 |
|
6 |
|
| 7 |
|
7 |
|
| 8 |
|
8 |
|
|
9 |
|
|
| 9 |
|
10 |
|
|
|
||
| 6 |
|
6 |
|
| 7 |
|
7 |
|
| 8 |
|
8 |
|
| 9 |
|
|
|
|
9 |
|
|
| 10 |
|
10 |
|
|
|
||
|
1 |
|
|
|
2 |
|
|
|
3 |
|
|
|
4 |
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
|
|
|
8 |
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
|
|
|
12 |
|
|
|
||
| 6 |
|
6 |
|
| 7 |
|
7 |
|
| 8 |
|
8 |
|
| 9 |
|
|
|
| 10 |
|
9 |
|
| 11 |
|
10 |
|
| 12 |
|
11 |
|
|
|
||
| 6 |
|
6 |
|
| 7 |
|
7 |
|
| 8 |
|
8 |
|
|
9 |
|
|
| 9 |
|
10 |
|
| 10 |
|
11 |
|
| 11 |
|
12 |
|
|
|
||
| 104 |
|
104 |
|
| 105 |
|
105 |
|
| 106 |
|
106 |
|
|
107 |
|
|
|
108 |
|
|
|
109 |
|
|
|
110 |
|
|
|
111 |
|
|
|
112 |
|
|
| 107 |
|
113 |
|
|
|
||
| 103 |
|
103 |
|
| 104 |
|
104 |
|
| 105 |
|
105 |
|
|
106 |
|
|
|
107 |
|
|
| 106 |
|
108 |
|
| 107 |
|
|
|
| 108 |
|
|
|
| 109 |
|
109 |
|
| 110 |
|
110 |
|
| 111 |
|
111 |
|
|
|
||
| 3 |
|
3 |
|
| 4 |
|
4 |
|
| 5 |
|
5 |
|
|
6 |
|
|
| 6 |
|
7 |
|
| 7 |
|
8 |
|
| 8 |
|
9 |
|
|
|
||
| 25 |
|
26 |
|
| 26 |
|
27 |
|
| 27 |
|
28 |
|
|
29 |
|
|
|
30 |
|
|
| 28 |
|
31 |
|
| 29 |
|
32 |
|
| 30 |
|
33 |
|
|
|
||
| 35 |
|
38 |
|
| 36 |
|
39 |
|
| 37 |
|
40 |
|
|
41 |
|
|
|
42 |
|
|
| 38 |
|
43 |
|
|
|
||
| 30 |
|
30 |
|
| 31 |
|
31 |
|
| 32 |
|
32 |
|
| 33 |
|
|
|
|
33 |
|
|
|
34 |
|
|
| 34 |
|
35 |
|
| 35 |
|
36 |
|
| 36 |
|
37 |
|
|
|
||
| 42 |
|
43 |
|
| 43 |
|
44 |
|
| 44 |
|
45 |
|
|
46 |
|
|
|
47 |
|
|
| 45 |
|
48 |
|
| 46 |
|
49 |
|
| 47 |
|
50 |
|
|
|
||
| 195 |
|
198 |
|
| 196 |
|
199 |
|
| 197 |
|
200 |
|
| 198 |
|
|
|
| 199 |
|
|
|
| 200 |
|
|
|
| 201 |
|
|
|
| 202 |
|
|
|
| 203 |
|
|
|
| 204 |
|
|
|
| 205 |
|
|
|
| 206 |
|
201 |
|
| 207 |
|
202 |
|
| 208 |
|
203 |
|
|
|
||
| 283 |
|
278 |
|
| 284 |
|
279 |
|
| 285 |
|
280 |
|
|
281 |
|
|
|
282 |
|
|
|
283 |
|
|
|
284 |
|
|
|
285 |
|
|
|
286 |
|
|
|
287 |
|
|
|
288 |
|
|
|
289 |
|
|
|
290 |
|
|
|
291 |
|
|
|
292 |
|
|
|
293 |
|
|
|
294 |
|
|
|
295 |
|
|
|
296 |
|
|
|
297 |
|
|
|
298 |
|
|
|
299 |
|
|
|
300 |
|
|
|
301 |
|
|
|
302 |
|
|
|
303 |
|
|
|
304 |
|
|
|
305 |
|
|
|
306 |
|
|
|
307 |
|
|
| 286 |
|
308 |
|
| 287 |
|
309 |
|
| 288 |
|
310 |
|
|
|
||
| 23 |
|
23 |
|
| 24 |
|
24 |
|
| 25 |
|
25 |
|
|
26 |
|
|
| 26 |
|
27 |
|
| 27 |
|
28 |
|
|
|
||
| 108 |
|
108 |
|
| 109 |
|
109 |
|
| 110 |
|
110 |
|
| 111 |
|
|
|
|
111 |
|
|
| 112 |
|
112 |
|
| 113 |
|
113 |
|
| 114 |
|
114 |
|
|
115 |
|
|
|
116 |
|
|
|
117 |
|
|
|
118 |
|
|
| 115 |
|
119 |
|
| 116 |
|
120 |
|
| 117 |
|
121 |
|
|
|
||
| 6 |
|
6 |
|
| 7 |
|
7 |
|
| 8 |
|
8 |
|
| 9 |
|
|
|
| 10 |
|
9 |
|
| 11 |
|
10 |
|
| 12 |
|
11 |
|
|
|
||
| 11 |
|
11 |
|
| 12 |
|
12 |
|
| 13 |
|
13 |
|
| 14 |
|
|
|
| 15 |
|
14 |
|
| 16 |
|
15 |
|
| 17 |
|
16 |
|
|
|
||
|
1 |
|
|
|
2 |
|
|
|
3 |
|
|
|
4 |
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
|
|
|
8 |
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
|
|
|
12 |
|
|
|
13 |
|
|
|
14 |
|
|
|
15 |
|
|
|
16 |
|
|
|
17 |
|
|
|
18 |
|
|
|
||
|
1 |
|
|
|
2 |
|
|
|
3 |
|
|
|
4 |
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
|
|
|
8 |
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
|
|
|
12 |
|
|
|
13 |
|
|
|
14 |
|
|
|
15 |
|
|
|
16 |
|
|
|
17 |
|
|
|
18 |
|
|
|
19 |
|
|
|
20 |
|
|
|
21 |
|
|
|
22 |
|
|
|
23 |
|
|
|
24 |
|
|
|
25 |
|
|
|
26 |
|
|
|
27 |
|
|
|
28 |
|
|
|
29 |
|
|
|
30 |
|
|
|
31 |
|
|
|
32 |
|
|
|
||
| 59 |
|
59 |
|
| 60 |
|
60 |
|
| 61 |
|
61 |
|
|
62 |
|
|
|
63 |
|
|
| 62 |
|
64 |
|
| 63 |
|
65 |
|
| 64 |
|
66 |
|
|
|
||
| 207 |
|
209 |
|
| 208 |
|
210 |
|
| 209 |
|
211 |
|
|
212 |
|
|
|
213 |
|
|
| 210 |
|
214 |
|
| 211 |
|
215 |
|
| 212 |
|
216 |
|
|
|
||
| 426 |
|
430 |
|
| 427 |
|
431 |
|
| 428 |
|
432 |
|
|
433 |
|
|
|
434 |
|
|
| 429 |
|
435 |
|
| 430 |
|
436 |
|
| 431 |
|
437 |
|
|
|
||
| 603 |
|
609 |
|
| 604 |
|
610 |
|
| 605 |
|
611 |
|
|
612 |
|
|
| 606 |
|
613 |
|
| 607 |
|
614 |
|
| 608 |
|
615 |
|
|
|
||
| 757 |
|
764 |
|
| 758 |
|
765 |
|
| 759 |
|
766 |
|
|
767 |
|
|
| 760 |
|
768 |
|
| 761 |
|
769 |
|
| 762 |
|
770 |
|
|
|
||
| 174 |
|
174 |
|
| 175 |
|
175 |
|
| 176 |
|
176 |
|
| 177 |
|
|
|
|
177 |
|
|
| 178 |
|
178 |
|
| 179 |
|
179 |
|
| 180 |
|
180 |
|
|
|
||
| 1 |
|
|
|
| 2 |
|
|
|
| 3 |
|
|
|
| 4 |
|
|
|
| 5 |
|
|
|
| 6 |
|
|
|
| 7 |
|
|
|
| 8 |
|
|
|
| 9 |
|
|
|
| 10 |
|
|
|
| 11 |
|
|
|
| 12 |
|
|
|
| 13 |
|
|
|
| 14 |
|
|
|
| 15 |
|
|
|
| 16 |
|
|
|
| 17 |
|
|
|
|
||
| 1 |
|
|
|
| 2 |
|
|
|
| 3 |
|
|
|
| 4 |
|
|
|
| 5 |
|
|
|
| 6 |
|
|
|
| 7 |
|
|
|
| 8 |
|
|
|
| 9 |
|
|
|
| 10 |
|
|
|
| 11 |
|
|
|
| 12 |
|
|
|
| 13 |
|
|
|
| 14 |
|
|
|
| 15 |
|
|
|
| 16 |
|
|
|
| 17 |
|
|
|
| 18 |
|
|
|
| 19 |
|
|
|
| 20 |
|
|
|
| 21 |
|
|
|
| 22 |
|
|
|
| 23 |
|
|
|
| 24 |
|
|
|
| 25 |
|
|
|
| 26 |
|
|
|
| 27 |
|
|
|
| 28 |
|
|
|
| 29 |
|
|
|
| 30 |
|
|
|
| 31 |
|
|
|
| 32 |
|
|
|
| 33 |
|
|
|
| 34 |
|
|
|
|
||
| 2 |
|
2 |
|
| 3 |
|
3 |
|
| 4 |
|
4 |
|
|
5 |
|
|
| 5 |
|
6 |
|
| 6 |
|
7 |
|
| 7 |
|
8 |
|
|
|
||
| 9 |
|
10 |
|
| 10 |
|
11 |
|
| 11 |
|
12 |
|
|
13 |
|
|
| 12 |
|
14 |
|
| 13 |
|
15 |
|
| 14 |
|
16 |
|
|
|
||
| 1 |
|
1 |
|
| 2 |
|
2 |
|
| 3 |
|
|
|
| 4 |
|
3 |
|
| 5 |
|
4 |
|
| 6 |
|
5 |
|
| 7 |
|
6 |
|
| 8 |
|
7 |
|
| 9 |
|
|
|
|
8 |
|
|
| 10 |
|
9 |
|
| 11 |
|
10 |
|
| 12 |
|
11 |
|
| 13 |
|
12 |
|
| 14 |
|
|
|
|
13 |
|
|
|
14 |
|
|
|
15 |
|
|
|
16 |
|
|
| 15 |
|
17 |
|
| 16 |
|
18 |
|
| 17 |
|
19 |
|
|
|
||
|
1 |
|
|
|
2 |
|
|
|
3 |
|
|
|
4 |
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
|
|
|
8 |
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
|
|
|
12 |
|
|
|
13 |
|
|
|
14 |
|
|
|
15 |
|
|
|
16 |
|
|
|
17 |
|
|
|
18 |
|
|
|
19 |
|
|
|
20 |
|
|
|
21 |
|
|
|
22 |
|
|
|
23 |
|
|
|
||
|
1 |
|
|
|
2 |
|
|
|
3 |
|
|
|
4 |
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
|
|
|
8 |
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
|
|
|
12 |
|
|
|
13 |
|
|
|
14 |
|
|
|
15 |
|
|
|
16 |
|
|
|
17 |
|
|
|
18 |
|
|
|
||
| 4 |
|
4 |
|
| 5 |
|
5 |
|
| 6 |
|
6 |
|
| 7 |
|
|
|
| 8 |
|
7 |
|
| 9 |
|
8 |
|
| 10 |
|
9 |
|
|
|
||
| 14 |
|
13 |
|
| 15 |
|
14 |
|
| 16 |
|
15 |
|
| 17 |
|
|
|
| 18 |
|
16 |
|
| 19 |
|
17 |
|
| 20 |
|
18 |
|
|
|
||
| 3 |
|
3 |
|
| 4 |
|
4 |
|
| 5 |
|
5 |
|
| 6 |
|
|
|
| 7 |
|
6 |
|
| 8 |
|
7 |
|
| 9 |
|
8 |
|
|
|
||
| 13 |
|
12 |
|
| 14 |
|
13 |
|
| 15 |
|
14 |
|
| 16 |
|
|
|
| 17 |
|
15 |
|
| 18 |
|
16 |
|
| 19 |
|
17 |
|
|
|
||
| 1 |
|
1 |
|
| 2 |
|
2 |
|
| 3 |
|
3 |
|
|
4 |
|
|
| 4 |
|
5 |
|
| 5 |
|
6 |
|
| 6 |
|
7 |
|
| 7 |
|
8 |
|
| 8 |
|
9 |
|
|
10 |
|
|
| 9 |
|
11 |
|
| 10 |
|
12 |
|
| 11 |
|
13 |
|
|
|
||
| 13 |
|
15 |
|
| 14 |
|
16 |
|
| 15 |
|
17 |
|
|
18 |
|
|
| 16 |
|
19 |
|
| 17 |
|
20 |
|
| 18 |
|
21 |
|
|
|
||
| 1 |
|
1 |
|
| 2 |
|
2 |
|
| 3 |
|
3 |
|
|
4 |
|
|
| 4 |
|
5 |
|
| 5 |
|
6 |
|
| 6 |
|
7 |
|
|
8 |
|
|
| 7 |
|
9 |
|
| 8 |
|
10 |
|
| 9 |
|
11 |
|
|
|
||
| 23 |
|
25 |
|
| 24 |
|
26 |
|
| 25 |
|
27 |
|
|
28 |
|
|
| 26 |
|
29 |
|
| 27 |
|
30 |
|
| 28 |
|
31 |
|
|
|
||
| 33 |
|
36 |
|
| 34 |
|
37 |
|
| 35 |
|
38 |
|
|
39 |
|
|
| 36 |
|
40 |
|
| 37 |
|
41 |
|
| 38 |
|
42 |
|
|
|
||
| 42 |
|
42 |
|
| 43 |
|
43 |
|
| 44 |
|
44 |
|
| 45 |
|
|
|
| 46 |
|
|
|
|
45 |
|
|
|
46 |
|
|
| 47 |
|
47 |
|
| 48 |
|
48 |
|
| 49 |
|
49 |
|
|
|
||
| 53 |
|
53 |
|
| 54 |
|
54 |
|
| 55 |
|
55 |
|
|
56 |
|
|
|
57 |
|
|
|
58 |
|
|
|
59 |
|
|
|
60 |
|
|
|
61 |
|
|
| 56 |
|
62 |
|
| 57 |
|
63 |
|
| 58 |
|
64 |
|
|
|
||
| 61 |
|
67 |
|
| 62 |
|
68 |
|
| 63 |
|
69 |
|
|
70 |
|
|
|
71 |
|
|
|
72 |
|
|
|
73 |
|
|
|
74 |
|
|
|
75 |
|
|
| 64 |
|
76 |
|
| 65 |
|
77 |
|
| 66 |
|
78 |
|
|
|
||
| 42 |
|
42 |
|
| 43 |
|
43 |
|
| 44 |
|
44 |
|
|
45 |
|
|
|
46 |
|
|
| 45 |
|
47 |
|
| 46 |
|
48 |
|
| 47 |
|
49 |
|