Merge branch 'release/v0.8.3'

.travis.yml

@@ -5,7 +5,7 @@ addons:
  packages:
  - lib32stdc++6
 install:
- - git clone --depth 1 --branch 1.22.0 https://github.com/flutter/flutter.git
+ - git clone --depth 1 --branch 2.10.2 https://github.com/flutter/flutter.git
  - ./flutter/bin/flutter doctor
  - gem install coveralls-lcov
  - cp .env.example .env

android/app/build.gradle

@@ -48,6 +48,7 @@ android {
  applicationId "net.lucien144.fyx"
  minSdkVersion 19
  targetSdkVersion 31
+ //multiDexEnabled true // Uncomment for dev
  versionCode flutterVersionCode.toInteger()
  versionName flutterVersionName
  testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

android/app/src/main/AndroidManifest.xml

@@ -13,6 +13,9 @@
  android:label="fyx"
  android:requestLegacyExternalStorage="true"
  android:icon="@mipmap/ic_launcher">
+ <meta-data
+ android:name="com.google.firebase.messaging.default_notification_icon"
+ android:resource="@mipmap/notification"/>
  <activity
  android:name="io.flutter.embedding.android.FlutterActivity"
  android:exported="true"

android/build.gradle

@@ -1,13 +1,13 @@
 buildscript {
- ext.kotlin_version = '1.3.50'
+ ext.kotlin_version = '1.6.10'
  repositories {
  google()
  jcenter()
  }
 
  dependencies {
  classpath 'com.android.tools.build:gradle:3.5.4'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
  classpath 'com.google.gms:google-services:4.3.10'
  }
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
+rl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip

build.sh

@@ -56,6 +56,8 @@ if [ $ios == true ]; then
  # shellcheck disable=SC2059
  printf "$GREEN Building iOS: ${version}$NC\n"
  flutter clean
+ flutter pub get
+ (cd ios && pod cache clean --all && pod update)
  flutter build ios -t lib/main_production.dart
  open ios/Runner.xcworkspace
  /usr/bin/osascript -e "display notification \"iOS built.\""
@@ -72,4 +74,4 @@ if [ $android == true ]; then
  flutter build appbundle -t lib/main_production.dart
  open build/app/outputs/bundle/release/
  /usr/bin/osascript -e "display notification \"Android built.\""
-fi
+fi

ios/Podfile.lock

@@ -44,15 +44,15 @@ PODS:
  - FirebaseCoreDiagnostics (~> 8.0)
  - GoogleUtilities/Environment (~> 7.6)
  - GoogleUtilities/Logger (~> 7.6)
- - FirebaseCoreDiagnostics (8.10.0):
+ - FirebaseCoreDiagnostics (8.15.0):
  - GoogleDataTransport (~> 9.1)
- - GoogleUtilities/Environment (~> 7.6)
- - GoogleUtilities/Logger (~> 7.6)
+ - GoogleUtilities/Environment (~> 7.7)
+ - GoogleUtilities/Logger (~> 7.7)
  - nanopb (~> 2.30908.0)
- - FirebaseInstallations (8.10.0):
+ - FirebaseInstallations (8.15.0):
  - FirebaseCore (~> 8.0)
- - GoogleUtilities/Environment (~> 7.6)
- - GoogleUtilities/UserDefaults (~> 7.6)
+ - GoogleUtilities/Environment (~> 7.7)
+ - GoogleUtilities/UserDefaults (~> 7.7)
  - PromisesObjC (< 3.0, >= 1.2)
  - FirebaseMessaging (8.9.0):
  - FirebaseCore (~> 8.0)
@@ -94,28 +94,28 @@ PODS:
  - GoogleUtilities/Environment (~> 7.2)
  - nanopb (~> 2.30908.0)
  - PromisesObjC (< 3.0, >= 1.2)
- - GoogleUtilities/AppDelegateSwizzler (7.6.0):
+ - GoogleUtilities/AppDelegateSwizzler (7.7.0):
  - GoogleUtilities/Environment
  - GoogleUtilities/Logger
  - GoogleUtilities/Network
- - GoogleUtilities/Environment (7.6.0):
+ - GoogleUtilities/Environment (7.7.0):
  - PromisesObjC (< 3.0, >= 1.2)
- - GoogleUtilities/Logger (7.6.0):
+ - GoogleUtilities/Logger (7.7.0):
  - GoogleUtilities/Environment
- - GoogleUtilities/MethodSwizzler (7.6.0):
+ - GoogleUtilities/MethodSwizzler (7.7.0):
  - GoogleUtilities/Logger
- - GoogleUtilities/Network (7.6.0):
+ - GoogleUtilities/Network (7.7.0):
  - GoogleUtilities/Logger
  - "GoogleUtilities/NSData+zlib"
  - GoogleUtilities/Reachability
- - "GoogleUtilities/NSData+zlib (7.6.0)"
- - GoogleUtilities/Reachability (7.6.0):
+ - "GoogleUtilities/NSData+zlib (7.7.0)"
+ - GoogleUtilities/Reachability (7.7.0):
  - GoogleUtilities/Logger
- - GoogleUtilities/UserDefaults (7.6.0):
+ - GoogleUtilities/UserDefaults (7.7.0):
  - GoogleUtilities/Logger
  - image_gallery_saver (1.5.0):
  - Flutter
- - image_picker (0.0.1):
+ - image_picker_ios (0.0.1):
  - Flutter
  - nanopb (2.30908.0):
  - nanopb/decode (= 2.30908.0)
@@ -126,29 +126,29 @@ PODS:
  - Flutter
  - package_info_plus (0.4.5):
  - Flutter
- - path_provider (0.0.1):
+ - path_provider_ios (0.0.1):
  - Flutter
- - "permission_handler (5.1.0+2)":
+ - permission_handler_apple (9.0.4):
  - Flutter
- - PromisesObjC (2.0.0)
- - Sentry (7.5.4):
- - Sentry/Core (= 7.5.4)
- - Sentry/Core (7.5.4)
+ - PromisesObjC (2.1.0)
+ - Sentry (7.9.0):
+ - Sentry/Core (= 7.9.0)
+ - Sentry/Core (7.9.0)
  - sentry_flutter (0.0.1):
  - Flutter
  - FlutterMacOS
- - Sentry (~> 7.5.1)
+ - Sentry (~> 7.9.0)
  - share (0.0.1):
  - Flutter
- - shared_preferences (0.0.1):
+ - shared_preferences_ios (0.0.1):
  - Flutter
  - sqflite (0.0.2):
  - Flutter
  - FMDB (>= 2.7.5)
  - Toast (4.0.0)
- - url_launcher (0.0.1):
+ - url_launcher_ios (0.0.1):
  - Flutter
- - video_player (0.0.1):
+ - video_player_avfoundation (0.0.1):
  - Flutter
  - wakelock (0.0.1):
  - Flutter
@@ -163,17 +163,17 @@ DEPENDENCIES:
  - Flutter (from `Flutter`)
  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
  - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
- - image_picker (from `.symlinks/plugins/image_picker/ios`)
+ - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
  - package_info (from `.symlinks/plugins/package_info/ios`)
  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- - path_provider (from `.symlinks/plugins/path_provider/ios`)
- - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
+ - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+ - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
  - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
  - share (from `.symlinks/plugins/share/ios`)
- - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
+ - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
  - sqflite (from `.symlinks/plugins/sqflite/ios`)
- - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- - video_player (from `.symlinks/plugins/video_player/ios`)
+ - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+ - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
  - wakelock (from `.symlinks/plugins/wakelock/ios`)
  - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
 
@@ -209,28 +209,28 @@ EXTERNAL SOURCES:
  :path: ".symlinks/plugins/fluttertoast/ios"
  image_gallery_saver:
  :path: ".symlinks/plugins/image_gallery_saver/ios"
- image_picker:
- :path: ".symlinks/plugins/image_picker/ios"
+ image_picker_ios:
+ :path: ".symlinks/plugins/image_picker_ios/ios"
  package_info:
  :path: ".symlinks/plugins/package_info/ios"
  package_info_plus:
  :path: ".symlinks/plugins/package_info_plus/ios"
- path_provider:
- :path: ".symlinks/plugins/path_provider/ios"
- permission_handler:
- :path: ".symlinks/plugins/permission_handler/ios"
+ path_provider_ios:
+ :path: ".symlinks/plugins/path_provider_ios/ios"
+ permission_handler_apple:
+ :path: ".symlinks/plugins/permission_handler_apple/ios"
  sentry_flutter:
  :path: ".symlinks/plugins/sentry_flutter/ios"
  share:
  :path: ".symlinks/plugins/share/ios"
- shared_preferences:
- :path: ".symlinks/plugins/shared_preferences/ios"
+ shared_preferences_ios:
+ :path: ".symlinks/plugins/shared_preferences_ios/ios"
  sqflite:
  :path: ".symlinks/plugins/sqflite/ios"
- url_launcher:
- :path: ".symlinks/plugins/url_launcher/ios"
- video_player:
- :path: ".symlinks/plugins/video_player/ios"
+ url_launcher_ios:
+ :path: ".symlinks/plugins/url_launcher_ios/ios"
+ video_player_avfoundation:
+ :path: ".symlinks/plugins/video_player_avfoundation/ios"
  wakelock:
  :path: ".symlinks/plugins/wakelock/ios"
  webview_flutter:
@@ -244,31 +244,31 @@ SPEC CHECKSUMS:
  firebase_messaging: dff5cd08781ee1de988565a83c977e435405cd7e
  FirebaseAnalytics: 4ab446ce08a3fe52e8a4303dd997cf26276bf968
  FirebaseCore: 599ee609343eaf4941bd188f85e3aa077ffe325b
- FirebaseCoreDiagnostics: 56fb7216d87e0e6ec2feddefa9d8a392fe8b2c18
- FirebaseInstallations: 830327b45345ffc859eaa9c17bcd5ae893fd5425
+ FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb
+ FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
  FirebaseMessaging: 82c4a48638f53f7b184f3cc9f6cd2cbe533ab316
  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
- fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58
+ fluttertoast: 16fbe6039d06a763f3533670197d01fc73459037
  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
  GoogleAppMeasurement: 837649ad3987936c232f6717c5680216f6243d24
  GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940
- GoogleUtilities: 684ee790a24f73ebb2d1d966e9711c203f2a4237
+ GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
  image_gallery_saver: 259eab68fb271cfd57d599904f7acdc7832e7ef2
- image_picker: 9aa50e1d8cdacdbed739e925b7eea16d014367e6
+ image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb
  nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
- path_provider: d1e9807085df1f9cc9318206cd649dc0b76be3de
- permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
- PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
- Sentry: 5c5dd4005f3b7b9765d5a8871232cddbd0d888b7
- sentry_flutter: 4cd99764f9fe01c9415790d1f3fb1c7fd3a5cbe9
+ path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5
+ permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
+ PromisesObjC: 99b6f43f9e1044bd87a95a60beff28c2c44ddb72
+ Sentry: 2f7e91f247cfb05b05bd01e0b5d0692557a7687b
+ sentry_flutter: 7c3cb050dc23563a4ea5db438c83afdb460a2ae6
  share: 0b2c3e82132f5888bccca3351c504d0003b3b410
- shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
+ shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
  Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
- url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
- video_player: ecd305f42e9044793efd34846e1ce64c31ea6fcb
+ url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
+ video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
  wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
  webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
 

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
  archiveVersion = 1;
  classes = {
  };
- objectVersion = 46;
+ objectVersion = 50;
  objects = {
 
 /* Begin PBXBuildFile section */
@@ -168,7 +168,7 @@
  97C146E61CF9000F007C117D /* Project object */ = {
  isa = PBXProject;
  attributes = {
- LastUpgradeCheck = 1130;
+ LastUpgradeCheck = 1300;
  ORGANIZATIONNAME = "The Chromium Authors";
  TargetAttributes = {
  97C146ED1CF9000F007C117D = {
@@ -268,17 +268,17 @@
  "${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
  "${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework",
  "${BUILT_PRODUCTS_DIR}/image_gallery_saver/image_gallery_saver.framework",
- "${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework",
+ "${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework",
  "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
  "${BUILT_PRODUCTS_DIR}/package_info/package_info.framework",
  "${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework",
- "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
+ "${BUILT_PRODUCTS_DIR}/path_provider_ios/path_provider_ios.framework",
  "${BUILT_PRODUCTS_DIR}/sentry_flutter/sentry_flutter.framework",
  "${BUILT_PRODUCTS_DIR}/share/share.framework",
- "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
+ "${BUILT_PRODUCTS_DIR}/shared_preferences_ios/shared_preferences_ios.framework",
  "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
- "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
- "${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
+ "${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
+ "${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework",
  "${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
  "${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework",
  );
@@ -297,17 +297,17 @@
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_gallery_saver.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_ios.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sentry_flutter.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_ios.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework",
  );
@@ -429,7 +429,10 @@
  );
  INFOPLIST_FILE = Runner/Info.plist;
  IPHONEOS_DEPLOYMENT_TARGET = 10.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
  LIBRARY_SEARCH_PATHS = (
  "$(inherited)",
  "$(PROJECT_DIR)/Flutter",
@@ -565,7 +568,10 @@
  );
  INFOPLIST_FILE = Runner/Info.plist;
  IPHONEOS_DEPLOYMENT_TARGET = 10.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
  LIBRARY_SEARCH_PATHS = (
  "$(inherited)",
  "$(PROJECT_DIR)/Flutter",
@@ -597,7 +603,10 @@
  );
  INFOPLIST_FILE = Runner/Info.plist;
  IPHONEOS_DEPLOYMENT_TARGET = 10.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
  LIBRARY_SEARCH_PATHS = (
  "$(inherited)",
  "$(PROJECT_DIR)/Flutter",

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1130"
+ LastUpgradeVersion = "1300"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
  <device id="retina6_1" orientation="portrait" appearance="light"/>
  <dependencies>
  <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
  <capability name="System colors in document resources" minToolsVersion="11.0"/>
  <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
  </dependencies>