diff --git a/.env.example b/.env.example index eedd339..ece9fe8 100644 --- a/.env.example +++ b/.env.example @@ -37,4 +37,4 @@ KEY_ISSUER_ID="" PATH_TO_THE_P8_KEY="$PWD/applestore_key.p8" # Flutter version -FLUTTER_VERSION=3.10.6 \ No newline at end of file +FLUTTER_VERSION=3.13.7 \ No newline at end of file diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 2f49d15..3205620 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "3.10.6", + "flutterSdkVersion": "3.13.7", "flavors": {} } \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 861a763..f86013f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "type": "dart", "flutterMode": "debug", "program": "lib/main_dev.dart", - "args": ["--flavor", "dev"], + "args": ["--flavor", "dev", "--no-enable-impeller"], }, { "name": "FlutterPresetup PROD", diff --git a/README.md b/README.md index 8a8e002..59e09d1 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ NOTE: dev & prod scheme must be added manually in xcode (check the article above ## Dependencies & versions -Current Flutter version 3.10.6 +Current Flutter version 3.13.7 Install all dependecies: diff --git a/android/app/build.gradle b/android/app/build.gradle index d581df2..ba3e2d6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -56,7 +56,7 @@ android { applicationId "com.example.presetup" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion 21 + minSdkVersion 24 targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/android/build.gradle b/android/build.gradle index 9192654..80323f3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,14 +1,14 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:7.3.0' // START: FlutterFire Configuration - classpath 'com.google.gms:google-services:4.3.10' + classpath 'com.google.gms:google-services:4.3.14' // END: FlutterFire Configuration classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index cb24abd..3c472b9 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/docs/dependencies-and-versions.md b/docs/dependencies-and-versions.md index a90c925..44b4dd2 100644 --- a/docs/dependencies-and-versions.md +++ b/docs/dependencies-and-versions.md @@ -1,6 +1,6 @@ # Dependencies & versions -Current Flutter version 3.10.6 +Current Flutter version 3.13.7 Install all dependecies: diff --git a/ios/Podfile b/ios/Podfile index 0a4d76d..5730410 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -38,7 +38,11 @@ post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' + xcconfig_path = config.base_configuration_reference.real_path + xcconfig = File.read(xcconfig_path) + xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR") + File.open(xcconfig_path, "w") { |file| file << xcconfig_mod } end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4ddd621..2f5418e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -5,51 +5,51 @@ PODS: - AppAuth/Core (1.6.2) - AppAuth/ExternalUserAgent (1.6.2): - AppAuth/Core - - FBAEMKit (16.0.1): - - FBSDKCoreKit_Basics (= 16.0.1) - - FBSDKCoreKit (16.0.1): - - FBAEMKit (= 16.0.1) - - FBSDKCoreKit_Basics (= 16.0.1) - - FBSDKCoreKit_Basics (16.0.1) - - FBSDKLoginKit (16.0.1): - - FBSDKCoreKit (= 16.0.1) - - Firebase/Analytics (10.12.0): + - FBAEMKit (16.1.3): + - FBSDKCoreKit_Basics (= 16.1.3) + - FBSDKCoreKit (16.1.3): + - FBAEMKit (= 16.1.3) + - FBSDKCoreKit_Basics (= 16.1.3) + - FBSDKCoreKit_Basics (16.1.3) + - FBSDKLoginKit (16.1.3): + - FBSDKCoreKit (= 16.1.3) + - Firebase/Analytics (10.15.0): - Firebase/Core - - Firebase/Auth (10.12.0): + - Firebase/Auth (10.15.0): - Firebase/CoreOnly - - FirebaseAuth (~> 10.12.0) - - Firebase/Core (10.12.0): + - FirebaseAuth (~> 10.15.0) + - Firebase/Core (10.15.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 10.12.0) - - Firebase/CoreOnly (10.12.0): - - FirebaseCore (= 10.12.0) - - Firebase/DynamicLinks (10.12.0): + - FirebaseAnalytics (~> 10.15.0) + - Firebase/CoreOnly (10.15.0): + - FirebaseCore (= 10.15.0) + - Firebase/DynamicLinks (10.15.0): - Firebase/CoreOnly - - FirebaseDynamicLinks (~> 10.12.0) - - Firebase/Messaging (10.12.0): + - FirebaseDynamicLinks (~> 10.15.0) + - Firebase/Messaging (10.15.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.12.0) - - firebase_analytics (10.4.4): - - Firebase/Analytics (= 10.12.0) + - FirebaseMessaging (~> 10.15.0) + - firebase_analytics (10.6.0): + - Firebase/Analytics (= 10.15.0) - firebase_core - Flutter - - firebase_auth (4.7.2): - - Firebase/Auth (= 10.12.0) + - firebase_auth (4.11.0): + - Firebase/Auth (= 10.15.0) - firebase_core - Flutter - - firebase_core (2.15.0): - - Firebase/CoreOnly (= 10.12.0) + - firebase_core (2.18.0): + - Firebase/CoreOnly (= 10.15.0) - Flutter - - firebase_dynamic_links (5.3.4): - - Firebase/DynamicLinks (= 10.12.0) + - firebase_dynamic_links (5.4.0): + - Firebase/DynamicLinks (= 10.15.0) - firebase_core - Flutter - - firebase_messaging (14.6.5): - - Firebase/Messaging (= 10.12.0) + - firebase_messaging (14.7.0): + - Firebase/Messaging (= 10.15.0) - firebase_core - Flutter - - FirebaseAnalytics (10.12.0): - - FirebaseAnalytics/AdIdSupport (= 10.12.0) + - FirebaseAnalytics (10.15.0): + - FirebaseAnalytics/AdIdSupport (= 10.15.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) @@ -57,36 +57,37 @@ PODS: - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (10.12.0): + - FirebaseAnalytics/AdIdSupport (10.15.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - - GoogleAppMeasurement (= 10.12.0) + - GoogleAppMeasurement (= 10.15.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAppCheckInterop (10.12.0) - - FirebaseAuth (10.12.0): + - FirebaseAppCheckInterop (10.16.0) + - FirebaseAuth (10.15.0): - FirebaseAppCheckInterop (~> 10.0) - FirebaseCore (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/Environment (~> 7.8) - GTMSessionFetcher/Core (< 4.0, >= 2.1) - - FirebaseCore (10.12.0): + - RecaptchaInterop (~> 100.0) + - FirebaseCore (10.15.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreInternal (10.12.0): + - FirebaseCoreInternal (10.16.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseDynamicLinks (10.12.0): + - FirebaseDynamicLinks (10.15.0): - FirebaseCore (~> 10.0) - - FirebaseInstallations (10.12.0): + - FirebaseInstallations (10.16.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.12.0): + - FirebaseMessaging (10.15.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.2) @@ -96,44 +97,44 @@ PODS: - GoogleUtilities/UserDefaults (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - Flutter (1.0.0) - - flutter_facebook_auth (6.0.0): - - FBSDKLoginKit (~> 16.0.1) + - flutter_facebook_auth (6.0.1): + - FBSDKLoginKit (~> 16.1.3) - Flutter - flutter_local_notifications (0.0.1): - Flutter - flutter_secure_storage (6.0.0): - Flutter - - Google-Mobile-Ads-SDK (10.4.0): + - Google-Mobile-Ads-SDK (10.9.0): - GoogleAppMeasurement (< 11.0, >= 7.0) - GoogleUserMessagingPlatform (>= 1.1) - google_mobile_ads (1.0.0): - Flutter - - Google-Mobile-Ads-SDK (~> 10.4.0) + - Google-Mobile-Ads-SDK (~> 10.9.0) - webview_flutter_wkwebview - google_sign_in_ios (0.0.1): - Flutter - GoogleSignIn (~> 6.2) - - GoogleAppMeasurement (10.12.0): - - GoogleAppMeasurement/AdIdSupport (= 10.12.0) + - GoogleAppMeasurement (10.15.0): + - GoogleAppMeasurement/AdIdSupport (= 10.15.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (10.12.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.12.0) + - GoogleAppMeasurement/AdIdSupport (10.15.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.15.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (10.12.0): + - GoogleAppMeasurement/WithoutAdIdSupport (10.15.0): - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleDataTransport (9.2.3): + - GoogleDataTransport (9.2.5): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) @@ -141,25 +142,25 @@ PODS: - AppAuth (~> 1.5) - GTMAppAuth (~> 1.3) - GTMSessionFetcher/Core (< 3.0, >= 1.1) - - GoogleUserMessagingPlatform (2.0.1) - - GoogleUtilities/AppDelegateSwizzler (7.11.4): + - GoogleUserMessagingPlatform (2.1.0) + - GoogleUtilities/AppDelegateSwizzler (7.11.5): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.11.4): + - GoogleUtilities/Environment (7.11.5): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.11.4): + - GoogleUtilities/Logger (7.11.5): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.11.4): + - GoogleUtilities/MethodSwizzler (7.11.5): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.11.4): + - GoogleUtilities/Network (7.11.5): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.11.4)" - - GoogleUtilities/Reachability (7.11.4): + - "GoogleUtilities/NSData+zlib (7.11.5)" + - GoogleUtilities/Reachability (7.11.5): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.11.4): + - GoogleUtilities/UserDefaults (7.11.5): - GoogleUtilities/Logger - GTMAppAuth (1.3.1): - AppAuth/Core (~> 1.6) @@ -175,7 +176,8 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - PromisesObjC (2.3.0) + - PromisesObjC (2.3.1) + - RecaptchaInterop (100.0.0) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS @@ -228,6 +230,7 @@ SPEC REPOS: - GTMSessionFetcher - nanopb - PromisesObjC + - RecaptchaInterop EXTERNAL SOURCES: firebase_analytics: @@ -265,46 +268,47 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570 - FBAEMKit: daac7466b918752f020345be5c7d9787f98cfc07 - FBSDKCoreKit: 2cb033464b2134af0138f87d20b859eb3f9be359 - FBSDKCoreKit_Basics: d37280da2e65872f0e931d15f45d97ea324fec37 - FBSDKLoginKit: c47a3b90920702487b10b647c63520dc2676dad9 - Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0 - firebase_analytics: 3ff822ee2e90f95b61f0da300df20b378d380fbb - firebase_auth: 3f7820b22557dd4a1b024f4d86947d1a0ff8a10f - firebase_core: e477125798fc37cd4ab43ca6a8536bf7e0929c00 - firebase_dynamic_links: d85cf455646322fd101c8a5a5942c3d47132fe80 - firebase_messaging: 334d68c3a36b6d4d5cd91e4f42509e0d4ae49828 - FirebaseAnalytics: 0270389efbe3022b54ec4588862dabec3477ee98 - FirebaseAppCheckInterop: f95a4feb9089867aff1a4bdc2ce309137e07736a - FirebaseAuth: a66c1e14ec58f41d154a4b41ce1a23ea00ad4805 - FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed - FirebaseCoreInternal: 950500ad8a08963657f6d8c67b579740c06d6aa1 - FirebaseDynamicLinks: 1a387da899779e5ef34f4d6f8bdba882f90d0e67 - FirebaseInstallations: 7b99ef103f013624444c614397038219c45f8e63 - FirebaseMessaging: bb2c4f6422a753038fe137d90ae7c1af57251316 + FBAEMKit: af2972f39bb0f3f7c45998f435b007833c32ffb2 + FBSDKCoreKit: 19e2e18b3be578d7a51fed8fdd8c152bef0b9511 + FBSDKCoreKit_Basics: dd9826ce3c9fd9f8cdf8dbbd0ef0a53e6c0c9e7e + FBSDKLoginKit: c395c63a1a6cf4a8a1e6103fd94b8c46329ee81c + Firebase: 66043bd4579e5b73811f96829c694c7af8d67435 + firebase_analytics: 6b016f3d8e86fec024f1a495834ae30d44fe4fe2 + firebase_auth: d958ee5a8fe5906a77e025d2a0e0caf69f00aa28 + firebase_core: 49fd2395e3fbbf63f453888c8e9f42f541f4c11c + firebase_dynamic_links: 1f6b75bfeb1623a3a338af9a09ab320c0a72d24c + firebase_messaging: f29609230a6f0759b72218d66ada60ed51c14a51 + FirebaseAnalytics: 47cef43728f81a839cf1306576bdd77ffa2eac7e + FirebaseAppCheckInterop: 82358cff9f33452dd44259e88eea5e562500b1cb + FirebaseAuth: a55ec5f7f8a5b1c2dd750235c1bb419bfb642445 + FirebaseCore: 2cec518b43635f96afe7ac3a9c513e47558abd2e + FirebaseCoreInternal: 26233f705cc4531236818a07ac84d20c333e505a + FirebaseDynamicLinks: 206d4ed3efd2b722822598017f3980d9fda89815 + FirebaseInstallations: b822f91a61f7d1ba763e5ccc9d4f2e6f2ed3b3ee + FirebaseMessaging: 0c0ae1eb722ef0c07f7801e5ded8dccd1357d6d4 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_facebook_auth: edf70de5c47e5f2843f308c1c22bef9f1ec5d295 + flutter_facebook_auth: 47c7a8594f2d6864618e30b5a6d59dff0d2e59fe flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be - Google-Mobile-Ads-SDK: 32fe7836431a06a29f7734ae092b600137c8108d - google_mobile_ads: 53b1f0d74445963e5810e34ac38dfb27aabe278e + Google-Mobile-Ads-SDK: e81e8b009a182dc8dd14951782efdbb30a5e4510 + google_mobile_ads: 035df0d095e1a196b52e3c91534d0718d3dacf98 google_sign_in_ios: 1256ff9d941db546373826966720b0c24804bcdd - GoogleAppMeasurement: 2d800fab85e7848b1e66a6f8ce5bca06c5aad892 - GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd + GoogleAppMeasurement: 722db6550d1e6d552b08398b69a975ac61039338 + GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 GoogleSignIn: 5651ce3a61e56ca864160e79b484cd9ed3f49b7a - GoogleUserMessagingPlatform: 5f8b30daf181805317b6b985bb51c1ff3beca054 - GoogleUtilities: c63691989bf362ba0505507da00eeb326192e83e + GoogleUserMessagingPlatform: dce302b8f1b84d6e945812ee7a15c3f65a102cbf + GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084 GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 - package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 - PromisesObjC: 7f84fefd35e085854377a97e19424ae424cc7a9e + PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 + RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440 webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a -PODFILE CHECKSUM: f10c0438b63bc24e6bbc207956dc27d16c4408f2 +PODFILE CHECKSUM: f7ba764573edcf5c3215cb180447141e1967e11f -COCOAPODS: 1.12.1 +COCOAPODS: 1.11.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 3611506..623ce1b 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -172,7 +172,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 99efe5c..c5e4361 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ get(String path, + {Map? data, headers}) async { + try { + String url = '$_baseUrl$path'; + + Map qData = {}; + if (data != null) { + qData.addAll(data); + } + return await dio.get(url, + queryParameters: qData, + options: Options( + headers: await _setHeaders(headers: headers), + followRedirects: false, + receiveTimeout: const Duration(seconds: 10), + validateStatus: (status) { + return status! < 500 && status != 404; + })); + } on DioException catch (e) { + log('Unable to perform get request.'); + log('DioException:$e'); + log(e.response.toString()); + + throw Exception(e.response!.statusMessage); + } on SocketException catch (e) { + log('No internet connection'); + throw Exception(e.message); + } + } + + Future post(String path, {Map? data}) async { + try { + String url = '$_baseUrl$path'; + Map qData = {}; + if (data != null) { + qData.addAll(data); + } + + return await dio.post(url, + data: jsonEncode(qData), + options: Options( + headers: await _setHeaders(), + followRedirects: false, + validateStatus: (status) { + return status! < 500; + })); + } on DioException catch (e) { + log('Unable to perform post request: ${e.error}'); + log('DioException: ${e.response}'); + + throw Exception(e.response!.data); + } on SocketException catch (e) { + log('No internet connection'); + throw Exception(e.message); + } + } + + Future put(String path, {Map? data}) async { + try { + String url = '$_baseUrl$path'; + Map qData = {}; + if (data != null) { + qData.addAll(data); + } + + return await dio.put(url, + data: jsonEncode(qData), + options: Options( + headers: await _setHeaders(), + followRedirects: false, + validateStatus: (status) { + return status! < 500; + })); + } on DioException catch (e) { + log('Unable to perform post request: ${e.error}'); + log('DioException: ${e.response}'); + + throw Exception(e.response!.data); + } on SocketException catch (e) { + log('No internet connection'); + throw Exception(e.message); + } + } + + Future upload(String path, {Map? data}) async { + try { + String url = '$_baseUrl$path'; + + Map qData = {}; + if (data != null) { + qData.addAll(data); + } + qData['avatar'] = await MultipartFile.fromFile(data!["avatar"]); + + final formData = FormData.fromMap(qData); + + return await dio.post(url, + data: formData, + options: Options( + headers: await _setHeaders(), + followRedirects: false, + validateStatus: (status) { + return status! < 500; + })); + } on DioException catch (e) { + log('Unable to perform post request: ${e.error}'); + log('DioException: ${e.response}'); + + throw Exception(e.response!.data); + } on SocketException catch (e) { + log('No internet connection'); + throw Exception(e.message); + } + } + + Future delete(String path, {Map? data}) async { + try { + String url = '$_baseUrl$path'; + Map qData = {}; + if (data != null) { + qData.addAll(data); + } + + return await dio.delete(url, + data: jsonEncode(data), + options: Options( + headers: await _setHeaders(), + followRedirects: false, + validateStatus: (status) { + return status! < 500; + }, + )); + } on DioException catch (e) { + log('Unable to perform post request: ${e.error}'); + log('DioException: ${e.response}'); + + throw e.response!.data; + } on SocketException { + log('No internet connection'); + } + return null; + } + + _setHeaders({headers}) async { + Map storageHeaders = { + 'Content-type': 'application/json', + 'Accept': 'application/json' + }; + return storageHeaders; + } +} diff --git a/lib/services/local_notif_service.dart b/lib/services/local_notif_service.dart index 5ec34df..e216b01 100644 --- a/lib/services/local_notif_service.dart +++ b/lib/services/local_notif_service.dart @@ -30,9 +30,9 @@ class NotificationService { void setupLocalNotif() async { !kIsWeb && Platform.isLinux - ? null - : await flutterLocalNotificationsPlugin - .getNotificationAppLaunchDetails(); + ? null + : await flutterLocalNotificationsPlugin + .getNotificationAppLaunchDetails(); const AndroidInitializationSettings initializationSettingsAndroid = AndroidInitializationSettings('@mipmap/launcher_icon'); @@ -106,7 +106,7 @@ class NotificationService { flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation< AndroidFlutterLocalNotificationsPlugin>(); - await androidImplementation?.requestPermission(); + await androidImplementation?.requestNotificationsPermission(); } } diff --git a/lib/widgets/ads/native_ad_block.dart b/lib/widgets/ads/native_ad_block.dart index 8e9954d..c2c44f6 100644 --- a/lib/widgets/ads/native_ad_block.dart +++ b/lib/widgets/ads/native_ad_block.dart @@ -38,7 +38,8 @@ class _NativeAdBlockState extends State { onAdFailedToLoad: (Ad ad, LoadAdError error) { // Dispose the ad here to free resources. ad.dispose(); - debugPrint('Ad load failed (code=${error.code} message=${error.message})'); + debugPrint( + 'Ad load failed (code=${error.code} message=${error.message})'); }, // Called when an ad opens an overlay that covers the screen. onAdOpened: (Ad ad) => debugPrint('Ad opened.'), diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 90d4f2c..e6317c4 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -25,7 +25,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin")) FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SignInWithApplePlugin.register(with: registry.registrar(forPlugin: "SignInWithApplePlugin")) diff --git a/pubspec.lock b/pubspec.lock index 93535d3..5eac71e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "5dce45a06d386358334eb1689108db6455d90ceb0d75848d5f4819283d4ee2b8" + sha256: "2e3a565cdd40b32df6ff9a0d1f16b9144fcce769455597ee9195f568ffbb3a59" url: "https://pub.dev" source: hosted - version: "1.3.4" + version: "1.3.8" analyzer: dependency: transitive description: @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: archive - sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a" + sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03" url: "https://pub.dev" source: hosted - version: "3.3.7" + version: "3.4.6" args: dependency: transitive description: @@ -85,10 +85,10 @@ packages: dependency: transitive description: name: build_resolvers - sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20" + sha256: "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.4.1" build_runner: dependency: "direct dev" description: @@ -101,10 +101,10 @@ packages: dependency: transitive description: name: build_runner_core - sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41" + sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185 url: "https://pub.dev" source: hosted - version: "7.2.10" + version: "7.2.11" built_collection: dependency: transitive description: @@ -117,10 +117,10 @@ packages: dependency: transitive description: name: built_value - sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" + sha256: a8de5955205b4d1dbbbc267daddf2178bd737e4bab8987c04a500478c9651e74 url: "https://pub.dev" source: hosted - version: "8.6.1" + version: "8.6.3" change_app_package_name: dependency: "direct main" description: @@ -165,18 +165,18 @@ packages: dependency: transitive description: name: code_builder - sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" + sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677" url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.7.0" collection: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" convert: dependency: transitive description: @@ -197,10 +197,10 @@ packages: dependency: "direct main" description: name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" dart_style: dependency: transitive description: @@ -217,14 +217,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.8" + dio: + dependency: "direct main" + description: + name: dio + sha256: "417e2a6f9d83ab396ec38ff4ea5da6c254da71e4db765ad737a42af6930140b7" + url: "https://pub.dev" + source: hosted + version: "5.3.3" easy_localization: dependency: "direct main" description: name: easy_localization - sha256: "30ebf25448ffe169e0bd9bc4b5da94faa8398967a2ad2ca09f438be8b6953645" + sha256: de63e3b422adfc97f256cbb3f8cf12739b6a4993d390f3cadb3f51837afaefe5 url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" easy_logger: dependency: transitive description: @@ -237,10 +245,10 @@ packages: dependency: transitive description: name: facebook_auth_desktop - sha256: "2b34c4b85f58da897b8966e4b1126ccb38813e381c0b97b3725d854408e29e84" + sha256: "6df63a8882c2113fc76b5a09a26291bd2d6b2350593b53ace6c26ade5e090fee" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.1" fake_async: dependency: transitive description: @@ -253,130 +261,130 @@ packages: dependency: transitive description: name: ffi - sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" file: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.0" firebase_analytics: dependency: "direct main" description: name: firebase_analytics - sha256: d7494294bdb56a58ab6c4cfef377693835c43fa3610707346b98892fd7c4b634 + sha256: db4b89ce32ecee475481e3ade28f623e74121b0ffe9c47b1374bd5db24ddad98 url: "https://pub.dev" source: hosted - version: "10.4.4" + version: "10.6.0" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface - sha256: bcb32ac53c494bd6deb61dcd02087418ae96d063ce522a4004974a32545c3f2b + sha256: "1f481bdcaf95f35d704b73c745b2dc4e01f8862339c08711c18720356e7c9641" url: "https://pub.dev" source: hosted - version: "3.6.4" + version: "3.7.2" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web - sha256: "2f7d8ab97b46a747730f580b5a38b3e5330efb54c16af48613a6f729cc5f57fa" + sha256: "24294a6c28a2c2c17f09b6fe4f4fb75fd81495e85c81c84539f415b1575a3be8" url: "https://pub.dev" source: hosted - version: "0.5.4+4" + version: "0.5.5+2" firebase_auth: dependency: "direct main" description: name: firebase_auth - sha256: "49fd35ce06f2530dd460e5dc123235731cb61dd7c76b0af4b6e190404880d04d" + sha256: "932a5b96dfcb352739ca7149a4967df59366ed33b9f4a58bc6edb80c67336809" url: "https://pub.dev" source: hosted - version: "4.7.2" + version: "4.11.0" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - sha256: "817f3ceb84ef5e9adaaf50cf7a19255f6ffcdd12c6f9e9aa4cf00fc7f2eb3cfb" + sha256: "071f7065033fdf0c4db26aac7947fffe1b763d5cf95c4be25829784235d2d853" url: "https://pub.dev" source: hosted - version: "6.16.1" + version: "7.0.0" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - sha256: e9044778287f1ff8f9f4cee7e247b03ec87bb8977e0e65ad27dc337e196132e8 + sha256: "85449bac3d0af1238fd7e3a9360278f7905a4e32fbf240f72bc0f8243f419f9c" url: "https://pub.dev" source: hosted - version: "5.6.2" + version: "5.8.3" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "2e9324f719e90200dc7d3c4f5d2abc26052f9f2b995d3b6626c47a0dfe1c8192" + sha256: "761d0a00562ba09d491eacdceaf1885df62d072c9431bf3110333e2a9904b1e1" url: "https://pub.dev" source: hosted - version: "2.15.0" + version: "2.18.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - sha256: b63e3be6c96ef5c33bdec1aab23c91eb00696f6452f0519401d640938c94cba2 + sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63 url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "5.0.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: "0fd5c4b228de29b55fac38aed0d9e42514b3d3bd47675de52bf7f8fccaf922fa" + sha256: "0631a2ec971dbc540275e2fa00c3a8a2676f0a7adbc3c197d6fba569db689d97" url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.8.1" firebase_dynamic_links: dependency: "direct main" description: name: firebase_dynamic_links - sha256: "4872f4d7e94736041398bc3490c2ddd87ee159d6b051ba01ca2708e5260a7ebe" + sha256: "39630dbf1853ed441cc573d679dd270fa68ac04aa0e42955748e5f35b671eb57" url: "https://pub.dev" source: hosted - version: "5.3.4" + version: "5.4.0" firebase_dynamic_links_platform_interface: dependency: transitive description: name: firebase_dynamic_links_platform_interface - sha256: "946fccfefb67e26bf63e392f1b3917d79ea031d3071488f0c5e8ab72de8219ab" + sha256: b0fcd1fe11d05de15228c8eee1117f6f5390e2204f4949460db7d3191f949965 url: "https://pub.dev" source: hosted - version: "0.2.6+4" + version: "0.2.6+8" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: "8ac91d83a028eef050de770f1dc98421e215714d245f34de7b154d436676fbd0" + sha256: "26febca93007cdfd0e4684c9ca2f3e59b096d5fb39b83ae42bc9c1f726b27b0c" url: "https://pub.dev" source: hosted - version: "14.6.5" + version: "14.7.0" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: b2995e3640efb646e9ebf0e2fa50dea84895f0746a31d7e3af0e5e009a533a1a + sha256: "049da43147b078c8d389e2c24e6acfdda96968a53da2061632bb0cb74fea92c5" url: "https://pub.dev" source: hosted - version: "4.5.4" + version: "4.5.9" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "5d8446a28339124a2cb4f57a6ca454a3aca7d0c5c0cdfa5707afb192f7c830a7" + sha256: ac22d3c09949cd37d94431e7deba4e270a93e5134c4842a9d784bd884835b54b url: "https://pub.dev" source: hosted - version: "3.5.4" + version: "3.5.9" fixnum: dependency: transitive description: @@ -402,10 +410,10 @@ packages: dependency: "direct main" description: name: flutter_facebook_auth - sha256: "804de2aa5b5dec4f68d1c15c74467700fa80b7a2d25235e1398f4637f80cfcf7" + sha256: "849a6772c3c698aabf05c675f914b3a76d235d3160aab99f8d55f3ddc4bed6a8" url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "6.0.2" flutter_facebook_auth_platform_interface: dependency: transitive description: @@ -434,18 +442,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4" + sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" flutter_local_notifications: dependency: "direct main" description: name: flutter_local_notifications - sha256: "3cc40fe8c50ab8383f3e053a499f00f975636622ecdc8e20a77418ece3b1e975" + sha256: "6d11ea777496061e583623aaf31923f93a9409ef8fcaeeefdd6cd78bf4fe5bb3" url: "https://pub.dev" source: hosted - version: "15.1.0+1" + version: "16.1.0" flutter_local_notifications_linux: dependency: transitive description: @@ -471,58 +479,58 @@ packages: dependency: "direct main" description: name: flutter_riverpod - sha256: b83ac5827baadefd331ea1d85110f34645827ea234ccabf53a655f41901a9bf4 + sha256: bdba94be666ecb1beeb0f5a748d96cdd6a37215f27e6b48c7673b95cecb800c8 url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.4.4" flutter_secure_storage: dependency: transitive description: name: flutter_secure_storage - sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5" + sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685 url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "9.0.0" flutter_secure_storage_linux: dependency: transitive description: name: flutter_secure_storage_linux - sha256: "0912ae29a572230ad52d8a4697e5518d7f0f429052fd51df7e5a7952c7efe2a3" + sha256: "3d5032e314774ee0e1a7d0a9f5e2793486f0dff2dd9ef5a23f4e3fb2a0ae6a9e" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.2.0" flutter_secure_storage_macos: dependency: transitive description: name: flutter_secure_storage_macos - sha256: "083add01847fc1c80a07a08e1ed6927e9acd9618a35e330239d4422cd2a58c50" + sha256: bd33935b4b628abd0b86c8ca20655c5b36275c3a3f5194769a7b3f37c905369c url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" flutter_secure_storage_platform_interface: dependency: transitive description: name: flutter_secure_storage_platform_interface - sha256: b3773190e385a3c8a382007893d678ae95462b3c2279e987b55d140d3b0cb81b + sha256: "0d4d3a5dd4db28c96ae414d7ba3b8422fd735a8255642774803b2532c9a61d7e" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" flutter_secure_storage_web: dependency: transitive description: name: flutter_secure_storage_web - sha256: "42938e70d4b872e856e678c423cc0e9065d7d294f45bc41fc1981a4eb4beaffe" + sha256: "30f84f102df9dcdaa2241866a958c2ec976902ebdaa8883fbfe525f1f2f3cf20" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" flutter_secure_storage_windows: dependency: transitive description: name: flutter_secure_storage_windows - sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee + sha256: "5809c66f9dd3b4b93b0a6e2e8561539405322ee767ac2f64d084e2ab5429d108" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.0" flutter_spinkit: dependency: transitive description: @@ -545,10 +553,10 @@ packages: dependency: "direct dev" description: name: freezed - sha256: "2df89855fe181baae3b6d714dc3c4317acf4fccd495a6f36e5e00f24144c6c3b" + sha256: "21bf2825311de65501d22e563e3d7605dff57fb5e6da982db785ae5372ff018a" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.5" freezed_annotation: dependency: "direct main" description: @@ -577,74 +585,74 @@ packages: dependency: "direct main" description: name: go_router - sha256: b3cadd2cd59a4103fd5f6bc572ca75111264698784e927aa471921c3477d5475 + sha256: "2ccd74480706e0a70a0e0dfa9543dede41bc11d0fe3b146a6ad7b7686f6b4407" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "11.1.4" google_fonts: dependency: "direct main" description: name: google_fonts - sha256: e20ff62b158b96f392bfc8afe29dee1503c94fbea2cbe8186fd59b756b8ae982 + sha256: f0b8d115a13ecf827013ec9fc883390ccc0e87a96ed5347a3114cac177ef18e8 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "6.1.0" google_identity_services_web: dependency: transitive description: name: google_identity_services_web - sha256: "7940fdc3b1035db4d65d387c1bdd6f9574deaa6777411569c05ecc25672efacd" + sha256: "000b7a31e1fa17ee04b6c0553a2b2ea18f9f9352e4dcc0c9fcc785cf10f2484e" url: "https://pub.dev" source: hosted - version: "0.2.1" + version: "0.2.2" google_mobile_ads: dependency: "direct main" description: name: google_mobile_ads - sha256: "24ee4e9546866cc15ebe565dabf6a6c485ce5fbec0645fde22799800532000f0" + sha256: "7b8915f0ad358f49ba7d547b5187204cfe72ca668fb83aa303f96a2eacdc4033" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.0" google_sign_in: dependency: "direct main" description: name: google_sign_in - sha256: aab6fdc41374014494f9e9026b9859e7309639d50a0bf4a2a412467a5ae4abc6 + sha256: f45038d27bcad37498f282295ae97eece23c9349fc16649154067b87b9f1fd03 url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "6.1.5" google_sign_in_android: dependency: transitive description: name: google_sign_in_android - sha256: "8d60a787b29cb7d2bcf29230865f4a91f17323c6ac5b6b9027a6418e48d9ffc3" + sha256: "6031f59074a337fdd81be821aba84cee3a41338c6e958499a5cd34d3e1db80ef" url: "https://pub.dev" source: hosted - version: "6.1.18" + version: "6.1.20" google_sign_in_ios: dependency: transitive description: name: google_sign_in_ios - sha256: "6ec0e13a4c5c646471b9f6a25ceb3ae76d339889d4c0f79b729bf0714215a63e" + sha256: "974944859f9cd40eb8a15b3fe8efb2d47fb7e99438f763f61a1ccd28d74ff4ce" url: "https://pub.dev" source: hosted - version: "5.6.2" + version: "5.6.4" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface - sha256: e69553c0fc6a76216e9d06a8c3767e291ad9be42171f879aab7ab708569d4393 + sha256: "35ceee5f0eadc1c07b0b4af7553246e315c901facbb7d3dadf734ba2693ceec4" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" google_sign_in_web: dependency: transitive description: name: google_sign_in_web - sha256: "69b9ce0e760945ff52337921a8b5871592b74c92f85e7632293310701eea68cc" + sha256: b48263e47f9493ba4120ccdfffe7412549ee297e82b97be9b8fa16ea8919ffbe url: "https://pub.dev" source: hosted - version: "0.12.0+2" + version: "0.12.0+4" graphs: dependency: transitive description: @@ -681,18 +689,18 @@ packages: dependency: transitive description: name: image - sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf + sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271" url: "https://pub.dev" source: hosted - version: "4.0.17" + version: "4.1.3" intl: dependency: transitive description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -737,18 +745,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -777,10 +785,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b + sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.2.0" package_info_plus_platform_interface: dependency: transitive description: @@ -801,50 +809,50 @@ packages: dependency: transitive description: name: path_provider - sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" + sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.1.1" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86" + sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1" url: "https://pub.dev" source: hosted - version: "2.0.27" + version: "2.2.0" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "916731ccbdce44d545414dd9961f26ba5fbaa74bcbb55237d8e65a623a8c7297" + sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" url: "https://pub.dev" source: hosted - version: "2.2.4" + version: "2.3.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57 + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.1.11" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84 + sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" + sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.2.1" petitparser: dependency: transitive description: @@ -853,22 +861,30 @@ packages: url: "https://pub.dev" source: hosted version: "5.4.0" + pigeon: + dependency: transitive + description: + name: pigeon + sha256: "5a79fd0b10423f6b5705525e32015597f861c31220b522a67d1e6b580da96719" + url: "https://pub.dev" + source: hosted + version: "11.0.1" platform: dependency: transitive description: name: platform - sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.3" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd" + sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.1.6" pointycastle: dependency: transitive description: @@ -913,66 +929,66 @@ packages: dependency: transitive description: name: riverpod - sha256: "80e48bebc83010d5e67a11c9514af6b44bbac1ec77b4333c8ea65dbc79e2d8ef" + sha256: "2af3d127a6e4e34b89b8f1f018086f5ded04b8e538174f0510bba3e4c0d878b1" url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.4.4" shared_preferences: dependency: "direct main" description: name: shared_preferences - sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1" + sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.2" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076 + sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4 + sha256: "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.4" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1" + sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.2" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1" + sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a" + sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d + sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.2" shelf: dependency: transitive description: @@ -1030,10 +1046,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -1046,10 +1062,10 @@ packages: dependency: transitive description: name: state_notifier - sha256: "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289" + sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb url: "https://pub.dev" source: hosted - version: "0.7.2+1" + version: "1.0.0" stream_channel: dependency: transitive description: @@ -1086,10 +1102,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" timezone: dependency: transitive description: @@ -1126,10 +1142,10 @@ packages: dependency: transitive description: name: visibility_detector - sha256: "15c54a459ec2c17b4705450483f3d5a2858e733aee893dcee9d75fd04814940d" + sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420 url: "https://pub.dev" source: hosted - version: "0.3.3" + version: "0.4.0+2" watcher: dependency: transitive description: @@ -1138,6 +1154,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: @@ -1150,50 +1174,50 @@ packages: dependency: transitive description: name: webview_flutter - sha256: "789d52bd789373cc1e100fb634af2127e86c99cf9abde09499743270c5de8d00" + sha256: c1ab9b81090705c6069197d9fdc1625e587b52b8d70cdde2339d177ad0dbb98e url: "https://pub.dev" source: hosted - version: "4.2.2" + version: "4.4.1" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: d936a09fbfd08cb78f7329e0bbacf6158fbdfe24ffc908b22444c07d295eb193 + sha256: b0cd33dd7d3dd8e5f664e11a19e17ba12c352647269921a3b568406b001f1dff url: "https://pub.dev" source: hosted - version: "3.9.2" + version: "3.12.0" webview_flutter_platform_interface: dependency: transitive description: name: webview_flutter_platform_interface - sha256: "564ef378cafc1a0e29f1d76ce175ef517a0a6115875dff7b43fccbef2b0aeb30" + sha256: "6d9213c65f1060116757a7c473247c60f3f7f332cac33dc417c9e362a9a13e4f" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.6.0" webview_flutter_wkwebview: dependency: transitive description: name: webview_flutter_wkwebview - sha256: "5fa098f28b606f699e8ca52d9e4e11edbbfef65189f5f77ae92703ba5408fd25" + sha256: "30b9af6bdd457b44c08748b9190d23208b5165357cc2eb57914fee1366c42974" url: "https://pub.dev" source: hosted - version: "3.7.2" + version: "3.9.1" win32: dependency: transitive description: name: win32 - sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0 + sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" url: "https://pub.dev" source: hosted - version: "5.0.6" + version: "5.0.9" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: e0b1147eec179d3911f1f19b59206448f78195ca1d20514134e10641b7d7fbff + sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.3" xml: dependency: transitive description: @@ -1211,5 +1235,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.7.6" diff --git a/pubspec.yaml b/pubspec.yaml index c99cc63..a19c02f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,10 +36,10 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - go_router: ^10.0.0 + go_router: ^11.1.4 easy_localization: ^3.0.1 flutter_riverpod: ^2.1.3 - google_fonts: ^5.1.0 + google_fonts: ^6.1.0 shared_preferences: ^2.0.15 freezed_annotation: ^2.2.0 change_app_package_name: ^1.1.0 @@ -54,9 +54,10 @@ dependencies: crypto: ^3.0.2 flutter_facebook_auth: ^6.0.0 google_mobile_ads: ^3.0.0 - flutter_local_notifications: ^15.1.0+1 + flutter_local_notifications: ^16.1.0 firebase_messaging: ^14.3.0 firebase_dynamic_links: ^5.1.0 + dio: ^5.3.3 dev_dependencies: flutter_test: diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 39cedd3..ea9741e 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,10 +6,13 @@ #include "generated_plugin_registrant.h" +#include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { + FirebaseAuthPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FirebaseAuthPluginCApi")); FirebaseCorePluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FirebaseCorePluginCApi")); FlutterSecureStorageWindowsPluginRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 1f5d05f..b8ca912 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + firebase_auth firebase_core flutter_secure_storage_windows )