소스 검색

chore(deps,rn) update navigation librarries to their latest versions

React Navigation v6.
master
Saúl Ibarra Corretgé 3 년 전
부모
커밋
61ae909ed5

+ 1
- 0
android/sdk/build.gradle 파일 보기

76
     implementation project(':react-native-immersive')
76
     implementation project(':react-native-immersive')
77
     implementation project(':react-native-keep-awake')
77
     implementation project(':react-native-keep-awake')
78
     implementation project(':react-native-masked-view_masked-view')
78
     implementation project(':react-native-masked-view_masked-view')
79
+    implementation project(':react-native-pager-view')
79
     implementation project(':react-native-performance')
80
     implementation project(':react-native-performance')
80
     implementation project(':react-native-reanimated')
81
     implementation project(':react-native-reanimated')
81
     implementation project(':react-native-safe-area-context')
82
     implementation project(':react-native-safe-area-context')

+ 1
- 0
android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java 파일 보기

181
                 new com.facebook.react.shell.MainReactPackage(),
181
                 new com.facebook.react.shell.MainReactPackage(),
182
                 new com.reactnativecommunity.clipboard.ClipboardPackage(),
182
                 new com.reactnativecommunity.clipboard.ClipboardPackage(),
183
                 new com.reactnativecommunity.netinfo.NetInfoPackage(),
183
                 new com.reactnativecommunity.netinfo.NetInfoPackage(),
184
+                new com.reactnativepagerview.PagerViewPackage(),
184
                 new com.oblador.performance.PerformancePackage(),
185
                 new com.oblador.performance.PerformancePackage(),
185
                 new com.reactnativecommunity.slider.ReactSliderPackage(),
186
                 new com.reactnativecommunity.slider.ReactSliderPackage(),
186
                 new com.brentvatne.react.ReactVideoPackage(),
187
                 new com.brentvatne.react.ReactVideoPackage(),

+ 2
- 0
android/settings.gradle 파일 보기

29
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
29
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
30
 include ':react-native-masked-view_masked-view'
30
 include ':react-native-masked-view_masked-view'
31
 project(':react-native-masked-view_masked-view').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-masked-view/masked-view/android')
31
 project(':react-native-masked-view_masked-view').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-masked-view/masked-view/android')
32
+include ':react-native-pager-view'
33
+project(':react-native-pager-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-pager-view/android')
32
 include ':react-native-performance'
34
 include ':react-native-performance'
33
 project(':react-native-performance').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-performance/android')
35
 project(':react-native-performance').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-performance/android')
34
 include ':react-native-reanimated'
36
 include ':react-native-reanimated'

+ 11
- 4
ios/Podfile.lock 파일 보기

291
     - React
291
     - React
292
   - react-native-netinfo (7.1.7):
292
   - react-native-netinfo (7.1.7):
293
     - React-Core
293
     - React-Core
294
+  - react-native-pager-view (5.4.9):
295
+    - React-Core
294
   - react-native-performance (2.1.0):
296
   - react-native-performance (2.1.0):
295
     - React-Core
297
     - React-Core
296
   - react-native-safe-area-context (3.3.2):
298
   - react-native-safe-area-context (3.3.2):
380
     - React-Core
382
     - React-Core
381
   - RNDeviceInfo (8.4.8):
383
   - RNDeviceInfo (8.4.8):
382
     - React-Core
384
     - React-Core
383
-  - RNGestureHandler (1.10.3):
385
+  - RNGestureHandler (2.1.0):
384
     - React-Core
386
     - React-Core
385
   - RNGoogleSignin (7.0.4):
387
   - RNGoogleSignin (7.0.4):
386
     - GoogleSignIn (~> 6.0.0)
388
     - GoogleSignIn (~> 6.0.0)
387
     - React-Core
389
     - React-Core
388
   - RNReanimated (1.13.3):
390
   - RNReanimated (1.13.3):
389
     - React-Core
391
     - React-Core
390
-  - RNScreens (2.18.1):
392
+  - RNScreens (3.10.1):
391
     - React-Core
393
     - React-Core
394
+    - React-RCTImage
392
   - RNSound (0.11.1):
395
   - RNSound (0.11.1):
393
     - React-Core
396
     - React-Core
394
     - RNSound/Core (= 0.11.1)
397
     - RNSound/Core (= 0.11.1)
428
   - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
431
   - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
429
   - react-native-keep-awake (from `../node_modules/react-native-keep-awake`)
432
   - react-native-keep-awake (from `../node_modules/react-native-keep-awake`)
430
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
433
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
434
+  - react-native-pager-view (from `../node_modules/react-native-pager-view`)
431
   - react-native-performance (from `../node_modules/react-native-performance/ios`)
435
   - react-native-performance (from `../node_modules/react-native-performance/ios`)
432
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
436
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
433
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
437
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
524
     :path: "../node_modules/react-native-keep-awake"
528
     :path: "../node_modules/react-native-keep-awake"
525
   react-native-netinfo:
529
   react-native-netinfo:
526
     :path: "../node_modules/@react-native-community/netinfo"
530
     :path: "../node_modules/@react-native-community/netinfo"
531
+  react-native-pager-view:
532
+    :path: "../node_modules/react-native-pager-view"
527
   react-native-performance:
533
   react-native-performance:
528
     :path: "../node_modules/react-native-performance/ios"
534
     :path: "../node_modules/react-native-performance/ios"
529
   react-native-safe-area-context:
535
   react-native-safe-area-context:
628
   react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
634
   react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
629
   react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
635
   react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
630
   react-native-netinfo: 27f287f2d191693f3b9d01a4273137fcf91c3b5d
636
   react-native-netinfo: 27f287f2d191693f3b9d01a4273137fcf91c3b5d
637
+  react-native-pager-view: 3ee7d4c7697fb3ef788346e834a60cca97ed8540
631
   react-native-performance: f4b6604a9d5a8a7407e34a82fab6c641d9a3ec12
638
   react-native-performance: f4b6604a9d5a8a7407e34a82fab6c641d9a3ec12
632
   react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
639
   react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
633
   react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
640
   react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
651
   RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
658
   RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
652
   RNDefaultPreference: 326860d42a681bfd7338c8f6d061cf58745bd860
659
   RNDefaultPreference: 326860d42a681bfd7338c8f6d061cf58745bd860
653
   RNDeviceInfo: 0400a6d0c94186d1120c3cbd97b23abc022187a9
660
   RNDeviceInfo: 0400a6d0c94186d1120c3cbd97b23abc022187a9
654
-  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
661
+  RNGestureHandler: e5c7cab5f214503dcefd6b2b0cefb050e1f51c4a
655
   RNGoogleSignin: c4381751eefd73c552b923ba347a9bfc6f18771c
662
   RNGoogleSignin: c4381751eefd73c552b923ba347a9bfc6f18771c
656
   RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926
663
   RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926
657
-  RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
664
+  RNScreens: 522705f2e5c9d27efb17f24aceb2bf8335bc7b8e
658
   RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
665
   RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
659
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e
666
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e
660
   RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80
667
   RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80

+ 194
- 181
package-lock.json 파일 보기

41
         "@react-native-community/slider": "4.1.12",
41
         "@react-native-community/slider": "4.1.12",
42
         "@react-native-google-signin/google-signin": "7.0.4",
42
         "@react-native-google-signin/google-signin": "7.0.4",
43
         "@react-native-masked-view/masked-view": "0.2.6",
43
         "@react-native-masked-view/masked-view": "0.2.6",
44
-        "@react-navigation/bottom-tabs": "5.11.15",
45
-        "@react-navigation/drawer": "5.12.9",
46
-        "@react-navigation/material-top-tabs": "5.3.19",
47
-        "@react-navigation/native": "5.9.8",
48
-        "@react-navigation/stack": "5.14.9",
44
+        "@react-navigation/bottom-tabs": "6.0.9",
45
+        "@react-navigation/drawer": "6.1.8",
46
+        "@react-navigation/elements": "1.2.1",
47
+        "@react-navigation/material-top-tabs": "6.0.6",
48
+        "@react-navigation/native": "6.0.6",
49
+        "@react-navigation/stack": "6.0.11",
49
         "@svgr/webpack": "4.3.2",
50
         "@svgr/webpack": "4.3.2",
50
         "@xmldom/xmldom": "0.7.5",
51
         "@xmldom/xmldom": "0.7.5",
51
         "amplitude-js": "8.2.1",
52
         "amplitude-js": "8.2.1",
87
         "react-native-collapsible": "1.6.0",
88
         "react-native-collapsible": "1.6.0",
88
         "react-native-default-preference": "github:kevinresol/react-native-default-preference#11bff5eb05cb04fd8d35b5e761eeee80525e8c6c",
89
         "react-native-default-preference": "github:kevinresol/react-native-default-preference#11bff5eb05cb04fd8d35b5e761eeee80525e8c6c",
89
         "react-native-device-info": "8.4.8",
90
         "react-native-device-info": "8.4.8",
90
-        "react-native-gesture-handler": "1.10.3",
91
+        "react-native-gesture-handler": "2.1.0",
91
         "react-native-get-random-values": "1.7.2",
92
         "react-native-get-random-values": "1.7.2",
92
         "react-native-immersive": "2.0.0",
93
         "react-native-immersive": "2.0.0",
93
         "react-native-keep-awake": "4.0.0",
94
         "react-native-keep-awake": "4.0.0",
95
+        "react-native-pager-view": "5.4.9",
94
         "react-native-paper": "4.11.1",
96
         "react-native-paper": "4.11.1",
95
         "react-native-performance": "2.1.0",
97
         "react-native-performance": "2.1.0",
96
         "react-native-reanimated": "1.13.3",
98
         "react-native-reanimated": "1.13.3",
97
         "react-native-safe-area-context": "3.3.2",
99
         "react-native-safe-area-context": "3.3.2",
98
-        "react-native-screens": "2.18.1",
100
+        "react-native-screens": "3.10.1",
99
         "react-native-sound": "0.11.1",
101
         "react-native-sound": "0.11.1",
100
         "react-native-splash-screen": "3.3.0",
102
         "react-native-splash-screen": "3.3.0",
101
         "react-native-svg": "12.1.0",
103
         "react-native-svg": "12.1.0",
102
         "react-native-svg-transformer": "1.0.0",
104
         "react-native-svg-transformer": "1.0.0",
103
-        "react-native-tab-view": "2.16.0",
105
+        "react-native-tab-view": "3.1.1",
104
         "react-native-url-polyfill": "1.3.0",
106
         "react-native-url-polyfill": "1.3.0",
105
         "react-native-video": "5.2.0",
107
         "react-native-video": "5.2.0",
106
         "react-native-watch-connectivity": "1.0.4",
108
         "react-native-watch-connectivity": "1.0.4",
2117
       }
2119
       }
2118
     },
2120
     },
2119
     "node_modules/@babel/plugin-transform-object-assign": {
2121
     "node_modules/@babel/plugin-transform-object-assign": {
2120
-      "version": "7.2.0",
2121
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.2.0.tgz",
2122
-      "integrity": "sha512-nmE55cZBPFgUktbF2OuoZgPRadfxosLOpSgzEPYotKSls9J4pEPcembi8r78RU37Rph6UApCpNmsQA4QMWK9Ng==",
2122
+      "version": "7.16.7",
2123
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.16.7.tgz",
2124
+      "integrity": "sha512-R8mawvm3x0COTJtveuoqZIjNypn2FjfvXZr4pSQ8VhEFBuQGBz4XhHasZtHXjgXU4XptZ4HtGof3NoYc93ZH9Q==",
2123
       "dependencies": {
2125
       "dependencies": {
2124
-        "@babel/helper-plugin-utils": "^7.0.0"
2126
+        "@babel/helper-plugin-utils": "^7.16.7"
2127
+      },
2128
+      "engines": {
2129
+        "node": ">=6.9.0"
2125
       },
2130
       },
2126
       "peerDependencies": {
2131
       "peerDependencies": {
2127
         "@babel/core": "^7.0.0-0"
2132
         "@babel/core": "^7.0.0-0"
4542
       }
4547
       }
4543
     },
4548
     },
4544
     "node_modules/@react-navigation/bottom-tabs": {
4549
     "node_modules/@react-navigation/bottom-tabs": {
4545
-      "version": "5.11.15",
4546
-      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-5.11.15.tgz",
4547
-      "integrity": "sha512-TBY419W6aN/HZg98xbVp5Bx1HEF5sXuHR5f55W6KMI4k2AvxlwelKD1wbfvEcX2iuQT0YUiiXsACRFUSECYhkw==",
4550
+      "version": "6.0.9",
4551
+      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-6.0.9.tgz",
4552
+      "integrity": "sha512-uRoq6Zd7lPNnLqNQkKC28eR62tpqcDeuakZU1sO8N46FtvrcTuNLoIlssrGty3GF7ALBIxCypn4A93t3nbmMrQ==",
4548
       "dependencies": {
4553
       "dependencies": {
4554
+        "@react-navigation/elements": "^1.2.1",
4549
         "color": "^3.1.3",
4555
         "color": "^3.1.3",
4550
-        "react-native-iphone-x-helper": "^1.3.0"
4556
+        "warn-once": "^0.1.0"
4551
       },
4557
       },
4552
       "peerDependencies": {
4558
       "peerDependencies": {
4553
-        "@react-navigation/native": "^5.0.5",
4559
+        "@react-navigation/native": "^6.0.0",
4554
         "react": "*",
4560
         "react": "*",
4555
         "react-native": "*",
4561
         "react-native": "*",
4556
-        "react-native-safe-area-context": ">= 0.6.0",
4557
-        "react-native-screens": ">= 2.0.0-alpha.0 || >= 2.0.0-beta.0 || >= 2.0.0"
4562
+        "react-native-safe-area-context": ">= 3.0.0",
4563
+        "react-native-screens": ">= 3.0.0"
4558
       }
4564
       }
4559
     },
4565
     },
4560
     "node_modules/@react-navigation/core": {
4566
     "node_modules/@react-navigation/core": {
4561
-      "version": "5.16.1",
4562
-      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-5.16.1.tgz",
4563
-      "integrity": "sha512-3AToC7vPNeSNcHFLd1h71L6u34hfXoRAS1CxF9Fc4uC8uOrVqcNvphpeFbE0O9Bw6Zpl0BnMFl7E5gaL3KGzNA==",
4567
+      "version": "6.1.0",
4568
+      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.1.0.tgz",
4569
+      "integrity": "sha512-LyZqD/ZCXSK9+ES8KiH+0tU+7aL84jUw1N9OxZfEuns/OcnSXKC3sOO+9NQ9XRowB1wLUfJhmqZ8G8rUlg33fQ==",
4564
       "dependencies": {
4570
       "dependencies": {
4565
-        "@react-navigation/routers": "^5.7.4",
4571
+        "@react-navigation/routers": "^6.1.0",
4566
         "escape-string-regexp": "^4.0.0",
4572
         "escape-string-regexp": "^4.0.0",
4567
-        "nanoid": "^3.1.15",
4568
-        "query-string": "^6.13.6",
4573
+        "nanoid": "^3.1.23",
4574
+        "query-string": "^7.0.0",
4569
         "react-is": "^16.13.0"
4575
         "react-is": "^16.13.0"
4570
       },
4576
       },
4571
       "peerDependencies": {
4577
       "peerDependencies": {
4584
       }
4590
       }
4585
     },
4591
     },
4586
     "node_modules/@react-navigation/core/node_modules/query-string": {
4592
     "node_modules/@react-navigation/core/node_modules/query-string": {
4587
-      "version": "6.14.1",
4588
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
4589
-      "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
4593
+      "version": "7.1.0",
4594
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.0.tgz",
4595
+      "integrity": "sha512-wnJ8covk+S9isYR5JIXPt93kFUmI2fQ4R/8130fuq+qwLiGVTurg7Klodgfw4NSz/oe7xnyi09y3lSrogUeM3g==",
4590
       "dependencies": {
4596
       "dependencies": {
4591
         "decode-uri-component": "^0.2.0",
4597
         "decode-uri-component": "^0.2.0",
4592
         "filter-obj": "^1.1.0",
4598
         "filter-obj": "^1.1.0",
4609
       }
4615
       }
4610
     },
4616
     },
4611
     "node_modules/@react-navigation/drawer": {
4617
     "node_modules/@react-navigation/drawer": {
4612
-      "version": "5.12.9",
4613
-      "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-5.12.9.tgz",
4614
-      "integrity": "sha512-SYb2BCEAn+BiEwC6WBfCzs1VlWD+ZdQbxmsim6vo1o+ndPW2e+kiq7FXKRs0vUXhQRZVl2oOB3vBn0c3YCllQg==",
4618
+      "version": "6.1.8",
4619
+      "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.1.8.tgz",
4620
+      "integrity": "sha512-kYE2EO5dianUuUcaYmAlYBcgtmvGm2fxWTQ5sn103cgPNidp4KBUR9ClkhF+btfRaHKq+8Ul5M6qvL0mBAv/Lg==",
4615
       "dependencies": {
4621
       "dependencies": {
4622
+        "@react-navigation/elements": "^1.2.1",
4616
         "color": "^3.1.3",
4623
         "color": "^3.1.3",
4617
-        "react-native-iphone-x-helper": "^1.3.0"
4624
+        "warn-once": "^0.1.0"
4618
       },
4625
       },
4619
       "peerDependencies": {
4626
       "peerDependencies": {
4620
-        "@react-navigation/native": "^5.0.5",
4627
+        "@react-navigation/native": "^6.0.0",
4621
         "react": "*",
4628
         "react": "*",
4622
         "react-native": "*",
4629
         "react-native": "*",
4623
         "react-native-gesture-handler": ">= 1.0.0",
4630
         "react-native-gesture-handler": ">= 1.0.0",
4624
         "react-native-reanimated": ">= 1.0.0",
4631
         "react-native-reanimated": ">= 1.0.0",
4625
-        "react-native-safe-area-context": ">= 0.6.0",
4626
-        "react-native-screens": ">= 2.0.0-alpha.0 || >= 2.0.0-beta.0 || >= 2.0.0"
4632
+        "react-native-safe-area-context": ">= 3.0.0",
4633
+        "react-native-screens": ">= 3.0.0"
4634
+      }
4635
+    },
4636
+    "node_modules/@react-navigation/elements": {
4637
+      "version": "1.2.1",
4638
+      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.2.1.tgz",
4639
+      "integrity": "sha512-EnmAbKMsptrliRKf95rdgS6BhMjML+mIns06+G1Vdih6BrEo7/0iytThUv3WBf99AI76dyEq/cqLUwHPiFzXWg==",
4640
+      "peerDependencies": {
4641
+        "@react-navigation/native": "^6.0.0",
4642
+        "react": "*",
4643
+        "react-native": "*",
4644
+        "react-native-safe-area-context": ">= 3.0.0"
4627
       }
4645
       }
4628
     },
4646
     },
4629
     "node_modules/@react-navigation/material-top-tabs": {
4647
     "node_modules/@react-navigation/material-top-tabs": {
4630
-      "version": "5.3.19",
4631
-      "resolved": "https://registry.npmjs.org/@react-navigation/material-top-tabs/-/material-top-tabs-5.3.19.tgz",
4632
-      "integrity": "sha512-I7bEF99THxxcY7kCUZ5pPmwXr6kgo6L2sg3P1YJo+CcBWSGvGiHyNbZXNs15HuKRuFvEuueChNV9n8QuKBWbDA==",
4648
+      "version": "6.0.6",
4649
+      "resolved": "https://registry.npmjs.org/@react-navigation/material-top-tabs/-/material-top-tabs-6.0.6.tgz",
4650
+      "integrity": "sha512-kbm/0jndRVeGdAgOd4NcDSdSQiYeA7fkctCKbPxe3mT36j9qOqpfHfmd2dbv/VbNCngdTtZ3/+QMxTIViZGy7g==",
4633
       "dependencies": {
4651
       "dependencies": {
4634
-        "color": "^3.1.3"
4652
+        "color": "^3.1.3",
4653
+        "warn-once": "^0.1.0"
4635
       },
4654
       },
4636
       "peerDependencies": {
4655
       "peerDependencies": {
4637
-        "@react-navigation/native": "^5.0.5",
4656
+        "@react-navigation/native": "^6.0.0",
4638
         "react": "*",
4657
         "react": "*",
4639
         "react-native": "*",
4658
         "react-native": "*",
4640
-        "react-native-gesture-handler": ">= 1.0.0",
4641
-        "react-native-reanimated": ">= 1.0.0",
4642
-        "react-native-tab-view": ">= 2.0.0"
4659
+        "react-native-pager-view": ">= 4.0.0",
4660
+        "react-native-tab-view": ">= 3.0.0"
4643
       }
4661
       }
4644
     },
4662
     },
4645
     "node_modules/@react-navigation/native": {
4663
     "node_modules/@react-navigation/native": {
4646
-      "version": "5.9.8",
4647
-      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-5.9.8.tgz",
4648
-      "integrity": "sha512-DNbcDHXQPSFDLn51kkVVJjT3V7jJy2GztNYZe/2bEg29mi5QEcHHcpifjMCtyFKntAOWzKlG88UicIQ17UEghg==",
4664
+      "version": "6.0.6",
4665
+      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.6.tgz",
4666
+      "integrity": "sha512-XzL7YPsaRRQgdCQSXbA8PJWLN2I4lhUUvSFoKQPNO4DS6y8eqZI1V8COPYlJg8+tsetGV5J8jt+jVjWL7h6ZrQ==",
4649
       "dependencies": {
4667
       "dependencies": {
4650
-        "@react-navigation/core": "^5.16.1",
4668
+        "@react-navigation/core": "^6.1.0",
4651
         "escape-string-regexp": "^4.0.0",
4669
         "escape-string-regexp": "^4.0.0",
4652
-        "nanoid": "^3.1.15"
4670
+        "nanoid": "^3.1.23"
4653
       },
4671
       },
4654
       "peerDependencies": {
4672
       "peerDependencies": {
4655
         "react": "*",
4673
         "react": "*",
4668
       }
4686
       }
4669
     },
4687
     },
4670
     "node_modules/@react-navigation/routers": {
4688
     "node_modules/@react-navigation/routers": {
4671
-      "version": "5.7.4",
4672
-      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-5.7.4.tgz",
4673
-      "integrity": "sha512-0N202XAqsU/FlE53Nmh6GHyMtGm7g6TeC93mrFAFJOqGRKznT0/ail+cYlU6tNcPA9AHzZu1Modw1eoDINSliQ==",
4689
+      "version": "6.1.0",
4690
+      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.0.tgz",
4691
+      "integrity": "sha512-8xJL+djIzpFdRW/sGlKojQ06fWgFk1c5jER9501HYJ12LF5DIJFr/tqBI2TJ6bk+y+QFu0nbNyeRC80OjRlmkA==",
4674
       "dependencies": {
4692
       "dependencies": {
4675
-        "nanoid": "^3.1.15"
4693
+        "nanoid": "^3.1.23"
4676
       }
4694
       }
4677
     },
4695
     },
4678
     "node_modules/@react-navigation/stack": {
4696
     "node_modules/@react-navigation/stack": {
4679
-      "version": "5.14.9",
4680
-      "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-5.14.9.tgz",
4681
-      "integrity": "sha512-DuvrT9P+Tz8ezZLQYxORZqOGqO+vEufaxlW1hSLw1knLD4jNxkz8TJDXtfKwaz//9gb43UhTNccNM02vm7iPqQ==",
4697
+      "version": "6.0.11",
4698
+      "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.0.11.tgz",
4699
+      "integrity": "sha512-Osc2mXi0Zh/u92HRCceDqVfVnypTa2sZgYMJDU+vDhHz38negtbCG+cjje6nApSjwC5WTVhYP4OoD5WBSh51+g==",
4682
       "dependencies": {
4700
       "dependencies": {
4701
+        "@react-navigation/elements": "^1.2.1",
4683
         "color": "^3.1.3",
4702
         "color": "^3.1.3",
4684
-        "react-native-iphone-x-helper": "^1.3.0"
4703
+        "warn-once": "^0.1.0"
4685
       },
4704
       },
4686
       "peerDependencies": {
4705
       "peerDependencies": {
4687
-        "@react-native-community/masked-view": ">= 0.1.0",
4688
-        "@react-navigation/native": "^5.0.5",
4706
+        "@react-navigation/native": "^6.0.0",
4689
         "react": "*",
4707
         "react": "*",
4690
         "react-native": "*",
4708
         "react-native": "*",
4691
         "react-native-gesture-handler": ">= 1.0.0",
4709
         "react-native-gesture-handler": ">= 1.0.0",
4692
-        "react-native-safe-area-context": ">= 0.6.0",
4693
-        "react-native-screens": ">= 2.0.0-alpha.0 || >= 2.0.0-beta.0 || >= 2.0.0"
4710
+        "react-native-safe-area-context": ">= 3.0.0",
4711
+        "react-native-screens": ">= 3.0.0"
4694
       }
4712
       }
4695
     },
4713
     },
4696
     "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
4714
     "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
7240
         "node": ">=4"
7258
         "node": ">=4"
7241
       }
7259
       }
7242
     },
7260
     },
7243
-    "node_modules/cross-fetch": {
7244
-      "version": "3.1.4",
7245
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
7246
-      "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
7247
-      "dependencies": {
7248
-        "node-fetch": "2.6.1"
7249
-      }
7250
-    },
7251
-    "node_modules/cross-fetch/node_modules/node-fetch": {
7252
-      "version": "2.6.1",
7253
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
7254
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
7255
-      "engines": {
7256
-        "node": "4.x || >=6.0.0"
7257
-      }
7258
-    },
7259
     "node_modules/cross-spawn": {
7261
     "node_modules/cross-spawn": {
7260
       "version": "6.0.5",
7262
       "version": "6.0.5",
7261
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
7263
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
15178
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
15180
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
15179
       "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
15181
       "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
15180
     },
15182
     },
15183
+    "node_modules/react-freeze": {
15184
+      "version": "1.0.0",
15185
+      "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.0.tgz",
15186
+      "integrity": "sha512-yQaiOqDmoKqks56LN9MTgY06O0qQHgV4FUrikH357DydArSZHQhl0BJFqGKIZoTqi8JizF9Dxhuk1FIZD6qCaw==",
15187
+      "engines": {
15188
+        "node": ">=10"
15189
+      },
15190
+      "peerDependencies": {
15191
+        "react": "^17.0.0"
15192
+      }
15193
+    },
15181
     "node_modules/react-i18next": {
15194
     "node_modules/react-i18next": {
15182
       "version": "10.11.4",
15195
       "version": "10.11.4",
15183
       "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-10.11.4.tgz",
15196
       "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-10.11.4.tgz",
15305
       }
15318
       }
15306
     },
15319
     },
15307
     "node_modules/react-native-gesture-handler": {
15320
     "node_modules/react-native-gesture-handler": {
15308
-      "version": "1.10.3",
15309
-      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.10.3.tgz",
15310
-      "integrity": "sha512-cBGMi1IEsIVMgoox4RvMx7V2r6bNKw0uR1Mu1o7NbuHS6BRSVLq0dP34l2ecnPlC+jpWd3le6Yg1nrdCjby2Mw==",
15321
+      "version": "2.1.0",
15322
+      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.1.0.tgz",
15323
+      "integrity": "sha512-vF4yEUrV5GMBioTkvf5Le1l3N/52dSLBnNMFC+kZ4hssnRoXB0hEQ0ReUkZckRB5L3nbHBhAyjySEtFPx4nyEA==",
15311
       "dependencies": {
15324
       "dependencies": {
15312
         "@egjs/hammerjs": "^2.0.17",
15325
         "@egjs/hammerjs": "^2.0.17",
15313
-        "fbjs": "^3.0.0",
15314
         "hoist-non-react-statics": "^3.3.0",
15326
         "hoist-non-react-statics": "^3.3.0",
15315
         "invariant": "^2.2.4",
15327
         "invariant": "^2.2.4",
15328
+        "lodash": "^4.17.21",
15316
         "prop-types": "^15.7.2"
15329
         "prop-types": "^15.7.2"
15317
       }
15330
       }
15318
     },
15331
     },
15319
-    "node_modules/react-native-gesture-handler/node_modules/fbjs": {
15320
-      "version": "3.0.0",
15321
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.0.tgz",
15322
-      "integrity": "sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==",
15323
-      "dependencies": {
15324
-        "cross-fetch": "^3.0.4",
15325
-        "fbjs-css-vars": "^1.0.0",
15326
-        "loose-envify": "^1.0.0",
15327
-        "object-assign": "^4.1.0",
15328
-        "promise": "^7.1.1",
15329
-        "setimmediate": "^1.0.5",
15330
-        "ua-parser-js": "^0.7.18"
15331
-      }
15332
-    },
15333
     "node_modules/react-native-get-random-values": {
15332
     "node_modules/react-native-get-random-values": {
15334
       "version": "1.7.2",
15333
       "version": "1.7.2",
15335
       "resolved": "https://registry.npmjs.org/react-native-get-random-values/-/react-native-get-random-values-1.7.2.tgz",
15334
       "resolved": "https://registry.npmjs.org/react-native-get-random-values/-/react-native-get-random-values-1.7.2.tgz",
15362
       "resolved": "https://registry.npmjs.org/react-native-keep-awake/-/react-native-keep-awake-4.0.0.tgz",
15361
       "resolved": "https://registry.npmjs.org/react-native-keep-awake/-/react-native-keep-awake-4.0.0.tgz",
15363
       "integrity": "sha512-0Fotox+eLXQooeibVs3P60yASYUWjtRw9MZNmbuHt5UZQrgUrAKsE4jm7gTr4tPU1m1RkwGzcgUFpcOkh/ec7g=="
15362
       "integrity": "sha512-0Fotox+eLXQooeibVs3P60yASYUWjtRw9MZNmbuHt5UZQrgUrAKsE4jm7gTr4tPU1m1RkwGzcgUFpcOkh/ec7g=="
15364
     },
15363
     },
15364
+    "node_modules/react-native-pager-view": {
15365
+      "version": "5.4.9",
15366
+      "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-5.4.9.tgz",
15367
+      "integrity": "sha512-D6tzxpwMGdl6CXgtskGWhKRc5cJakCazESRGt7PkqnpyiH3N35ft1KmR82pCSQetAFlytFiToeu3a/dG5CELvA==",
15368
+      "peerDependencies": {
15369
+        "react": "*",
15370
+        "react-native": "*"
15371
+      }
15372
+    },
15365
     "node_modules/react-native-paper": {
15373
     "node_modules/react-native-paper": {
15366
       "version": "4.11.1",
15374
       "version": "4.11.1",
15367
       "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-4.11.1.tgz",
15375
       "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-4.11.1.tgz",
15422
       }
15430
       }
15423
     },
15431
     },
15424
     "node_modules/react-native-screens": {
15432
     "node_modules/react-native-screens": {
15425
-      "version": "2.18.1",
15426
-      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-2.18.1.tgz",
15427
-      "integrity": "sha512-r5WZLpmx2hHjC1RgMdPq5YpSU9tEhBpUaZ5M1SUtNIONyiLqQVxabhRCINdebIk4depJiIl7yw2Q85zJyeX6fw==",
15433
+      "version": "3.10.1",
15434
+      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.10.1.tgz",
15435
+      "integrity": "sha512-ZF/XHnRsuinvDY1XiCWLXxoUoSf+NgsAes2SZfX9rFQQcv128zmh/+19SSavGrSf6rQNzqytEMdRGI6yr4Gbjw==",
15436
+      "dependencies": {
15437
+        "react-freeze": "^1.0.0",
15438
+        "warn-once": "^0.1.0"
15439
+      },
15428
       "peerDependencies": {
15440
       "peerDependencies": {
15429
         "react": "*",
15441
         "react": "*",
15430
         "react-native": "*"
15442
         "react-native": "*"
15893
       }
15905
       }
15894
     },
15906
     },
15895
     "node_modules/react-native-tab-view": {
15907
     "node_modules/react-native-tab-view": {
15896
-      "version": "2.16.0",
15897
-      "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-2.16.0.tgz",
15898
-      "integrity": "sha512-ac2DmT7+l13wzIFqtbfXn4wwfgtPoKzWjjZyrK1t+T8sdemuUvD4zIt+UImg03fu3s3VD8Wh/fBrIdcqQyZJWg==",
15908
+      "version": "3.1.1",
15909
+      "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-3.1.1.tgz",
15910
+      "integrity": "sha512-M5pRN6utQfytKWoKlKVzg5NbkYu308qNoW1khGTtEOTs1k14p2dHJ/BWOJoJYHKbPVUyZldbG9MFT7gUl4YHnw==",
15899
       "peerDependencies": {
15911
       "peerDependencies": {
15900
         "react": "*",
15912
         "react": "*",
15901
         "react-native": "*",
15913
         "react-native": "*",
15902
-        "react-native-gesture-handler": "*",
15903
-        "react-native-reanimated": "*"
15914
+        "react-native-pager-view": "*"
15904
       }
15915
       }
15905
     },
15916
     },
15906
     "node_modules/react-native-url-polyfill": {
15917
     "node_modules/react-native-url-polyfill": {
18862
         "makeerror": "1.0.12"
18873
         "makeerror": "1.0.12"
18863
       }
18874
       }
18864
     },
18875
     },
18876
+    "node_modules/warn-once": {
18877
+      "version": "0.1.0",
18878
+      "resolved": "https://registry.npmjs.org/warn-once/-/warn-once-0.1.0.tgz",
18879
+      "integrity": "sha512-recZTSvuaH/On5ZU5ywq66y99lImWqzP93+AiUo9LUwG8gXHW+LJjhOd6REJHm7qb0niYqrEQJvbHSQfuJtTqA=="
18880
+    },
18865
     "node_modules/warning": {
18881
     "node_modules/warning": {
18866
       "version": "4.0.3",
18882
       "version": "4.0.3",
18867
       "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
18883
       "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
21772
       }
21788
       }
21773
     },
21789
     },
21774
     "@babel/plugin-transform-object-assign": {
21790
     "@babel/plugin-transform-object-assign": {
21775
-      "version": "7.2.0",
21776
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.2.0.tgz",
21777
-      "integrity": "sha512-nmE55cZBPFgUktbF2OuoZgPRadfxosLOpSgzEPYotKSls9J4pEPcembi8r78RU37Rph6UApCpNmsQA4QMWK9Ng==",
21791
+      "version": "7.16.7",
21792
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.16.7.tgz",
21793
+      "integrity": "sha512-R8mawvm3x0COTJtveuoqZIjNypn2FjfvXZr4pSQ8VhEFBuQGBz4XhHasZtHXjgXU4XptZ4HtGof3NoYc93ZH9Q==",
21778
       "requires": {
21794
       "requires": {
21779
-        "@babel/helper-plugin-utils": "^7.0.0"
21795
+        "@babel/helper-plugin-utils": "^7.16.7"
21780
       }
21796
       }
21781
     },
21797
     },
21782
     "@babel/plugin-transform-object-super": {
21798
     "@babel/plugin-transform-object-super": {
23617
       "integrity": "sha512-303CxmetUmgiX9NSUxatZkNh9qTYYdiM8xkGf9I3Uj20U3eGY3M78ljeNQ4UVCJA+FNGS5nC1dtS9GjIqvB4dg=="
23633
       "integrity": "sha512-303CxmetUmgiX9NSUxatZkNh9qTYYdiM8xkGf9I3Uj20U3eGY3M78ljeNQ4UVCJA+FNGS5nC1dtS9GjIqvB4dg=="
23618
     },
23634
     },
23619
     "@react-navigation/bottom-tabs": {
23635
     "@react-navigation/bottom-tabs": {
23620
-      "version": "5.11.15",
23621
-      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-5.11.15.tgz",
23622
-      "integrity": "sha512-TBY419W6aN/HZg98xbVp5Bx1HEF5sXuHR5f55W6KMI4k2AvxlwelKD1wbfvEcX2iuQT0YUiiXsACRFUSECYhkw==",
23636
+      "version": "6.0.9",
23637
+      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-6.0.9.tgz",
23638
+      "integrity": "sha512-uRoq6Zd7lPNnLqNQkKC28eR62tpqcDeuakZU1sO8N46FtvrcTuNLoIlssrGty3GF7ALBIxCypn4A93t3nbmMrQ==",
23623
       "requires": {
23639
       "requires": {
23640
+        "@react-navigation/elements": "^1.2.1",
23624
         "color": "^3.1.3",
23641
         "color": "^3.1.3",
23625
-        "react-native-iphone-x-helper": "^1.3.0"
23642
+        "warn-once": "^0.1.0"
23626
       }
23643
       }
23627
     },
23644
     },
23628
     "@react-navigation/core": {
23645
     "@react-navigation/core": {
23629
-      "version": "5.16.1",
23630
-      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-5.16.1.tgz",
23631
-      "integrity": "sha512-3AToC7vPNeSNcHFLd1h71L6u34hfXoRAS1CxF9Fc4uC8uOrVqcNvphpeFbE0O9Bw6Zpl0BnMFl7E5gaL3KGzNA==",
23646
+      "version": "6.1.0",
23647
+      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.1.0.tgz",
23648
+      "integrity": "sha512-LyZqD/ZCXSK9+ES8KiH+0tU+7aL84jUw1N9OxZfEuns/OcnSXKC3sOO+9NQ9XRowB1wLUfJhmqZ8G8rUlg33fQ==",
23632
       "requires": {
23649
       "requires": {
23633
-        "@react-navigation/routers": "^5.7.4",
23650
+        "@react-navigation/routers": "^6.1.0",
23634
         "escape-string-regexp": "^4.0.0",
23651
         "escape-string-regexp": "^4.0.0",
23635
-        "nanoid": "^3.1.15",
23636
-        "query-string": "^6.13.6",
23652
+        "nanoid": "^3.1.23",
23653
+        "query-string": "^7.0.0",
23637
         "react-is": "^16.13.0"
23654
         "react-is": "^16.13.0"
23638
       },
23655
       },
23639
       "dependencies": {
23656
       "dependencies": {
23643
           "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
23660
           "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
23644
         },
23661
         },
23645
         "query-string": {
23662
         "query-string": {
23646
-          "version": "6.14.1",
23647
-          "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
23648
-          "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
23663
+          "version": "7.1.0",
23664
+          "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.0.tgz",
23665
+          "integrity": "sha512-wnJ8covk+S9isYR5JIXPt93kFUmI2fQ4R/8130fuq+qwLiGVTurg7Klodgfw4NSz/oe7xnyi09y3lSrogUeM3g==",
23649
           "requires": {
23666
           "requires": {
23650
             "decode-uri-component": "^0.2.0",
23667
             "decode-uri-component": "^0.2.0",
23651
             "filter-obj": "^1.1.0",
23668
             "filter-obj": "^1.1.0",
23661
       }
23678
       }
23662
     },
23679
     },
23663
     "@react-navigation/drawer": {
23680
     "@react-navigation/drawer": {
23664
-      "version": "5.12.9",
23665
-      "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-5.12.9.tgz",
23666
-      "integrity": "sha512-SYb2BCEAn+BiEwC6WBfCzs1VlWD+ZdQbxmsim6vo1o+ndPW2e+kiq7FXKRs0vUXhQRZVl2oOB3vBn0c3YCllQg==",
23681
+      "version": "6.1.8",
23682
+      "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.1.8.tgz",
23683
+      "integrity": "sha512-kYE2EO5dianUuUcaYmAlYBcgtmvGm2fxWTQ5sn103cgPNidp4KBUR9ClkhF+btfRaHKq+8Ul5M6qvL0mBAv/Lg==",
23667
       "requires": {
23684
       "requires": {
23685
+        "@react-navigation/elements": "^1.2.1",
23668
         "color": "^3.1.3",
23686
         "color": "^3.1.3",
23669
-        "react-native-iphone-x-helper": "^1.3.0"
23687
+        "warn-once": "^0.1.0"
23670
       }
23688
       }
23671
     },
23689
     },
23690
+    "@react-navigation/elements": {
23691
+      "version": "1.2.1",
23692
+      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.2.1.tgz",
23693
+      "integrity": "sha512-EnmAbKMsptrliRKf95rdgS6BhMjML+mIns06+G1Vdih6BrEo7/0iytThUv3WBf99AI76dyEq/cqLUwHPiFzXWg=="
23694
+    },
23672
     "@react-navigation/material-top-tabs": {
23695
     "@react-navigation/material-top-tabs": {
23673
-      "version": "5.3.19",
23674
-      "resolved": "https://registry.npmjs.org/@react-navigation/material-top-tabs/-/material-top-tabs-5.3.19.tgz",
23675
-      "integrity": "sha512-I7bEF99THxxcY7kCUZ5pPmwXr6kgo6L2sg3P1YJo+CcBWSGvGiHyNbZXNs15HuKRuFvEuueChNV9n8QuKBWbDA==",
23696
+      "version": "6.0.6",
23697
+      "resolved": "https://registry.npmjs.org/@react-navigation/material-top-tabs/-/material-top-tabs-6.0.6.tgz",
23698
+      "integrity": "sha512-kbm/0jndRVeGdAgOd4NcDSdSQiYeA7fkctCKbPxe3mT36j9qOqpfHfmd2dbv/VbNCngdTtZ3/+QMxTIViZGy7g==",
23676
       "requires": {
23699
       "requires": {
23677
-        "color": "^3.1.3"
23700
+        "color": "^3.1.3",
23701
+        "warn-once": "^0.1.0"
23678
       }
23702
       }
23679
     },
23703
     },
23680
     "@react-navigation/native": {
23704
     "@react-navigation/native": {
23681
-      "version": "5.9.8",
23682
-      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-5.9.8.tgz",
23683
-      "integrity": "sha512-DNbcDHXQPSFDLn51kkVVJjT3V7jJy2GztNYZe/2bEg29mi5QEcHHcpifjMCtyFKntAOWzKlG88UicIQ17UEghg==",
23705
+      "version": "6.0.6",
23706
+      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.6.tgz",
23707
+      "integrity": "sha512-XzL7YPsaRRQgdCQSXbA8PJWLN2I4lhUUvSFoKQPNO4DS6y8eqZI1V8COPYlJg8+tsetGV5J8jt+jVjWL7h6ZrQ==",
23684
       "requires": {
23708
       "requires": {
23685
-        "@react-navigation/core": "^5.16.1",
23709
+        "@react-navigation/core": "^6.1.0",
23686
         "escape-string-regexp": "^4.0.0",
23710
         "escape-string-regexp": "^4.0.0",
23687
-        "nanoid": "^3.1.15"
23711
+        "nanoid": "^3.1.23"
23688
       },
23712
       },
23689
       "dependencies": {
23713
       "dependencies": {
23690
         "escape-string-regexp": {
23714
         "escape-string-regexp": {
23695
       }
23719
       }
23696
     },
23720
     },
23697
     "@react-navigation/routers": {
23721
     "@react-navigation/routers": {
23698
-      "version": "5.7.4",
23699
-      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-5.7.4.tgz",
23700
-      "integrity": "sha512-0N202XAqsU/FlE53Nmh6GHyMtGm7g6TeC93mrFAFJOqGRKznT0/ail+cYlU6tNcPA9AHzZu1Modw1eoDINSliQ==",
23722
+      "version": "6.1.0",
23723
+      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.0.tgz",
23724
+      "integrity": "sha512-8xJL+djIzpFdRW/sGlKojQ06fWgFk1c5jER9501HYJ12LF5DIJFr/tqBI2TJ6bk+y+QFu0nbNyeRC80OjRlmkA==",
23701
       "requires": {
23725
       "requires": {
23702
-        "nanoid": "^3.1.15"
23726
+        "nanoid": "^3.1.23"
23703
       }
23727
       }
23704
     },
23728
     },
23705
     "@react-navigation/stack": {
23729
     "@react-navigation/stack": {
23706
-      "version": "5.14.9",
23707
-      "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-5.14.9.tgz",
23708
-      "integrity": "sha512-DuvrT9P+Tz8ezZLQYxORZqOGqO+vEufaxlW1hSLw1knLD4jNxkz8TJDXtfKwaz//9gb43UhTNccNM02vm7iPqQ==",
23730
+      "version": "6.0.11",
23731
+      "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.0.11.tgz",
23732
+      "integrity": "sha512-Osc2mXi0Zh/u92HRCceDqVfVnypTa2sZgYMJDU+vDhHz38negtbCG+cjje6nApSjwC5WTVhYP4OoD5WBSh51+g==",
23709
       "requires": {
23733
       "requires": {
23734
+        "@react-navigation/elements": "^1.2.1",
23710
         "color": "^3.1.3",
23735
         "color": "^3.1.3",
23711
-        "react-native-iphone-x-helper": "^1.3.0"
23736
+        "warn-once": "^0.1.0"
23712
       }
23737
       }
23713
     },
23738
     },
23714
     "@svgr/babel-plugin-add-jsx-attribute": {
23739
     "@svgr/babel-plugin-add-jsx-attribute": {
25769
         "parse-json": "^4.0.0"
25794
         "parse-json": "^4.0.0"
25770
       }
25795
       }
25771
     },
25796
     },
25772
-    "cross-fetch": {
25773
-      "version": "3.1.4",
25774
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
25775
-      "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
25776
-      "requires": {
25777
-        "node-fetch": "2.6.1"
25778
-      },
25779
-      "dependencies": {
25780
-        "node-fetch": {
25781
-          "version": "2.6.1",
25782
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
25783
-          "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
25784
-        }
25785
-      }
25786
-    },
25787
     "cross-spawn": {
25797
     "cross-spawn": {
25788
       "version": "6.0.5",
25798
       "version": "6.0.5",
25789
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
25799
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
31982
         }
31992
         }
31983
       }
31993
       }
31984
     },
31994
     },
31995
+    "react-freeze": {
31996
+      "version": "1.0.0",
31997
+      "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.0.tgz",
31998
+      "integrity": "sha512-yQaiOqDmoKqks56LN9MTgY06O0qQHgV4FUrikH357DydArSZHQhl0BJFqGKIZoTqi8JizF9Dxhuk1FIZD6qCaw=="
31999
+    },
31985
     "react-i18next": {
32000
     "react-i18next": {
31986
       "version": "10.11.4",
32001
       "version": "10.11.4",
31987
       "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-10.11.4.tgz",
32002
       "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-10.11.4.tgz",
32124
       "integrity": "sha512-92676ZWHZHsPM/EW1ulgb2MuVfjYfMWRTWMbLcrCsipkcMaZ9Traz5mpsnCS7KZpsOksnvUinzDIjsct2XGc6Q=="
32139
       "integrity": "sha512-92676ZWHZHsPM/EW1ulgb2MuVfjYfMWRTWMbLcrCsipkcMaZ9Traz5mpsnCS7KZpsOksnvUinzDIjsct2XGc6Q=="
32125
     },
32140
     },
32126
     "react-native-gesture-handler": {
32141
     "react-native-gesture-handler": {
32127
-      "version": "1.10.3",
32128
-      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.10.3.tgz",
32129
-      "integrity": "sha512-cBGMi1IEsIVMgoox4RvMx7V2r6bNKw0uR1Mu1o7NbuHS6BRSVLq0dP34l2ecnPlC+jpWd3le6Yg1nrdCjby2Mw==",
32142
+      "version": "2.1.0",
32143
+      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.1.0.tgz",
32144
+      "integrity": "sha512-vF4yEUrV5GMBioTkvf5Le1l3N/52dSLBnNMFC+kZ4hssnRoXB0hEQ0ReUkZckRB5L3nbHBhAyjySEtFPx4nyEA==",
32130
       "requires": {
32145
       "requires": {
32131
         "@egjs/hammerjs": "^2.0.17",
32146
         "@egjs/hammerjs": "^2.0.17",
32132
-        "fbjs": "^3.0.0",
32133
         "hoist-non-react-statics": "^3.3.0",
32147
         "hoist-non-react-statics": "^3.3.0",
32134
         "invariant": "^2.2.4",
32148
         "invariant": "^2.2.4",
32149
+        "lodash": "^4.17.21",
32135
         "prop-types": "^15.7.2"
32150
         "prop-types": "^15.7.2"
32136
-      },
32137
-      "dependencies": {
32138
-        "fbjs": {
32139
-          "version": "3.0.0",
32140
-          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.0.tgz",
32141
-          "integrity": "sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==",
32142
-          "requires": {
32143
-            "cross-fetch": "^3.0.4",
32144
-            "fbjs-css-vars": "^1.0.0",
32145
-            "loose-envify": "^1.0.0",
32146
-            "object-assign": "^4.1.0",
32147
-            "promise": "^7.1.1",
32148
-            "setimmediate": "^1.0.5",
32149
-            "ua-parser-js": "^0.7.18"
32150
-          }
32151
-        }
32152
       }
32151
       }
32153
     },
32152
     },
32154
     "react-native-get-random-values": {
32153
     "react-native-get-random-values": {
32174
       "resolved": "https://registry.npmjs.org/react-native-keep-awake/-/react-native-keep-awake-4.0.0.tgz",
32173
       "resolved": "https://registry.npmjs.org/react-native-keep-awake/-/react-native-keep-awake-4.0.0.tgz",
32175
       "integrity": "sha512-0Fotox+eLXQooeibVs3P60yASYUWjtRw9MZNmbuHt5UZQrgUrAKsE4jm7gTr4tPU1m1RkwGzcgUFpcOkh/ec7g=="
32174
       "integrity": "sha512-0Fotox+eLXQooeibVs3P60yASYUWjtRw9MZNmbuHt5UZQrgUrAKsE4jm7gTr4tPU1m1RkwGzcgUFpcOkh/ec7g=="
32176
     },
32175
     },
32176
+    "react-native-pager-view": {
32177
+      "version": "5.4.9",
32178
+      "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-5.4.9.tgz",
32179
+      "integrity": "sha512-D6tzxpwMGdl6CXgtskGWhKRc5cJakCazESRGt7PkqnpyiH3N35ft1KmR82pCSQetAFlytFiToeu3a/dG5CELvA=="
32180
+    },
32177
     "react-native-paper": {
32181
     "react-native-paper": {
32178
       "version": "4.11.1",
32182
       "version": "4.11.1",
32179
       "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-4.11.1.tgz",
32183
       "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-4.11.1.tgz",
32220
       "integrity": "sha512-yOwiiPJ1rk+/nfK13eafbpW6sKW0jOnsRem2C1LPJjM3tfTof6hlvV5eWHATye3XOpu2cJ7N+HdkUvUDGwFD2Q=="
32224
       "integrity": "sha512-yOwiiPJ1rk+/nfK13eafbpW6sKW0jOnsRem2C1LPJjM3tfTof6hlvV5eWHATye3XOpu2cJ7N+HdkUvUDGwFD2Q=="
32221
     },
32225
     },
32222
     "react-native-screens": {
32226
     "react-native-screens": {
32223
-      "version": "2.18.1",
32224
-      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-2.18.1.tgz",
32225
-      "integrity": "sha512-r5WZLpmx2hHjC1RgMdPq5YpSU9tEhBpUaZ5M1SUtNIONyiLqQVxabhRCINdebIk4depJiIl7yw2Q85zJyeX6fw=="
32227
+      "version": "3.10.1",
32228
+      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.10.1.tgz",
32229
+      "integrity": "sha512-ZF/XHnRsuinvDY1XiCWLXxoUoSf+NgsAes2SZfX9rFQQcv128zmh/+19SSavGrSf6rQNzqytEMdRGI6yr4Gbjw==",
32230
+      "requires": {
32231
+        "react-freeze": "^1.0.0",
32232
+        "warn-once": "^0.1.0"
32233
+      }
32226
     },
32234
     },
32227
     "react-native-sound": {
32235
     "react-native-sound": {
32228
       "version": "0.11.1",
32236
       "version": "0.11.1",
32484
       }
32492
       }
32485
     },
32493
     },
32486
     "react-native-tab-view": {
32494
     "react-native-tab-view": {
32487
-      "version": "2.16.0",
32488
-      "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-2.16.0.tgz",
32489
-      "integrity": "sha512-ac2DmT7+l13wzIFqtbfXn4wwfgtPoKzWjjZyrK1t+T8sdemuUvD4zIt+UImg03fu3s3VD8Wh/fBrIdcqQyZJWg=="
32495
+      "version": "3.1.1",
32496
+      "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-3.1.1.tgz",
32497
+      "integrity": "sha512-M5pRN6utQfytKWoKlKVzg5NbkYu308qNoW1khGTtEOTs1k14p2dHJ/BWOJoJYHKbPVUyZldbG9MFT7gUl4YHnw=="
32490
     },
32498
     },
32491
     "react-native-url-polyfill": {
32499
     "react-native-url-polyfill": {
32492
       "version": "1.3.0",
32500
       "version": "1.3.0",
34731
         "makeerror": "1.0.12"
34739
         "makeerror": "1.0.12"
34732
       }
34740
       }
34733
     },
34741
     },
34742
+    "warn-once": {
34743
+      "version": "0.1.0",
34744
+      "resolved": "https://registry.npmjs.org/warn-once/-/warn-once-0.1.0.tgz",
34745
+      "integrity": "sha512-recZTSvuaH/On5ZU5ywq66y99lImWqzP93+AiUo9LUwG8gXHW+LJjhOd6REJHm7qb0niYqrEQJvbHSQfuJtTqA=="
34746
+    },
34734
     "warning": {
34747
     "warning": {
34735
       "version": "4.0.3",
34748
       "version": "4.0.3",
34736
       "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
34749
       "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",

+ 10
- 8
package.json 파일 보기

46
     "@react-native-community/slider": "4.1.12",
46
     "@react-native-community/slider": "4.1.12",
47
     "@react-native-google-signin/google-signin": "7.0.4",
47
     "@react-native-google-signin/google-signin": "7.0.4",
48
     "@react-native-masked-view/masked-view": "0.2.6",
48
     "@react-native-masked-view/masked-view": "0.2.6",
49
-    "@react-navigation/bottom-tabs": "5.11.15",
50
-    "@react-navigation/drawer": "5.12.9",
51
-    "@react-navigation/material-top-tabs": "5.3.19",
52
-    "@react-navigation/native": "5.9.8",
53
-    "@react-navigation/stack": "5.14.9",
49
+    "@react-navigation/bottom-tabs": "6.0.9",
50
+    "@react-navigation/drawer": "6.1.8",
51
+    "@react-navigation/elements": "1.2.1",
52
+    "@react-navigation/material-top-tabs": "6.0.6",
53
+    "@react-navigation/native": "6.0.6",
54
+    "@react-navigation/stack": "6.0.11",
54
     "@svgr/webpack": "4.3.2",
55
     "@svgr/webpack": "4.3.2",
55
     "@xmldom/xmldom": "0.7.5",
56
     "@xmldom/xmldom": "0.7.5",
56
     "amplitude-js": "8.2.1",
57
     "amplitude-js": "8.2.1",
92
     "react-native-collapsible": "1.6.0",
93
     "react-native-collapsible": "1.6.0",
93
     "react-native-default-preference": "github:kevinresol/react-native-default-preference#11bff5eb05cb04fd8d35b5e761eeee80525e8c6c",
94
     "react-native-default-preference": "github:kevinresol/react-native-default-preference#11bff5eb05cb04fd8d35b5e761eeee80525e8c6c",
94
     "react-native-device-info": "8.4.8",
95
     "react-native-device-info": "8.4.8",
95
-    "react-native-gesture-handler": "1.10.3",
96
+    "react-native-gesture-handler": "2.1.0",
96
     "react-native-get-random-values": "1.7.2",
97
     "react-native-get-random-values": "1.7.2",
97
     "react-native-immersive": "2.0.0",
98
     "react-native-immersive": "2.0.0",
98
     "react-native-keep-awake": "4.0.0",
99
     "react-native-keep-awake": "4.0.0",
100
+    "react-native-pager-view": "5.4.9",
99
     "react-native-paper": "4.11.1",
101
     "react-native-paper": "4.11.1",
100
     "react-native-performance": "2.1.0",
102
     "react-native-performance": "2.1.0",
101
     "react-native-reanimated": "1.13.3",
103
     "react-native-reanimated": "1.13.3",
102
     "react-native-safe-area-context": "3.3.2",
104
     "react-native-safe-area-context": "3.3.2",
103
-    "react-native-screens": "2.18.1",
105
+    "react-native-screens": "3.10.1",
104
     "react-native-sound": "0.11.1",
106
     "react-native-sound": "0.11.1",
105
     "react-native-splash-screen": "3.3.0",
107
     "react-native-splash-screen": "3.3.0",
106
     "react-native-svg": "12.1.0",
108
     "react-native-svg": "12.1.0",
107
     "react-native-svg-transformer": "1.0.0",
109
     "react-native-svg-transformer": "1.0.0",
108
-    "react-native-tab-view": "2.16.0",
110
+    "react-native-tab-view": "3.1.1",
109
     "react-native-url-polyfill": "1.3.0",
111
     "react-native-url-polyfill": "1.3.0",
110
     "react-native-video": "5.2.0",
112
     "react-native-video": "5.2.0",
111
     "react-native-watch-connectivity": "1.0.4",
113
     "react-native-watch-connectivity": "1.0.4",

+ 13
- 0
patches/react-native-gesture-handler+2.1.0.patch 파일 보기

1
+diff --git a/node_modules/react-native-gesture-handler/android/build.gradle b/node_modules/react-native-gesture-handler/android/build.gradle
2
+index 8afc3d5..4b1f721 100644
3
+--- a/node_modules/react-native-gesture-handler/android/build.gradle
4
++++ b/node_modules/react-native-gesture-handler/android/build.gradle
5
+@@ -26,7 +26,7 @@ def shouldUseCommonInterfaceFromReanimated() {
6
+         def json = new JsonSlurper().parseText(inputFile.text)
7
+         def reanimatedVersion = json.version as String
8
+         def (major, minor, patch) = reanimatedVersion.tokenize('.')
9
+-        return Integer.parseInt(minor) >= 3
10
++        return Integer.parseInt(major) >= 2 && Integer.parseInt(minor) >= 3
11
+     } else {
12
+         return false
13
+     }

+ 1
- 1
react/features/base/modal/components/JitsiKeyboardAvoidingView.js 파일 보기

1
 // @flow
1
 // @flow
2
 
2
 
3
-import { useHeaderHeight } from '@react-navigation/stack';
3
+import { useHeaderHeight } from '@react-navigation/elements';
4
 import React, { useEffect, useState } from 'react';
4
 import React, { useEffect, useState } from 'react';
5
 import {
5
 import {
6
     KeyboardAvoidingView,
6
     KeyboardAvoidingView,

+ 1
- 1
react/features/chat/components/native/ChatAndPolls.js 파일 보기

27
                 height: clientHeight,
27
                 height: clientHeight,
28
                 width: clientWidth
28
                 width: clientWidth
29
             }}
29
             }}
30
-            tabBarOptions = {{
30
+            screenOptions = {{
31
                 ...chatTabBarOptions
31
                 ...chatTabBarOptions
32
             }}>
32
             }}>
33
             <ChatTab.Screen
33
             <ChatTab.Screen

+ 3
- 1
react/features/conference/components/native/ConferenceNavigationContainer.js 파일 보기

64
                 theme = { navigationContainerTheme }>
64
                 theme = { navigationContainerTheme }>
65
                 <ConferenceStack.Navigator
65
                 <ConferenceStack.Navigator
66
                     initialRouteName = { screen.conference.main }
66
                     initialRouteName = { screen.conference.main }
67
-                    mode = 'modal'>
67
+                    screenOptions = {{
68
+                        presentation: 'modal'
69
+                    }}>
68
                     <ConferenceStack.Screen
70
                     <ConferenceStack.Screen
69
                         component = { Conference }
71
                         component = { Conference }
70
                         name = { screen.conference.main }
72
                         name = { screen.conference.main }

+ 4
- 4
react/features/conference/components/native/ConferenceNavigatorScreenOptions.js 파일 보기

164
  * Tab bar options for chat screen.
164
  * Tab bar options for chat screen.
165
  */
165
  */
166
 export const chatTabBarOptions = {
166
 export const chatTabBarOptions = {
167
-    activeTintColor: BaseTheme.palette.screen01Header,
168
-    labelStyle: {
167
+    tabBarActiveTintColor: BaseTheme.palette.screen01Header,
168
+    tabBarLabelStyle: {
169
         fontSize: BaseTheme.typography.labelRegular.fontSize
169
         fontSize: BaseTheme.typography.labelRegular.fontSize
170
     },
170
     },
171
-    inactiveTintColor: BaseTheme.palette.field02Disabled,
172
-    indicatorStyle: {
171
+    tabBarInactiveTintColor: BaseTheme.palette.field02Disabled,
172
+    tabBarIndicatorStyle: {
173
         backgroundColor: BaseTheme.palette.screen01Header
173
         backgroundColor: BaseTheme.palette.screen01Header
174
     }
174
     }
175
 };
175
 };

+ 1
- 0
react/features/conference/components/native/routes.js 파일 보기

1
 export const screen = {
1
 export const screen = {
2
+    root: 'Root',
2
     welcome: {
3
     welcome: {
3
         main: 'Home',
4
         main: 'Home',
4
         tabs: {
5
         tabs: {

+ 3
- 3
react/features/welcome/components/RootNavigationContainer.js 파일 보기

38
             ref = { rootNavigationRef }
38
             ref = { rootNavigationRef }
39
             theme = { navigationContainerTheme }>
39
             theme = { navigationContainerTheme }>
40
             <RootStack.Navigator
40
             <RootStack.Navigator
41
-                initialRouteName = { screen.welcome.main }>
41
+                initialRouteName = { screen.root }>
42
                 {
42
                 {
43
                     isWelcomePageAvailable
43
                     isWelcomePageAvailable
44
                         ? <RootStack.Screen
44
                         ? <RootStack.Screen
45
                             component = { WelcomePageNavigationContainer }
45
                             component = { WelcomePageNavigationContainer }
46
-                            name = { screen.welcome.main }
46
+                            name = { screen.root }
47
                             options = { drawerNavigatorScreenOptions } />
47
                             options = { drawerNavigatorScreenOptions } />
48
                         : <RootStack.Screen
48
                         : <RootStack.Screen
49
                             component = { BlankPage }
49
                             component = { BlankPage }
50
-                            name = { screen.welcome.main } />
50
+                            name = { screen.root } />
51
                 }
51
                 }
52
                 <RootStack.Screen
52
                 <RootStack.Screen
53
                     component = { DialInSummary }
53
                     component = { DialInSummary }

+ 2
- 3
react/features/welcome/components/WelcomePageNavigationContainer.js 파일 보기

19
 import CustomDrawerContent from './CustomDrawerContent';
19
 import CustomDrawerContent from './CustomDrawerContent';
20
 import WelcomePage from './WelcomePage.native';
20
 import WelcomePage from './WelcomePage.native';
21
 import { drawerContentOptions } from './constants';
21
 import { drawerContentOptions } from './constants';
22
-import styles from './styles';
22
+
23
 
23
 
24
 const DrawerStack = createDrawerNavigator();
24
 const DrawerStack = createDrawerNavigator();
25
 
25
 
31
         <DrawerStack.Navigator
31
         <DrawerStack.Navigator
32
             /* eslint-disable-next-line react/jsx-no-bind */
32
             /* eslint-disable-next-line react/jsx-no-bind */
33
             drawerContent = { props => <CustomDrawerContent { ...props } /> }
33
             drawerContent = { props => <CustomDrawerContent { ...props } /> }
34
-            drawerContentOptions = { drawerContentOptions }
35
-            drawerStyle = { styles.drawerStyle }>
34
+            screenOptions = { drawerContentOptions }>
36
             <DrawerStack.Screen
35
             <DrawerStack.Screen
37
                 component = { WelcomePage }
36
                 component = { WelcomePage }
38
                 name = { screen.welcome.main }
37
                 name = { screen.welcome.main }

+ 4
- 1
react/features/welcome/components/WelcomePageTabs.js 파일 보기

39
 
39
 
40
     return (
40
     return (
41
         <WelcomePage.Navigator
41
         <WelcomePage.Navigator
42
-            tabBarOptions = { tabBarOptions }>
42
+            screenOptions = {{
43
+                headerShown: false,
44
+                ...tabBarOptions
45
+            }}>
43
             <WelcomePage.Screen
46
             <WelcomePage.Screen
44
                 name = { screen.welcome.tabs.recent }
47
                 name = { screen.welcome.tabs.recent }
45
                 options = { recentListTabBarOptions }>
48
                 options = { recentListTabBarOptions }>

+ 7
- 3
react/features/welcome/components/constants.js 파일 보기

4
 
4
 
5
 
5
 
6
 export const drawerContentOptions = {
6
 export const drawerContentOptions = {
7
-    activeBackgroundColor: BaseTheme.palette.ui12,
8
-    activeTintColor: BaseTheme.palette.screen01Header,
9
-    labelStyle: {
7
+    drawerActiveBackgroundColor: BaseTheme.palette.ui12,
8
+    drawerActiveTintColor: BaseTheme.palette.screen01Header,
9
+    drawerLabelStyle: {
10
         marginLeft: BaseTheme.spacing[2]
10
         marginLeft: BaseTheme.spacing[2]
11
+    },
12
+    drawerStyle: {
13
+        backgroundColor: BaseTheme.palette.ui12,
14
+        width: '54%'
11
     }
15
     }
12
 };
16
 };

+ 0
- 8
react/features/welcome/components/styles.js 파일 보기

81
         fontSize: 14
81
         fontSize: 14
82
     },
82
     },
83
 
83
 
84
-    /**
85
-     * Drawer style.
86
-     */
87
-    drawerStyle: {
88
-        backgroundColor: BaseTheme.palette.ui12,
89
-        width: '54%'
90
-    },
91
-
92
     /**
84
     /**
93
      * The style of the display name label in the side bar.
85
      * The style of the display name label in the side bar.
94
      */
86
      */

+ 4
- 4
react/features/welcome/constants.js 파일 보기

10
 export const INACTIVE_TAB_COLOR = BaseTheme.palette.tab01Disabled;
10
 export const INACTIVE_TAB_COLOR = BaseTheme.palette.tab01Disabled;
11
 
11
 
12
 export const tabBarOptions = {
12
 export const tabBarOptions = {
13
-    activeTintColor: BaseTheme.palette.icon01,
14
-    inactiveTintColor: INACTIVE_TAB_COLOR,
15
-    labelStyle: {
13
+    tabBarActiveTintColor: BaseTheme.palette.icon01,
14
+    tabBarInactiveTintColor: INACTIVE_TAB_COLOR,
15
+    tabBarLabelStyle: {
16
         fontSize: 12
16
         fontSize: 12
17
     },
17
     },
18
-    style: {
18
+    tabBarStyle: {
19
         backgroundColor: BaseTheme.palette.screen01Header
19
         backgroundColor: BaseTheme.palette.screen01Header
20
     }
20
     }
21
 };
21
 };

Loading…
취소
저장