Преглед изворни кода

Add Android navigation bar

master
zbettenbuk пре 7 година
родитељ
комит
1020a54a33

+ 3
- 0
css/_font.scss Прегледај датотеку

42
 .icon-public:before {
42
 .icon-public:before {
43
     content: "\e80b";
43
     content: "\e80b";
44
 }
44
 }
45
+.icon-restore:before {
46
+  content: "\e8b3";
47
+}
45
 .icon-timer:before {
48
 .icon-timer:before {
46
     content: "\e425";
49
     content: "\e425";
47
 }
50
 }


+ 1
- 0
fonts/jitsi.svg Прегледај датотеку

23
 <glyph unicode="&#xe616;" glyph-name="event_note" d="M598 426v-84h-300v84h300zM810 214v468h-596v-468h596zM810 896c46 0 86-40 86-86v-596c0-46-40-86-86-86h-596c-48 0-86 40-86 86v596c0 46 38 86 86 86h42v86h86v-86h340v86h86v-86h42zM726 598v-86h-428v86h428z" />
23
 <glyph unicode="&#xe616;" glyph-name="event_note" d="M598 426v-84h-300v84h300zM810 214v468h-596v-468h596zM810 896c46 0 86-40 86-86v-596c0-46-40-86-86-86h-596c-48 0-86 40-86 86v596c0 46 38 86 86 86h42v86h86v-86h340v86h86v-86h42zM726 598v-86h-428v86h428z" />
24
 <glyph unicode="&#xe61d;" glyph-name="phone-talk" d="M640 512c0 70-58 128-128 128v86c118 0 214-96 214-214h-86zM810 512c0 166-132 298-298 298v86c212 0 384-172 384-384h-86zM854 362c24 0 42-18 42-42v-150c0-24-18-42-42-42-400 0-726 326-726 726 0 24 18 42 42 42h150c24 0 42-18 42-42 0-54 8-104 24-152 4-14 2-32-10-44l-94-94c62-122 162-220 282-282l94 94c12 12 30 14 44 10 48-16 98-24 152-24z" />
24
 <glyph unicode="&#xe61d;" glyph-name="phone-talk" d="M640 512c0 70-58 128-128 128v86c118 0 214-96 214-214h-86zM810 512c0 166-132 298-298 298v86c212 0 384-172 384-384h-86zM854 362c24 0 42-18 42-42v-150c0-24-18-42-42-42-400 0-726 326-726 726 0 24 18 42 42 42h150c24 0 42-18 42-42 0-54 8-104 24-152 4-14 2-32-10-44l-94-94c62-122 162-220 282-282l94 94c12 12 30 14 44 10 48-16 98-24 152-24z" />
25
 <glyph unicode="&#xe80b;" glyph-name="public" d="M764 282c56 60 90 142 90 230 0 142-88 266-214 316v-18c0-46-40-84-86-84h-84v-86c0-24-20-42-44-42h-84v-86h256c24 0 42-18 42-42v-128h42c38 0 70-26 82-60zM470 174v82c-46 0-86 40-86 86v42l-204 204c-6-24-10-50-10-76 0-174 132-318 300-338zM512 938c236 0 426-190 426-426s-190-426-426-426-426 190-426 426 190 426 426 426z" />
25
 <glyph unicode="&#xe80b;" glyph-name="public" d="M764 282c56 60 90 142 90 230 0 142-88 266-214 316v-18c0-46-40-84-86-84h-84v-86c0-24-20-42-44-42h-84v-86h256c24 0 42-18 42-42v-128h42c38 0 70-26 82-60zM470 174v82c-46 0-86 40-86 86v42l-204 204c-6-24-10-50-10-76 0-174 132-318 300-338zM512 938c236 0 426-190 426-426s-190-426-426-426-426 190-426 426 190 426 426 426z" />
26
+<glyph unicode="&#xe8b3;" glyph-name="restore" d="M512 682h64v-180l150-90-32-52-182 110v212zM554 896c212 0 384-172 384-384s-172-384-384-384c-106 0-200 42-270 112l60 62c54-54 128-88 210-88 166 0 300 132 300 298s-134 298-300 298-298-132-298-298h128l-172-172-4 6-166 166h128c0 212 172 384 384 384z" />
26
 <glyph unicode="&#xe901;" glyph-name="avatar" d="M512 204c106 0 200 56 256 138-2 84-172 132-256 132-86 0-254-48-256-132 56-82 150-138 256-138zM512 810c-70 0-128-58-128-128s58-128 128-128 128 58 128 128-58 128-128 128zM512 938c236 0 426-190 426-426s-190-426-426-426-426 190-426 426 190 426 426 426z" />
27
 <glyph unicode="&#xe901;" glyph-name="avatar" d="M512 204c106 0 200 56 256 138-2 84-172 132-256 132-86 0-254-48-256-132 56-82 150-138 256-138zM512 810c-70 0-128-58-128-128s58-128 128-128 128 58 128 128-58 128-128 128zM512 938c236 0 426-190 426-426s-190-426-426-426-426 190-426 426 190 426 426 426z" />
27
 <glyph unicode="&#xe902;" glyph-name="download" d="M726 470h-128v170h-172v-170h-128l214-214zM826 596c110-8 198-100 198-212 0-118-96-214-214-214h-554c-142 0-256 114-256 256 0 132 100 240 228 254 54 102 160 174 284 174 156 0 284-110 314-258z" />
28
 <glyph unicode="&#xe902;" glyph-name="download" d="M726 470h-128v170h-172v-170h-128l214-214zM826 596c110-8 198-100 198-212 0-118-96-214-214-214h-554c-142 0-256 114-256 256 0 132 100 240 228 254 54 102 160 174 284 174 156 0 284-110 314-258z" />
28
 <glyph unicode="&#xe903;" glyph-name="mic-camera-combined" d="M756.704 628.138l267.296 202.213v-635.075l-267.296 202.213v-191.923c0-12.085-11.296-21.863-25.216-21.863h-706.272c-13.92 0-25.216 9.777-25.216 21.863v612.25c0 12.085 11.296 21.863 25.216 21.863h706.272c13.92 0 25.216-9.777 25.216-21.863v-189.679zM371.338 376.228c47.817 0 86.529 40.232 86.529 89.811v184.835c0 49.651-38.713 89.883-86.529 89.883-47.788 0-86.515-40.232-86.515-89.883v-184.835c0-49.579 38.756-89.811 86.515-89.811v0zM356.754 314.070v-32.78h33.718v33.412c73.858 9.606 131.235 73.73 131.235 151.351v88.232h-30.636v-88.232c0-67.57-53.696-122.534-119.734-122.534-66.024 0-119.691 54.964-119.691 122.534v88.232h-30.636v-88.232c0-79.215 59.674-144.502 135.744-151.969v-0.014z" />
29
 <glyph unicode="&#xe903;" glyph-name="mic-camera-combined" d="M756.704 628.138l267.296 202.213v-635.075l-267.296 202.213v-191.923c0-12.085-11.296-21.863-25.216-21.863h-706.272c-13.92 0-25.216 9.777-25.216 21.863v612.25c0 12.085 11.296 21.863 25.216 21.863h706.272c13.92 0 25.216-9.777 25.216-21.863v-189.679zM371.338 376.228c47.817 0 86.529 40.232 86.529 89.811v184.835c0 49.651-38.713 89.883-86.529 89.883-47.788 0-86.515-40.232-86.515-89.883v-184.835c0-49.579 38.756-89.811 86.515-89.811v0zM356.754 314.070v-32.78h33.718v33.412c73.858 9.606 131.235 73.73 131.235 151.351v88.232h-30.636v-88.232c0-67.57-53.696-122.534-119.734-122.534-66.024 0-119.691 54.964-119.691 122.534v88.232h-30.636v-88.232c0-79.215 59.674-144.502 135.744-151.969v-0.014z" />



+ 84
- 57
fonts/selection.json Прегледај датотеку

1
 {
1
 {
2
   "IcoMoonType": "selection",
2
   "IcoMoonType": "selection",
3
   "icons": [
3
   "icons": [
4
+    {
5
+      "icon": {
6
+        "paths": [
7
+          "M512 342h64v180l150 90-32 52-182-110v-212zM554 128c212 0 384 172 384 384s-172 384-384 384c-106 0-200-42-270-112l60-62c54 54 128 88 210 88 166 0 300-132 300-298s-134-298-300-298-298 132-298 298h128l-172 172-4-6-166-166h128c0-212 172-384 384-384z"
8
+        ],
9
+        "attrs": [],
10
+        "isMulticolor": false,
11
+        "isMulticolor2": false,
12
+        "tags": [
13
+          "restore"
14
+        ],
15
+        "defaultCode": 59571,
16
+        "grid": 24
17
+      },
18
+      "attrs": [],
19
+      "properties": {
20
+        "ligatures": "history, restore",
21
+        "id": 385,
22
+        "order": 930,
23
+        "prevSize": 24,
24
+        "code": 59571,
25
+        "name": "restore"
26
+      },
27
+      "setIdx": 0,
28
+      "setId": 2,
29
+      "iconIdx": 385
30
+    },
4
     {
31
     {
5
       "icon": {
32
       "icon": {
6
         "paths": [
33
         "paths": [
24
         "code": 58377,
51
         "code": 58377,
25
         "name": "navigate_next"
52
         "name": "navigate_next"
26
       },
53
       },
27
-      "setIdx": 0,
28
-      "setId": 2,
29
-      "iconIdx": 153
54
+      "setIdx": 1,
55
+      "setId": 1,
56
+      "iconIdx": 0
30
     },
57
     },
31
     {
58
     {
32
       "icon": {
59
       "icon": {
53
       },
80
       },
54
       "setIdx": 1,
81
       "setIdx": 1,
55
       "setId": 1,
82
       "setId": 1,
56
-      "iconIdx": 0
83
+      "iconIdx": 1
57
     },
84
     },
58
     {
85
     {
59
       "icon": {
86
       "icon": {
80
       },
107
       },
81
       "setIdx": 1,
108
       "setIdx": 1,
82
       "setId": 1,
109
       "setId": 1,
83
-      "iconIdx": 1
110
+      "iconIdx": 2
84
     },
111
     },
85
     {
112
     {
86
       "icon": {
113
       "icon": {
107
       },
134
       },
108
       "setIdx": 1,
135
       "setIdx": 1,
109
       "setId": 1,
136
       "setId": 1,
110
-      "iconIdx": 2
137
+      "iconIdx": 3
111
     },
138
     },
112
     {
139
     {
113
       "icon": {
140
       "icon": {
134
       },
161
       },
135
       "setIdx": 1,
162
       "setIdx": 1,
136
       "setId": 1,
163
       "setId": 1,
137
-      "iconIdx": 3
164
+      "iconIdx": 4
138
     },
165
     },
139
     {
166
     {
140
       "icon": {
167
       "icon": {
161
       },
188
       },
162
       "setIdx": 1,
189
       "setIdx": 1,
163
       "setId": 1,
190
       "setId": 1,
164
-      "iconIdx": 4
191
+      "iconIdx": 5
165
     },
192
     },
166
     {
193
     {
167
       "icon": {
194
       "icon": {
181
       "properties": {
208
       "properties": {
182
         "ligatures": "timer",
209
         "ligatures": "timer",
183
         "id": 760,
210
         "id": 760,
184
-        "order": 916,
211
+        "order": 928,
185
         "prevSize": 24,
212
         "prevSize": 24,
186
         "code": 58405,
213
         "code": 58405,
187
         "name": "timer"
214
         "name": "timer"
188
       },
215
       },
189
       "setIdx": 1,
216
       "setIdx": 1,
190
       "setId": 1,
217
       "setId": 1,
191
-      "iconIdx": 5
218
+      "iconIdx": 6
192
     },
219
     },
193
     {
220
     {
194
       "icon": {
221
       "icon": {
215
       },
242
       },
216
       "setIdx": 1,
243
       "setIdx": 1,
217
       "setId": 1,
244
       "setId": 1,
218
-      "iconIdx": 6
245
+      "iconIdx": 7
219
     },
246
     },
220
     {
247
     {
221
       "icon": {
248
       "icon": {
242
       },
269
       },
243
       "setIdx": 1,
270
       "setIdx": 1,
244
       "setId": 1,
271
       "setId": 1,
245
-      "iconIdx": 7
272
+      "iconIdx": 8
246
     },
273
     },
247
     {
274
     {
248
       "icon": {
275
       "icon": {
269
       },
296
       },
270
       "setIdx": 1,
297
       "setIdx": 1,
271
       "setId": 1,
298
       "setId": 1,
272
-      "iconIdx": 8
299
+      "iconIdx": 9
273
     },
300
     },
274
     {
301
     {
275
       "icon": {
302
       "icon": {
296
       },
323
       },
297
       "setIdx": 1,
324
       "setIdx": 1,
298
       "setId": 1,
325
       "setId": 1,
299
-      "iconIdx": 9
326
+      "iconIdx": 10
300
     },
327
     },
301
     {
328
     {
302
       "icon": {
329
       "icon": {
325
       },
352
       },
326
       "setIdx": 1,
353
       "setIdx": 1,
327
       "setId": 1,
354
       "setId": 1,
328
-      "iconIdx": 10
355
+      "iconIdx": 11
329
     },
356
     },
330
     {
357
     {
331
       "icon": {
358
       "icon": {
352
       },
379
       },
353
       "setIdx": 1,
380
       "setIdx": 1,
354
       "setId": 1,
381
       "setId": 1,
355
-      "iconIdx": 11
382
+      "iconIdx": 12
356
     },
383
     },
357
     {
384
     {
358
       "icon": {
385
       "icon": {
379
       },
406
       },
380
       "setIdx": 1,
407
       "setIdx": 1,
381
       "setId": 1,
408
       "setId": 1,
382
-      "iconIdx": 12
409
+      "iconIdx": 13
383
     },
410
     },
384
     {
411
     {
385
       "icon": {
412
       "icon": {
408
       },
435
       },
409
       "setIdx": 1,
436
       "setIdx": 1,
410
       "setId": 1,
437
       "setId": 1,
411
-      "iconIdx": 13
438
+      "iconIdx": 14
412
     },
439
     },
413
     {
440
     {
414
       "icon": {
441
       "icon": {
437
       },
464
       },
438
       "setIdx": 1,
465
       "setIdx": 1,
439
       "setId": 1,
466
       "setId": 1,
440
-      "iconIdx": 14
467
+      "iconIdx": 15
441
     },
468
     },
442
     {
469
     {
443
       "icon": {
470
       "icon": {
466
       },
493
       },
467
       "setIdx": 1,
494
       "setIdx": 1,
468
       "setId": 1,
495
       "setId": 1,
469
-      "iconIdx": 15
496
+      "iconIdx": 16
470
     },
497
     },
471
     {
498
     {
472
       "icon": {
499
       "icon": {
495
       },
522
       },
496
       "setIdx": 1,
523
       "setIdx": 1,
497
       "setId": 1,
524
       "setId": 1,
498
-      "iconIdx": 16
525
+      "iconIdx": 17
499
     },
526
     },
500
     {
527
     {
501
       "icon": {
528
       "icon": {
524
       },
551
       },
525
       "setIdx": 1,
552
       "setIdx": 1,
526
       "setId": 1,
553
       "setId": 1,
527
-      "iconIdx": 17
554
+      "iconIdx": 18
528
     },
555
     },
529
     {
556
     {
530
       "icon": {
557
       "icon": {
550
       },
577
       },
551
       "setIdx": 1,
578
       "setIdx": 1,
552
       "setId": 1,
579
       "setId": 1,
553
-      "iconIdx": 18
580
+      "iconIdx": 19
554
     },
581
     },
555
     {
582
     {
556
       "icon": {
583
       "icon": {
576
       },
603
       },
577
       "setIdx": 1,
604
       "setIdx": 1,
578
       "setId": 1,
605
       "setId": 1,
579
-      "iconIdx": 19
606
+      "iconIdx": 20
580
     },
607
     },
581
     {
608
     {
582
       "icon": {
609
       "icon": {
602
       },
629
       },
603
       "setIdx": 1,
630
       "setIdx": 1,
604
       "setId": 1,
631
       "setId": 1,
605
-      "iconIdx": 20
632
+      "iconIdx": 21
606
     },
633
     },
607
     {
634
     {
608
       "icon": {
635
       "icon": {
628
       },
655
       },
629
       "setIdx": 1,
656
       "setIdx": 1,
630
       "setId": 1,
657
       "setId": 1,
631
-      "iconIdx": 21
658
+      "iconIdx": 22
632
     },
659
     },
633
     {
660
     {
634
       "icon": {
661
       "icon": {
654
       },
681
       },
655
       "setIdx": 1,
682
       "setIdx": 1,
656
       "setId": 1,
683
       "setId": 1,
657
-      "iconIdx": 22
684
+      "iconIdx": 23
658
     },
685
     },
659
     {
686
     {
660
       "icon": {
687
       "icon": {
680
       },
707
       },
681
       "setIdx": 1,
708
       "setIdx": 1,
682
       "setId": 1,
709
       "setId": 1,
683
-      "iconIdx": 23
710
+      "iconIdx": 24
684
     },
711
     },
685
     {
712
     {
686
       "icon": {
713
       "icon": {
706
       },
733
       },
707
       "setIdx": 1,
734
       "setIdx": 1,
708
       "setId": 1,
735
       "setId": 1,
709
-      "iconIdx": 24
736
+      "iconIdx": 25
710
     },
737
     },
711
     {
738
     {
712
       "icon": {
739
       "icon": {
732
       },
759
       },
733
       "setIdx": 1,
760
       "setIdx": 1,
734
       "setId": 1,
761
       "setId": 1,
735
-      "iconIdx": 25
762
+      "iconIdx": 26
736
     },
763
     },
737
     {
764
     {
738
       "icon": {
765
       "icon": {
758
       },
785
       },
759
       "setIdx": 1,
786
       "setIdx": 1,
760
       "setId": 1,
787
       "setId": 1,
761
-      "iconIdx": 26
788
+      "iconIdx": 27
762
     },
789
     },
763
     {
790
     {
764
       "icon": {
791
       "icon": {
784
       },
811
       },
785
       "setIdx": 1,
812
       "setIdx": 1,
786
       "setId": 1,
813
       "setId": 1,
787
-      "iconIdx": 27
814
+      "iconIdx": 28
788
     },
815
     },
789
     {
816
     {
790
       "icon": {
817
       "icon": {
810
       },
837
       },
811
       "setIdx": 1,
838
       "setIdx": 1,
812
       "setId": 1,
839
       "setId": 1,
813
-      "iconIdx": 28
840
+      "iconIdx": 29
814
     },
841
     },
815
     {
842
     {
816
       "icon": {
843
       "icon": {
836
       },
863
       },
837
       "setIdx": 1,
864
       "setIdx": 1,
838
       "setId": 1,
865
       "setId": 1,
839
-      "iconIdx": 29
866
+      "iconIdx": 30
840
     },
867
     },
841
     {
868
     {
842
       "icon": {
869
       "icon": {
862
       },
889
       },
863
       "setIdx": 1,
890
       "setIdx": 1,
864
       "setId": 1,
891
       "setId": 1,
865
-      "iconIdx": 30
892
+      "iconIdx": 31
866
     },
893
     },
867
     {
894
     {
868
       "icon": {
895
       "icon": {
888
       },
915
       },
889
       "setIdx": 1,
916
       "setIdx": 1,
890
       "setId": 1,
917
       "setId": 1,
891
-      "iconIdx": 31
918
+      "iconIdx": 32
892
     },
919
     },
893
     {
920
     {
894
       "icon": {
921
       "icon": {
914
       },
941
       },
915
       "setIdx": 1,
942
       "setIdx": 1,
916
       "setId": 1,
943
       "setId": 1,
917
-      "iconIdx": 32
944
+      "iconIdx": 33
918
     },
945
     },
919
     {
946
     {
920
       "icon": {
947
       "icon": {
940
       },
967
       },
941
       "setIdx": 1,
968
       "setIdx": 1,
942
       "setId": 1,
969
       "setId": 1,
943
-      "iconIdx": 33
970
+      "iconIdx": 34
944
     },
971
     },
945
     {
972
     {
946
       "icon": {
973
       "icon": {
966
       },
993
       },
967
       "setIdx": 1,
994
       "setIdx": 1,
968
       "setId": 1,
995
       "setId": 1,
969
-      "iconIdx": 34
996
+      "iconIdx": 35
970
     },
997
     },
971
     {
998
     {
972
       "icon": {
999
       "icon": {
992
       },
1019
       },
993
       "setIdx": 1,
1020
       "setIdx": 1,
994
       "setId": 1,
1021
       "setId": 1,
995
-      "iconIdx": 35
1022
+      "iconIdx": 36
996
     },
1023
     },
997
     {
1024
     {
998
       "icon": {
1025
       "icon": {
1018
       },
1045
       },
1019
       "setIdx": 1,
1046
       "setIdx": 1,
1020
       "setId": 1,
1047
       "setId": 1,
1021
-      "iconIdx": 36
1048
+      "iconIdx": 37
1022
     },
1049
     },
1023
     {
1050
     {
1024
       "icon": {
1051
       "icon": {
1044
       },
1071
       },
1045
       "setIdx": 1,
1072
       "setIdx": 1,
1046
       "setId": 1,
1073
       "setId": 1,
1047
-      "iconIdx": 37
1074
+      "iconIdx": 38
1048
     },
1075
     },
1049
     {
1076
     {
1050
       "icon": {
1077
       "icon": {
1070
       },
1097
       },
1071
       "setIdx": 1,
1098
       "setIdx": 1,
1072
       "setId": 1,
1099
       "setId": 1,
1073
-      "iconIdx": 38
1100
+      "iconIdx": 39
1074
     },
1101
     },
1075
     {
1102
     {
1076
       "icon": {
1103
       "icon": {
1096
       },
1123
       },
1097
       "setIdx": 1,
1124
       "setIdx": 1,
1098
       "setId": 1,
1125
       "setId": 1,
1099
-      "iconIdx": 39
1126
+      "iconIdx": 40
1100
     },
1127
     },
1101
     {
1128
     {
1102
       "icon": {
1129
       "icon": {
1122
       },
1149
       },
1123
       "setIdx": 1,
1150
       "setIdx": 1,
1124
       "setId": 1,
1151
       "setId": 1,
1125
-      "iconIdx": 40
1152
+      "iconIdx": 41
1126
     },
1153
     },
1127
     {
1154
     {
1128
       "icon": {
1155
       "icon": {
1148
       },
1175
       },
1149
       "setIdx": 1,
1176
       "setIdx": 1,
1150
       "setId": 1,
1177
       "setId": 1,
1151
-      "iconIdx": 41
1178
+      "iconIdx": 42
1152
     },
1179
     },
1153
     {
1180
     {
1154
       "icon": {
1181
       "icon": {
1174
       },
1201
       },
1175
       "setIdx": 1,
1202
       "setIdx": 1,
1176
       "setId": 1,
1203
       "setId": 1,
1177
-      "iconIdx": 42
1204
+      "iconIdx": 43
1178
     },
1205
     },
1179
     {
1206
     {
1180
       "icon": {
1207
       "icon": {
1200
       },
1227
       },
1201
       "setIdx": 1,
1228
       "setIdx": 1,
1202
       "setId": 1,
1229
       "setId": 1,
1203
-      "iconIdx": 43
1230
+      "iconIdx": 44
1204
     },
1231
     },
1205
     {
1232
     {
1206
       "icon": {
1233
       "icon": {
1226
       },
1253
       },
1227
       "setIdx": 1,
1254
       "setIdx": 1,
1228
       "setId": 1,
1255
       "setId": 1,
1229
-      "iconIdx": 44
1256
+      "iconIdx": 45
1230
     },
1257
     },
1231
     {
1258
     {
1232
       "icon": {
1259
       "icon": {
1252
       },
1279
       },
1253
       "setIdx": 1,
1280
       "setIdx": 1,
1254
       "setId": 1,
1281
       "setId": 1,
1255
-      "iconIdx": 45
1282
+      "iconIdx": 46
1256
     },
1283
     },
1257
     {
1284
     {
1258
       "icon": {
1285
       "icon": {
1278
       },
1305
       },
1279
       "setIdx": 1,
1306
       "setIdx": 1,
1280
       "setId": 1,
1307
       "setId": 1,
1281
-      "iconIdx": 46
1308
+      "iconIdx": 47
1282
     },
1309
     },
1283
     {
1310
     {
1284
       "icon": {
1311
       "icon": {
1307
       },
1334
       },
1308
       "setIdx": 1,
1335
       "setIdx": 1,
1309
       "setId": 1,
1336
       "setId": 1,
1310
-      "iconIdx": 47
1337
+      "iconIdx": 48
1311
     },
1338
     },
1312
     {
1339
     {
1313
       "icon": {
1340
       "icon": {
1337
       },
1364
       },
1338
       "setIdx": 1,
1365
       "setIdx": 1,
1339
       "setId": 1,
1366
       "setId": 1,
1340
-      "iconIdx": 48
1367
+      "iconIdx": 49
1341
     },
1368
     },
1342
     {
1369
     {
1343
       "icon": {
1370
       "icon": {
1367
       },
1394
       },
1368
       "setIdx": 1,
1395
       "setIdx": 1,
1369
       "setId": 1,
1396
       "setId": 1,
1370
-      "iconIdx": 49
1397
+      "iconIdx": 50
1371
     },
1398
     },
1372
     {
1399
     {
1373
       "icon": {
1400
       "icon": {
1393
       },
1420
       },
1394
       "setIdx": 1,
1421
       "setIdx": 1,
1395
       "setId": 1,
1422
       "setId": 1,
1396
-      "iconIdx": 50
1423
+      "iconIdx": 51
1397
     },
1424
     },
1398
     {
1425
     {
1399
       "icon": {
1426
       "icon": {
1419
       },
1446
       },
1420
       "setIdx": 1,
1447
       "setIdx": 1,
1421
       "setId": 1,
1448
       "setId": 1,
1422
-      "iconIdx": 51
1449
+      "iconIdx": 52
1423
     },
1450
     },
1424
     {
1451
     {
1425
       "icon": {
1452
       "icon": {
1445
       },
1472
       },
1446
       "setIdx": 1,
1473
       "setIdx": 1,
1447
       "setId": 1,
1474
       "setId": 1,
1448
-      "iconIdx": 52
1475
+      "iconIdx": 53
1449
     }
1476
     }
1450
   ],
1477
   ],
1451
   "height": 1024,
1478
   "height": 1024,

+ 84
- 57
react/features/base/font-icons/jitsi.json Прегледај датотеку

1
 {
1
 {
2
   "IcoMoonType": "selection",
2
   "IcoMoonType": "selection",
3
   "icons": [
3
   "icons": [
4
+    {
5
+      "icon": {
6
+        "paths": [
7
+          "M512 342h64v180l150 90-32 52-182-110v-212zM554 128c212 0 384 172 384 384s-172 384-384 384c-106 0-200-42-270-112l60-62c54 54 128 88 210 88 166 0 300-132 300-298s-134-298-300-298-298 132-298 298h128l-172 172-4-6-166-166h128c0-212 172-384 384-384z"
8
+        ],
9
+        "attrs": [],
10
+        "isMulticolor": false,
11
+        "isMulticolor2": false,
12
+        "tags": [
13
+          "restore"
14
+        ],
15
+        "defaultCode": 59571,
16
+        "grid": 24
17
+      },
18
+      "attrs": [],
19
+      "properties": {
20
+        "ligatures": "history, restore",
21
+        "id": 385,
22
+        "order": 930,
23
+        "prevSize": 24,
24
+        "code": 59571,
25
+        "name": "restore"
26
+      },
27
+      "setIdx": 0,
28
+      "setId": 2,
29
+      "iconIdx": 385
30
+    },
4
     {
31
     {
5
       "icon": {
32
       "icon": {
6
         "paths": [
33
         "paths": [
24
         "code": 58377,
51
         "code": 58377,
25
         "name": "navigate_next"
52
         "name": "navigate_next"
26
       },
53
       },
27
-      "setIdx": 0,
28
-      "setId": 2,
29
-      "iconIdx": 153
54
+      "setIdx": 1,
55
+      "setId": 1,
56
+      "iconIdx": 0
30
     },
57
     },
31
     {
58
     {
32
       "icon": {
59
       "icon": {
53
       },
80
       },
54
       "setIdx": 1,
81
       "setIdx": 1,
55
       "setId": 1,
82
       "setId": 1,
56
-      "iconIdx": 0
83
+      "iconIdx": 1
57
     },
84
     },
58
     {
85
     {
59
       "icon": {
86
       "icon": {
80
       },
107
       },
81
       "setIdx": 1,
108
       "setIdx": 1,
82
       "setId": 1,
109
       "setId": 1,
83
-      "iconIdx": 1
110
+      "iconIdx": 2
84
     },
111
     },
85
     {
112
     {
86
       "icon": {
113
       "icon": {
107
       },
134
       },
108
       "setIdx": 1,
135
       "setIdx": 1,
109
       "setId": 1,
136
       "setId": 1,
110
-      "iconIdx": 2
137
+      "iconIdx": 3
111
     },
138
     },
112
     {
139
     {
113
       "icon": {
140
       "icon": {
134
       },
161
       },
135
       "setIdx": 1,
162
       "setIdx": 1,
136
       "setId": 1,
163
       "setId": 1,
137
-      "iconIdx": 3
164
+      "iconIdx": 4
138
     },
165
     },
139
     {
166
     {
140
       "icon": {
167
       "icon": {
161
       },
188
       },
162
       "setIdx": 1,
189
       "setIdx": 1,
163
       "setId": 1,
190
       "setId": 1,
164
-      "iconIdx": 4
191
+      "iconIdx": 5
165
     },
192
     },
166
     {
193
     {
167
       "icon": {
194
       "icon": {
181
       "properties": {
208
       "properties": {
182
         "ligatures": "timer",
209
         "ligatures": "timer",
183
         "id": 760,
210
         "id": 760,
184
-        "order": 916,
211
+        "order": 928,
185
         "prevSize": 24,
212
         "prevSize": 24,
186
         "code": 58405,
213
         "code": 58405,
187
         "name": "timer"
214
         "name": "timer"
188
       },
215
       },
189
       "setIdx": 1,
216
       "setIdx": 1,
190
       "setId": 1,
217
       "setId": 1,
191
-      "iconIdx": 5
218
+      "iconIdx": 6
192
     },
219
     },
193
     {
220
     {
194
       "icon": {
221
       "icon": {
215
       },
242
       },
216
       "setIdx": 1,
243
       "setIdx": 1,
217
       "setId": 1,
244
       "setId": 1,
218
-      "iconIdx": 6
245
+      "iconIdx": 7
219
     },
246
     },
220
     {
247
     {
221
       "icon": {
248
       "icon": {
242
       },
269
       },
243
       "setIdx": 1,
270
       "setIdx": 1,
244
       "setId": 1,
271
       "setId": 1,
245
-      "iconIdx": 7
272
+      "iconIdx": 8
246
     },
273
     },
247
     {
274
     {
248
       "icon": {
275
       "icon": {
269
       },
296
       },
270
       "setIdx": 1,
297
       "setIdx": 1,
271
       "setId": 1,
298
       "setId": 1,
272
-      "iconIdx": 8
299
+      "iconIdx": 9
273
     },
300
     },
274
     {
301
     {
275
       "icon": {
302
       "icon": {
296
       },
323
       },
297
       "setIdx": 1,
324
       "setIdx": 1,
298
       "setId": 1,
325
       "setId": 1,
299
-      "iconIdx": 9
326
+      "iconIdx": 10
300
     },
327
     },
301
     {
328
     {
302
       "icon": {
329
       "icon": {
325
       },
352
       },
326
       "setIdx": 1,
353
       "setIdx": 1,
327
       "setId": 1,
354
       "setId": 1,
328
-      "iconIdx": 10
355
+      "iconIdx": 11
329
     },
356
     },
330
     {
357
     {
331
       "icon": {
358
       "icon": {
352
       },
379
       },
353
       "setIdx": 1,
380
       "setIdx": 1,
354
       "setId": 1,
381
       "setId": 1,
355
-      "iconIdx": 11
382
+      "iconIdx": 12
356
     },
383
     },
357
     {
384
     {
358
       "icon": {
385
       "icon": {
379
       },
406
       },
380
       "setIdx": 1,
407
       "setIdx": 1,
381
       "setId": 1,
408
       "setId": 1,
382
-      "iconIdx": 12
409
+      "iconIdx": 13
383
     },
410
     },
384
     {
411
     {
385
       "icon": {
412
       "icon": {
408
       },
435
       },
409
       "setIdx": 1,
436
       "setIdx": 1,
410
       "setId": 1,
437
       "setId": 1,
411
-      "iconIdx": 13
438
+      "iconIdx": 14
412
     },
439
     },
413
     {
440
     {
414
       "icon": {
441
       "icon": {
437
       },
464
       },
438
       "setIdx": 1,
465
       "setIdx": 1,
439
       "setId": 1,
466
       "setId": 1,
440
-      "iconIdx": 14
467
+      "iconIdx": 15
441
     },
468
     },
442
     {
469
     {
443
       "icon": {
470
       "icon": {
466
       },
493
       },
467
       "setIdx": 1,
494
       "setIdx": 1,
468
       "setId": 1,
495
       "setId": 1,
469
-      "iconIdx": 15
496
+      "iconIdx": 16
470
     },
497
     },
471
     {
498
     {
472
       "icon": {
499
       "icon": {
495
       },
522
       },
496
       "setIdx": 1,
523
       "setIdx": 1,
497
       "setId": 1,
524
       "setId": 1,
498
-      "iconIdx": 16
525
+      "iconIdx": 17
499
     },
526
     },
500
     {
527
     {
501
       "icon": {
528
       "icon": {
524
       },
551
       },
525
       "setIdx": 1,
552
       "setIdx": 1,
526
       "setId": 1,
553
       "setId": 1,
527
-      "iconIdx": 17
554
+      "iconIdx": 18
528
     },
555
     },
529
     {
556
     {
530
       "icon": {
557
       "icon": {
550
       },
577
       },
551
       "setIdx": 1,
578
       "setIdx": 1,
552
       "setId": 1,
579
       "setId": 1,
553
-      "iconIdx": 18
580
+      "iconIdx": 19
554
     },
581
     },
555
     {
582
     {
556
       "icon": {
583
       "icon": {
576
       },
603
       },
577
       "setIdx": 1,
604
       "setIdx": 1,
578
       "setId": 1,
605
       "setId": 1,
579
-      "iconIdx": 19
606
+      "iconIdx": 20
580
     },
607
     },
581
     {
608
     {
582
       "icon": {
609
       "icon": {
602
       },
629
       },
603
       "setIdx": 1,
630
       "setIdx": 1,
604
       "setId": 1,
631
       "setId": 1,
605
-      "iconIdx": 20
632
+      "iconIdx": 21
606
     },
633
     },
607
     {
634
     {
608
       "icon": {
635
       "icon": {
628
       },
655
       },
629
       "setIdx": 1,
656
       "setIdx": 1,
630
       "setId": 1,
657
       "setId": 1,
631
-      "iconIdx": 21
658
+      "iconIdx": 22
632
     },
659
     },
633
     {
660
     {
634
       "icon": {
661
       "icon": {
654
       },
681
       },
655
       "setIdx": 1,
682
       "setIdx": 1,
656
       "setId": 1,
683
       "setId": 1,
657
-      "iconIdx": 22
684
+      "iconIdx": 23
658
     },
685
     },
659
     {
686
     {
660
       "icon": {
687
       "icon": {
680
       },
707
       },
681
       "setIdx": 1,
708
       "setIdx": 1,
682
       "setId": 1,
709
       "setId": 1,
683
-      "iconIdx": 23
710
+      "iconIdx": 24
684
     },
711
     },
685
     {
712
     {
686
       "icon": {
713
       "icon": {
706
       },
733
       },
707
       "setIdx": 1,
734
       "setIdx": 1,
708
       "setId": 1,
735
       "setId": 1,
709
-      "iconIdx": 24
736
+      "iconIdx": 25
710
     },
737
     },
711
     {
738
     {
712
       "icon": {
739
       "icon": {
732
       },
759
       },
733
       "setIdx": 1,
760
       "setIdx": 1,
734
       "setId": 1,
761
       "setId": 1,
735
-      "iconIdx": 25
762
+      "iconIdx": 26
736
     },
763
     },
737
     {
764
     {
738
       "icon": {
765
       "icon": {
758
       },
785
       },
759
       "setIdx": 1,
786
       "setIdx": 1,
760
       "setId": 1,
787
       "setId": 1,
761
-      "iconIdx": 26
788
+      "iconIdx": 27
762
     },
789
     },
763
     {
790
     {
764
       "icon": {
791
       "icon": {
784
       },
811
       },
785
       "setIdx": 1,
812
       "setIdx": 1,
786
       "setId": 1,
813
       "setId": 1,
787
-      "iconIdx": 27
814
+      "iconIdx": 28
788
     },
815
     },
789
     {
816
     {
790
       "icon": {
817
       "icon": {
810
       },
837
       },
811
       "setIdx": 1,
838
       "setIdx": 1,
812
       "setId": 1,
839
       "setId": 1,
813
-      "iconIdx": 28
840
+      "iconIdx": 29
814
     },
841
     },
815
     {
842
     {
816
       "icon": {
843
       "icon": {
836
       },
863
       },
837
       "setIdx": 1,
864
       "setIdx": 1,
838
       "setId": 1,
865
       "setId": 1,
839
-      "iconIdx": 29
866
+      "iconIdx": 30
840
     },
867
     },
841
     {
868
     {
842
       "icon": {
869
       "icon": {
862
       },
889
       },
863
       "setIdx": 1,
890
       "setIdx": 1,
864
       "setId": 1,
891
       "setId": 1,
865
-      "iconIdx": 30
892
+      "iconIdx": 31
866
     },
893
     },
867
     {
894
     {
868
       "icon": {
895
       "icon": {
888
       },
915
       },
889
       "setIdx": 1,
916
       "setIdx": 1,
890
       "setId": 1,
917
       "setId": 1,
891
-      "iconIdx": 31
918
+      "iconIdx": 32
892
     },
919
     },
893
     {
920
     {
894
       "icon": {
921
       "icon": {
914
       },
941
       },
915
       "setIdx": 1,
942
       "setIdx": 1,
916
       "setId": 1,
943
       "setId": 1,
917
-      "iconIdx": 32
944
+      "iconIdx": 33
918
     },
945
     },
919
     {
946
     {
920
       "icon": {
947
       "icon": {
940
       },
967
       },
941
       "setIdx": 1,
968
       "setIdx": 1,
942
       "setId": 1,
969
       "setId": 1,
943
-      "iconIdx": 33
970
+      "iconIdx": 34
944
     },
971
     },
945
     {
972
     {
946
       "icon": {
973
       "icon": {
966
       },
993
       },
967
       "setIdx": 1,
994
       "setIdx": 1,
968
       "setId": 1,
995
       "setId": 1,
969
-      "iconIdx": 34
996
+      "iconIdx": 35
970
     },
997
     },
971
     {
998
     {
972
       "icon": {
999
       "icon": {
992
       },
1019
       },
993
       "setIdx": 1,
1020
       "setIdx": 1,
994
       "setId": 1,
1021
       "setId": 1,
995
-      "iconIdx": 35
1022
+      "iconIdx": 36
996
     },
1023
     },
997
     {
1024
     {
998
       "icon": {
1025
       "icon": {
1018
       },
1045
       },
1019
       "setIdx": 1,
1046
       "setIdx": 1,
1020
       "setId": 1,
1047
       "setId": 1,
1021
-      "iconIdx": 36
1048
+      "iconIdx": 37
1022
     },
1049
     },
1023
     {
1050
     {
1024
       "icon": {
1051
       "icon": {
1044
       },
1071
       },
1045
       "setIdx": 1,
1072
       "setIdx": 1,
1046
       "setId": 1,
1073
       "setId": 1,
1047
-      "iconIdx": 37
1074
+      "iconIdx": 38
1048
     },
1075
     },
1049
     {
1076
     {
1050
       "icon": {
1077
       "icon": {
1070
       },
1097
       },
1071
       "setIdx": 1,
1098
       "setIdx": 1,
1072
       "setId": 1,
1099
       "setId": 1,
1073
-      "iconIdx": 38
1100
+      "iconIdx": 39
1074
     },
1101
     },
1075
     {
1102
     {
1076
       "icon": {
1103
       "icon": {
1096
       },
1123
       },
1097
       "setIdx": 1,
1124
       "setIdx": 1,
1098
       "setId": 1,
1125
       "setId": 1,
1099
-      "iconIdx": 39
1126
+      "iconIdx": 40
1100
     },
1127
     },
1101
     {
1128
     {
1102
       "icon": {
1129
       "icon": {
1122
       },
1149
       },
1123
       "setIdx": 1,
1150
       "setIdx": 1,
1124
       "setId": 1,
1151
       "setId": 1,
1125
-      "iconIdx": 40
1152
+      "iconIdx": 41
1126
     },
1153
     },
1127
     {
1154
     {
1128
       "icon": {
1155
       "icon": {
1148
       },
1175
       },
1149
       "setIdx": 1,
1176
       "setIdx": 1,
1150
       "setId": 1,
1177
       "setId": 1,
1151
-      "iconIdx": 41
1178
+      "iconIdx": 42
1152
     },
1179
     },
1153
     {
1180
     {
1154
       "icon": {
1181
       "icon": {
1174
       },
1201
       },
1175
       "setIdx": 1,
1202
       "setIdx": 1,
1176
       "setId": 1,
1203
       "setId": 1,
1177
-      "iconIdx": 42
1204
+      "iconIdx": 43
1178
     },
1205
     },
1179
     {
1206
     {
1180
       "icon": {
1207
       "icon": {
1200
       },
1227
       },
1201
       "setIdx": 1,
1228
       "setIdx": 1,
1202
       "setId": 1,
1229
       "setId": 1,
1203
-      "iconIdx": 43
1230
+      "iconIdx": 44
1204
     },
1231
     },
1205
     {
1232
     {
1206
       "icon": {
1233
       "icon": {
1226
       },
1253
       },
1227
       "setIdx": 1,
1254
       "setIdx": 1,
1228
       "setId": 1,
1255
       "setId": 1,
1229
-      "iconIdx": 44
1256
+      "iconIdx": 45
1230
     },
1257
     },
1231
     {
1258
     {
1232
       "icon": {
1259
       "icon": {
1252
       },
1279
       },
1253
       "setIdx": 1,
1280
       "setIdx": 1,
1254
       "setId": 1,
1281
       "setId": 1,
1255
-      "iconIdx": 45
1282
+      "iconIdx": 46
1256
     },
1283
     },
1257
     {
1284
     {
1258
       "icon": {
1285
       "icon": {
1278
       },
1305
       },
1279
       "setIdx": 1,
1306
       "setIdx": 1,
1280
       "setId": 1,
1307
       "setId": 1,
1281
-      "iconIdx": 46
1308
+      "iconIdx": 47
1282
     },
1309
     },
1283
     {
1310
     {
1284
       "icon": {
1311
       "icon": {
1307
       },
1334
       },
1308
       "setIdx": 1,
1335
       "setIdx": 1,
1309
       "setId": 1,
1336
       "setId": 1,
1310
-      "iconIdx": 47
1337
+      "iconIdx": 48
1311
     },
1338
     },
1312
     {
1339
     {
1313
       "icon": {
1340
       "icon": {
1337
       },
1364
       },
1338
       "setIdx": 1,
1365
       "setIdx": 1,
1339
       "setId": 1,
1366
       "setId": 1,
1340
-      "iconIdx": 48
1367
+      "iconIdx": 49
1341
     },
1368
     },
1342
     {
1369
     {
1343
       "icon": {
1370
       "icon": {
1367
       },
1394
       },
1368
       "setIdx": 1,
1395
       "setIdx": 1,
1369
       "setId": 1,
1396
       "setId": 1,
1370
-      "iconIdx": 49
1397
+      "iconIdx": 50
1371
     },
1398
     },
1372
     {
1399
     {
1373
       "icon": {
1400
       "icon": {
1393
       },
1420
       },
1394
       "setIdx": 1,
1421
       "setIdx": 1,
1395
       "setId": 1,
1422
       "setId": 1,
1396
-      "iconIdx": 50
1423
+      "iconIdx": 51
1397
     },
1424
     },
1398
     {
1425
     {
1399
       "icon": {
1426
       "icon": {
1419
       },
1446
       },
1420
       "setIdx": 1,
1447
       "setIdx": 1,
1421
       "setId": 1,
1448
       "setId": 1,
1422
-      "iconIdx": 51
1449
+      "iconIdx": 52
1423
     },
1450
     },
1424
     {
1451
     {
1425
       "icon": {
1452
       "icon": {
1445
       },
1472
       },
1446
       "setIdx": 1,
1473
       "setIdx": 1,
1447
       "setId": 1,
1474
       "setId": 1,
1448
-      "iconIdx": 52
1475
+      "iconIdx": 53
1449
     }
1476
     }
1450
   ],
1477
   ],
1451
   "height": 1024,
1478
   "height": 1024,

+ 84
- 12
react/features/welcome/components/PagedList.android.js Прегледај датотеку

1
 // @flow
1
 // @flow
2
 import React from 'react';
2
 import React from 'react';
3
-import { View, ViewPagerAndroid } from 'react-native';
3
+import { Text, TouchableOpacity, View, ViewPagerAndroid } from 'react-native';
4
 
4
 
5
+import { Icon } from '../../base/font-icons';
5
 import { MeetingList } from '../../calendar-sync';
6
 import { MeetingList } from '../../calendar-sync';
6
 import { RecentList } from '../../recent-list';
7
 import { RecentList } from '../../recent-list';
7
 
8
 
14
  * @extends PagedList
15
  * @extends PagedList
15
  */
16
  */
16
 export default class PagedList extends AbstractPagedList {
17
 export default class PagedList extends AbstractPagedList {
18
+    /**
19
+     * A reference to the viewpager.
20
+     */
21
+    _viewPager: Object;
17
 
22
 
18
     /**
23
     /**
19
      * Constructor of the PagedList Component.
24
      * Constructor of the PagedList Component.
25
 
30
 
26
         this._getIndicatorStyle = this._getIndicatorStyle.bind(this);
31
         this._getIndicatorStyle = this._getIndicatorStyle.bind(this);
27
         this._onPageSelected = this._onPageSelected.bind(this);
32
         this._onPageSelected = this._onPageSelected.bind(this);
33
+        this._onSelectPage = this._onSelectPage.bind(this);
34
+        this._setPagerReference = this._setPagerReference.bind(this);
28
     }
35
     }
29
 
36
 
30
     /**
37
     /**
46
                     keyboardDismissMode = 'on-drag'
53
                     keyboardDismissMode = 'on-drag'
47
                     onPageSelected = { this._onPageSelected }
54
                     onPageSelected = { this._onPageSelected }
48
                     peekEnabled = { true }
55
                     peekEnabled = { true }
56
+                    ref = { this._setPagerReference }
49
                     style = { styles.pagedList }>
57
                     style = { styles.pagedList }>
50
                     <View key = { 0 }>
58
                     <View key = { 0 }>
51
                         <RecentList disabled = { disabled } />
59
                         <RecentList disabled = { disabled } />
55
                     </View>
63
                     </View>
56
                 </ViewPagerAndroid>
64
                 </ViewPagerAndroid>
57
                 <View style = { styles.pageIndicatorContainer }>
65
                 <View style = { styles.pageIndicatorContainer }>
58
-                    <View style = { this._getIndicatorStyle(0) } />
59
-                    <View style = { this._getIndicatorStyle(1) } />
66
+                    <TouchableOpacity
67
+                        onPress = { this._onSelectPage(0) }
68
+                        style = { styles.pageIndicator } >
69
+                        <View style = { styles.pageIndicator }>
70
+                            <Icon
71
+                                name = 'restore'
72
+                                style = { [
73
+                                    styles.pageIndicatorIcon,
74
+                                    this._getIndicatorStyle(0)
75
+                                ] } />
76
+                            <Text
77
+                                style = { [
78
+                                    styles.pageIndicatorText,
79
+                                    this._getIndicatorStyle(0)
80
+                                ] }>
81
+                                History
82
+                            </Text>
83
+                        </View>
84
+                    </TouchableOpacity>
85
+                    <TouchableOpacity
86
+                        onPress = { this._onSelectPage(1) }
87
+                        style = { styles.pageIndicator } >
88
+                        <View style = { styles.pageIndicator }>
89
+                            <Icon
90
+                                name = 'event_note'
91
+                                style = { [
92
+                                    styles.pageIndicatorIcon,
93
+                                    this._getIndicatorStyle(1)
94
+                                ] } />
95
+                            <Text
96
+                                style = { [
97
+                                    styles.pageIndicatorText,
98
+                                    this._getIndicatorStyle(1)
99
+                                ] }>
100
+                                Calendar
101
+                            </Text>
102
+                        </View>
103
+                    </TouchableOpacity>
60
                 </View>
104
                 </View>
61
             </View>
105
             </View>
62
         );
106
         );
63
     }
107
     }
64
 
108
 
65
-    _getIndicatorStyle: number => Array<Object>;
109
+    _getIndicatorStyle: number => Object;
66
 
110
 
67
     /**
111
     /**
68
-     * Constructs the style array of an idicator.
112
+     * Constructs the style of an indicator.
69
      *
113
      *
70
      * @private
114
      * @private
71
      * @param {number} indicatorIndex - The index of the indicator.
115
      * @param {number} indicatorIndex - The index of the indicator.
72
-     * @returns {Array<Object>}
116
+     * @returns {Object}
73
      */
117
      */
74
     _getIndicatorStyle(indicatorIndex) {
118
     _getIndicatorStyle(indicatorIndex) {
75
-        const style = [
76
-            styles.pageIndicator
77
-        ];
78
-
79
         if (this.state.pageIndex === indicatorIndex) {
119
         if (this.state.pageIndex === indicatorIndex) {
80
-            style.push(styles.pageIndicatorActive);
120
+            return styles.pageIndicatorTextActive;
81
         }
121
         }
82
 
122
 
83
-        return style;
123
+        return null;
84
     }
124
     }
85
 
125
 
86
     _onPageSelected: Object => void;
126
     _onPageSelected: Object => void;
99
             });
139
             });
100
         }
140
         }
101
     }
141
     }
142
+
143
+    _onSelectPage: number => Function
144
+
145
+    /**
146
+     * Constructs a function to be used as a callback for the tab bar.
147
+     *
148
+     * @private
149
+     * @param {number} pageIndex - The index of the page to activate via the
150
+     * callback.
151
+     * @returns {Function}
152
+     */
153
+    _onSelectPage(pageIndex) {
154
+        return () => {
155
+            this._viewPager.setPage(pageIndex);
156
+            this.setState({
157
+                pageIndex
158
+            });
159
+        };
160
+    }
161
+
162
+    _setPagerReference: Object => void
163
+
164
+    /**
165
+     * Sets the pager's reference for direct modification.
166
+     *
167
+     * @private
168
+     * @param {React@Node} component - The pager component.
169
+     * @returns {void}
170
+     */
171
+    _setPagerReference(component) {
172
+        this._viewPager = component;
173
+    }
102
 }
174
 }

+ 21
- 11
react/features/welcome/components/styles.js Прегледај датотеку

150
     },
150
     },
151
 
151
 
152
     pageIndicator: {
152
     pageIndicator: {
153
-        backgroundColor: 'rgba(255, 255, 255, 0.2)',
154
-        height: 3,
155
-        marginHorizontal: 7,
156
-        width: 20
157
-    },
158
-
159
-    pageIndicatorActive: {
160
-        backgroundColor: 'rgba(255, 255, 255, 0.8)'
153
+        alignItems: 'center',
154
+        flex: 1,
155
+        flexDirection: 'column',
156
+        justifyContent: 'center'
161
     },
157
     },
162
 
158
 
163
     pageIndicatorContainer: {
159
     pageIndicatorContainer: {
164
-        alignItems: 'center',
160
+        alignItems: 'stretch',
161
+        backgroundColor: ColorPalette.blue,
165
         flexDirection: 'row',
162
         flexDirection: 'row',
166
-        justifyContent: 'center',
167
-        padding: 12
163
+        height: 56,
164
+        justifyContent: 'center'
165
+    },
166
+
167
+    pageIndicatorIcon: {
168
+        color: ColorPalette.blueHighlight,
169
+        fontSize: 24
170
+    },
171
+
172
+    pageIndicatorText: {
173
+        color: ColorPalette.blueHighlight
174
+    },
175
+
176
+    pageIndicatorTextActive: {
177
+        color: ColorPalette.white
168
     },
178
     },
169
 
179
 
170
     /**
180
     /**

Loading…
Откажи
Сачувај