Fix small build issue.

3 files changed, 22 insertions, 36 deletions

diff --git a/ios/Frontend/Info.plist b/ios/Frontend/Info.plist
index b04df4b4..bf077fca 100644
--- a/ios/Frontend/Info.plist
+++ b/ios/Frontend/Info.plist
@@ -56,15 +56,12 @@
 	<string></string>
 	<key>NSMainNibFile</key>
 	<string>LaunchScreen</string>
-<<<<<<< HEAD
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Enable microphone access to record and listen to videos</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
 	<string>This lets you save photos captured on Tagg, to your library</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>This lets you share photos from your library and select profile displays</string>
-=======
->>>>>>> master
 	<key>UIAppFonts</key>
 	<array>
 		<string>Feather.ttf</string>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index a889399c..35f67154 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -134,7 +134,6 @@ PODS:
     - GoogleUtilities/Environment (~> 7.2)
     - nanopb (~> 2.30907.0)
     - PromisesObjC (~> 1.2)
-<<<<<<< HEAD
   - GoogleUtilities/AppDelegateSwizzler (7.4.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
@@ -153,26 +152,6 @@ PODS:
   - GoogleUtilities/Reachability (7.4.3):
     - GoogleUtilities/Logger
   - GoogleUtilities/UserDefaults (7.4.3):
-=======
-  - GoogleUtilities/AppDelegateSwizzler (7.4.0):
-    - GoogleUtilities/Environment
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.4.0):
-    - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (7.4.0):
-    - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (7.4.0):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/Network (7.4.0):
-    - GoogleUtilities/Logger
-    - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.4.0)"
-  - GoogleUtilities/Reachability (7.4.0):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.4.0):
->>>>>>> master
     - GoogleUtilities/Logger
   - libevent (2.1.12)
   - nanopb (2.30907.0):
@@ -362,13 +341,13 @@ PODS:
     - React-Core
   - react-native-contacts (6.0.5):
     - React-Core
-  - react-native-date-picker (3.3.2):
+  - react-native-date-picker (3.3.1):
     - React-Core
-  - react-native-document-picker (5.2.0):
+  - react-native-document-picker (5.1.0):
     - React-Core
   - react-native-image-picker (4.0.4):
     - React-Core
-  - react-native-image-resizer (1.4.5):
+  - react-native-image-resizer (1.4.4):
     - React-Core
   - react-native-netinfo (6.0.0):
     - React-Core
@@ -476,7 +455,7 @@ PODS:
     - React-Core
     - React-RCTImage
     - TOCropViewController
-  - RNInAppBrowser (3.6.1):
+  - RNInAppBrowser (3.5.1):
     - React-Core
   - RNReactNativeHapticFeedback (1.11.0):
     - React-Core
@@ -774,11 +753,7 @@ SPEC CHECKSUMS:
   glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
   GoogleAppMeasurement: c542a2feaac9ab98fd074e8f1a02c3585bbfbd47
   GoogleDataTransport: 8b0e733ea77c9218778e5a9e34ba9508b8328939
-<<<<<<< HEAD
   GoogleUtilities: 45dbb24a7f351d69d0a601482b39ad6c32e30dab
-=======
-  GoogleUtilities: 284cddc7fffc14ae1907efb6f78ab95c1fccaedc
->>>>>>> master
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   nanopb: 59221d7f958fb711001e6a449489542d92ae113e
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
@@ -797,10 +772,10 @@ SPEC CHECKSUMS:
   react-native-camera: 7bf59f2728ffb019fa25e60a225d2c57e1a8f0f6
   react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
   react-native-contacts: 931baebf460125c5a7bbce1c4521a96c69795123
-  react-native-date-picker: 96a07ca27a6225da8a3935324d85046028456b0f
-  react-native-document-picker: f1b5398801b332c77bc62ae0eae2116f49bdff26
+  react-native-date-picker: 2dfef0fcb6c36d078bc62f5de3ca79eff7f42486
+  react-native-document-picker: f2f73db94328c84e22144e369fb4a3ede47bc1f5
   react-native-image-picker: c07b072faa83f3480b473a15ea3c19cc39b3d6fa
-  react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
+  react-native-image-resizer: 13ac4af788f88af36d0353a1324401ebabd04fe4
   react-native-netinfo: e849fc21ca2f4128a5726c801a82fc6f4a6db50d
   react-native-photo-manipulator: e44c14a28bf7c9b7657a0e0ac79327c1a4d8fe2c
   react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
@@ -826,7 +801,7 @@ SPEC CHECKSUMS:
   RNFS: 3ab21fa6c56d65566d1fb26c2228e2b6132e5e32
   RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
   RNImageCropPicker: 35a3ceb837446fa11547704709bb22b5fac6d584
-  RNInAppBrowser: 0523b3c15501fb8b54b4f32905d2e71ca902d914
+  RNInAppBrowser: 48b95ba7a4eaff5cc223bca338d3e319561dbd1b
   RNReactNativeHapticFeedback: 653a8c126a0f5e88ce15ffe280b3ff37e1fbb285
   RNReanimated: b9c929bfff7dedc9c89ab1875f1c6151023358d9
   RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
diff --git a/src/utils/camera.ts b/src/utils/camera.ts
index f3705552..3da5feaa 100644
--- a/src/utils/camera.ts
+++ b/src/utils/camera.ts
@@ -63,6 +63,8 @@ export const navigateToVideoPicker = (callback: (vid: Video) => void) => {
   })
     .then(async (vid) => {
       if (vid.path) {
+        ProcessingManager.compress(vid, options.compress) // like VideoPlayer compress options
+          .then((data: any) => console.log(data));
         callback(vid);
       }
     })
@@ -73,6 +75,18 @@ export const navigateToVideoPicker = (callback: (vid: Video) => void) => {
     });
 };
 
+const options = {
+  compress: {
+    width: 720,
+    height: 1280,
+    bitrateMultiplier: 3,
+    saveToCameraRoll: true, // default is false, iOS only
+    saveWithCurrentDate: true, // default is false, iOS only
+    minimumBitrate: 300000,
+    // removeAudio: true, // default is false
+  },
+};
+
 export const showGIFFailureAlert = (onSuccess: () => void) =>
   Alert.alert(
     'Warning',