From fa35d0dc28fd91eef069e911480af12d2f144196 Mon Sep 17 00:00:00 2001 From: TaYaKi71751 Date: Mon, 10 Feb 2025 22:45:07 +0900 Subject: [PATCH] Fix #632 --- violet/.gitignore | 2 + violet/android/build.gradle | 2 +- violet/integration_test/simple_test.dart | 13 + violet/ios/Flutter/AppFrameworkInfo.plist | 2 +- violet/ios/Podfile | 2 +- violet/ios/Podfile.lock | 480 +++++++------ violet/ios/Runner.xcodeproj/project.pbxproj | 65 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- violet/ios/Runner/AppDelegate.swift | 2 +- violet/lib/database/database.dart | 1 - violet/lib/database/user/search.dart | 4 +- violet/lib/pages/bookmark/crop_bookmark.dart | 4 +- .../pages/download/download_item_widget.dart | 4 +- violet/lib/pages/download/download_page.dart | 8 +- .../pages/settings/login/ehentai_login.dart | 42 +- .../lib/pages/viewer/viewer_controller.dart | 8 +- violet/lib/pages/viewer/viewer_page.dart | 3 +- violet/lib/script/script_webview.dart | 10 +- violet/lib/settings/device_type.dart | 4 +- violet/lib/src/rust/api/simple.dart | 15 +- violet/lib/src/rust/frb_generated.dart | 67 +- violet/lib/src/rust/frb_generated.io.dart | 2 +- violet/lib/src/rust/frb_generated.web.dart | 13 +- violet/lib/version/update_sync.dart | 4 +- .../widgets/cupertino_switch_list_tile.dart | 3 +- violet/pubspec.lock | 671 +++++++++++------- violet/pubspec.yaml | 43 +- violet/rust/Cargo.lock | 99 ++- violet/rust/Cargo.toml | 2 +- violet/rust/src/frb_generated.rs | 103 ++- violet/rust_builder/cargokit/build_pod.sh | 0 .../rust_builder/cargokit/run_build_tool.cmd | 0 violet/test_driver/integration_test.dart | 3 + .../flutter/generated_plugin_registrant.cc | 3 + .../windows/flutter/generated_plugins.cmake | 1 + 35 files changed, 1034 insertions(+), 653 deletions(-) create mode 100644 violet/integration_test/simple_test.dart mode change 100644 => 100755 violet/rust_builder/cargokit/build_pod.sh mode change 100644 => 100755 violet/rust_builder/cargokit/run_build_tool.cmd create mode 100644 violet/test_driver/integration_test.dart diff --git a/violet/.gitignore b/violet/.gitignore index c2e39baa2..3ea16308b 100644 --- a/violet/.gitignore +++ b/violet/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/violet/android/build.gradle b/violet/android/build.gradle index ffb98c5bf..b884278c2 100644 --- a/violet/android/build.gradle +++ b/violet/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.21' + ext.kotlin_version = '1.9.0' repositories { google() diff --git a/violet/integration_test/simple_test.dart b/violet/integration_test/simple_test.dart new file mode 100644 index 000000000..5d1b91cc1 --- /dev/null +++ b/violet/integration_test/simple_test.dart @@ -0,0 +1,13 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:violet/main.dart'; +import 'package:violet/src/rust/frb_generated.dart'; +import 'package:integration_test/integration_test.dart'; + +void main() { + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); + setUpAll(() async => await RustLib.init()); + testWidgets('Can call rust function', (WidgetTester tester) async { + await tester.pumpWidget(const MyApp()); + expect(find.textContaining('Result: `Hello, Tom!`'), findsOneWidget); + }); +} diff --git a/violet/ios/Flutter/AppFrameworkInfo.plist b/violet/ios/Flutter/AppFrameworkInfo.plist index 4f8d4d245..8c6e56146 100644 --- a/violet/ios/Flutter/AppFrameworkInfo.plist +++ b/violet/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/violet/ios/Podfile b/violet/ios/Podfile index 25edbb36a..359836181 100644 --- a/violet/ios/Podfile +++ b/violet/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '12.1' +platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/violet/ios/Podfile.lock b/violet/ios/Podfile.lock index d05f3a9ea..1a3f059f7 100644 --- a/violet/ios/Podfile.lock +++ b/violet/ios/Podfile.lock @@ -1,110 +1,114 @@ PODS: - - connectivity (0.0.1): + - apple_pencil_double_tap (0.0.1): + - Flutter + - connectivity_plus (0.0.1): - Flutter - - Reachability - device_info_plus (0.0.1): - Flutter - - DKImagePickerController/Core (4.3.4): + - DKImagePickerController/Core (4.3.9): - DKImagePickerController/ImageDataManager - DKImagePickerController/Resource - - DKImagePickerController/ImageDataManager (4.3.4) - - DKImagePickerController/PhotoGallery (4.3.4): + - DKImagePickerController/ImageDataManager (4.3.9) + - DKImagePickerController/PhotoGallery (4.3.9): - DKImagePickerController/Core - DKPhotoGallery - - DKImagePickerController/Resource (4.3.4) - - DKPhotoGallery (0.0.17): - - DKPhotoGallery/Core (= 0.0.17) - - DKPhotoGallery/Model (= 0.0.17) - - DKPhotoGallery/Preview (= 0.0.17) - - DKPhotoGallery/Resource (= 0.0.17) + - DKImagePickerController/Resource (4.3.9) + - DKPhotoGallery (0.0.19): + - DKPhotoGallery/Core (= 0.0.19) + - DKPhotoGallery/Model (= 0.0.19) + - DKPhotoGallery/Preview (= 0.0.19) + - DKPhotoGallery/Resource (= 0.0.19) - SDWebImage - SwiftyGif - - DKPhotoGallery/Core (0.0.17): + - DKPhotoGallery/Core (0.0.19): - DKPhotoGallery/Model - DKPhotoGallery/Preview - SDWebImage - SwiftyGif - - DKPhotoGallery/Model (0.0.17): + - DKPhotoGallery/Model (0.0.19): - SDWebImage - SwiftyGif - - DKPhotoGallery/Preview (0.0.17): + - DKPhotoGallery/Preview (0.0.19): - DKPhotoGallery/Model - DKPhotoGallery/Resource - SDWebImage - SwiftyGif - - DKPhotoGallery/Resource (0.0.17): + - DKPhotoGallery/Resource (0.0.19): - SDWebImage - SwiftyGif - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - Firebase/Analytics (10.15.0): + - Firebase/Analytics (11.7.0): - Firebase/Core - - Firebase/Core (10.15.0): + - Firebase/Core (11.7.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 10.15.0) - - Firebase/CoreOnly (10.15.0): - - FirebaseCore (= 10.15.0) - - Firebase/Crashlytics (10.15.0): + - FirebaseAnalytics (~> 11.7.0) + - Firebase/CoreOnly (11.7.0): + - FirebaseCore (~> 11.7.0) + - Firebase/Crashlytics (11.7.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 10.15.0) - - firebase_analytics (10.5.1): - - Firebase/Analytics (= 10.15.0) + - FirebaseCrashlytics (~> 11.7.0) + - firebase_analytics (11.4.2): + - Firebase/Analytics (= 11.7.0) - firebase_core - Flutter - - firebase_core (2.17.0): - - Firebase/CoreOnly (= 10.15.0) + - firebase_core (3.11.0): + - Firebase/CoreOnly (= 11.7.0) - Flutter - - firebase_crashlytics (3.3.7): - - Firebase/Crashlytics (= 10.15.0) + - firebase_crashlytics (4.3.2): + - Firebase/Crashlytics (= 11.7.0) - firebase_core - Flutter - - FirebaseAnalytics (10.15.0): - - FirebaseAnalytics/AdIdSupport (= 10.15.0) - - FirebaseCore (~> 10.0) - - FirebaseInstallations (~> 10.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) - - FirebaseAnalytics/AdIdSupport (10.15.0): - - FirebaseCore (~> 10.0) - - FirebaseInstallations (~> 10.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) - - FirebaseCore (10.15.0): - - FirebaseCoreInternal (~> 10.0) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreExtension (10.16.0): - - FirebaseCore (~> 10.0) - - FirebaseCoreInternal (10.16.0): - - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseCrashlytics (10.15.0): - - FirebaseCore (~> 10.5) - - FirebaseInstallations (~> 10.0) - - FirebaseSessions (~> 10.5) - - GoogleDataTransport (~> 9.2) - - GoogleUtilities/Environment (~> 7.8) - - nanopb (< 2.30910.0, >= 2.30908.0) - - PromisesObjC (~> 2.1) - - FirebaseInstallations (10.16.0): - - FirebaseCore (~> 10.0) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/UserDefaults (~> 7.8) - - PromisesObjC (~> 2.1) - - FirebaseSessions (10.16.0): - - FirebaseCore (~> 10.5) - - FirebaseCoreExtension (~> 10.0) - - FirebaseInstallations (~> 10.0) - - GoogleDataTransport (~> 9.2) - - GoogleUtilities/Environment (~> 7.10) - - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseAnalytics (11.7.0): + - FirebaseAnalytics/AdIdSupport (= 11.7.0) + - FirebaseCore (~> 11.7.0) + - FirebaseInstallations (~> 11.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - FirebaseAnalytics/AdIdSupport (11.7.0): + - FirebaseCore (~> 11.7.0) + - FirebaseInstallations (~> 11.0) + - GoogleAppMeasurement (= 11.7.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - FirebaseCore (11.7.0): + - FirebaseCoreInternal (~> 11.7.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/Logger (~> 8.0) + - FirebaseCoreExtension (11.7.0): + - FirebaseCore (~> 11.7.0) + - FirebaseCoreInternal (11.7.0): + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - FirebaseCrashlytics (11.7.0): + - FirebaseCore (~> 11.7.0) + - FirebaseInstallations (~> 11.0) + - FirebaseRemoteConfigInterop (~> 11.0) + - FirebaseSessions (~> 11.0) + - GoogleDataTransport (~> 10.0) + - GoogleUtilities/Environment (~> 8.0) + - nanopb (~> 3.30910.0) + - PromisesObjC (~> 2.4) + - FirebaseInstallations (11.7.0): + - FirebaseCore (~> 11.7.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - PromisesObjC (~> 2.4) + - FirebaseRemoteConfigInterop (11.8.0) + - FirebaseSessions (11.7.0): + - FirebaseCore (~> 11.7.0) + - FirebaseCoreExtension (~> 11.7.0) + - FirebaseInstallations (~> 11.0) + - GoogleDataTransport (~> 10.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - nanopb (~> 3.30910.0) - PromisesSwift (~> 2.1) - Flutter (1.0.0) - flutter_downloader (0.0.1): @@ -114,121 +118,154 @@ PODS: - Mantle - SDWebImage - SDWebImageWebPCoder - - flutter_inappwebview (0.0.1): + - flutter_inappwebview_ios (0.0.1): - Flutter - - flutter_inappwebview/Core (= 0.0.1) - - OrderedSet (~> 5.0) - - flutter_inappwebview/Core (0.0.1): + - flutter_inappwebview_ios/Core (= 0.0.1) + - OrderedSet (~> 6.0.3) + - flutter_inappwebview_ios/Core (0.0.1): - Flutter - - OrderedSet (~> 5.0) + - OrderedSet (~> 6.0.3) - flutter_js (0.1.0): - Flutter - flutter_keyboard_visibility (0.0.1): - Flutter - fluttertoast (0.0.2): - Flutter - - Toast - - FMDB (2.7.5): - - FMDB/standard (= 2.7.5) - - FMDB/standard (2.7.5) - - 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.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.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.5): - - GoogleUtilities/Environment (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.11.5): + - GoogleAppMeasurement (11.7.0): + - GoogleAppMeasurement/AdIdSupport (= 11.7.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - GoogleAppMeasurement/AdIdSupport (11.7.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 11.7.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - GoogleAppMeasurement/WithoutAdIdSupport (11.7.0): + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - GoogleDataTransport (10.1.0): + - nanopb (~> 3.30910.0) + - PromisesObjC (~> 2.4) + - GoogleUtilities/AppDelegateSwizzler (8.0.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.11.5): - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.11.5): + - GoogleUtilities/Privacy + - GoogleUtilities/Environment (8.0.2): + - GoogleUtilities/Privacy + - GoogleUtilities/Logger (8.0.2): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.11.5): + - GoogleUtilities/Privacy + - GoogleUtilities/MethodSwizzler (8.0.2): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.11.5): + - GoogleUtilities/Privacy + - GoogleUtilities/Network (8.0.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.11.5)" - - GoogleUtilities/Reachability (7.11.5): + - "GoogleUtilities/NSData+zlib (8.0.2)": + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (8.0.2) + - GoogleUtilities/Reachability (8.0.2): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.11.5): + - GoogleUtilities/Privacy + - GoogleUtilities/UserDefaults (8.0.2): - GoogleUtilities/Logger - - libwebp (1.3.2): - - libwebp/demux (= 1.3.2) - - libwebp/mux (= 1.3.2) - - libwebp/sharpyuv (= 1.3.2) - - libwebp/webp (= 1.3.2) - - libwebp/demux (1.3.2): + - GoogleUtilities/Privacy + - image_crop (0.0.1): + - Flutter + - integration_test (0.0.1): + - Flutter + - libwebp (1.5.0): + - libwebp/demux (= 1.5.0) + - libwebp/mux (= 1.5.0) + - libwebp/sharpyuv (= 1.5.0) + - libwebp/webp (= 1.5.0) + - libwebp/demux (1.5.0): - libwebp/webp - - libwebp/mux (1.3.2): + - libwebp/mux (1.5.0): - libwebp/demux - - libwebp/sharpyuv (1.3.2) - - libwebp/webp (1.3.2): + - libwebp/sharpyuv (1.5.0) + - libwebp/webp (1.5.0): - libwebp/sharpyuv - - local_auth_ios (0.0.1): + - local_auth_darwin (0.0.1): - Flutter + - FlutterMacOS - Mantle (2.2.0): - Mantle/extobjc (= 2.2.0) - Mantle/extobjc (2.2.0) - - nanopb (2.30909.0): - - nanopb/decode (= 2.30909.0) - - nanopb/encode (= 2.30909.0) - - nanopb/decode (2.30909.0) - - nanopb/encode (2.30909.0) - - open_file (0.0.1): + - nanopb (3.30910.0): + - nanopb/decode (= 3.30910.0) + - nanopb/encode (= 3.30910.0) + - nanopb/decode (3.30910.0) + - nanopb/encode (3.30910.0) + - open_file_ios (0.0.1): - Flutter - - OrderedSet (5.0.0) + - OrderedSet (6.0.3) - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - permission_handler_apple (9.1.1): + - permission_handler_apple (9.3.0): + - Flutter + - pointer_interceptor_ios (0.0.1): + - Flutter + - PromisesObjC (2.4.0) + - PromisesSwift (2.4.0): + - PromisesObjC (= 2.4.0) + - rust_lib_violet (0.0.1): - Flutter - - PromisesObjC (2.3.1) - - PromisesSwift (2.3.1): - - PromisesObjC (= 2.3.1) - - Reachability (3.2) - - SDWebImage (5.18.3): - - SDWebImage/Core (= 5.18.3) - - SDWebImage/Core (5.18.3) - - SDWebImageWebPCoder (0.14.2): + - SDWebImage (5.20.0): + - SDWebImage/Core (= 5.20.0) + - SDWebImage/Core (5.20.0) + - SDWebImageWebPCoder (0.14.6): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.17) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - sqflite (0.0.3): + - sqflite_darwin (0.0.4): + - Flutter + - FlutterMacOS + - sqlite3 (3.49.0): + - sqlite3/common (= 3.49.0) + - sqlite3/common (3.49.0) + - sqlite3/dbstatvtab (3.49.0): + - sqlite3/common + - sqlite3/fts5 (3.49.0): + - sqlite3/common + - sqlite3/perf-threadsafe (3.49.0): + - sqlite3/common + - sqlite3/rtree (3.49.0): + - sqlite3/common + - sqlite3_flutter_libs (0.0.1): + - Flutter + - FlutterMacOS + - sqlite3 (~> 3.49.0) + - sqlite3/dbstatvtab + - sqlite3/fts5 + - sqlite3/perf-threadsafe + - sqlite3/rtree + - SwiftyGif (5.4.5) + - uni_links (0.0.1): - Flutter - - FMDB (>= 2.7.5) - - SwiftyGif (5.4.4) - - Toast (4.0.0) - url_launcher_ios (0.0.1): - Flutter - webview_flutter_wkwebview (0.0.1): - Flutter + - FlutterMacOS DEPENDENCIES: - - connectivity (from `.symlinks/plugins/connectivity/ios`) + - apple_pencil_double_tap (from `.symlinks/plugins/apple_pencil_double_tap/ios`) + - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`) @@ -237,18 +274,24 @@ DEPENDENCIES: - Flutter (from `Flutter`) - flutter_downloader (from `.symlinks/plugins/flutter_downloader/ios`) - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`) - - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`) + - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`) - flutter_js (from `.symlinks/plugins/flutter_js/ios`) - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`) - - open_file (from `.symlinks/plugins/open_file/ios`) + - image_crop (from `.symlinks/plugins/image_crop/ios`) + - integration_test (from `.symlinks/plugins/integration_test/ios`) + - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`) + - open_file_ios (from `.symlinks/plugins/open_file_ios/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) + - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`) + - rust_lib_violet (from `.symlinks/plugins/rust_lib_violet/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - - sqflite (from `.symlinks/plugins/sqflite/ios`) + - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) + - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`) + - uni_links (from `.symlinks/plugins/uni_links/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) + - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`) SPEC REPOS: trunk: @@ -261,8 +304,8 @@ SPEC REPOS: - FirebaseCoreInternal - FirebaseCrashlytics - FirebaseInstallations + - FirebaseRemoteConfigInterop - FirebaseSessions - - FMDB - GoogleAppMeasurement - GoogleDataTransport - GoogleUtilities @@ -272,15 +315,16 @@ SPEC REPOS: - OrderedSet - PromisesObjC - PromisesSwift - - Reachability - SDWebImage - SDWebImageWebPCoder + - sqlite3 - SwiftyGif - - Toast EXTERNAL SOURCES: - connectivity: - :path: ".symlinks/plugins/connectivity/ios" + apple_pencil_double_tap: + :path: ".symlinks/plugins/apple_pencil_double_tap/ios" + connectivity_plus: + :path: ".symlinks/plugins/connectivity_plus/ios" device_info_plus: :path: ".symlinks/plugins/device_info_plus/ios" file_picker: @@ -297,79 +341,97 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_downloader/ios" flutter_image_compress_common: :path: ".symlinks/plugins/flutter_image_compress_common/ios" - flutter_inappwebview: - :path: ".symlinks/plugins/flutter_inappwebview/ios" + flutter_inappwebview_ios: + :path: ".symlinks/plugins/flutter_inappwebview_ios/ios" flutter_js: :path: ".symlinks/plugins/flutter_js/ios" flutter_keyboard_visibility: :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" fluttertoast: :path: ".symlinks/plugins/fluttertoast/ios" - local_auth_ios: - :path: ".symlinks/plugins/local_auth_ios/ios" - open_file: - :path: ".symlinks/plugins/open_file/ios" + image_crop: + :path: ".symlinks/plugins/image_crop/ios" + integration_test: + :path: ".symlinks/plugins/integration_test/ios" + local_auth_darwin: + :path: ".symlinks/plugins/local_auth_darwin/darwin" + open_file_ios: + :path: ".symlinks/plugins/open_file_ios/ios" path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" + pointer_interceptor_ios: + :path: ".symlinks/plugins/pointer_interceptor_ios/ios" + rust_lib_violet: + :path: ".symlinks/plugins/rust_lib_violet/ios" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" - sqflite: - :path: ".symlinks/plugins/sqflite/ios" + sqflite_darwin: + :path: ".symlinks/plugins/sqflite_darwin/darwin" + sqlite3_flutter_libs: + :path: ".symlinks/plugins/sqlite3_flutter_libs/darwin" + uni_links: + :path: ".symlinks/plugins/uni_links/ios" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: - :path: ".symlinks/plugins/webview_flutter_wkwebview/ios" + :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin" SPEC CHECKSUMS: - connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467 - device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea - DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac - DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: ce3938a0df3cc1ef404671531facef740d03f920 - Firebase: 66043bd4579e5b73811f96829c694c7af8d67435 - firebase_analytics: f153c564d6a7675e56e4f171454b9f1b3e7b6601 - firebase_core: 28e84c2a4fcf6a50ef83f47b145ded8c1fa331e4 - firebase_crashlytics: 36b8a72e23437dbb69bd97102661ce31b6721be5 - FirebaseAnalytics: 47cef43728f81a839cf1306576bdd77ffa2eac7e - FirebaseCore: 2cec518b43635f96afe7ac3a9c513e47558abd2e - FirebaseCoreExtension: 2dbc745b337eb99d2026a7a309ae037bd873f45e - FirebaseCoreInternal: 26233f705cc4531236818a07ac84d20c333e505a - FirebaseCrashlytics: a83f26fb922a3fe181eb738fb4dcf0c92bba6455 - FirebaseInstallations: b822f91a61f7d1ba763e5ccc9d4f2e6f2ed3b3ee - FirebaseSessions: 96e7781e545929cde06dd91088ddbb0841391b43 - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + apple_pencil_double_tap: 4a02c184f6cf4163c64d5e8542f6a4d58a72fe30 + connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d + device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342 + DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c + DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 + file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49 + Firebase: a64bf6a8546e6eab54f1c715cd6151f39d2329f4 + firebase_analytics: 7236e6115c1b4e62c2270faa29c052a317e31107 + firebase_core: aa979ae726f00b3ef4ccf59dfb96170af84efbd4 + firebase_crashlytics: f2a7d93add38e165a0101a7be761703ed7292aad + FirebaseAnalytics: bc9e565af9044ba8d6c6e4157e4edca8e5fdf7ec + FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4 + FirebaseCoreExtension: 206c1b399f0d103055207c16f299b28e3dbd1949 + FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881 + FirebaseCrashlytics: 785a73b624715bbc09a40bb56cdc3829a801cc98 + FirebaseInstallations: 9347e719c3d52d8d7b9074b2c32407dd027305e9 + FirebaseRemoteConfigInterop: 98897a64aa372eac3c5b3fe2816594ccfaac55ef + FirebaseSessions: 32ed7a9387ae71efe3a35a7f20f3a7292950957b + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_downloader: b7301ae057deadd4b1650dc7c05375f10ff12c39 flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e - flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf + flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4 flutter_js: 95929d4e146e8ceb1c8e1889d8c2065c5d840076 flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 - fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265 - FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - GoogleAppMeasurement: 722db6550d1e6d552b08398b69a975ac61039338 - GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 - GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084 - libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 - local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605 + fluttertoast: 21eecd6935e7064cc1fcb733a4c5a428f3f24f0f + GoogleAppMeasurement: 0471a5b5bff51f3a91b1e76df22c952d04c63967 + GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 + GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d + image_crop: e0a67085d3ebf3cf46ca46d61c53a082507b0bc3 + integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573 + libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8 + local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3 Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d - nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 - open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d - OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 - PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 - PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265 - Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 - SDWebImage: 96e0c18ef14010b7485210e92fac888587ebb958 - SDWebImageWebPCoder: 633b813fca24f1de5e076bcd7f720c038b23892b - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 - sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a - SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f - Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 - webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f + nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 + open_file_ios: 461db5853723763573e140de3193656f91990d9e + OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 + pointer_interceptor_ios: 508241697ff0947f853c061945a8b822463947c1 + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 + rust_lib_violet: 410022e0a70e52e07292e08a4ba4afa985911618 + SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8 + SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 + sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d + sqlite3: 4922312598b67e1825c6a6c821296dcbf6783046 + sqlite3_flutter_libs: 069c435986dd4b63461aecd68f4b30be4a9e9daa + SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 + uni_links: d97da20c7701486ba192624d99bffaaffcfc298a + url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe + webview_flutter_wkwebview: a4af96a051138e28e29f60101d094683b9f82188 -PODFILE CHECKSUM: 3d2608411ef731a5e331f61617c828db1f3917b7 +PODFILE CHECKSUM: fe239e369e1f48df0b325a22cdded74495af7b01 -COCOAPODS: 1.14.2 +COCOAPODS: 1.16.2 diff --git a/violet/ios/Runner.xcodeproj/project.pbxproj b/violet/ios/Runner.xcodeproj/project.pbxproj index cec5b65c4..ea0fc2fc3 100644 --- a/violet/ios/Runner.xcodeproj/project.pbxproj +++ b/violet/ios/Runner.xcodeproj/project.pbxproj @@ -148,6 +148,7 @@ 3B06AD1E1E4923F5004D2608 /* Thin Binary */, E8D4AF64A9C7F1F6B5643B8F /* [CP] Embed Pods Frameworks */, 594A27C15FCAFD552C764E6B /* [firebase_crashlytics] Crashlytics Upload Symbols */, + D9761735C38D6BE05E7A82AB /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -164,7 +165,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -283,6 +284,24 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + D9761735C38D6BE05E7A82AB /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/permission_handler_apple/permission_handler_apple_privacy.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/permission_handler_apple_privacy.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; E8D4AF64A9C7F1F6B5643B8F /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -292,12 +311,12 @@ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", "${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework", "${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework", - "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCoreExtension/FirebaseCoreExtension.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics/FirebaseCrashlytics.framework", "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfigInterop/FirebaseRemoteConfigInterop.framework", "${BUILT_PRODUCTS_DIR}/FirebaseSessions/FirebaseSessions.framework", "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", @@ -305,27 +324,33 @@ "${BUILT_PRODUCTS_DIR}/OrderedSet/OrderedSet.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", "${BUILT_PRODUCTS_DIR}/PromisesSwift/Promises.framework", - "${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework", "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", "${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework", "${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework", - "${BUILT_PRODUCTS_DIR}/Toast/Toast.framework", - "${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework", + "${BUILT_PRODUCTS_DIR}/apple_pencil_double_tap/apple_pencil_double_tap.framework", + "${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework", "${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework", "${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework", "${BUILT_PRODUCTS_DIR}/flutter_downloader/flutter_downloader.framework", "${BUILT_PRODUCTS_DIR}/flutter_image_compress_common/flutter_image_compress_common.framework", - "${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework", + "${BUILT_PRODUCTS_DIR}/flutter_inappwebview_ios/flutter_inappwebview_ios.framework", "${BUILT_PRODUCTS_DIR}/flutter_js/flutter_js.framework", "${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework", "${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework", + "${BUILT_PRODUCTS_DIR}/image_crop/image_crop.framework", + "${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework", "${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework", - "${BUILT_PRODUCTS_DIR}/local_auth_ios/local_auth_ios.framework", + "${BUILT_PRODUCTS_DIR}/local_auth_darwin/local_auth_darwin.framework", "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", - "${BUILT_PRODUCTS_DIR}/open_file/open_file.framework", + "${BUILT_PRODUCTS_DIR}/open_file_ios/open_file_ios.framework", "${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework", + "${BUILT_PRODUCTS_DIR}/pointer_interceptor_ios/pointer_interceptor_ios.framework", + "${BUILT_PRODUCTS_DIR}/rust_lib_violet/rust_lib_violet.framework", "${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework", - "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", + "${BUILT_PRODUCTS_DIR}/sqflite_darwin/sqflite_darwin.framework", + "${BUILT_PRODUCTS_DIR}/sqlite3/sqlite3.framework", + "${BUILT_PRODUCTS_DIR}/sqlite3_flutter_libs/sqlite3_flutter_libs.framework", + "${BUILT_PRODUCTS_DIR}/uni_links/uni_links.framework", "${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework", "${BUILT_PRODUCTS_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework", ); @@ -333,12 +358,12 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKImagePickerController.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKPhotoGallery.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreExtension.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfigInterop.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSessions.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", @@ -346,27 +371,33 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OrderedSet.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Promises.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/apple_pencil_double_tap.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_downloader.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress_common.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_js.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_crop.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth_ios.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth_darwin.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/open_file.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/open_file_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/pointer_interceptor_ios.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/rust_lib_violet.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite_darwin.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3_flutter_libs.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/uni_links.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter_wkwebview.framework", ); diff --git a/violet/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/violet/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a6b826db2..5e31d3d34 100644 --- a/violet/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/violet/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ insertSearchLog(String? searchWhat, [DateTime? datetime]) async { datetime ??= DateTime.now(); final db = await CommonUserDatabase.getInstance(); - final body = { - 'SearchWhat': searchWhat, + Map body = { + 'SearchWhat': searchWhat.toString(), 'DateTime': datetime.toString(), }; await db.insert('SearchLog', body); diff --git a/violet/lib/pages/bookmark/crop_bookmark.dart b/violet/lib/pages/bookmark/crop_bookmark.dart index 163674b8c..1646909be 100644 --- a/violet/lib/pages/bookmark/crop_bookmark.dart +++ b/violet/lib/pages/bookmark/crop_bookmark.dart @@ -365,10 +365,10 @@ class _CropBookmarkPageState extends State { '${dir.path}/daily.zip'); final inputStream = InputFileStream('${dir.path}/daily.zip'); - final archive = ZipDecoder().decodeBuffer(inputStream); + final archive = ZipDecoder().decodeBytes(inputStream.toUint8List()); for (final file in archive.files) { if (file.name == 'violet/assets/daily/crop-bookmarks.json') { - final outputStream = OutputStream(); + final outputStream = OutputMemoryStream(); file.writeContent(outputStream); final json = jsonDecode(utf8.decode(outputStream.getBytes())); diff --git a/violet/lib/pages/download/download_item_widget.dart b/violet/lib/pages/download/download_item_widget.dart index b41fd75d8..04dfd9786 100644 --- a/violet/lib/pages/download/download_item_widget.dart +++ b/violet/lib/pages/download/download_item_widget.dart @@ -403,7 +403,9 @@ class DownloadItemWidgetState extends State recovery() { if (widget.item.thumbnail() != null && (widget.item.thumbnail()!.contains('e-hentai') || - widget.item.thumbnail()!.contains('exhentai'))) return; + widget.item.thumbnail()!.contains('exhentai'))) { + return; + } _recovery(); } diff --git a/violet/lib/pages/download/download_page.dart b/violet/lib/pages/download/download_page.dart index e409e84db..9452e969e 100644 --- a/violet/lib/pages/download/download_page.dart +++ b/violet/lib/pages/download/download_page.dart @@ -139,9 +139,13 @@ class _DownloadPageState extends ThemeSwitchableState if (item.files() == null) continue; if (item.files() != null && - item.files()!.toLowerCase().contains(newPath.toLowerCase())) continue; + item.files()!.toLowerCase().contains(newPath.toLowerCase())) { + continue; + } if (item.path() != null && - item.path()!.toLowerCase().contains(newPath.toLowerCase())) continue; + item.path()!.toLowerCase().contains(newPath.toLowerCase())) { + continue; + } final oldPath = ((jsonDecode(item.files()!) as List)[0] as String) diff --git a/violet/lib/pages/settings/login/ehentai_login.dart b/violet/lib/pages/settings/login/ehentai_login.dart index c38416968..c56d40d10 100644 --- a/violet/lib/pages/settings/login/ehentai_login.dart +++ b/violet/lib/pages/settings/login/ehentai_login.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'dart:collection'; import 'dart:convert'; import 'dart:developer' as developer; - import 'package:flutter/material.dart'; import 'package:webview_flutter/webview_flutter.dart'; @@ -26,9 +25,6 @@ Map parseCookies(String cookies) { return result; } -// Input id-pwd login? -// Or cookie? - class LoginScreen extends StatefulWidget { const LoginScreen({super.key}); @@ -39,7 +35,20 @@ class LoginScreen extends StatefulWidget { class _LoginScreenState extends State { static const _loginUrl = 'https://e-hentai.org/bounce_login.php'; - final _webViewController = Completer(); + late final WebViewController _controller; + + @override + void initState() { + super.initState(); + _controller = WebViewController() + ..setJavaScriptMode(JavaScriptMode.unrestricted) + ..setNavigationDelegate( + NavigationDelegate( + onPageFinished: (url) => _checkCookie(), + ), + ) + ..loadRequest(Uri.parse(_loginUrl)); + } @override Widget build(BuildContext context) { @@ -47,38 +56,27 @@ class _LoginScreenState extends State { appBar: AppBar( title: const Text('Login'), ), - body: WebView( - initialUrl: _loginUrl, - javascriptMode: JavascriptMode.unrestricted, - onWebViewCreated: (controller) { - _webViewController.complete(controller); - }, - onPageFinished: (url) { - _checkCookie(); - }, - ), + body: WebViewWidget(controller: _controller), ); } Future _checkCookie() async { - final controller = await _webViewController.future; var cookieString = - await controller.runJavascriptReturningResult('document.cookie'); + await _controller.runJavaScriptReturningResult('document.cookie'); try { - cookieString = jsonDecode(cookieString) as String; + cookieString = jsonDecode(cookieString as String) as String; } catch (e) {} - final cookies = parseCookies(cookieString); + + final cookies = parseCookies(cookieString as String); developer.log('Get cookies: $cookies'); if (cookies.containsKey('ipb_member_id') && cookies.containsKey('ipb_pass_hash') && (cookies.containsKey('sk') || cookies.containsKey('igneous'))) { - // await sessionStore.setSession(cookieString); - // await _cookieManager.clearCookies(); if (!mounted) return; Navigator.pop(context, cookieString); } else if (cookies.containsKey('ipb_member_id')) { - controller.loadUrl('https://exhentai.org'); + _controller.loadRequest(Uri.parse('https://exhentai.org')); } } } diff --git a/violet/lib/pages/viewer/viewer_controller.dart b/violet/lib/pages/viewer/viewer_controller.dart index bc6833145..9af2a8c26 100644 --- a/violet/lib/pages/viewer/viewer_controller.dart +++ b/violet/lib/pages/viewer/viewer_controller.dart @@ -145,7 +145,9 @@ class ViewerController extends GetxController { jump(int page) { if (page < 0) return; if (page >= maxPage && - (!secondPageToSecondPage.value || page >= maxPage + 1)) return; + (!secondPageToSecondPage.value || page >= maxPage + 1)) { + return; + } this.page.value = page; @@ -163,7 +165,9 @@ class ViewerController extends GetxController { move(int page) { if (page < 0) return; if (page >= maxPage && - (!secondPageToSecondPage.value || page >= maxPage + 1)) return; + (!secondPageToSecondPage.value || page >= maxPage + 1)) { + return; + } if (!animation.value) { jump(page); diff --git a/violet/lib/pages/viewer/viewer_page.dart b/violet/lib/pages/viewer/viewer_page.dart index 69fae0a5e..4c8b93744 100644 --- a/violet/lib/pages/viewer/viewer_page.dart +++ b/violet/lib/pages/viewer/viewer_page.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'dart:io'; import 'package:apple_pencil_double_tap/apple_pencil_double_tap.dart'; +import 'package:apple_pencil_double_tap/entities/preferred_action.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; @@ -191,7 +192,7 @@ class _ViewerPageState extends State { }, ); - ApplePencilDoubleTap().listen((PreferredDoubleTapAction preferedAction) { + ApplePencilDoubleTap().listen(v1Callback: (PreferredAction preferedAction) { if (ModalRoute.of(context)!.isCurrent) { c.next(); } diff --git a/violet/lib/script/script_webview.dart b/violet/lib/script/script_webview.dart index 5503c92f4..9a1dae480 100644 --- a/violet/lib/script/script_webview.dart +++ b/violet/lib/script/script_webview.dart @@ -56,7 +56,9 @@ class _ScriptWebViewState extends State Future v4FailCheckProbe() async { if (ScriptManager.enableV4) return; if (Settings.routingRule.first != 'Hitomi' && - Settings.routingRule.first != 'Hiyobi') return; + Settings.routingRule.first != 'Hiyobi') { + return; + } // showOkDialog( // context, @@ -83,7 +85,7 @@ class _ScriptWebViewState extends State height: 1, child: InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse('https://hitomi.la/'), + url: WebUri('https://hitomi.la/'), ), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions( @@ -127,7 +129,9 @@ class _ScriptWebViewState extends State }), onLoadHttpError: (controller, url, statusCode, description) { if (!(url.toString() == 'https://hitomi.la' || - url.toString() == 'https://hitomi.la/')) return; + url.toString() == 'https://hitomi.la/')) { + return; + } if (statusCode >= 500) { isCurrentReload = true; diff --git a/violet/lib/settings/device_type.dart b/violet/lib/settings/device_type.dart index 594b69368..41b246ed7 100644 --- a/violet/lib/settings/device_type.dart +++ b/violet/lib/settings/device_type.dart @@ -48,7 +48,9 @@ class Device { (screenHeight == 812 || screenWidth == 812 || screenHeight == 896 || - screenWidth == 896)) isIphoneX = true; + screenWidth == 896)) { + isIphoneX = true; + } return _device = Device( isTablet: isTablet, diff --git a/violet/lib/src/rust/api/simple.dart b/violet/lib/src/rust/api/simple.dart index 15c964402..24dbf5cc2 100644 --- a/violet/lib/src/rust/api/simple.dart +++ b/violet/lib/src/rust/api/simple.dart @@ -1,14 +1,17 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.24. +// @generated by `flutter_rust_bridge`@ 2.7.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import import '../frb_generated.dart'; import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart'; -String greet({required String name, dynamic hint}) => - RustLib.instance.api.greet(name: name, hint: hint); +/// frb_marker: #[frb(init)] +Future initApp() => RustLib.instance.api.crateApiSimpleInitApp(); -Future decompress7Z( - {required String src, required String dest, dynamic hint}) => - RustLib.instance.api.decompress7Z(src: src, dest: dest, hint: hint); +/// frb_marker: #[frb(sync)] +Future greet({required String name}) => + RustLib.instance.api.crateApiSimpleGreet(name: name); + +Future decompress7Z({required String src, required String dest}) => + RustLib.instance.api.crateApiSimpleDecompress7Z(src: src, dest: dest); diff --git a/violet/lib/src/rust/frb_generated.dart b/violet/lib/src/rust/frb_generated.dart index 60cd6438e..2cdaa5443 100644 --- a/violet/lib/src/rust/frb_generated.dart +++ b/violet/lib/src/rust/frb_generated.dart @@ -1,12 +1,14 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.24. +// @generated by `flutter_rust_bridge`@ 2.7.1. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field import 'api/simple.dart'; import 'dart:async'; import 'dart:convert'; -import 'frb_generated.io.dart' if (dart.library.html) 'frb_generated.web.dart'; +import 'frb_generated.dart'; +import 'frb_generated.io.dart' + if (dart.library.js_interop) 'frb_generated.web.dart'; import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart'; /// Main entrypoint of the Rust API @@ -29,6 +31,16 @@ class RustLib extends BaseEntrypoint { ); } + /// Initialize flutter_rust_bridge in mock mode. + /// No libraries for FFI are loaded. + static void initMock({ + required RustLibApi api, + }) { + instance.initMockImpl( + api: api, + ); + } + /// Dispose flutter_rust_bridge /// /// The call to this function is optional, since flutter_rust_bridge (and everything else) @@ -44,16 +56,17 @@ class RustLib extends BaseEntrypoint { RustLibWire.fromExternalLibrary; @override - Future executeRustInitializers() async { - await api.initApp(); - } + Future executeRustInitializers() async {} @override ExternalLibraryLoaderConfig get defaultExternalLibraryLoaderConfig => kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.0.0-dev.24'; + String get codegenVersion => '2.7.1'; + + @override + int get rustContentHash => -1884772811; static const kDefaultExternalLibraryLoaderConfig = ExternalLibraryLoaderConfig( @@ -64,12 +77,12 @@ class RustLib extends BaseEntrypoint { } abstract class RustLibApi extends BaseApi { - Future decompress7Z( - {required String src, required String dest, dynamic hint}); + Future crateApiSimpleDecompress7Z( + {required String src, required String dest}); - String greet({required String name, dynamic hint}); + Future crateApiSimpleGreet({required String name}); - Future initApp({dynamic hint}); + Future crateApiSimpleInitApp(); } class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { @@ -81,76 +94,74 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { }); @override - Future decompress7Z( - {required String src, required String dest, dynamic hint}) { + Future crateApiSimpleDecompress7Z( + {required String src, required String dest}) { return handler.executeNormal(NormalTask( callFfi: (port_) { final serializer = SseSerializer(generalizedFrbRustBinding); sse_encode_String(src, serializer); sse_encode_String(dest, serializer); pdeCallFfi(generalizedFrbRustBinding, serializer, - funcId: 3, port: port_); + funcId: 1, port: port_); }, codec: SseCodec( decodeSuccessData: sse_decode_unit, decodeErrorData: null, ), - constMeta: kDecompress7ZConstMeta, + constMeta: kCrateApiSimpleDecompress7ZConstMeta, argValues: [src, dest], apiImpl: this, - hint: hint, )); } - TaskConstMeta get kDecompress7ZConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiSimpleDecompress7ZConstMeta => const TaskConstMeta( debugName: "decompress_7z", argNames: ["src", "dest"], ); @override - String greet({required String name, dynamic hint}) { - return handler.executeSync(SyncTask( - callFfi: () { + Future crateApiSimpleGreet({required String name}) { + return handler.executeNormal(NormalTask( + callFfi: (port_) { final serializer = SseSerializer(generalizedFrbRustBinding); sse_encode_String(name, serializer); - return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 2)!; + pdeCallFfi(generalizedFrbRustBinding, serializer, + funcId: 2, port: port_); }, codec: SseCodec( decodeSuccessData: sse_decode_String, decodeErrorData: null, ), - constMeta: kGreetConstMeta, + constMeta: kCrateApiSimpleGreetConstMeta, argValues: [name], apiImpl: this, - hint: hint, )); } - TaskConstMeta get kGreetConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiSimpleGreetConstMeta => const TaskConstMeta( debugName: "greet", argNames: ["name"], ); @override - Future initApp({dynamic hint}) { + Future crateApiSimpleInitApp() { return handler.executeNormal(NormalTask( callFfi: (port_) { final serializer = SseSerializer(generalizedFrbRustBinding); pdeCallFfi(generalizedFrbRustBinding, serializer, - funcId: 1, port: port_); + funcId: 3, port: port_); }, codec: SseCodec( decodeSuccessData: sse_decode_unit, decodeErrorData: null, ), - constMeta: kInitAppConstMeta, + constMeta: kCrateApiSimpleInitAppConstMeta, argValues: [], apiImpl: this, - hint: hint, )); } - TaskConstMeta get kInitAppConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiSimpleInitAppConstMeta => const TaskConstMeta( debugName: "init_app", argNames: [], ); diff --git a/violet/lib/src/rust/frb_generated.io.dart b/violet/lib/src/rust/frb_generated.io.dart index f0d2b2b24..77a12ebd7 100644 --- a/violet/lib/src/rust/frb_generated.io.dart +++ b/violet/lib/src/rust/frb_generated.io.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.24. +// @generated by `flutter_rust_bridge`@ 2.7.1. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field diff --git a/violet/lib/src/rust/frb_generated.web.dart b/violet/lib/src/rust/frb_generated.web.dart index 4b31a19f4..130c2ee46 100644 --- a/violet/lib/src/rust/frb_generated.web.dart +++ b/violet/lib/src/rust/frb_generated.web.dart @@ -1,8 +1,11 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.24. +// @generated by `flutter_rust_bridge`@ 2.7.1. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field +// Static analysis wrongly picks the IO variant, thus ignore this +// ignore_for_file: argument_type_not_assignable + import 'api/simple.dart'; import 'dart:async'; import 'dart:convert'; @@ -78,10 +81,4 @@ external RustLibWasmModule get wasmModule; @JS() @anonymous -class RustLibWasmModule implements WasmModule { - @override - external Object /* Promise */ call([String? moduleName]); - - @override - external RustLibWasmModule bind(dynamic thisArg, String moduleName); -} +extension type RustLibWasmModule._(JSObject _) implements JSObject {} diff --git a/violet/lib/version/update_sync.dart b/violet/lib/version/update_sync.dart index e272070ae..ca28f8ddb 100644 --- a/violet/lib/version/update_sync.dart +++ b/violet/lib/version/update_sync.dart @@ -43,7 +43,9 @@ class UpdateSyncManager { if (majorVersion == ver[0] && minorVersion == ver[1] && patchVersion < ver[2] && - enableSensitiveUpdate) return true; + enableSensitiveUpdate) { + return true; + } return false; } diff --git a/violet/lib/widgets/cupertino_switch_list_tile.dart b/violet/lib/widgets/cupertino_switch_list_tile.dart index 0ba797d3b..143e9b921 100644 --- a/violet/lib/widgets/cupertino_switch_list_tile.dart +++ b/violet/lib/widgets/cupertino_switch_list_tile.dart @@ -98,7 +98,8 @@ class CupertinoSwitchListTile extends StatelessWidget { child: CupertinoSwitch( value: value, onChanged: onChanged, - activeColor: activeColor ?? Theme.of(context).colorScheme.secondary, + activeTrackColor: + activeColor ?? Theme.of(context).colorScheme.secondary, ), ); return MergeSemantics( diff --git a/violet/pubspec.lock b/violet/pubspec.lock index d416e7e9b..59066294a 100644 --- a/violet/pubspec.lock +++ b/violet/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "37a42d06068e2fe3deddb2da079a8c4d105f241225ba27b7122b37e9865fd8f7" + sha256: e051259913915ea5bc8fe18664596bea08592fd123930605d562969cd7315fcd url: "https://pub.dev" source: hosted - version: "1.3.35" + version: "1.3.51" _macros: dependency: transitive description: dart @@ -34,10 +34,10 @@ packages: dependency: "direct main" description: name: android_intent_plus - sha256: "04cbc7c332a6f0bba88fed354de78813e9d24049c1800aaf10f449c7adc22603" + sha256: dfc1fd3a577205ae8f11e990fb4ece8c90cceabbee56fcf48e463ecf0bd6aae3 url: "https://pub.dev" source: hosted - version: "3.1.9" + version: "5.3.0" animated_widgets: dependency: "direct main" description: @@ -58,34 +58,34 @@ packages: dependency: "direct main" description: name: apple_pencil_double_tap - sha256: "17dd723f038191dfa6f284910d86ca3be1598f85a64021abc89c60579275eed8" + sha256: "0815d8fd167762a2fd1dbecbbc54b72a5a5b0ae863e2b3baf6e0b47ba3cf62f3" url: "https://pub.dev" source: hosted - version: "0.0.2" + version: "0.1.0" archive: dependency: "direct main" description: name: archive - sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a" url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "4.0.2" args: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" asn1lib: dependency: transitive description: name: asn1lib - sha256: "2ca377ad4d677bbadca278e0ba4da4e057b80a10b927bfc8f7d8bda8fe2ceb75" + sha256: "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c" url: "https://pub.dev" source: hosted - version: "1.5.4" + version: "1.5.9" async: dependency: "direct main" description: @@ -123,10 +123,10 @@ packages: dependency: "direct main" description: name: bloc - sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e" + sha256: "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189" url: "https://pub.dev" source: hosted - version: "8.1.4" + version: "9.0.0" boolean_selector: dependency: transitive description: @@ -147,10 +147,10 @@ packages: dependency: transitive description: name: build - sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" build_cli_annotations: dependency: transitive description: @@ -163,42 +163,42 @@ packages: dependency: transitive description: name: build_config - sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" build_daemon: dependency: transitive description: name: build_daemon - sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" + sha256: "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.0.3" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + sha256: "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.3" build_runner: dependency: "direct dev" description: name: build_runner - sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04 + sha256: "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573" url: "https://pub.dev" source: hosted - version: "2.4.12" + version: "2.4.14" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 + sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021" url: "https://pub.dev" source: hosted - version: "7.3.2" + version: "8.0.0" built_collection: dependency: transitive description: @@ -211,10 +211,10 @@ packages: dependency: transitive description: name: built_value - sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2" url: "https://pub.dev" source: hosted - version: "8.9.2" + version: "8.9.3" cached_network_image: dependency: "direct main" description: @@ -267,18 +267,18 @@ packages: dependency: "direct main" description: name: chopper - sha256: "6b2f5681f2bdca65a1fe2372922e797303fa058b6ead765afa88e40e0fd61071" + sha256: "18928a74069cf1c257e657809c1b84b0304d8e32a6fc446dd2bbb28657e0358a" url: "https://pub.dev" source: hosted - version: "8.0.2" + version: "8.1.0" chopper_generator: dependency: "direct dev" description: name: chopper_generator - sha256: "7d25ad17062a9b671020f96082ed5f8ee85e18137beb74aca4620137ae6ea523" + sha256: "2cb23febc9ac9bbc9288b4703e60f3edc8e301a2ef5057d0c22369eab7313c6d" url: "https://pub.dev" source: hosted - version: "8.0.2" + version: "8.1.0" clock: dependency: transitive description: @@ -291,10 +291,10 @@ packages: dependency: transitive description: name: code_builder - sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" url: "https://pub.dev" source: hosted - version: "4.10.0" + version: "4.10.1" collection: dependency: "direct main" description: @@ -323,10 +323,10 @@ packages: dependency: "direct main" description: name: connectivity_plus - sha256: "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0" + sha256: "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27" url: "https://pub.dev" source: hosted - version: "6.0.5" + version: "6.1.3" connectivity_plus_platform_interface: dependency: transitive description: @@ -339,10 +339,10 @@ packages: dependency: "direct main" description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" country_pickers: dependency: "direct main" description: @@ -364,18 +364,18 @@ packages: dependency: "direct main" description: name: crypto - sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.6" csslib: dependency: transitive description: name: csslib - sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.2" cupertino_icons: dependency: "direct main" description: @@ -388,58 +388,58 @@ packages: dependency: transitive description: name: dart_style - sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820" url: "https://pub.dev" source: hosted - version: "2.3.7" + version: "2.3.8" dbus: dependency: transitive description: name: dbus - sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac" + sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.11" device_info_plus: dependency: "direct main" description: name: device_info_plus - sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 + sha256: "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da" url: "https://pub.dev" source: hosted - version: "10.1.2" + version: "11.3.0" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2" url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "7.0.2" dio: dependency: "direct main" description: name: dio - sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260" + sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9" url: "https://pub.dev" source: hosted - version: "5.7.0" + version: "5.8.0+1" dio_cache_interceptor: dependency: "direct main" description: name: dio_cache_interceptor - sha256: fb7905c0d12075d8786a6b63bffd64ae062d053f682cfaf28d145a2686507308 + sha256: "1346705a2057c265014d7696e3e2318b560bfb00b484dac7f9b01e2ceaebb07d" url: "https://pub.dev" source: hosted - version: "3.5.0" + version: "3.5.1" dio_web_adapter: dependency: transitive description: name: dio_web_adapter - sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" + sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" draggable_scrollbar: dependency: "direct main" description: @@ -452,10 +452,10 @@ packages: dependency: transitive description: name: drift - sha256: "5b561ec76fff260e1e0593a29ca0d058a140a4b4dfb11dcc0c3813820cd20200" + sha256: ab4d0e7aa1793829b1dd8e72d71bbf0b53bf4ff84b184045d1ab71b0832e632e url: "https://pub.dev" source: hosted - version: "2.20.2" + version: "2.25.0" drift_sqflite: dependency: "direct dev" description: @@ -485,10 +485,10 @@ packages: dependency: transitive description: name: equatable - sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7" url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.0.7" expandable: dependency: "direct main" description: @@ -509,10 +509,10 @@ packages: dependency: transitive description: name: extended_image_library - sha256: "9a94ec9314aa206cfa35f16145c3cd6e2c924badcc670eaaca8a3a8063a68cd7" + sha256: e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1 url: "https://pub.dev" source: hosted - version: "4.0.5" + version: "4.0.6" extended_wrap: dependency: "direct main" description: @@ -549,82 +549,82 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12" + sha256: "8d8f126484286375baad27927d6d0d847c922e2a1613aa5305e9580e5999e1b5" url: "https://pub.dev" source: hosted - version: "8.1.2" + version: "8.3.3" firebase_analytics: dependency: "direct main" description: name: firebase_analytics - sha256: dbf1e7ab22cfb1f4a4adb103b46a26276b4edc593d4a78ef6fb942bafc92e035 + sha256: "47428047a0778f72af53a3c7cb5d556e1cb25e2327cc8aa40d544971dc6245b2" url: "https://pub.dev" source: hosted - version: "10.10.7" + version: "11.4.2" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface - sha256: "3729b74f8cf1d974a27ba70332ecb55ff5ff560edc8164a6469f4a055b429c37" + sha256: "1076f4b041f76143e14878c70f0758f17fe5910c0cd992db9e93bd3c3584512b" url: "https://pub.dev" source: hosted - version: "3.10.8" + version: "4.3.2" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web - sha256: "019cd7eee74254d33fbd2e29229367ce33063516bf6b3258a341d89e3b0f1655" + sha256: "8f6dd64ea6d28b7f5b9e739d183a9e1c7f17027794a3e9aba1879621d42426ef" url: "https://pub.dev" source: hosted - version: "0.5.7+7" + version: "0.5.10+8" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "26de145bb9688a90962faec6f838247377b0b0d32cc0abecd9a4e43525fc856c" + sha256: "93dc4dd12f9b02c5767f235307f609e61ed9211047132d07f9e02c668f0bfc33" url: "https://pub.dev" source: hosted - version: "2.32.0" + version: "3.11.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - sha256: f7d7180c7f99babd4b4c517754d41a09a4943a0f7a69b65c894ca5c68ba66315 + sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf url: "https://pub.dev" source: hosted - version: "5.2.1" + version: "5.4.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: f4ee170441ca141c5f9ee5ad8737daba3ee9c8e7efb6902aee90b4fbd178ce25 + sha256: "0e13c80f0de8acaa5d0519cbe23c8b4cc138a2d5d508b5755c861bdfc9762678" url: "https://pub.dev" source: hosted - version: "2.18.0" + version: "2.20.0" firebase_crashlytics: dependency: "direct main" description: name: firebase_crashlytics - sha256: "9897c01efaa950d2f6da8317d12452749a74dc45f33b46390a14cfe28067f271" + sha256: "6273ed71bcd8a6fb4d0ca13d3abddbb3301796807efaad8782b5f90156f26f03" url: "https://pub.dev" source: hosted - version: "3.5.7" + version: "4.3.2" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: "16a71e08fbf6e00382816e1b13397898c29a54fa0ad969c2c2a3b82a704877f0" + sha256: "94f3986e1a10e5a883f2ad5e3d719aef98a8a0f9a49357f6e45b7d3696ea6a97" url: "https://pub.dev" source: hosted - version: "3.6.35" + version: "3.8.2" fixnum: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flare_flutter: dependency: "direct main" description: @@ -660,10 +660,15 @@ packages: dependency: "direct main" description: name: flutter_downloader - sha256: b6da5495b6258aa7c243d0f0a5281e3430b385bccac11cc508f981e653b25aa6 + sha256: "93a9ddbd561f8a3f5483b4189453fba145a0a1014a88143c96a966296b78a118" url: "https://pub.dev" source: hosted - version: "1.11.8" + version: "1.12.0" + flutter_driver: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_heatmap_calendar: dependency: "direct main" description: @@ -676,26 +681,26 @@ packages: dependency: "direct main" description: name: flutter_image_compress - sha256: "45a3071868092a61b11044c70422b04d39d4d9f2ef536f3c5b11fb65a1e7dd90" + sha256: "51d23be39efc2185e72e290042a0da41aed70b14ef97db362a6b5368d0523b27" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.0" flutter_image_compress_common: dependency: transitive description: name: flutter_image_compress_common - sha256: "7f79bc6c8a363063620b4e372fa86bc691e1cb28e58048cd38e030692fbd99ee" + sha256: c5c5d50c15e97dd7dc72ff96bd7077b9f791932f2076c5c5b6c43f2c88607bfb url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" flutter_image_compress_macos: dependency: transitive description: name: flutter_image_compress_macos - sha256: "26df6385512e92b3789dc76b613b54b55c457a7f1532e59078b04bf189782d47" + sha256: "20019719b71b743aba0ef874ed29c50747461e5e8438980dfa5c2031898f7337" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.3" flutter_image_compress_ohos: dependency: transitive description: @@ -716,18 +721,74 @@ packages: dependency: transitive description: name: flutter_image_compress_web - sha256: f02fe352b17f82b72f481de45add240db062a2585850bea1667e82cc4cd6c311 + sha256: b9b141ac7c686a2ce7bb9a98176321e1182c9074650e47bb140741a44b6f5a96 url: "https://pub.dev" source: hosted - version: "0.1.4+1" + version: "0.1.5" flutter_inappwebview: dependency: "direct main" description: name: flutter_inappwebview - sha256: d198297060d116b94048301ee6749cd2e7d03c1f2689783f52d210a6b7aba350 + sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5" + url: "https://pub.dev" + source: hosted + version: "6.1.5" + flutter_inappwebview_android: + dependency: transitive + description: + name: flutter_inappwebview_android + sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba" + url: "https://pub.dev" + source: hosted + version: "1.1.3" + flutter_inappwebview_internal_annotations: + dependency: transitive + description: + name: flutter_inappwebview_internal_annotations + sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + flutter_inappwebview_ios: + dependency: transitive + description: + name: flutter_inappwebview_ios + sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_macos: + dependency: transitive + description: + name: flutter_inappwebview_macos + sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1 url: "https://pub.dev" source: hosted - version: "5.8.0" + version: "1.1.2" + flutter_inappwebview_platform_interface: + dependency: transitive + description: + name: flutter_inappwebview_platform_interface + sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500 + url: "https://pub.dev" + source: hosted + version: "1.3.0+1" + flutter_inappwebview_web: + dependency: transitive + description: + name: flutter_inappwebview_web + sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_windows: + dependency: transitive + description: + name: flutter_inappwebview_windows + sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055" + url: "https://pub.dev" + source: hosted + version: "0.6.0" flutter_js: dependency: "direct main" description: @@ -788,10 +849,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1" + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "5.0.0" flutter_localizations: dependency: "direct main" description: flutter @@ -801,26 +862,26 @@ packages: dependency: "direct main" description: name: flutter_markdown - sha256: a23c41ee57573e62fc2190a1f36a0480c4d90bde3a8a8d7126e5d5992fb53fb7 + sha256: b3ff1ef5fb3924ee02b4d38b974ffae3969d50603e68787684ee9dd45f6f144a url: "https://pub.dev" source: hosted - version: "0.7.3+1" + version: "0.7.6+1" flutter_mobx: dependency: "direct main" description: name: flutter_mobx - sha256: "859fbf452fa9c2519d2700b125dd7fb14c508bbdd7fb65e26ca8ff6c92280e2e" + sha256: ba5e93467866a2991259dc51cffd41ef45f695c667c2b8e7b087bf24118b50fe url: "https://pub.dev" source: hosted - version: "2.2.1+1" + version: "2.3.0" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda" + sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e" url: "https://pub.dev" source: hosted - version: "2.0.22" + version: "2.0.24" flutter_reorderable_list: dependency: "direct main" description: @@ -833,10 +894,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: "7bdcbe0dc20a85f743bfc1a8ee940656d57beeccb0da44b0e2c8271535b61ae5" + sha256: "3292ad6085552987b8b3b9a7e5805567f4013372d302736b702801acb001ee00" url: "https://pub.dev" source: hosted - version: "2.0.0-dev.24" + version: "2.7.1" flutter_speed_dial: dependency: "direct main" description: @@ -866,10 +927,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" + sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b url: "https://pub.dev" source: hosted - version: "2.0.10+1" + version: "2.0.17" flutter_test: dependency: "direct dev" description: flutter @@ -900,18 +961,18 @@ packages: dependency: "direct main" description: name: fluttertoast - sha256: "95f349437aeebe524ef7d6c9bde3e6b4772717cf46a0eb6a3ceaddc740b297cc" + sha256: "8971efe7e59585e9149052e33718d84bca51e806f063d1467622b3dcb2878b6c" url: "https://pub.dev" source: hosted - version: "8.2.8" + version: "8.2.11" freezed: dependency: "direct dev" description: name: freezed - sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e" + sha256: "62b248b2dfb06ded10c84b713215b25aea020a5b08c32e801a974361557ebc3f" url: "https://pub.dev" source: hosted - version: "2.5.7" + version: "3.0.0-0.0.dev" freezed_annotation: dependency: "direct main" description: @@ -928,6 +989,11 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + fuchsia_remote_debug_protocol: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" fullscreen_window: dependency: "direct main" description: @@ -948,10 +1014,10 @@ packages: dependency: transitive description: name: glob - sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" gradient_widgets: dependency: "direct main" description: @@ -980,10 +1046,10 @@ packages: dependency: "direct main" description: name: html - sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" url: "https://pub.dev" source: hosted - version: "0.15.4" + version: "0.15.5" html_unescape: dependency: "direct main" description: @@ -996,10 +1062,10 @@ packages: dependency: "direct main" description: name: http - sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.3.0" http_client_helper: dependency: transitive description: @@ -1012,26 +1078,26 @@ packages: dependency: transitive description: name: http_multi_server - sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" http_parser: dependency: transitive description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.2" image: dependency: "direct main" description: name: image - sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" + sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6" url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.5.2" image_crop: dependency: "direct main" description: @@ -1045,10 +1111,15 @@ packages: dependency: "direct main" description: name: image_size_getter - sha256: f98c4246144e9b968899d2dfde69091e22a539bb64bc9b0bea51505fbb490e57 + sha256: "9a299e3af2ebbcfd1baf21456c3c884037ff524316c97d8e56035ea8fdf35653" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.4.0" + integration_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" intl: dependency: "direct main" description: @@ -1061,10 +1132,10 @@ packages: dependency: transitive description: name: io - sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" js: dependency: transitive description: @@ -1085,10 +1156,10 @@ packages: dependency: "direct dev" description: name: json_serializable - sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b + sha256: b0a98230538fe5d0b60a22fb6bf1b6cb03471b53e3324ff6069c591679dd59c9 url: "https://pub.dev" source: hosted - version: "6.8.0" + version: "6.9.3" kdtree: dependency: "direct main" description: @@ -1125,10 +1196,10 @@ packages: dependency: transitive description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "5.1.1" local_auth: dependency: "direct main" description: @@ -1141,18 +1212,18 @@ packages: dependency: transitive description: name: local_auth_android - sha256: e9a3c321e94359a552b1bdd0f98f79885f2b3e27234d270f9bef5cd82b29340c + sha256: "6763aaf8965f21822624cb2fd3c03d2a8b3791037b5efb0fe4b13e110f5afc92" url: "https://pub.dev" source: hosted - version: "1.0.44" + version: "1.0.46" local_auth_darwin: dependency: transitive description: name: local_auth_darwin - sha256: "7ba5738c874ca2b910d72385d00d2bebad9d4e807612936cf5e32bc01a048c71" + sha256: "630996cd7b7f28f5ab92432c4b35d055dd03a747bc319e5ffbb3c4806a3e50d2" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.3" local_auth_platform_interface: dependency: transitive description: @@ -1173,18 +1244,18 @@ packages: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" lottie: dependency: "direct main" description: name: lottie - sha256: "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b" + sha256: c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950 url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.3.1" macros: dependency: transitive description: @@ -1197,10 +1268,10 @@ packages: dependency: transitive description: name: markdown - sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + sha256: "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1" url: "https://pub.dev" source: hosted - version: "7.2.2" + version: "7.3.0" matcher: dependency: transitive description: @@ -1245,18 +1316,18 @@ packages: dependency: transitive description: name: mime - sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "2.0.0" mobx: dependency: transitive description: name: mobx - sha256: "63920b27b32ad1910adfe767ab1750e4c212e8923232a1f891597b362074ea5e" + sha256: bf1a90e5bcfd2851fc6984e20eef69557c65d9e4d0a88f5be4cf72c9819ce6b0 url: "https://pub.dev" source: hosted - version: "2.3.3+2" + version: "2.5.0" modal_bottom_sheet: dependency: "direct main" description: @@ -1293,74 +1364,74 @@ packages: dependency: "direct main" description: name: open_file - sha256: de371f549b1320a48980952473fae1903d4927975506534c8ea4643642eb5f98 + sha256: d17e2bddf5b278cb2ae18393d0496aa4f162142ba97d1a9e0c30d476adf99c0e url: "https://pub.dev" source: hosted - version: "3.5.3" + version: "3.5.10" open_file_android: dependency: transitive description: name: open_file_android - sha256: b5e1a2e9c5ea8e256b015403e94299039627c7205c2a5e6bb426c33235b6ca9a + sha256: "58141fcaece2f453a9684509a7275f231ac0e3d6ceb9a5e6de310a7dff9084aa" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.6" open_file_ios: dependency: transitive description: name: open_file_ios - sha256: "8d9c03495cf14ca70bdbf191894b822ba3b2629cc0046ee311cbbe504db66c44" + sha256: "02996f01e5f6863832068e97f8f3a5ef9b613516db6897f373b43b79849e4d07" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.3" open_file_linux: dependency: transitive description: name: open_file_linux - sha256: cd2088722048b9c40f8615c6d83005fe0726e0e447e9cdfb40c2b65477291f7d + sha256: d189f799eecbb139c97f8bc7d303f9e720954fa4e0fa1b0b7294767e5f2d7550 url: "https://pub.dev" source: hosted - version: "0.0.4" + version: "0.0.5" open_file_mac: dependency: transitive description: name: open_file_mac - sha256: "9d809f528cccc6dc9390caf50893eae9a6944e0f3b8a2558c7ad19e91c9244a1" + sha256: "1440b1e37ceb0642208cfeb2c659c6cda27b25187a90635c9d1acb7d0584d324" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.3" open_file_platform_interface: dependency: transitive description: name: open_file_platform_interface - sha256: "14c50efb1a9667cb96e4fa68d601e6ad348fe337b02789834029b37ae3631498" + sha256: "101b424ca359632699a7e1213e83d025722ab668b9fd1412338221bf9b0e5757" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.3" open_file_web: dependency: transitive description: name: open_file_web - sha256: ba35c6f38c21c2bb4268a80927bb828353dda0edfce92e274e0b9639e4f31360 + sha256: e3dbc9584856283dcb30aef5720558b90f88036360bd078e494ab80a80130c4f url: "https://pub.dev" source: hosted - version: "0.0.2" + version: "0.0.4" open_file_windows: dependency: transitive description: name: open_file_windows - sha256: "2f4318d2d3958ec8d63b6dd4430c15b1fcb2fe7a2113e83c734584501a5c6d81" + sha256: d26c31ddf935a94a1a3aa43a23f4fff8a5ff4eea395fe7a8cb819cf55431c875 url: "https://pub.dev" source: hosted - version: "0.0.2" + version: "0.0.3" package_config: dependency: transitive description: name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" path: dependency: "direct main" description: @@ -1373,34 +1444,34 @@ packages: dependency: transitive description: name: path_parsing - sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" path_provider: dependency: "direct main" description: name: path_provider - sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" + sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2" url: "https://pub.dev" source: hosted - version: "2.2.10" + version: "2.2.15" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 + sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" path_provider_linux: dependency: transitive description: @@ -1437,10 +1508,10 @@ packages: dependency: transitive description: name: permission_handler_android - sha256: "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa" + sha256: "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1" url: "https://pub.dev" source: hosted - version: "12.0.12" + version: "12.0.13" permission_handler_apple: dependency: transitive description: @@ -1453,10 +1524,10 @@ packages: dependency: transitive description: name: permission_handler_html - sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851 + sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24" url: "https://pub.dev" source: hosted - version: "0.1.3+2" + version: "0.1.3+5" permission_handler_platform_interface: dependency: transitive description: @@ -1485,10 +1556,10 @@ packages: dependency: "direct main" description: name: photo_view - sha256: "8036802a00bae2a78fc197af8a158e3e2f7b500561ed23b4c458107685e645bb" + sha256: "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e" url: "https://pub.dev" source: hosted - version: "0.14.0" + version: "0.15.0" pimp_my_button: dependency: "direct main" description: @@ -1522,6 +1593,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.9.3+7" + pointer_interceptor_ios: + dependency: "direct main" + description: + name: pointer_interceptor_ios + sha256: a6906772b3205b42c44614fcea28f818b1e5fdad73a4ca742a7bd49818d9c917 + url: "https://pub.dev" + source: hosted + version: "0.10.1" + pointer_interceptor_platform_interface: + dependency: "direct main" + description: + name: pointer_interceptor_platform_interface + sha256: "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506" + url: "https://pub.dev" + source: hosted + version: "0.10.0+1" + pointer_interceptor_web: + dependency: "direct main" + description: + name: pointer_interceptor_web + sha256: "7a7087782110f8c1827170660b09f8aa893e0e9a61431dbbe2ac3fc482e8c044" + url: "https://pub.dev" + source: hosted + version: "0.10.2+1" pointycastle: dependency: "direct main" description: @@ -1538,6 +1633,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" + posix: + dependency: transitive + description: + name: posix + sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a + url: "https://pub.dev" + source: hosted + version: "6.0.1" + process: + dependency: transitive + description: + name: process + sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" + url: "https://pub.dev" + source: hosted + version: "5.0.2" provider: dependency: "direct main" description: @@ -1550,34 +1661,34 @@ packages: dependency: transitive description: name: pub_semver - sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.5.0" pull_down_button: dependency: "direct main" description: name: pull_down_button - sha256: "48b928203afdeafa4a8be5dc96980523bc8a2ddbd04569f766071a722be22379" + sha256: "12cdd8ff187a3150ebdf075e5074299f085579b158d2b4e655ccbafccf95f25b" url: "https://pub.dev" source: hosted - version: "0.9.4" + version: "0.10.2" qs_dart: dependency: transitive description: name: qs_dart - sha256: "8dddeaf1d32fe407e253840b2c25c9ab5bf347d2761d82cb4ce010096565c9ff" + sha256: "98a068f7224fe17b68028dbbd43dd48a6049d2de2175f50b2fad2e08f2811f0e" url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.3.2" recase: dependency: transitive description: @@ -1621,26 +1732,26 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051" + sha256: "688ee90fbfb6989c980254a56cb26ebe9bb30a3a2dff439a78894211f73de67a" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.5.1" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e" + sha256: "650584dcc0a39856f369782874e562efd002a9c94aec032412c9eb81419cce1f" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.4" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f + sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03" url: "https://pub.dev" source: hosted - version: "2.5.2" + version: "2.5.4" shared_preferences_linux: dependency: transitive description: @@ -1677,18 +1788,18 @@ packages: dependency: transitive description: name: shelf - sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.4.2" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.0.1" sky_engine: dependency: transitive description: flutter @@ -1698,18 +1809,18 @@ packages: dependency: transitive description: name: source_gen - sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b" url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "2.0.0" source_helper: dependency: transitive description: name: source_helper - sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c" url: "https://pub.dev" source: hosted - version: "1.3.4" + version: "1.3.5" source_span: dependency: transitive description: @@ -1730,42 +1841,66 @@ packages: dependency: "direct main" description: name: sqflite - sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d + sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb" url: "https://pub.dev" source: hosted - version: "2.3.3+1" + version: "2.4.1" + sqflite_android: + dependency: transitive + description: + name: sqflite_android + sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3" + url: "https://pub.dev" + source: hosted + version: "2.4.0" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "4058172e418eb7e7f2058dcb7657d451a8fc264afa0dea4dbd0f304a57131611" + sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709" url: "https://pub.dev" source: hosted - version: "2.5.4+3" + version: "2.5.4+6" sqflite_common_ffi: dependency: "direct dev" description: name: sqflite_common_ffi - sha256: "4d6137c29e930d6e4a8ff373989dd9de7bac12e3bc87bce950f6e844e8ad3bb5" + sha256: "883dd810b2b49e6e8c3b980df1829ef550a94e3f87deab5d864917d27ca6bf36" + url: "https://pub.dev" + source: hosted + version: "2.3.4+4" + sqflite_darwin: + dependency: transitive + description: + name: sqflite_darwin + sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c" + url: "https://pub.dev" + source: hosted + version: "2.4.1+1" + sqflite_platform_interface: + dependency: transitive + description: + name: sqflite_platform_interface + sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.4.0" sqlite3: dependency: transitive description: name: sqlite3 - sha256: "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb" + sha256: decd58236d7c59e01ae81b34ebd158e6a1b61e0ae5397fc428736eb91ab82808 url: "https://pub.dev" source: hosted - version: "2.4.6" + version: "2.7.3" sqlite3_flutter_libs: dependency: "direct main" description: name: sqlite3_flutter_libs - sha256: "7ae52b23366e5295005022e62fa093f64bfe190810223ea0ebf733a4cd140bce" + sha256: "57fafacd815c981735406215966ff7caaa8eab984b094f52e692accefcbd9233" url: "https://pub.dev" source: hosted - version: "0.5.26" + version: "0.5.30" stack_trace: dependency: transitive description: @@ -1794,10 +1929,10 @@ packages: dependency: transitive description: name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -1810,10 +1945,10 @@ packages: dependency: "direct dev" description: name: swagger_dart_code_generator - sha256: "73dedc94da13ee4c7259cb60411ccf699789eeceb842a493e025afbca808bb99" + sha256: e6fab279c2adb3f91aa170c9126601d22e1485217dddc1443cf3c05eb6480d45 url: "https://pub.dev" source: hosted - version: "2.15.2" + version: "3.0.1" sync_http: dependency: transitive description: @@ -1826,10 +1961,10 @@ packages: dependency: "direct main" description: name: synchronized - sha256: "51b08572b9f091f8c3eb4d9d4be253f196ff0075d5ec9b10a884026d5b55d7bc" + sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" url: "https://pub.dev" source: hosted - version: "3.3.0+2" + version: "3.3.0+3" term_glyph: dependency: transitive description: @@ -1858,18 +1993,18 @@ packages: dependency: transitive description: name: timing - sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" typed_data: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" uni_links: dependency: "direct main" description: @@ -1906,42 +2041,42 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" + sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603" url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab + sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193" url: "https://pub.dev" source: hosted - version: "6.3.10" + version: "6.3.14" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e + sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626" url: "https://pub.dev" source: hosted - version: "6.3.1" + version: "6.3.2" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af + sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" + sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.2" url_launcher_platform_interface: dependency: transitive description: @@ -1954,50 +2089,50 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" + sha256: "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.4.0" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" + sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.4" uuid: dependency: "direct main" description: name: uuid - sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77 + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.5.1" vector_graphics: dependency: transitive description: name: vector_graphics - sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + sha256: "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.18" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da + sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.13" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" + sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.16" vector_math: dependency: transitive description: @@ -2026,26 +2161,26 @@ packages: dependency: transitive description: name: watcher - sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" weak_map: dependency: transitive description: name: weak_map - sha256: "95ca338f0cdf5f0022cc283dfa4d97f6f6b03752f67eca85ebe6d7a679ffe3ed" + sha256: "5f8e5d5ce57dc624db5fae814dd689ccae1f17f92b426e52f0a7cbe7f6f4ab97" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "4.0.1" web: dependency: transitive description: name: web - sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" web_socket: dependency: transitive description: @@ -2058,50 +2193,58 @@ packages: dependency: transitive description: name: web_socket_channel - sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" + sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" + webdriver: + dependency: transitive + description: + name: webdriver + sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8" + url: "https://pub.dev" + source: hosted + version: "3.0.4" webview_flutter: dependency: "direct main" description: name: webview_flutter - sha256: "392c1d83b70fe2495de3ea2c84531268d5b8de2de3f01086a53334d8b6030a88" + sha256: "889a0a678e7c793c308c68739996227c9661590605e70b1f6cf6b9a6634f7aec" url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "4.10.0" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: "8b3b2450e98876c70bfcead876d9390573b34b9418c19e28168b74f6cb252dbd" + sha256: "5568f17a9c25c0fdd0737900fa1c2d1fee2d780bc212d9aec10c2d1f48ef0f59" url: "https://pub.dev" source: hosted - version: "2.10.4" + version: "4.3.1" webview_flutter_platform_interface: dependency: transitive description: name: webview_flutter_platform_interface - sha256: "812165e4e34ca677bdfbfa58c01e33b27fd03ab5fa75b70832d4b7d4ca1fa8cf" + sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d url: "https://pub.dev" source: hosted - version: "1.9.5" + version: "2.10.0" webview_flutter_wkwebview: dependency: transitive description: name: webview_flutter_wkwebview - sha256: a5364369c758892aa487cbf59ea41d9edd10f9d9baf06a94e80f1bd1b4c7bbc0 + sha256: "8e0593559bfecd35eb1757d6907ed6b995a41ef82607d6113df897c2805ce6be" url: "https://pub.dev" source: hosted - version: "2.9.5" + version: "3.18.0" win32: dependency: transitive description: name: win32 - sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" + sha256: daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e url: "https://pub.dev" source: hosted - version: "5.5.4" + version: "5.10.1" win32_registry: dependency: transitive description: @@ -2114,10 +2257,10 @@ packages: dependency: transitive description: name: xdg_directories - sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.1.0" xml: dependency: transitive description: @@ -2130,10 +2273,10 @@ packages: dependency: transitive description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" sdks: - dart: ">=3.5.2 <4.0.0" - flutter: ">=3.24.2" + dart: ">=3.6.0 <4.0.0" + flutter: ">=3.27.0" diff --git a/violet/pubspec.yaml b/violet/pubspec.yaml index b29113769..8715d7535 100644 --- a/violet/pubspec.yaml +++ b/violet/pubspec.yaml @@ -30,17 +30,17 @@ dependencies: cupertino_icons: ^1.0.5 # I know there are too many packages. - android_intent_plus: ^3.1.0 + android_intent_plus: ^5.3.0 animated_widgets: ^1.1.0 animations: - apple_pencil_double_tap: ^0.0.2 - archive: ^3.6.1 + apple_pencil_double_tap: ^0.1.0 + archive: ^4.0.2 async: auto_animated: ^3.0.1 azlistview: git: https://github.com/violet-dev/azlistview badges: ^3.1.2 - bloc: ^8.1.2 + bloc: ^9.0.0 bubble_tab_indicator: ^0.1.6 # cached_network_image: ^3.0.0 cached_network_image: ^3.2.1 @@ -53,7 +53,6 @@ dependencies: # path: charts_flutter # charts_flutter: ^0.12.0 community_charts_flutter: ^1.0.1 - connectivity_plus: ^6.0.5 convert: country_pickers: git: @@ -61,7 +60,7 @@ dependencies: ref: 4b21a901ed3890f3a8aa5637a1eaa87a9a79afd2 crypto: # device_info: ^2.0.0 - device_info_plus: ^10.1.2 + device_info_plus: ^11.3.0 dio: ^5.0.0 dio_cache_interceptor: ^3.3.1 draggable_scrollbar: @@ -74,9 +73,9 @@ dependencies: extended_wrap: ^0.1.5 ffi: ^2.0.2 file_picker: ^8.1.2 - firebase_core: ^2.5.0 - firebase_analytics: ^10.1.1 - firebase_crashlytics: ^3.0.12 + firebase_core: ^3.11.0 + firebase_analytics: ^11.4.2 + firebase_crashlytics: ^4.3.2 # flare_dart: flare_flutter: git: @@ -91,11 +90,11 @@ dependencies: flutter_downloader: ^1.11.3 flutter_heatmap_calendar: ^1.0.5 flutter_image_compress: ^2.0.4 - flutter_inappwebview: ^5.8.0 + flutter_inappwebview: ^6.1.5 flutter_markdown: flutter_mobx: flutter_reorderable_list: - flutter_keyboard_visibility: ^5.1.1 + flutter_keyboard_visibility: ^5.4.1 flutter_speed_dial: ^7.0.0 flutter_staggered_animations: git: https://github.com/mfrischbutter/flutter_staggered_animations @@ -127,17 +126,16 @@ dependencies: path: path_provider: ^2.1.4 permission_handler: ^11.0.1 - photo_view: ^0.14.0 + photo_view: ^0.15.0 platform: ^3.1.0 pimp_my_button: git: https://github.com/MichaelMarner/pimp_my_button - pull_down_button: ^0.9.3 + pull_down_button: ^0.10.2 pointycastle: provider: ^6.0.2 # scrollable_positioned_list: ^0.3.2 shared_preferences: ^2.0.15 sqflite: ^2.0.2 - sqlite3_flutter_libs: ^0.5.24 sticky_headers: "^0.3.0" synchronized: timeago: @@ -145,25 +143,32 @@ dependencies: url_launcher: ^6.1.10 uuid: # wakelock: ^0.6.2 - webview_flutter: ^3.0.0 + webview_flutter: ^4.10.0 collection: ^1.16.0 octo_image: ^2.0.0 rust_lib_violet: path: rust_builder - flutter_rust_bridge: 2.0.0-dev.24 + flutter_rust_bridge: 2.7.1 json_annotation: ^4.9.0 + connectivity_plus: ^6.1.3 + sqlite3_flutter_libs: ^0.5.30 + pointer_interceptor_ios: ^0.10.1 + pointer_interceptor_platform_interface: ^0.10.0+1 + pointer_interceptor_web: ^0.10.2+1 dev_dependencies: flutter_test: sdk: flutter build_runner: ^2.4.4 json_serializable: ^6.8.0 - freezed: ^2.5.2 + freezed: ^3.0.0-0.0.dev drift_sqflite: ^2.0.0 sqflite_common_ffi: - flutter_lints: ^3.0.0 + flutter_lints: ^5.0.0 chopper_generator: ^8.0.0 - swagger_dart_code_generator: ^2.10.4 + swagger_dart_code_generator: ^3.0.1 + integration_test: + sdk: flutter dependency_overrides: intl: ^0.18.1 diff --git a/violet/rust/Cargo.lock b/violet/rust/Cargo.lock index 8c482b1be..2472d66ea 100644 --- a/violet/rust/Cargo.lock +++ b/violet/rust/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "allo-isolate" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f5a5fd28223e6f3cafb7d9cd685f51eafdd71d33ca1229f8316925d5957240" +checksum = "1f67642eb6773fb42a95dd3b348c305ee18dee6642274c6b412d67e985e3befc" dependencies = [ "anyhow", "atomic", @@ -211,10 +211,10 @@ dependencies = [ ] [[package]] -name = "dart-sys-fork" -version = "4.1.1" +name = "dart-sys" +version = "4.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dafff26172b719bb9695dd3715a1e7792f62dcdc8a5d4c740db7e0fedee8b" +checksum = "57967e4b200d767d091b961d6ab42cc7d0cc14fe9e052e75d0d3cf9eb732d895" dependencies = [ "cc", ] @@ -294,9 +294,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.0.0-dev.24" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610e046fae4b0b21210e67b212f3a97ccfd454976e8ef74634d641a2ce9a7075" +checksum = "131b0bebc810a966ead8541d5911ab4815b1c227e8bdc91a6c21e3b4f69427fb" dependencies = [ "allo-isolate", "android_logger", @@ -305,13 +305,15 @@ dependencies = [ "bytemuck", "byteorder", "console_error_panic_hook", - "dart-sys-fork", + "dart-sys", "delegate-attr", "flutter_rust_bridge_macros", "futures", "js-sys", "lazy_static", + "log", "oslog", + "portable-atomic", "threadpool", "tokio", "wasm-bindgen", @@ -321,9 +323,16 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.0.0-dev.24" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa90b2229a73f1aac282856e7870d11c8d1117285c8f6d7142de581497277825" +checksum = "2610593cdcdd7073d790f45ece3d336ba86bc90fa5a6eaee2ae9d6721a7d481d" +dependencies = [ + "hex", + "md-5", + "proc-macro2", + "quote", + "syn", +] [[package]] name = "futures" @@ -436,12 +445,19 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -472,6 +488,16 @@ dependencies = [ "byteorder", ] +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + [[package]] name = "memchr" version = "2.6.4" @@ -560,6 +586,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "portable-atomic" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" + [[package]] name = "powerfmt" version = "0.2.0" @@ -637,6 +669,12 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +[[package]] +name = "rustversion" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + [[package]] name = "serde" version = "1.0.196" @@ -775,23 +813,24 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -800,21 +839,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -822,9 +862,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -835,15 +875,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/violet/rust/Cargo.toml b/violet/rust/Cargo.toml index 06622a924..3ad6c7f7c 100644 --- a/violet/rust/Cargo.toml +++ b/violet/rust/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" crate-type = ["cdylib", "staticlib"] [dependencies] -flutter_rust_bridge = "=2.0.0-dev.24" +flutter_rust_bridge = "=2.7.1" sevenz-rust = { version = "0.6.1" } [dev-dependencies] diff --git a/violet/rust/src/frb_generated.rs b/violet/rust/src/frb_generated.rs index d21cf486a..0003e6db3 100644 --- a/violet/rust/src/frb_generated.rs +++ b/violet/rust/src/frb_generated.rs @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.24. +// @generated by `flutter_rust_bridge`@ 2.7.1. #![allow( non_camel_case_types, @@ -14,13 +14,19 @@ clippy::double_parens, clippy::let_and_return, clippy::too_many_arguments, - clippy::match_single_binding + clippy::match_single_binding, + clippy::clone_on_copy, + clippy::let_unit_value, + clippy::deref_addrof, + clippy::explicit_auto_deref, + clippy::borrow_deref_ref, + clippy::needless_borrow )] // Section: imports use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt}; -use flutter_rust_bridge::for_generated::transform_result_dco; +use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable}; use flutter_rust_bridge::{Handler, IntoIntoDart}; // Section: boilerplate @@ -30,7 +36,8 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueMoi, default_rust_auto_opaque = RustAutoOpaqueMoi, ); -const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.24"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.7.1"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = -1884772811; // Section: executor @@ -38,7 +45,7 @@ flutter_rust_bridge::frb_generated_default_handler!(); // Section: wire_funcs -fn wire_decompress_7z_impl( +fn wire__crate__api__simple__decompress_7z_impl( port_: flutter_rust_bridge::for_generated::MessagePort, ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr, rust_vec_len_: i32, @@ -64,11 +71,12 @@ fn wire_decompress_7z_impl( let api_dest = ::sse_decode(&mut deserializer); deserializer.end(); move |context| async move { - transform_result_sse( + transform_result_sse::<_, ()>( (move || async move { - Result::<_, ()>::Ok( - crate::api::simple::decompress_7z(api_src, api_dest).await, - ) + let output_ok = Result::<_, ()>::Ok({ + crate::api::simple::decompress_7z(api_src, api_dest).await; + })?; + Ok(output_ok) })() .await, ) @@ -76,16 +84,17 @@ fn wire_decompress_7z_impl( }, ) } -fn wire_greet_impl( +fn wire__crate__api__simple__greet_impl( + port_: flutter_rust_bridge::for_generated::MessagePort, ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr, rust_vec_len_: i32, data_len_: i32, -) -> flutter_rust_bridge::for_generated::WireSyncRust2DartSse { - FLUTTER_RUST_BRIDGE_HANDLER.wrap_sync::( +) { + FLUTTER_RUST_BRIDGE_HANDLER.wrap_normal::( flutter_rust_bridge::for_generated::TaskInfo { debug_name: "greet", - port: None, - mode: flutter_rust_bridge::for_generated::FfiCallMode::Sync, + port: Some(port_), + mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal, }, move || { let message = unsafe { @@ -99,13 +108,16 @@ fn wire_greet_impl( flutter_rust_bridge::for_generated::SseDeserializer::new(message); let api_name = ::sse_decode(&mut deserializer); deserializer.end(); - transform_result_sse((move || { - Result::<_, ()>::Ok(crate::api::simple::greet(api_name)) - })()) + move |context| { + transform_result_sse::<_, ()>((move || { + let output_ok = Result::<_, ()>::Ok(crate::api::simple::greet(api_name))?; + Ok(output_ok) + })()) + } }, ) } -fn wire_init_app_impl( +fn wire__crate__api__simple__init_app_impl( port_: flutter_rust_bridge::for_generated::MessagePort, ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr, rust_vec_len_: i32, @@ -129,9 +141,12 @@ fn wire_init_app_impl( flutter_rust_bridge::for_generated::SseDeserializer::new(message); deserializer.end(); move |context| { - transform_result_sse( - (move || Result::<_, ()>::Ok(crate::api::simple::init_app()))(), - ) + transform_result_sse::<_, ()>((move || { + let output_ok = Result::<_, ()>::Ok({ + crate::api::simple::init_app(); + })?; + Ok(output_ok) + })()) } }, ) @@ -194,8 +209,9 @@ fn pde_ffi_dispatcher_primary_impl( ) { // Codec=Pde (Serialization + dispatch), see doc to use other codecs match func_id { - 3 => wire_decompress_7z_impl(port, ptr, rust_vec_len, data_len), - 1 => wire_init_app_impl(port, ptr, rust_vec_len, data_len), + 1 => wire__crate__api__simple__decompress_7z_impl(port, ptr, rust_vec_len, data_len), + 2 => wire__crate__api__simple__greet_impl(port, ptr, rust_vec_len, data_len), + 3 => wire__crate__api__simple__init_app_impl(port, ptr, rust_vec_len, data_len), _ => unreachable!(), } } @@ -208,7 +224,6 @@ fn pde_ffi_dispatcher_sync_impl( ) -> flutter_rust_bridge::for_generated::WireSyncRust2DartSse { // Codec=Pde (Serialization + dispatch), see doc to use other codecs match func_id { - 2 => wire_greet_impl(ptr, rust_vec_len, data_len), _ => unreachable!(), } } @@ -259,14 +274,46 @@ impl SseEncode for bool { } #[cfg(not(target_family = "wasm"))] -#[path = "frb_generated.io.rs"] -mod io; +mod io { + // This file is automatically generated, so please do not edit it. + // @generated by `flutter_rust_bridge`@ 2.7.1. + + // Section: imports + + use super::*; + use flutter_rust_bridge::for_generated::byteorder::{ + NativeEndian, ReadBytesExt, WriteBytesExt, + }; + use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable}; + use flutter_rust_bridge::{Handler, IntoIntoDart}; + + // Section: boilerplate + + flutter_rust_bridge::frb_generated_boilerplate_io!(); +} #[cfg(not(target_family = "wasm"))] pub use io::*; /// cbindgen:ignore #[cfg(target_family = "wasm")] -#[path = "frb_generated.web.rs"] -mod web; +mod web { + // This file is automatically generated, so please do not edit it. + // @generated by `flutter_rust_bridge`@ 2.7.1. + + // Section: imports + + use super::*; + use flutter_rust_bridge::for_generated::byteorder::{ + NativeEndian, ReadBytesExt, WriteBytesExt, + }; + use flutter_rust_bridge::for_generated::wasm_bindgen; + use flutter_rust_bridge::for_generated::wasm_bindgen::prelude::*; + use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable}; + use flutter_rust_bridge::{Handler, IntoIntoDart}; + + // Section: boilerplate + + flutter_rust_bridge::frb_generated_boilerplate_web!(); +} #[cfg(target_family = "wasm")] pub use web::*; diff --git a/violet/rust_builder/cargokit/build_pod.sh b/violet/rust_builder/cargokit/build_pod.sh old mode 100644 new mode 100755 diff --git a/violet/rust_builder/cargokit/run_build_tool.cmd b/violet/rust_builder/cargokit/run_build_tool.cmd old mode 100644 new mode 100755 diff --git a/violet/test_driver/integration_test.dart b/violet/test_driver/integration_test.dart new file mode 100644 index 000000000..b38629cca --- /dev/null +++ b/violet/test_driver/integration_test.dart @@ -0,0 +1,3 @@ +import 'package:integration_test/integration_test_driver.dart'; + +Future main() => integrationDriver(); diff --git a/violet/windows/flutter/generated_plugin_registrant.cc b/violet/windows/flutter/generated_plugin_registrant.cc index 9bcdbcae5..40dd7e54a 100644 --- a/violet/windows/flutter/generated_plugin_registrant.cc +++ b/violet/windows/flutter/generated_plugin_registrant.cc @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -20,6 +21,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin")); FirebaseCorePluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FirebaseCorePluginCApi")); + FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi")); FlutterJsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterJsPlugin")); FullscreenWindowPluginCApiRegisterWithRegistrar( diff --git a/violet/windows/flutter/generated_plugins.cmake b/violet/windows/flutter/generated_plugins.cmake index 475375b94..b33e3e96b 100644 --- a/violet/windows/flutter/generated_plugins.cmake +++ b/violet/windows/flutter/generated_plugins.cmake @@ -5,6 +5,7 @@ list(APPEND FLUTTER_PLUGIN_LIST connectivity_plus firebase_core + flutter_inappwebview_windows flutter_js fullscreen_window local_auth_windows