Merge branch 'master-qa' of github.com:LucasBrazi06/ev-mobile into ma…

…ster-qa
kiwigrid · Nov 11, 2021 · ba261d7 · ba261d7
2 parents 344b42a + 75d0e2a
commit ba261d7
Show file tree

Hide file tree

Showing 61 changed files with 645 additions and 996 deletions.
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
@@ -2,5 +2,6 @@
   <color name="primary_dark">#00376C</color>
   <color name="modalBackground">#262626</color>
   <color name="status_bar_color">#00376C</color>
+  <color name="navigationBarBackground">#262626</color>
   <color name="white">#FFFFFF</color>
 </resources>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
@@ -2,6 +2,7 @@
     <!-- Base application theme. -->
   <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
     <item name="android:datePickerDialogTheme">@style/DialogDatePicker.Theme</item>
+    <item name="android:navigationBarColor">@color/navigationBarBackground</item>
   </style>
 
   <style name="DialogDatePicker.Theme" parent="Theme.AppCompat.DayNight.Dialog">

diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
@@ -2,5 +2,6 @@
   <color name="primary_dark">#00376C</color>
   <color name="primary">#0a6ed1</color>
   <color name="status_bar_color">#00376C</color>
+  <color name="navigationBarBackground">#E7E7E7</color>
   <color name="white">#FFF</color>
 </resources>
diff --git a/assets/map/satellite.png b/assets/map/satellite.png
diff --git a/assets/map/standard.png b/assets/map/standard.png
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -360,13 +360,13 @@ PODS:
     - React
   - react-native-blob-util (0.13.16):
     - React-Core
-  - react-native-camera (3.43.9):
+  - react-native-camera (3.44.3):
     - React-Core
-    - react-native-camera/RCT (= 3.43.9)
-    - react-native-camera/RN (= 3.43.9)
-  - react-native-camera/RCT (3.43.9):
+    - react-native-camera/RCT (= 3.44.3)
+    - react-native-camera/RN (= 3.44.3)
+  - react-native-camera/RCT (3.44.3):
     - React-Core
-  - react-native-camera/RN (3.43.9):
+  - react-native-camera/RN (3.44.3):
     - React-Core
   - react-native-google-maps (0.29.3):
     - Google-Maps-iOS-Utils (= 2.1.0)
@@ -384,7 +384,7 @@ PODS:
     - React
   - react-native-splash-screen (3.2.0):
     - React
-  - react-native-webview (11.13.0):
+  - react-native-webview (11.14.2):
     - React-Core
   - React-perflogger (0.64.2)
   - React-RCTActionSheet (0.64.2):
@@ -454,7 +454,7 @@ PODS:
     - React
   - RNCPicker (1.8.1):
     - React-Core
-  - RNDateTimePicker (3.5.0):
+  - RNDateTimePicker (3.5.2):
     - React-Core
   - RNDeviceInfo (7.4.0):
     - React-Core
@@ -473,7 +473,7 @@ PODS:
     - React-Core
   - RNPermissions (2.2.2):
     - React-Core
-  - RNReanimated (2.2.3):
+  - RNReanimated (2.2.4):
     - DoubleConversion
     - FBLazyVector
     - FBReactNativeSpec
@@ -502,20 +502,24 @@ PODS:
     - React-RCTVibration
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNScreens (2.18.1):
+  - RNScreens (3.9.0):
     - React-Core
+    - React-RCTImage
   - RNSecureStorage (1.0.82):
     - React
   - RNSVG (12.1.1):
     - React
   - RNVectorIcons (7.1.0):
     - React
-  - Stripe (21.6.0):
-    - Stripe/Stripe3DS2 (= 21.6.0)
-  - stripe-react-native (0.1.4):
+  - Stripe (21.7.0):
+    - Stripe/Stripe3DS2 (= 21.7.0)
+    - StripeCore (= 21.7.0)
+  - stripe-react-native (0.1.5):
     - React
-    - Stripe (~> 21.6.0)
-  - Stripe/Stripe3DS2 (21.6.0)
+    - Stripe (~> 21.7.0)
+  - Stripe/Stripe3DS2 (21.7.0):
+    - StripeCore (= 21.7.0)
+  - StripeCore (21.7.0)
   - SwiftyJSON (5.0.0)
   - toolbar-android (0.2.1):
     - React
@@ -640,6 +644,7 @@ SPEC REPOS:
     - PromisesObjC
     - Protobuf
     - Stripe
+    - StripeCore
     - SwiftyJSON
     - YogaKit
 
@@ -763,7 +768,7 @@ SPEC CHECKSUMS:
   DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
   Fabric: ea977e3cd9c20425516d3dafd3bf8c941c51223f
   FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
-  FBReactNativeSpec: e30d74099a6ef3e67364c1ecb8ab68197a5eb022
+  FBReactNativeSpec: 52a80ca1a343877d4c72738fffcf539ac4a64dec
   Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
   FirebaseAnalytics: 5dd088bd2e67bb9d13dbf792d1164ceaf3052193
   FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
@@ -787,7 +792,7 @@ SPEC CHECKSUMS:
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
-  Permission-Camera: 375576c57ea625c88137d2cc52ba6dfeb21db036
+  Permission-Camera: 5d2aaf95592660b6dcb5e8d1d90ed5d0156cad02
   PromisesObjC: b14b1c6b68e306650688599de8a45e49fae81151
   Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
   RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
@@ -801,17 +806,17 @@ SPEC CHECKSUMS:
   React-jsi: 67747b9722f6dab2ffe15b011bcf6b3f2c3f1427
   React-jsiexecutor: 80c46bd381fd06e418e0d4f53672dc1d1945c4c3
   React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae
-  react-native-appearance: fc2014516054585d531e07aa0b40ab0de1d2be85
+  react-native-appearance: 0f0e5fc2fcef70e03d48c8fe6b00b9158c2ba8aa
   react-native-blob-util: 6e75bea8ffce35c4009c0e519cd0a96432a93e2b
-  react-native-camera: a3193de4cc61352d9309d15a849b1e0c4a085ac4
+  react-native-camera: b8cc03e2feec0c04403d0998e37cf519d8fd4c6f
   react-native-google-maps: d6a30377b40a338bd09d6ad36ce48dc5d12b5792
-  react-native-location: 9c53c0957756f7d70e8fdc76b1c7ed85867c8d0b
+  react-native-location: 5a40ec1cc6abf2f6d94df979f98ec76c3a415681
   react-native-maps: 41d01d8e0afcebe32bec9eea3bd945adc1b18f7a
   react-native-orientation-locker: 998c0744e26624407dac068c04c605b4af7304a2
-  react-native-safe-area-context: 5cf05f49df9d17261e40e518481f2e334c6cd4b5
+  react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
   react-native-sensitive-info: 400c6e3d27945e15c8cddb5b4b92233c85ee06f8
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-webview: b176c6404ad40d10cfc818be41c053f85a72d751
+  react-native-webview: cc4ac8f021a832dce2979e1f48c5595341dd2fb5
   React-perflogger: 25373e382fed75ce768a443822f07098a15ab737
   React-RCTActionSheet: af7796ba49ffe4ca92e7277a5d992d37203f7da5
   React-RCTAnimation: 6a2e76ab50c6f25b428d81b76a5a45351c4d77aa
@@ -824,26 +829,27 @@ SPEC CHECKSUMS:
   React-RCTVibration: 24600e3b1aaa77126989bc58b6747509a1ba14f3
   React-runtimeexecutor: a9904c6d0218fb9f8b19d6dd88607225927668f9
   ReactCommon: 149906e01aa51142707a10665185db879898e966
-  RNCMaskedView: f127cd9652acfa31b91dcff613e07ba18b774db6
+  RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
   RNCPicker: 914b557e20b3b8317b084aca9ff4b4edb95f61e4
-  RNDateTimePicker: f375105b262e0c13746f467c873b75e12f7f4757
-  RNDeviceInfo: febcb25b09201a312c66c36ecc1f155c5a43eecc
+  RNDateTimePicker: 7658208086d86d09e1627b5c34ba0cf237c60140
+  RNDeviceInfo: 9538a884f862fe4aa0d7cead9f34e292d41ba8f6
   RNFirebase: 37daa9a346d070f9f6ee1f3b4aaf4c8e3b1d5d1c
   RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
-  RNLocalize: ff8b96bffbe096a158f952a170741208f2c18746
-  RNPermissions: 067727df624665d4a6c8e2cffcc172ba608b96ed
-  RNReanimated: 64c38d47ffcc29c97fc1d8cfde9e8a73d7be7cc8
-  RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
+  RNLocalize: 7c7aeda16c01db7a0918981c14875c0a53be9b79
+  RNPermissions: 5df468064df661a4c8c017e2791ce90d7695eea5
+  RNReanimated: 024eff8202342abf4b24e11575a16afc441dabfe
+  RNScreens: 4d79118be80f79fa1f4aa131909a1d6e86280af3
   RNSecureStorage: 8b2b07278d80c48b3a881c56e604ab147372f243
   RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
   RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
-  Stripe: 6cc7bb348f4b1fad111129f6ee40eb6682deaefb
-  stripe-react-native: dbb9117864014d4c621e9152c25999264a63c9fb
+  Stripe: 90596971ef49bade169f68bc59369a796b30a045
+  stripe-react-native: f1b034cb702aa214078d9441b0a4313ac00c020d
+  StripeCore: c09b492efc3b269a6ff875ad738ca366db97e03b
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
-  toolbar-android: 7c528a58a3d79f03124cbb370f738280bf1114a6
+  toolbar-android: 2a73856e98b750d7e71ce4644d3f41cc98211719
   Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: b8dc8cd1a42309e725520e15610740f459384595
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2
diff --git a/ios/eMobility.xcodeproj/project.pbxproj b/ios/eMobility.xcodeproj/project.pbxproj
@@ -564,7 +564,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-eMobility/Pods-eMobility-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -727,7 +727,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-eMobility-eMobilityTests/Pods-eMobility-eMobilityTests-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (