Merge branch 'develop' into feature/86-request-invite-splash-page

# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/provider.dart

ios/OneSignalNotificationServiceExtension-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+

ios/Podfile

@@ -27,6 +27,7 @@ def parse_KV_file(file, separator='=')
 end
 
 target 'Runner' do
+  use_frameworks!
   # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
   # referring to absolute paths on developers' machines.
   system('rm -rf .symlinks')
@@ -55,14 +56,15 @@ target 'Runner' do
 end
 
 target 'OneSignalNotificationServiceExtension' do
+  use_frameworks!
   pod 'OneSignal', '>= 2.9.5', '< 3.0'
 end
 
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['ENABLE_BITCODE'] = 'NO'
-      config.build_settings['SWIFT_VERSION'] = '3.2' # <--- add this
+      config.build_settings['SWIFT_VERSION'] = '5' # <--- add this
     end
   end
 end

ios/Podfile.lock

@@ -1,4 +1,9 @@
 PODS:
+  - BSGridCollectionViewLayout (1.2.3)
+  - BSImagePicker (2.10.0):
+    - BSGridCollectionViewLayout (= 1.2.3)
+    - BSImageView (= 1.0.3)
+  - BSImageView (1.0.3)
   - device_info (0.0.1):
     - Flutter
   - Flutter (1.0.0)
@@ -11,17 +16,20 @@ PODS:
   - FMDB/standard (2.7.5)
   - image_cropper (0.0.1):
     - Flutter
-    - TOCropViewController (~> 2.4.0)
+    - TOCropViewController (~> 2.5.0)
   - image_picker (0.0.1):
     - Flutter
   - Intercom (5.2.1)
   - intercom_flutter (1.0.7):
     - Flutter
     - Intercom
-  - onesignal (1.0.5):
+  - multi_image_picker (4.3.3):
+    - BSImagePicker (~> 2.10.0)
+    - Flutter
+  - OneSignal (2.10.0)
+  - onesignalflutter (1.0.5):
     - Flutter
     - OneSignal (< 3.0, >= 2.9.5)
-  - OneSignal (2.9.5)
   - path_provider (0.0.1):
     - Flutter
   - share (0.5.2):
@@ -31,7 +39,7 @@ PODS:
   - sqflite (0.0.1):
     - Flutter
     - FMDB (~> 2.7.2)
-  - TOCropViewController (2.4.0)
+  - TOCropViewController (2.5.0)
   - uni_links (0.0.1):
     - Flutter
   - url_launcher (0.0.1):
@@ -47,8 +55,9 @@ DEPENDENCIES:
   - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
   - image_picker (from `.symlinks/plugins/image_picker/ios`)
   - intercom_flutter (from `.symlinks/plugins/intercom_flutter/ios`)
+  - multi_image_picker (from `.symlinks/plugins/multi_image_picker/ios`)
   - OneSignal (< 3.0, >= 2.9.5)
-  - onesignal (from `.symlinks/plugins/onesignal/ios`)
+  - onesignalflutter (from `.symlinks/plugins/onesignalflutter/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
   - share (from `.symlinks/plugins/share/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
@@ -59,6 +68,9 @@ DEPENDENCIES:
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
+    - BSGridCollectionViewLayout
+    - BSImagePicker
+    - BSImageView
     - FMDB
     - Intercom
     - OneSignal
@@ -79,8 +91,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/image_picker/ios"
   intercom_flutter:
     :path: ".symlinks/plugins/intercom_flutter/ios"
-  onesignal:
-    :path: ".symlinks/plugins/onesignal/ios"
+  multi_image_picker:
+    :path: ".symlinks/plugins/multi_image_picker/ios"
+  onesignalflutter:
+    :path: ".symlinks/plugins/onesignalflutter/ios"
   path_provider:
     :path: ".symlinks/plugins/path_provider/ios"
   share:
@@ -97,26 +111,30 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/video_player/ios"
 
 SPEC CHECKSUMS:
+  BSGridCollectionViewLayout: 568273e113fbc815f868f1898ef0465aee68f955
+  BSImagePicker: fa0c15b6740e8aa7a7b7f0fe38a71ad4cfa0ec4a
+  BSImageView: a149459433a2687157d034c78e059d30ac7f2544
   device_info: 76ce0b32e13034d1883be4a382433648f9dcee63
   Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
   flutter_exif_rotation: 458778023267a1f0157ae8d9483474749990ce24
   flutter_secure_storage: dbcc8ff35d99569c3a4d3b483afa3339416c1a78
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  image_cropper: 43c1f7f5ea92b68f43cae9340f55c84bdaad54bb
+  image_cropper: e0a40e80b2107490926d0f15e3b42f44867c15b4
   image_picker: ee00aab0487cedc80a304085219503cc6d0f2e22
   Intercom: 53f07c24f0ca18c1e910750e79b75f9c9867338f
   intercom_flutter: e281b619d2fc03dccf171089c87c01a17e1ed8b1
-  OneSignal: ccdeb961882f8668305e5b694e2cb7cb325fc907
-  onesignal: c2122c20ffcb03d65445f3e0b49273c10f9c37a6
+  multi_image_picker: 83e69aae993ddffd49db61a1d970e2916e554103
+  OneSignal: 0f5ff711d9f25da54885e4ab06ef0abc221a46ef
+  onesignalflutter: 872db11e9c18bcc9225e06c1cc7280872813783a
   path_provider: 09407919825bfe3c2deae39453b7a5b44f467873
   share: 222b5dcc8031238af9d7de91149df65bad1aef75
   shared_preferences: 5a1d487c427ee18fcd3ea1f2a131569481834b53
   sqflite: d1612813fa7db7c667bed9f1d1b508deffc56999
-  TOCropViewController: 368d8df3ea43b62c3dc5a61f11b9048274d240bd
+  TOCropViewController: d86078d3a57a70c116bf3db7c89c80046a0e5fdf
   uni_links: 5ee5240df5cbffc52d9e7f8017a576b6a6bc5141
   url_launcher: 92b89c1029a0373879933c21642958c874539095
   video_player: 906796a841943c8d370ac7c13b18039aa9b56498
 
-PODFILE CHECKSUM: 6f8026df7eb2040a45b4a2313fc73d43e59d6bd6
+PODFILE CHECKSUM: d3e4257a4755deb71f0bcbcc7c1e0639177bc4ed
 
 COCOAPODS: 1.5.3

ios/Runner-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+