Merge master into this test branch.

2 files changed, 55 insertions, 10 deletions

diff --git a/ios/Frontend/Info.plist b/ios/Frontend/Info.plist
index d74f2dcb..b04df4b4 100644
--- a/ios/Frontend/Info.plist
+++ b/ios/Frontend/Info.plist
@@ -56,12 +56,15 @@
 	<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>
@@ -72,6 +75,8 @@
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>This lets you share video audio from your camera for a Moment post on your profile!</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -80,6 +85,12 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This lets you share photos from your library and select profile displays</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>This lets you save photos captured on Tagg, to your library</string>
+	<key>NSCameraUsageDescription</key>
+	<string>This lets you share photos/videos from your camera for a Moment post on your profile!</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 </dict>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 407b696d..a889399c 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -134,6 +134,7 @@ PODS:
     - GoogleUtilities/Environment (~> 7.2)
     - nanopb (~> 2.30907.0)
     - PromisesObjC (~> 1.2)
+<<<<<<< HEAD
   - GoogleUtilities/AppDelegateSwizzler (7.4.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
@@ -152,6 +153,26 @@ 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):
@@ -341,13 +362,13 @@ PODS:
     - React-Core
   - react-native-contacts (6.0.5):
     - React-Core
-  - react-native-date-picker (3.3.1):
+  - react-native-date-picker (3.3.2):
     - React-Core
-  - react-native-document-picker (5.1.0):
+  - react-native-document-picker (5.2.0):
     - React-Core
-  - react-native-image-picker (4.0.3):
+  - react-native-image-picker (4.0.4):
     - React-Core
-  - react-native-image-resizer (1.4.4):
+  - react-native-image-resizer (1.4.5):
     - React-Core
   - react-native-netinfo (6.0.0):
     - React-Core
@@ -358,6 +379,11 @@ PODS:
     - React-Core
   - react-native-splash-screen (3.2.0):
     - React
+  - react-native-video (5.1.1):
+    - React-Core
+    - react-native-video/Video (= 5.1.1)
+  - react-native-video/Video (5.1.1):
+    - React-Core
   - React-RCTActionSheet (0.63.3):
     - React-Core/RCTActionSheetHeaders (= 0.63.3)
   - React-RCTAnimation (0.63.3):
@@ -450,7 +476,7 @@ PODS:
     - React-Core
     - React-RCTImage
     - TOCropViewController
-  - RNInAppBrowser (3.5.1):
+  - RNInAppBrowser (3.6.1):
     - React-Core
   - RNReactNativeHapticFeedback (1.11.0):
     - React-Core
@@ -548,6 +574,7 @@ DEPENDENCIES:
   - react-native-photo-manipulator (from `../node_modules/react-native-photo-manipulator`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
+  - react-native-video (from `../node_modules/react-native-video`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
   - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
@@ -663,6 +690,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-safe-area-context"
   react-native-splash-screen:
     :path: "../node_modules/react-native-splash-screen"
+  react-native-video:
+    :path: "../node_modules/react-native-video"
   React-RCTActionSheet:
     :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
   React-RCTAnimation:
@@ -745,7 +774,11 @@ SPEC CHECKSUMS:
   glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
   GoogleAppMeasurement: c542a2feaac9ab98fd074e8f1a02c3585bbfbd47
   GoogleDataTransport: 8b0e733ea77c9218778e5a9e34ba9508b8328939
+<<<<<<< HEAD
   GoogleUtilities: 45dbb24a7f351d69d0a601482b39ad6c32e30dab
+=======
+  GoogleUtilities: 284cddc7fffc14ae1907efb6f78ab95c1fccaedc
+>>>>>>> master
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   nanopb: 59221d7f958fb711001e6a449489542d92ae113e
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
@@ -764,14 +797,15 @@ SPEC CHECKSUMS:
   react-native-camera: 7bf59f2728ffb019fa25e60a225d2c57e1a8f0f6
   react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
   react-native-contacts: 931baebf460125c5a7bbce1c4521a96c69795123
-  react-native-date-picker: 2dfef0fcb6c36d078bc62f5de3ca79eff7f42486
-  react-native-document-picker: f2f73db94328c84e22144e369fb4a3ede47bc1f5
-  react-native-image-picker: 474cf2c33c2b6671da53d293a16c97995f0aec15
-  react-native-image-resizer: 13ac4af788f88af36d0353a1324401ebabd04fe4
+  react-native-date-picker: 96a07ca27a6225da8a3935324d85046028456b0f
+  react-native-document-picker: f1b5398801b332c77bc62ae0eae2116f49bdff26
+  react-native-image-picker: c07b072faa83f3480b473a15ea3c19cc39b3d6fa
+  react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
   react-native-netinfo: e849fc21ca2f4128a5726c801a82fc6f4a6db50d
   react-native-photo-manipulator: e44c14a28bf7c9b7657a0e0ac79327c1a4d8fe2c
   react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
+  react-native-video: 0bb76b6d6b77da3009611586c7dbf817b947f30e
   React-RCTActionSheet: 53ea72699698b0b47a6421cb1c8b4ab215a774aa
   React-RCTAnimation: 1befece0b5183c22ae01b966f5583f42e69a83c2
   React-RCTBlob: 0b284339cbe4b15705a05e2313a51c6d8b51fa40
@@ -792,7 +826,7 @@ SPEC CHECKSUMS:
   RNFS: 3ab21fa6c56d65566d1fb26c2228e2b6132e5e32
   RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
   RNImageCropPicker: 35a3ceb837446fa11547704709bb22b5fac6d584
-  RNInAppBrowser: 48b95ba7a4eaff5cc223bca338d3e319561dbd1b
+  RNInAppBrowser: 0523b3c15501fb8b54b4f32905d2e71ca902d914
   RNReactNativeHapticFeedback: 653a8c126a0f5e88ce15ffe280b3ff37e1fbb285
   RNReanimated: b9c929bfff7dedc9c89ab1875f1c6151023358d9
   RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d