From 62d90eac9447ac9a582e3f39149e5e9542147411 Mon Sep 17 00:00:00 2001 From: Chen Asraf Date: Thu, 27 Oct 2022 19:23:22 +0300 Subject: [PATCH] chore: upgrade flutter version --- .metadata | 30 +- analysis_options.yaml | 2 +- .../app/dungeon_paper_2/MainActivity.kt | 6 + ios/Podfile.lock | 322 +++++++++--------- lib/app/data/services/user_service.dart | 3 +- .../views/ability_scores_form_view.dart | 2 +- lib/app/modules/About/views/about_view.dart | 10 +- .../modules/Account/views/account_view.dart | 4 +- .../views/basic_info_form_view.dart | 2 +- .../views/bonds_flags_form_view.dart | 4 +- .../views/select_moves_spells_view.dart | 2 +- lib/app/modules/Home/views/home_nav_bar.dart | 3 +- lib/app/modules/Home/views/home_view.dart | 8 +- .../LibraryList/views/library_card_list.dart | 4 +- .../views/library_collection_view.dart | 2 +- lib/app/modules/Login/views/login_view.dart | 4 +- .../Migration/views/migration_view.dart | 6 +- .../views/select_character_theme_view.dart | 4 +- .../modules/Settings/views/settings_view.dart | 4 +- lib/app/themes/button_themes.dart | 4 +- lib/app/themes/theme_utils.dart | 27 +- .../advanced_floating_action_button.dart | 2 +- lib/app/widgets/atoms/character_avatar.dart | 2 +- .../widgets/atoms/custom_expansion_tile.dart | 8 +- lib/app/widgets/atoms/custom_list_tile.dart | 20 +- lib/app/widgets/atoms/help_text.dart | 4 +- lib/app/widgets/atoms/hyperlink.dart | 4 +- .../widgets/cards/dynamic_action_card.dart | 10 +- .../cards/dynamic_action_card_mini.dart | 2 +- .../widgets/dialogs/character_bio_dialog.dart | 12 +- .../dialogs/character_bonds_flags_dialog.dart | 4 +- lib/app/widgets/dialogs/view_tag_dialog.dart | 6 +- lib/app/widgets/menus/entity_edit_menu.dart | 4 +- .../widgets/molecules/character_subtitle.dart | 2 +- .../widgets/molecules/chip_list_input.dart | 2 +- .../widgets/molecules/user_menu_popover.dart | 2 +- .../molecules/value_change_slider.dart | 4 +- lib/app/widgets/views/roll_dice_view.dart | 5 +- lib/core/utils/markdown_styles.dart | 12 +- macos/Podfile | 2 +- macos/Podfile.lock | 310 ++++++++--------- macos/Runner.xcodeproj/project.pbxproj | 5 +- pubspec.lock | 209 ++++++------ pubspec.yaml | 14 +- 44 files changed, 544 insertions(+), 554 deletions(-) create mode 100644 android/app/src/main/kotlin/app/dungeon_paper_2/MainActivity.kt diff --git a/.metadata b/.metadata index 76c83415..097232d7 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: bcea432bce54a83306b3c00a7ad0ed98f777348d + revision: 71520442d4d0d41b2d158c519928d90ddab3766f channel: beta project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d - base_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d + create_revision: 71520442d4d0d41b2d158c519928d90ddab3766f + base_revision: 71520442d4d0d41b2d158c519928d90ddab3766f - platform: android - create_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d - base_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d + create_revision: 71520442d4d0d41b2d158c519928d90ddab3766f + base_revision: 71520442d4d0d41b2d158c519928d90ddab3766f - platform: ios - create_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d - base_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d + create_revision: 71520442d4d0d41b2d158c519928d90ddab3766f + base_revision: 71520442d4d0d41b2d158c519928d90ddab3766f - platform: linux - create_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d - base_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d + create_revision: 71520442d4d0d41b2d158c519928d90ddab3766f + base_revision: 71520442d4d0d41b2d158c519928d90ddab3766f - platform: macos - create_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d - base_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d + create_revision: 71520442d4d0d41b2d158c519928d90ddab3766f + base_revision: 71520442d4d0d41b2d158c519928d90ddab3766f - platform: web - create_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d - base_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d + create_revision: 71520442d4d0d41b2d158c519928d90ddab3766f + base_revision: 71520442d4d0d41b2d158c519928d90ddab3766f - platform: windows - create_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d - base_revision: bcea432bce54a83306b3c00a7ad0ed98f777348d + create_revision: 71520442d4d0d41b2d158c519928d90ddab3766f + base_revision: 71520442d4d0d41b2d158c519928d90ddab3766f # User provided section diff --git a/analysis_options.yaml b/analysis_options.yaml index af28f9b9..43091fa7 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -25,6 +25,6 @@ linter: # avoid_print: false # Uncomment to disable the `avoid_print` rule prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule avoid_renaming_method_parameters: false - todo: false + # flutter_style_todos: false # Additional information about this file can be found at # https://dart.dev/guides/language/analysis-options diff --git a/android/app/src/main/kotlin/app/dungeon_paper_2/MainActivity.kt b/android/app/src/main/kotlin/app/dungeon_paper_2/MainActivity.kt new file mode 100644 index 00000000..ce6a2443 --- /dev/null +++ b/android/app/src/main/kotlin/app/dungeon_paper_2/MainActivity.kt @@ -0,0 +1,6 @@ +package app.dungeon_paper_2 + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/ios/Podfile.lock b/ios/Podfile.lock index c0be6d20..867f79eb 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -596,11 +596,11 @@ PODS: - abseil/base/base_internal - abseil/base/config - abseil/meta/type_traits - - AppAuth (1.5.0): - - AppAuth/Core (= 1.5.0) - - AppAuth/ExternalUserAgent (= 1.5.0) - - AppAuth/Core (1.5.0) - - AppAuth/ExternalUserAgent (1.5.0): + - AppAuth (1.6.0): + - AppAuth/Core (= 1.6.0) + - AppAuth/ExternalUserAgent (= 1.6.0) + - AppAuth/Core (1.6.0) + - AppAuth/ExternalUserAgent (1.6.0): - AppAuth/Core - BoringSSL-GRPC (0.0.24): - BoringSSL-GRPC/Implementation (= 0.0.24) @@ -608,104 +608,99 @@ PODS: - BoringSSL-GRPC/Implementation (0.0.24): - BoringSSL-GRPC/Interface (= 0.0.24) - BoringSSL-GRPC/Interface (0.0.24) - - cloud_firestore (3.4.3): - - Firebase/Firestore (= 9.3.0) + - cloud_firestore (4.0.3): + - Firebase/Firestore (= 10.0.0) - firebase_core - Flutter - - Firebase/Analytics (9.3.0): + - nanopb (< 2.30910.0, >= 2.30908.0) + - Firebase/Analytics (10.0.0): - Firebase/Core - - Firebase/Auth (9.3.0): + - Firebase/Auth (10.0.0): - Firebase/CoreOnly - - FirebaseAuth (~> 9.3.0) - - Firebase/Core (9.3.0): + - FirebaseAuth (~> 10.0.0) + - Firebase/Core (10.0.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 9.3.0) - - Firebase/CoreOnly (9.3.0): - - FirebaseCore (= 9.3.0) - - Firebase/Crashlytics (9.3.0): + - FirebaseAnalytics (~> 10.0.0) + - Firebase/CoreOnly (10.0.0): + - FirebaseCore (= 10.0.0) + - Firebase/Crashlytics (10.0.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 9.3.0) - - Firebase/Firestore (9.3.0): + - FirebaseCrashlytics (~> 10.0.0) + - Firebase/Firestore (10.0.0): - Firebase/CoreOnly - - FirebaseFirestore (~> 9.3.0) - - Firebase/RemoteConfig (9.3.0): + - FirebaseFirestore (~> 10.0.0) + - Firebase/RemoteConfig (10.0.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 9.3.0) - - Firebase/Storage (9.3.0): + - FirebaseRemoteConfig (~> 10.0.0) + - Firebase/Storage (10.0.0): - Firebase/CoreOnly - - FirebaseStorage (~> 9.3.0) - - firebase_analytics (9.3.0): - - Firebase/Analytics (= 9.3.0) + - FirebaseStorage (~> 10.0.0) + - firebase_analytics (10.0.3): + - Firebase/Analytics (= 10.0.0) - firebase_core - Flutter - - firebase_auth (3.6.2): - - Firebase/Auth (= 9.3.0) + - firebase_auth (4.1.0): + - Firebase/Auth (= 10.0.0) - firebase_core - Flutter - - firebase_core (1.20.0): - - Firebase/CoreOnly (= 9.3.0) + - firebase_core (2.1.1): + - Firebase/CoreOnly (= 10.0.0) - Flutter - - firebase_crashlytics (2.8.6): - - Firebase/Crashlytics (= 9.3.0) + - firebase_crashlytics (3.0.3): + - Firebase/Crashlytics (= 10.0.0) - firebase_core - Flutter - - firebase_remote_config (2.0.13): - - Firebase/RemoteConfig (= 9.3.0) + - firebase_remote_config (3.0.3): + - Firebase/RemoteConfig (= 10.0.0) - firebase_core - Flutter - - firebase_storage (10.3.4): - - Firebase/Storage (= 9.3.0) + - firebase_storage (11.0.3): + - Firebase/Storage (= 10.0.0) - firebase_core - Flutter - - FirebaseABTesting (9.4.0): - - FirebaseCore (~> 9.0) - - FirebaseAnalytics (9.3.0): - - FirebaseAnalytics/AdIdSupport (= 9.3.0) - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseABTesting (10.0.0): + - FirebaseCore (~> 10.0) + - FirebaseAnalytics (10.0.0): + - FirebaseAnalytics/AdIdSupport (= 10.0.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleAppMeasurement (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseAnalytics/AdIdSupport (10.0.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleAppMeasurement (= 10.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAppCheckInterop (9.4.0) - - FirebaseAuth (9.3.0): - - FirebaseCore (~> 9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/Environment (~> 7.7) - - GTMSessionFetcher/Core (< 3.0, >= 1.7) - - FirebaseAuthInterop (9.4.0) - - FirebaseCore (9.3.0): - - FirebaseCoreDiagnostics (~> 9.0) - - FirebaseCoreInternal (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (9.4.0): - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCoreExtension (9.4.0): - - FirebaseCore (~> 9.0) - - FirebaseCoreInternal (9.4.0): - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseCrashlytics (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) + - FirebaseAppCheckInterop (10.0.0) + - FirebaseAuth (10.0.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/Environment (~> 7.8) + - GTMSessionFetcher/Core (~> 2.1) + - FirebaseAuthInterop (10.0.0) + - FirebaseCore (10.0.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreExtension (10.0.0): + - FirebaseCore (~> 10.0) + - FirebaseCoreInternal (10.0.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseCrashlytics (10.0.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (~> 2.1) - - FirebaseFirestore (9.3.0): + - FirebaseFirestore (10.0.0): - abseil/algorithm (~> 1.20211102.0) - abseil/base (~> 1.20211102.0) - abseil/container/flat_hash_map (~> 1.20211102.0) @@ -714,30 +709,27 @@ PODS: - abseil/strings/strings (~> 1.20211102.0) - abseil/time (~> 1.20211102.0) - abseil/types (~> 1.20211102.0) - - FirebaseCore (~> 9.0) + - FirebaseCore (~> 10.0) - "gRPC-C++ (~> 1.44.0)" - leveldb-library (~> 1.22) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseInstallations (9.4.0): - - FirebaseCore (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) + - FirebaseInstallations (10.0.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseRemoteConfig (9.3.0): - - FirebaseABTesting (~> 9.0) - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseStorage (9.3.0): - - FirebaseAppCheckInterop (~> 9.0) - - FirebaseAuthInterop (~> 9.0) - - FirebaseCore (~> 9.0) - - FirebaseCoreExtension (~> 9.0) - - FirebaseStorageInternal (~> 9.0) - - FirebaseStorageInternal (9.4.0): - - FirebaseCore (~> 9.0) - - GTMSessionFetcher/Core (< 3.0, >= 1.7) + - FirebaseRemoteConfig (10.0.0): + - FirebaseABTesting (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseStorage (10.0.0): + - FirebaseAppCheckInterop (~> 10.0) + - FirebaseAuthInterop (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseCoreExtension (~> 10.0) + - GTMSessionFetcher/Core (~> 2.1) - Flutter (1.0.0) - flutter_file_dialog (0.0.1): - Flutter @@ -749,52 +741,52 @@ PODS: - google_sign_in_ios (0.0.1): - Flutter - GoogleSignIn (~> 6.2) - - GoogleAppMeasurement (9.3.0): - - GoogleAppMeasurement/AdIdSupport (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement (10.0.0): + - GoogleAppMeasurement/AdIdSupport (= 10.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (9.3.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement/AdIdSupport (10.0.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (9.3.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement/WithoutAdIdSupport (10.0.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - GoogleDataTransport (9.2.0): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleSignIn (6.2.2): + - GoogleSignIn (6.2.4): - AppAuth (~> 1.5) - GTMAppAuth (~> 1.3) - - GTMSessionFetcher/Core (~> 1.1) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): + - GTMSessionFetcher/Core (< 3.0, >= 1.1) + - GoogleUtilities/AppDelegateSwizzler (7.8.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.8.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/Logger (7.8.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.7.0): + - GoogleUtilities/MethodSwizzler (7.8.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.7.0): + - GoogleUtilities/Network (7.8.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): + - "GoogleUtilities/NSData+zlib (7.8.0)" + - GoogleUtilities/Reachability (7.8.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): + - GoogleUtilities/UserDefaults (7.8.0): - GoogleUtilities/Logger - "gRPC-C++ (1.44.0)": - "gRPC-C++/Implementation (= 1.44.0)" @@ -847,10 +839,10 @@ PODS: - gRPC-Core/Interface (= 1.44.0) - Libuv-gRPC (= 0.0.10) - gRPC-Core/Interface (1.44.0) - - GTMAppAuth (1.3.0): - - AppAuth/Core (~> 1.4) - - GTMSessionFetcher/Core (~> 1.5) - - GTMSessionFetcher/Core (1.7.2) + - GTMAppAuth (1.3.1): + - AppAuth/Core (~> 1.6) + - GTMSessionFetcher/Core (< 3.0, >= 1.5) + - GTMSessionFetcher/Core (2.1.0) - image_cropper (0.0.4): - Flutter - TOCropViewController (~> 2.6.1) @@ -871,13 +863,13 @@ PODS: - path_provider_ios (0.0.1): - Flutter - PromisesObjC (2.1.1) - - Sentry (7.22.0): - - Sentry/Core (= 7.22.0) - - Sentry/Core (7.22.0) + - Sentry (7.28.0): + - Sentry/Core (= 7.28.0) + - Sentry/Core (7.28.0) - sentry_flutter (0.0.1): - Flutter - FlutterMacOS - - Sentry (~> 7.22.0) + - Sentry (~> 7.28.0) - shared_preferences_ios (0.0.1): - Flutter - sign_in_with_apple (0.0.1): @@ -925,7 +917,6 @@ SPEC REPOS: - FirebaseAuth - FirebaseAuthInterop - FirebaseCore - - FirebaseCoreDiagnostics - FirebaseCoreExtension - FirebaseCoreInternal - FirebaseCrashlytics @@ -933,7 +924,6 @@ SPEC REPOS: - FirebaseInstallations - FirebaseRemoteConfig - FirebaseStorage - - FirebaseStorageInternal - FMDB - GoogleAppMeasurement - GoogleDataTransport @@ -994,44 +984,42 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: abseil: ebe5b5529fb05d93a8bdb7951607be08b7fa71bc - AppAuth: 80317d99ac7ff2801a2f18ff86b48cd315ed465d + AppAuth: 8fca6b5563a5baef2c04bee27538025e4ceb2add BoringSSL-GRPC: 3175b25143e648463a56daeaaa499c6cb86dad33 - cloud_firestore: 08093e207dfb2e6c82a6b272def699e022548786 - Firebase: ef75abb1cdbc746d5a38f4e26c422c807b189b8c - firebase_analytics: 8f772ccb3dad1e8968019a158823f99e63069d2b - firebase_auth: e4bd9a01f6c45764bf3bfb0cea4d5ce3673a92a2 - firebase_core: 96214f90497b808a2cf2a24517084c5f6de37b53 - firebase_crashlytics: cdba3f556462dd5ee25cc7d28790ff2de2c0edcf - firebase_remote_config: f3cc693a849be94ee43335f99310df75dc9edc05 - firebase_storage: e95ec41580e311cb30b1ed7459b9e94fb4bbe672 - FirebaseABTesting: e59eec91fafce74a0f5261809ed0025b7e450db1 - FirebaseAnalytics: bf46f5163f44097ce2c789de0b3e6f87f1da834a - FirebaseAppCheckInterop: 63119cdfc94b16c3e9421513c17f597aee2ea225 - FirebaseAuth: 9ebc3577fe0acf9092df21ac314024b70aebf21e - FirebaseAuthInterop: 826d3d772b554e3675ceaab8c665008277ca9d1c - FirebaseCore: c088995ece701a021a48a1348ea0174877de2a6a - FirebaseCoreDiagnostics: aaa87098082c4d4bdd1a9557b1186d18ca85ce8c - FirebaseCoreExtension: 2cf8c542b54ad3c2d4b746c22e8828b670dcd9b0 - FirebaseCoreInternal: a13302b0088fbf5f38b79b6ece49c2af7d3e05d6 - FirebaseCrashlytics: 65a5b349e664e986e6c7486b0a9b5ed8c11d0491 - FirebaseFirestore: 5a72aa925528f67469b16a54a6cfc369467197e4 - FirebaseInstallations: 61db1054e688d2bdc4e2b3f744c1b086e913b742 - FirebaseRemoteConfig: 0a644c924b3339bcf3bc3ea253206f171672308e - FirebaseStorage: 1414d27e15fa04f6350ef6602accef0e951c8bca - FirebaseStorageInternal: 425c7dc7de44d9b7e07a9f8d6515bab0f1266b87 + cloud_firestore: 1efcf26ee1fe576dc695389683695230d60680f5 + Firebase: 1b810f3d0c0532e27a48f1961f8c0400a668a2cf + firebase_analytics: ed8e5198c08a3ec3f5e1dd150dd4db07d7871e5b + firebase_auth: e07b2260d936b7b20f45f9ddafc871f75778be66 + firebase_core: 5c0bb0ca7d0e70480a68a6e9ad9bf55d1edd5305 + firebase_crashlytics: ff96f93b1f78d0347aa795abca038cf9f8625cdf + firebase_remote_config: 40c0b133bc2cbbba8043189b372405097cd9958d + firebase_storage: 0e84174eaa45056b3bf9c09659f1c8706acaec7d + FirebaseABTesting: 5a08a4d3060b7fb5638f60698bc2cb57996bcc73 + FirebaseAnalytics: 9921a52739f4ab66099da31b6e0243db78a3ac0a + FirebaseAppCheckInterop: 9a7af9d0a4d9197265cda30194f3644e8aea24f9 + FirebaseAuth: 493382cf533cc45e2862b00e9aa4cfe4c98daf71 + FirebaseAuthInterop: c342679f45bee2a665a3b9148a55fcdb10df8c66 + FirebaseCore: 97f48a3a567a72b8d4daa0f03c3aadb78df4e995 + FirebaseCoreExtension: 449595a035812f16314ca88cebf959e3bb77dd67 + FirebaseCoreInternal: 5eb3960335da5ea30115d57d39db6988c4ad06f3 + FirebaseCrashlytics: 6b0613b548fe096221b5ba6d2f7a9732b451233b + FirebaseFirestore: 5007583f3db2129de8e87f18ee63f4c86f07e7a3 + FirebaseInstallations: 7f1c9ae6bd9df6abe9c74124b38fa8740aba5df4 + FirebaseRemoteConfig: e4431ddba74ddf705e2aabd7d356a23d5b802853 + FirebaseStorage: 8b0b0630e11b9f3e4a479a26cfccb70ec790ec50 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_file_dialog: 4c014a45b105709a27391e266c277d7e588e9299 flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a google_sign_in_ios: 4f85eb9f937450765c8573bb85fd8cd6a5af675c - GoogleAppMeasurement: b907bdad775b6975a8108762345b2cfbf1a93c37 + GoogleAppMeasurement: 7e48a3249792ac35d6f18f107f63f199a7e9d0ce GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleSignIn: 3c68388ac221f379676e8f1cb115df3aaf73b93f - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 + GoogleSignIn: 5651ce3a61e56ca864160e79b484cd9ed3f49b7a + GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7 "gRPC-C++": 9675f953ace2b3de7c506039d77be1f2e77a8db2 gRPC-Core: 943e491cb0d45598b0b0eb9e910c88080369290b - GTMAppAuth: 4d8f864896f3646f0c33baf38a28362f4c601e15 - GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba + GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd + GTMSessionFetcher: ffbb25ec00ebcb5201adab0a56d808f6f1902d9f image_cropper: 60c2789d1f1a78c873235d4319ca0c34a69f2d98 leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729 Libuv-gRPC: 55e51798e14ef436ad9bc45d12d43b77b49df378 @@ -1039,8 +1027,8 @@ SPEC CHECKSUMS: package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb - Sentry: 30b51086ca9aac23337880152e95538f7e177f7f - sentry_flutter: eaca55af5c951f4be6c4b1daddce1744c37d8476 + Sentry: 2c6053e4cfe6dea6608135dea1928ffbb4ecfba5 + sentry_flutter: fad3ef0917dc1afa7d242af0743696ed9a9a8864 shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440 sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 diff --git a/lib/app/data/services/user_service.dart b/lib/app/data/services/user_service.dart index dc4dd9cf..5b6ad261 100644 --- a/lib/app/data/services/user_service.dart +++ b/lib/app/data/services/user_service.dart @@ -11,7 +11,6 @@ import 'package:dungeon_paper/app/routes/app_pages.dart'; import 'package:dungeon_paper/core/http/api.dart'; import 'package:dungeon_paper/core/http/api_requests/migration.dart'; import 'package:dungeon_paper/core/storage_handler/storage_handler.dart'; -import 'package:dungeon_paper/core/task_runner/task_utils.dart'; import 'package:dungeon_paper/generated/l10n.dart'; import 'package:email_validator/email_validator.dart'; import 'package:firebase_auth/firebase_auth.dart' as fba; @@ -141,7 +140,7 @@ class UserService extends GetxService email: user.email, id: authService.fbUser.value?.uid, username: user.username, - extras: { + data: { 'displayName': user.displayName, 'version': pkg.version, }, diff --git a/lib/app/modules/AbilityScoresForm/views/ability_scores_form_view.dart b/lib/app/modules/AbilityScoresForm/views/ability_scores_form_view.dart index 18607d40..a49f14f9 100644 --- a/lib/app/modules/AbilityScoresForm/views/ability_scores_form_view.dart +++ b/lib/app/modules/AbilityScoresForm/views/ability_scores_form_view.dart @@ -106,7 +106,7 @@ class AbilityScoresFormView extends GetView { Text(stat.name), ], ), - subtitle: Text(stat.description, style: textTheme.caption), + subtitle: Text(stat.description, style: textTheme.bodySmall), minVerticalPadding: 8, ), const Divider(height: 8), diff --git a/lib/app/modules/About/views/about_view.dart b/lib/app/modules/About/views/about_view.dart index 0fb0b29f..873169ba 100644 --- a/lib/app/modules/About/views/about_view.dart +++ b/lib/app/modules/About/views/about_view.dart @@ -29,13 +29,13 @@ class AboutView extends GetView { () => Text( S.current.appName, textAlign: TextAlign.center, - style: textTheme.headline4, + style: textTheme.headlineMedium, ), () => Obx( () => Text( S.current.aboutVersion(controller.version.value?.toString() ?? '-'), textAlign: TextAlign.center, - style: textTheme.caption, + style: textTheme.bodySmall, ), ), () => const SizedBox(height: 16), @@ -56,7 +56,7 @@ class AboutView extends GetView { () => ListTile( leading: const Icon(DwIcons.discord), title: Text(S.current.aboutJoinDiscord), - subtitle: Text(S.current.aboutJoinDiscordSubtitle, style: textTheme.caption), + subtitle: Text(S.current.aboutJoinDiscordSubtitle, style: textTheme.bodySmall), onTap: () => launchUrl(Uri.parse('https://bit.ly/DungeonPaper-Discord')), isThreeLine: true, visualDensity: VisualDensity.compact, @@ -64,7 +64,7 @@ class AboutView extends GetView { () => ListTile( leading: const Icon(Icons.send), title: Text(S.current.aboutSendFeedback), - subtitle: Text(S.current.aboutSendFeedbackSubtitle, style: textTheme.caption), + subtitle: Text(S.current.aboutSendFeedbackSubtitle, style: textTheme.bodySmall), onTap: () => Get.toNamed(Routes.sendFeedback), isThreeLine: true, visualDensity: VisualDensity.compact, @@ -72,7 +72,7 @@ class AboutView extends GetView { () => const Divider(), () => Padding( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), - child: Text(S.current.aboutSocialLinks, style: textTheme.caption), + child: Text(S.current.aboutSocialLinks, style: textTheme.bodySmall), ), () => Padding( padding: const EdgeInsets.all(16.0).copyWith(top: 0), diff --git a/lib/app/modules/Account/views/account_view.dart b/lib/app/modules/Account/views/account_view.dart index 27fe9f16..712ce6d3 100644 --- a/lib/app/modules/Account/views/account_view.dart +++ b/lib/app/modules/Account/views/account_view.dart @@ -36,7 +36,7 @@ class AccountView extends GetView { padding: const EdgeInsets.symmetric(horizontal: 16).copyWith(top: 8), child: Text( S.current.accountCategoryDetails, - style: textTheme.caption, + style: textTheme.bodySmall, ), ), () => Obx( @@ -82,7 +82,7 @@ class AccountView extends GetView { padding: const EdgeInsets.symmetric(horizontal: 16).copyWith(top: 8), child: Text( S.current.accountCategorySocials, - style: textTheme.caption, + style: textTheme.bodySmall, ), ), ], diff --git a/lib/app/modules/BasicInfoForm/views/basic_info_form_view.dart b/lib/app/modules/BasicInfoForm/views/basic_info_form_view.dart index 946ed6cc..dcfa9521 100644 --- a/lib/app/modules/BasicInfoForm/views/basic_info_form_view.dart +++ b/lib/app/modules/BasicInfoForm/views/basic_info_form_view.dart @@ -135,7 +135,7 @@ class BasicInfoFormView extends GetView with UserServic ), TextSpan(text: S.current.basicInfoImageNeedAccountSuffix), ], - style: theme.textTheme.bodyText2, + style: theme.textTheme.bodyMedium, ), ), ) diff --git a/lib/app/modules/BondsFlagsForm/views/bonds_flags_form_view.dart b/lib/app/modules/BondsFlagsForm/views/bonds_flags_form_view.dart index 669bc378..22f1dad2 100644 --- a/lib/app/modules/BondsFlagsForm/views/bonds_flags_form_view.dart +++ b/lib/app/modules/BondsFlagsForm/views/bonds_flags_form_view.dart @@ -30,7 +30,7 @@ class BondsFlagsFormView extends GetView { body: ListView( padding: const EdgeInsets.all(16), children: [ - Text(S.current.characterBondsFlagsDialogBonds, style: textTheme.headline5), + Text(S.current.characterBondsFlagsDialogBonds, style: textTheme.headlineSmall), for (final bond in enumerate(controller.bondsDesc)) ListTile( contentPadding: const EdgeInsets.all(0), @@ -51,7 +51,7 @@ class BondsFlagsFormView extends GetView { icon: const Icon(Icons.add), ), const Divider(height: 24), - Text(S.current.characterBondsFlagsDialogFlags, style: textTheme.headline5), + Text(S.current.characterBondsFlagsDialogFlags, style: textTheme.headlineSmall), for (final flag in enumerate(controller.flagsDesc)) ListTile( contentPadding: const EdgeInsets.all(0), diff --git a/lib/app/modules/CreateCharacter/SelectMovesSpells/views/select_moves_spells_view.dart b/lib/app/modules/CreateCharacter/SelectMovesSpells/views/select_moves_spells_view.dart index 5992241f..8787f0d4 100644 --- a/lib/app/modules/CreateCharacter/SelectMovesSpells/views/select_moves_spells_view.dart +++ b/lib/app/modules/CreateCharacter/SelectMovesSpells/views/select_moves_spells_view.dart @@ -23,7 +23,7 @@ class SelectMovesSpellsView extends GetView { @override Widget build(BuildContext context) { - var titleStyle = Theme.of(context).textTheme.headline6; + var titleStyle = Theme.of(context).textTheme.titleLarge; return ConfirmExitView( dirty: controller.dirty.value, child: Scaffold( diff --git a/lib/app/modules/Home/views/home_nav_bar.dart b/lib/app/modules/Home/views/home_nav_bar.dart index d2268aed..d70ad199 100644 --- a/lib/app/modules/Home/views/home_nav_bar.dart +++ b/lib/app/modules/Home/views/home_nav_bar.dart @@ -1,4 +1,3 @@ - import 'package:dungeon_paper/core/dw_icons.dart'; import 'package:dungeon_paper/core/utils/list_utils.dart'; import 'package:dungeon_paper/generated/l10n.dart'; @@ -136,7 +135,7 @@ class _NavItem extends StatelessWidget { const SizedBox(height: 2), AnimatedDefaultTextStyle( duration: duration, - style: theme.textTheme.caption!.copyWith( + style: theme.textTheme.bodySmall!.copyWith( fontWeight: FontWeight.w600, color: selected ? selectedColor : null, ), diff --git a/lib/app/modules/Home/views/home_view.dart b/lib/app/modules/Home/views/home_view.dart index 762b6155..ee4d6d4a 100644 --- a/lib/app/modules/Home/views/home_view.dart +++ b/lib/app/modules/Home/views/home_view.dart @@ -100,13 +100,13 @@ class HomeEmptyState extends StatelessWidget with UserServiceMixin { IconSpan(context, icon: Icons.person, size: 24), TextSpan(text: ' ' + S.current.homeEmptyStateLoginTitle), ], - style: textTheme.headline6, + style: textTheme.titleLarge, ), ), const SizedBox(height: 16), Text( S.current.homeEmptyStateLoginSubtitle, - style: textTheme.subtitle1, + style: textTheme.titleMedium, textAlign: TextAlign.center, ), const SizedBox(height: 16), @@ -126,13 +126,13 @@ class HomeEmptyState extends StatelessWidget with UserServiceMixin { ], Text( S.current.homeEmptyStateTitle, - style: textTheme.headline6, + style: textTheme.titleLarge, textAlign: TextAlign.center, ), const SizedBox(height: 16), Text( S.current.homeEmptyStateSubtitle, - style: textTheme.subtitle1, + style: textTheme.titleMedium, textAlign: TextAlign.center, ), const SizedBox(height: 16), diff --git a/lib/app/modules/LibraryList/views/library_card_list.dart b/lib/app/modules/LibraryList/views/library_card_list.dart index ff1b158c..e8b9d915 100644 --- a/lib/app/modules/LibraryList/views/library_card_list.dart +++ b/lib/app/modules/LibraryList/views/library_card_list.dart @@ -112,7 +112,7 @@ class LibraryCardList> () => const SizedBox(height: 32), () => Text( S.current.libraryListNoItemsFoundTitle(S.current.entityPlural(T)), - style: textTheme.headline6, + style: textTheme.titleLarge, textAlign: TextAlign.center, ), () => const SizedBox(height: 8), @@ -124,7 +124,7 @@ class LibraryCardList> ? S.current .libraryListNoItemsFoundSubtitleNoFilters(S.current.entityPlural(T)) : S.current.libraryListNoItemsFoundSubtitleFilters(S.current.entityPlural(T)), - style: textTheme.subtitle1, + style: textTheme.titleMedium, textAlign: TextAlign.center, ), ), diff --git a/lib/app/modules/LibraryList/views/library_collection_view.dart b/lib/app/modules/LibraryList/views/library_collection_view.dart index e65deddc..9bf882e2 100644 --- a/lib/app/modules/LibraryList/views/library_collection_view.dart +++ b/lib/app/modules/LibraryList/views/library_collection_view.dart @@ -80,7 +80,7 @@ class LibraryCollectionView extends GetView ), title: Text( S.current.entityPlural(type), - style: textTheme.headline6, + style: textTheme.titleLarge, ), subtitle: Text( [ diff --git a/lib/app/modules/Login/views/login_view.dart b/lib/app/modules/Login/views/login_view.dart index 9794ceb4..b7349b00 100644 --- a/lib/app/modules/Login/views/login_view.dart +++ b/lib/app/modules/Login/views/login_view.dart @@ -40,13 +40,13 @@ class LoginView extends GetView { children: [ Text( controller.isLogin ? S.current.signinTitle : S.current.signupTitle, - style: textTheme.headline4, + style: textTheme.headlineMedium, textAlign: TextAlign.center, ), const SizedBox(height: 8), Text( controller.isLogin ? S.current.signinSubtitle : S.current.signupSubtitle, - style: textTheme.subtitle1, + style: textTheme.titleMedium, textAlign: TextAlign.center, ), const SizedBox(height: 24), diff --git a/lib/app/modules/Migration/views/migration_view.dart b/lib/app/modules/Migration/views/migration_view.dart index a83f0657..ddcfa23e 100644 --- a/lib/app/modules/Migration/views/migration_view.dart +++ b/lib/app/modules/Migration/views/migration_view.dart @@ -42,13 +42,13 @@ class MigrationView extends GetView { const SizedBox(height: 16), Text( S.current.migrationTitle, - style: textTheme.headline4, + style: textTheme.headlineMedium, textAlign: TextAlign.center, ), const SizedBox(height: 16), Text( S.current.migrationSubtitle, - style: textTheme.subtitle1, + style: textTheme.titleMedium, textAlign: TextAlign.center, ), const SizedBox(height: 32), @@ -62,7 +62,7 @@ class MigrationView extends GetView { ), ), const SizedBox(height: 8), - Text(S.current.migrationUsernameInfo, style: textTheme.caption), + Text(S.current.migrationUsernameInfo, style: textTheme.bodySmall), const SizedBox(height: 16), Obx( () => SelectBox( diff --git a/lib/app/modules/SelectCharacterTheme/views/select_character_theme_view.dart b/lib/app/modules/SelectCharacterTheme/views/select_character_theme_view.dart index 3c14ecfb..bb64613e 100644 --- a/lib/app/modules/SelectCharacterTheme/views/select_character_theme_view.dart +++ b/lib/app/modules/SelectCharacterTheme/views/select_character_theme_view.dart @@ -89,10 +89,10 @@ class SelectCharacterThemeView extends GetView { }) { final theme = Theme.of(context); final textTheme = theme.textTheme; - final caption = textTheme.caption!; + final bodySmall = textTheme.bodySmall!; return _pad(Row( children: [ - Expanded(child: Text(labelText, style: caption)), + Expanded(child: Text(labelText, style: bodySmall)), Text(S.current.seeAll), Switch.adaptive(value: seeAll, onChanged: onChangeSeeAll), ElevatedButton(onPressed: resetEnabled ? onReset : null, child: Text(S.current.useDefault)), diff --git a/lib/app/modules/Settings/views/settings_view.dart b/lib/app/modules/Settings/views/settings_view.dart index d153b3f8..caf16919 100644 --- a/lib/app/modules/Settings/views/settings_view.dart +++ b/lib/app/modules/Settings/views/settings_view.dart @@ -100,10 +100,10 @@ class SettingsView extends GetView with CharacterServiceMixi }) { final theme = Theme.of(context); final textTheme = theme.textTheme; - final caption = textTheme.caption!; + final bodySmall = textTheme.bodySmall!; return _pad(Row( children: [ - Expanded(child: Text(labelText, style: caption)), + Expanded(child: Text(labelText, style: bodySmall)), if (seeAll != null && onChangeSeeAll != null) ...[ Text(S.current.seeAll), Switch.adaptive(value: seeAll, onChanged: onChangeSeeAll), diff --git a/lib/app/themes/button_themes.dart b/lib/app/themes/button_themes.dart index d7061e06..83a81a2f 100644 --- a/lib/app/themes/button_themes.dart +++ b/lib/app/themes/button_themes.dart @@ -12,13 +12,13 @@ class ButtonThemes { // ); static ButtonStyle? errorElevated(BuildContext context) => ElevatedButton.styleFrom( - backgroundColor: Theme.of(context).errorColor, + backgroundColor: Theme.of(context).colorScheme.error, foregroundColor: Theme.of(context).colorScheme.onError, shape: rRectShape, ); static ButtonStyle? errorText(BuildContext context) => TextButton.styleFrom( - foregroundColor: Theme.of(context).errorColor, + foregroundColor: Theme.of(context).colorScheme.error, shape: rRectShape, ); diff --git a/lib/app/themes/theme_utils.dart b/lib/app/themes/theme_utils.dart index 4534cc4e..a50fe28b 100644 --- a/lib/app/themes/theme_utils.dart +++ b/lib/app/themes/theme_utils.dart @@ -40,19 +40,20 @@ TextTheme copyTextThemeWith( Color? specialColor, }) => original.copyWith( - headline1: original.headline1?.copyWith(fontFamily: fontFamily, color: specialColor), - headline2: original.headline2?.copyWith(fontFamily: fontFamily, color: specialColor), - headline3: original.headline3?.copyWith(fontFamily: fontFamily, color: specialColor), - headline4: original.headline4?.copyWith(fontFamily: fontFamily, color: specialColor), - headline5: original.headline5?.copyWith(fontFamily: fontFamily, color: specialColor), - headline6: original.headline6?.copyWith(fontFamily: fontFamily, color: specialColor), - subtitle1: original.subtitle1?.copyWith(fontFamily: fontFamily, color: specialColor), - subtitle2: original.subtitle2?.copyWith(fontFamily: fontFamily, color: specialColor), - bodyText1: original.bodyText1?.copyWith(fontFamily: fontFamily, color: normalColor), - bodyText2: original.bodyText2?.copyWith(fontFamily: fontFamily, color: normalColor), - caption: original.caption?.copyWith(fontFamily: fontFamily, color: normalColor), - button: original.button?.copyWith(fontFamily: fontFamily, color: normalColor), - overline: original.overline?.copyWith(fontFamily: fontFamily, color: normalColor), + displayLarge: original.displayLarge?.copyWith(fontFamily: fontFamily, color: specialColor), + displayMedium: original.displayMedium?.copyWith(fontFamily: fontFamily, color: specialColor), + displaySmall: original.displaySmall?.copyWith(fontFamily: fontFamily, color: specialColor), + headlineMedium: + original.headlineMedium?.copyWith(fontFamily: fontFamily, color: specialColor), + headlineSmall: original.headlineSmall?.copyWith(fontFamily: fontFamily, color: specialColor), + titleLarge: original.titleLarge?.copyWith(fontFamily: fontFamily, color: specialColor), + titleMedium: original.titleMedium?.copyWith(fontFamily: fontFamily, color: specialColor), + titleSmall: original.titleSmall?.copyWith(fontFamily: fontFamily, color: specialColor), + bodyLarge: original.bodyLarge?.copyWith(fontFamily: fontFamily, color: normalColor), + bodyMedium: original.bodyMedium?.copyWith(fontFamily: fontFamily, color: normalColor), + bodySmall: original.bodySmall?.copyWith(fontFamily: fontFamily, color: normalColor), + labelLarge: original.labelLarge?.copyWith(fontFamily: fontFamily, color: normalColor), + labelSmall: original.labelSmall?.copyWith(fontFamily: fontFamily, color: normalColor), ); ColorScheme createColorScheme(Color seedColor, diff --git a/lib/app/widgets/atoms/advanced_floating_action_button.dart b/lib/app/widgets/atoms/advanced_floating_action_button.dart index e995aac5..98fd9e28 100644 --- a/lib/app/widgets/atoms/advanced_floating_action_button.dart +++ b/lib/app/widgets/atoms/advanced_floating_action_button.dart @@ -414,7 +414,7 @@ class AdvancedFloatingActionButton extends StatelessWidget { /// The text style for an extended [FloatingActionButton]'s label. /// /// If null, [FloatingActionButtonThemeData.extendedTextStyle] is used. If - /// that is also null, then [TextTheme.button] with a letter spacing of 1.2 + /// that is also null, then [TextTheme.labelLarge] with a letter spacing of 1.2 /// is used. final TextStyle? extendedTextStyle; diff --git a/lib/app/widgets/atoms/character_avatar.dart b/lib/app/widgets/atoms/character_avatar.dart index cedd0561..595a53f8 100644 --- a/lib/app/widgets/atoms/character_avatar.dart +++ b/lib/app/widgets/atoms/character_avatar.dart @@ -107,7 +107,7 @@ class CharacterAvatar extends GetView { static Widget _buildDefaultImage(BuildContext context, double size) { final theme = Theme.of(context); - final textStyle = theme.primaryTextTheme.subtitle1!; + final textStyle = theme.primaryTextTheme.titleMedium!; return Container( color: ThemeData.estimateBrightnessForColor(textStyle.color!) == Brightness.dark ? theme.primaryColorLight diff --git a/lib/app/widgets/atoms/custom_expansion_tile.dart b/lib/app/widgets/atoms/custom_expansion_tile.dart index 808fb2b3..36d976d2 100644 --- a/lib/app/widgets/atoms/custom_expansion_tile.dart +++ b/lib/app/widgets/atoms/custom_expansion_tile.dart @@ -402,8 +402,10 @@ class _CustomExpansionTileState extends State ...widget.leading, Expanded( child: DefaultTextStyle( - style: - Theme.of(context).textTheme.subtitle1!.copyWith(color: _headerColor.value), + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith(color: _headerColor.value), child: widget.title ?? widget.titleBuilder!.call( context, @@ -436,7 +438,7 @@ class _CustomExpansionTileState extends State final ThemeData theme = Theme.of(context); final ColorScheme colorScheme = theme.colorScheme; _headerColorTween - ..begin = widget.collapsedTextColor ?? theme.textTheme.subtitle1!.color + ..begin = widget.collapsedTextColor ?? theme.textTheme.titleMedium!.color ..end = widget.textColor ?? colorScheme.primary; _iconColorTween ..begin = widget.collapsedIconColor ?? theme.unselectedWidgetColor diff --git a/lib/app/widgets/atoms/custom_list_tile.dart b/lib/app/widgets/atoms/custom_list_tile.dart index af6da5d6..16b80010 100644 --- a/lib/app/widgets/atoms/custom_list_tile.dart +++ b/lib/app/widgets/atoms/custom_list_tile.dart @@ -9,8 +9,8 @@ import 'package:flutter/rendering.dart'; /// Defines the title font used for [CustomListTile] descendants of a [ListTileTheme]. /// -/// List tiles that appear in a [Drawer] use the theme's [TextTheme.bodyText1] -/// text style, which is a little smaller than the theme's [TextTheme.subtitle1] +/// List tiles that appear in a [Drawer] use the theme's [TextTheme.bodyLarge] +/// text style, which is a little smaller than the theme's [TextTheme.titleMedium] /// text style, which is used by default. // enum ListTileStyle { // /// Use a title font that's appropriate for a [CustomListTile] in a list. @@ -316,7 +316,7 @@ class CustomListTile extends StatelessWidget { this.horizontalTitleGap, this.minVerticalPadding, this.minLeadingWidth, - }) : assert(!isThreeLine || subtitle != null); + }) : assert(!isThreeLine || subtitle != null); /// A widget to display before the title. /// @@ -341,14 +341,14 @@ class CustomListTile extends StatelessWidget { /// two lines. For example, you can use [Text.maxLines] to enforce the number /// of lines. /// - /// The subtitle's default [TextStyle] depends on [TextTheme.bodyText2] except + /// The subtitle's default [TextStyle] depends on [TextTheme.bodyMedium] except /// [TextStyle.color]. The [TextStyle.color] depends on the value of [enabled] /// and [selected]. /// /// When [enabled] is false, the text color is set to [ThemeData.disabledColor]. /// /// When [selected] is false, the text color is set to [ListTileTheme.textColor] - /// if it's not null and to [TextTheme.caption]'s color if [ListTileTheme.textColor] + /// if it's not null and to [TextTheme.bodySmall]'s color if [ListTileTheme.textColor] /// is null. final Widget? subtitle; @@ -642,11 +642,11 @@ class CustomListTile extends StatelessWidget { final TextStyle textStyle; switch (style ?? tileTheme.style ?? theme.listTileTheme.style ?? ListTileStyle.list) { case ListTileStyle.drawer: - textStyle = theme.textTheme.bodyText1!; + textStyle = theme.textTheme.bodyLarge!; break; case ListTileStyle.list: default: - textStyle = theme.textTheme.subtitle1!; + textStyle = theme.textTheme.titleMedium!; break; } final Color? color = _textColor(theme, tileTheme, textStyle.color); @@ -656,15 +656,15 @@ class CustomListTile extends StatelessWidget { } TextStyle _subtitleTextStyle(ThemeData theme, ListTileThemeData tileTheme) { - final TextStyle textStyle = theme.textTheme.bodyText2!; - final Color? color = _textColor(theme, tileTheme, theme.textTheme.caption!.color); + final TextStyle textStyle = theme.textTheme.bodyMedium!; + final Color? color = _textColor(theme, tileTheme, theme.textTheme.bodySmall!.color); return _isDenseLayout(theme, tileTheme) ? textStyle.copyWith(color: color, fontSize: 12.0) : textStyle.copyWith(color: color); } TextStyle _trailingAndLeadingTextStyle(ThemeData theme, ListTileThemeData tileTheme) { - final TextStyle textStyle = theme.textTheme.bodyText2!; + final TextStyle textStyle = theme.textTheme.bodyMedium!; final Color? color = _textColor(theme, tileTheme, textStyle.color); return textStyle.copyWith(color: color); } diff --git a/lib/app/widgets/atoms/help_text.dart b/lib/app/widgets/atoms/help_text.dart index 57b9a49e..6ab9d1b2 100644 --- a/lib/app/widgets/atoms/help_text.dart +++ b/lib/app/widgets/atoms/help_text.dart @@ -28,7 +28,7 @@ class HelpText extends StatelessWidget { ), ), decoration: BoxDecoration( - color: textTheme.caption!.color, + color: textTheme.bodySmall!.color, shape: BoxShape.circle, ), ), @@ -37,7 +37,7 @@ class HelpText extends StatelessWidget { Expanded( child: Text( text, - style: textTheme.caption, + style: textTheme.bodySmall, ), ), ], diff --git a/lib/app/widgets/atoms/hyperlink.dart b/lib/app/widgets/atoms/hyperlink.dart index 197d3a30..f01700a0 100644 --- a/lib/app/widgets/atoms/hyperlink.dart +++ b/lib/app/widgets/atoms/hyperlink.dart @@ -16,7 +16,7 @@ class Hyperlink extends StatelessWidget { return TextSpan( text: text, - style: Theme.of(context).textTheme.bodyText2!.copyWith( + style: Theme.of(context).textTheme.bodyMedium!.copyWith( color: Colors.blue[700], decoration: TextDecoration.underline, ), @@ -29,7 +29,7 @@ class Hyperlink extends StatelessWidget { return GestureDetector( child: Text( text, - style: Theme.of(context).textTheme.bodyText2!.copyWith( + style: Theme.of(context).textTheme.bodyMedium!.copyWith( color: Colors.blue[700], decoration: TextDecoration.underline, ), diff --git a/lib/app/widgets/cards/dynamic_action_card.dart b/lib/app/widgets/cards/dynamic_action_card.dart index 368a8f6d..2dc122b4 100644 --- a/lib/app/widgets/cards/dynamic_action_card.dart +++ b/lib/app/widgets/cards/dynamic_action_card.dart @@ -117,10 +117,10 @@ class _DynamicActionCardState extends State { maxLines: !expanded ? 1 : null, softWrap: expanded, normalTextStyle: TextStyle( - fontSize: Theme.of(context).textTheme.subtitle1!.fontSize, + fontSize: Theme.of(context).textTheme.titleMedium!.fontSize, color: color, ), - // highlightStyle: Theme.of(context).textTheme.subtitle1!.copyWith(color: color), + // highlightStyle: Theme.of(context).textTheme.titleMedium!.copyWith(color: color), ), key: widget.expansionKey, onExpansion: (val) { @@ -177,17 +177,17 @@ class _DynamicActionCardState extends State { ? _renderMarkdown( context, widget.description, - // style: Theme.of(context).textTheme.bodyText1, + // style: Theme.of(context).textTheme.bodyLarge, ) : Text( S.current.noDescription, - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, ), // Divider(height: 32, color: dividerColor), if (widget.explanation != null && widget.explanation!.isNotEmpty) ...[ Padding( padding: const EdgeInsets.only(top: 16, bottom: 4), - child: Text(S.current.explanation, style: Theme.of(context).textTheme.caption), + child: Text(S.current.explanation, style: Theme.of(context).textTheme.bodySmall), ), _renderMarkdown(context, widget.explanation!), ], diff --git a/lib/app/widgets/cards/dynamic_action_card_mini.dart b/lib/app/widgets/cards/dynamic_action_card_mini.dart index 74a046c9..5c104dbf 100644 --- a/lib/app/widgets/cards/dynamic_action_card_mini.dart +++ b/lib/app/widgets/cards/dynamic_action_card_mini.dart @@ -91,7 +91,7 @@ class DynamicActionCardMini extends StatelessWidget { overflow: TextOverflow.fade, maxLines: 1, softWrap: false, - style: textTheme.bodyText1!.copyWith( + style: textTheme.bodyLarge!.copyWith( color: titleFgColor, ), ), diff --git a/lib/app/widgets/dialogs/character_bio_dialog.dart b/lib/app/widgets/dialogs/character_bio_dialog.dart index 8de4d077..c4f99ebe 100644 --- a/lib/app/widgets/dialogs/character_bio_dialog.dart +++ b/lib/app/widgets/dialogs/character_bio_dialog.dart @@ -41,7 +41,7 @@ class CharacterBioDialog extends GetView with CharacterServiceMixin { crossAxisAlignment: CrossAxisAlignment.start, // shrinkWrap: true, children: [ - Text(S.current.characterBioDialogDescLabel, style: textTheme.caption), + Text(S.current.characterBioDialogDescLabel, style: textTheme.bodySmall), char.bio.description.isNotEmpty ? MarkdownBody( data: char.bio.description, @@ -50,9 +50,9 @@ class CharacterBioDialog extends GetView with CharacterServiceMixin { ) : Text(S.current.noDescription), const SizedBox(height: 16), - Text(S.current.characterBioDialogLooksLabel, style: textTheme.caption), + Text(S.current.characterBioDialogLooksLabel, style: textTheme.bodySmall), char.bio.looks.isNotEmpty - ? Text(char.bio.looks, style: textTheme.bodyText1) + ? Text(char.bio.looks, style: textTheme.bodyLarge) // TODO broken...?! // ? ConstrainedBox( // constraints: BoxConstraints.loose(Size.fromHeight(maxContentHeight)), @@ -77,17 +77,17 @@ class CharacterBioDialog extends GetView with CharacterServiceMixin { children: [ Text( S.current.characterBioDialogAlignmentNameDisplayLabel, - style: textTheme.caption, + style: textTheme.bodySmall, ), const SizedBox(width: 4), IconTheme.merge( - data: IconThemeData(size: 14, color: textTheme.caption!.color!), + data: IconThemeData(size: 14, color: textTheme.bodySmall!.color!), child: Icon(char.bio.alignment.icon), ), const SizedBox(width: 4), Text( S.current.alignment(char.bio.alignment.key), - style: textTheme.caption, + style: textTheme.bodySmall, ), ], ), diff --git a/lib/app/widgets/dialogs/character_bonds_flags_dialog.dart b/lib/app/widgets/dialogs/character_bonds_flags_dialog.dart index 0ebe8561..97dc94f9 100644 --- a/lib/app/widgets/dialogs/character_bonds_flags_dialog.dart +++ b/lib/app/widgets/dialogs/character_bonds_flags_dialog.dart @@ -77,7 +77,7 @@ class CharacterBondsFlagsDialog extends GetView with Character const Divider(height: 32), ], if (bonds.isNotEmpty && flags.isNotEmpty) - Text(S.current.characterBondsFlagsDialogBonds, style: textTheme.caption), + Text(S.current.characterBondsFlagsDialogBonds, style: textTheme.bodySmall), for (final bond in bonds) ...[ CheckboxListTile( title: Text(bond.description), @@ -90,7 +90,7 @@ class CharacterBondsFlagsDialog extends GetView with Character ], if (bonds.isNotEmpty && flags.isNotEmpty) ...[ const Divider(height: 32), - Text(S.current.characterBondsFlagsDialogFlags, style: textTheme.caption), + Text(S.current.characterBondsFlagsDialogFlags, style: textTheme.bodySmall), ], for (final flag in flags) ...[ CheckboxListTile( diff --git a/lib/app/widgets/dialogs/view_tag_dialog.dart b/lib/app/widgets/dialogs/view_tag_dialog.dart index f9528058..089cd7b9 100644 --- a/lib/app/widgets/dialogs/view_tag_dialog.dart +++ b/lib/app/widgets/dialogs/view_tag_dialog.dart @@ -35,7 +35,7 @@ class ViewTagDialog extends StatelessWidget { S.current.genericNameField( S.current.entity(dw.Tag), ), - style: textTheme.caption, + style: textTheme.bodySmall, ), Text( toTitleCase(tag.name), @@ -54,7 +54,7 @@ class ViewTagDialog extends StatelessWidget { S.current.genericValueField( S.current.entity(dw.Tag), ), - style: textTheme.caption, + style: textTheme.bodySmall, ), Text( tag.value.toString(), @@ -72,7 +72,7 @@ class ViewTagDialog extends StatelessWidget { S.current.genericDescriptionField( S.current.entity(dw.Tag), ), - style: textTheme.caption, + style: textTheme.bodySmall, ), Text( tag.description, diff --git a/lib/app/widgets/menus/entity_edit_menu.dart b/lib/app/widgets/menus/entity_edit_menu.dart index a35d5321..73f3be8e 100644 --- a/lib/app/widgets/menus/entity_edit_menu.dart +++ b/lib/app/widgets/menus/entity_edit_menu.dart @@ -50,11 +50,11 @@ class EntityEditMenu extends StatelessWidget { MenuEntry( value: 'remove', icon: IconTheme( - data: IconThemeData(color: Theme.of(context).errorColor), + data: IconThemeData(color: Theme.of(context).colorScheme.error), child: const Icon(Icons.delete), ), label: DefaultTextStyle.merge( - style: TextStyle(color: Theme.of(context).errorColor), + style: TextStyle(color: Theme.of(context).colorScheme.error), child: Text(S.current.remove), ), onSelect: onDelete!, diff --git a/lib/app/widgets/molecules/character_subtitle.dart b/lib/app/widgets/molecules/character_subtitle.dart index 1dd80e93..676db5a3 100644 --- a/lib/app/widgets/molecules/character_subtitle.dart +++ b/lib/app/widgets/molecules/character_subtitle.dart @@ -19,7 +19,7 @@ class CharacterSubtitle extends StatelessWidget { return RichText( textAlign: textAlign, text: TextSpan( - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, children: [ TextSpan(text: S.current.characterHeaderSubtitleLevel(character.stats.level)), TextSpan(text: S.current.characterHeaderSubtitleClass(character.characterClass.name)), diff --git a/lib/app/widgets/molecules/chip_list_input.dart b/lib/app/widgets/molecules/chip_list_input.dart index 70a8fe9c..4d6f4554 100644 --- a/lib/app/widgets/molecules/chip_list_input.dart +++ b/lib/app/widgets/molecules/chip_list_input.dart @@ -69,7 +69,7 @@ class _ChipListInputState extends State> { children: [ DefaultTextStyle( child: widget.label ?? Text(S.current.entityPlural(T)), - style: Theme.of(context).textTheme.caption!.copyWith(color: widget.labelColor), + style: Theme.of(context).textTheme.bodySmall!.copyWith(color: widget.labelColor), ), const SizedBox(height: 6), Wrap( diff --git a/lib/app/widgets/molecules/user_menu_popover.dart b/lib/app/widgets/molecules/user_menu_popover.dart index 7b9bcd8e..a8aafcd2 100644 --- a/lib/app/widgets/molecules/user_menu_popover.dart +++ b/lib/app/widgets/molecules/user_menu_popover.dart @@ -94,7 +94,7 @@ class UserMenuPopover extends GetView with AuthServiceMixin, U const SizedBox(height: 8), Text( S.current.userMenuRecentCharacters, - style: Theme.of(context).textTheme.caption, + style: Theme.of(context).textTheme.bodySmall, ), Padding( padding: const EdgeInsets.only(top: 8), diff --git a/lib/app/widgets/molecules/value_change_slider.dart b/lib/app/widgets/molecules/value_change_slider.dart index 4575b5f7..60ffe40d 100644 --- a/lib/app/widgets/molecules/value_change_slider.dart +++ b/lib/app/widgets/molecules/value_change_slider.dart @@ -55,7 +55,7 @@ class ValueChangeSlider extends StatelessWidget { : isChangePositive ? positiveText(changeAmount) : negativeText(changeAmount), - style: textTheme.headline5!.copyWith( + style: textTheme.headlineSmall!.copyWith( color: isChangeNeutral ? null : isChangePositive @@ -82,8 +82,6 @@ class ValueChangeSlider extends StatelessWidget { .copyWith( borderRadius: borderRadius, ), - // childBuilder: (_) => Text(_.toString()), - minMaxLabelBuilder: (_) => '', onSlideUpdate: (val) => onChange((N == int ? val.toInt() : val.toDouble()) as N), ), ), diff --git a/lib/app/widgets/views/roll_dice_view.dart b/lib/app/widgets/views/roll_dice_view.dart index c5b7175c..9fbe1991 100644 --- a/lib/app/widgets/views/roll_dice_view.dart +++ b/lib/app/widgets/views/roll_dice_view.dart @@ -156,7 +156,7 @@ class _RollDiceViewState extends State with TickerProviderStateMix Text( S.current.rollDialogResultTotal( results.isNotEmpty ? results[group.index].total : 0), - style: textTheme.headline6!.copyWith(color: Colors.white), + style: textTheme.titleLarge!.copyWith(color: Colors.white), ), Text( S.current.rollDialogResultBreakdown( @@ -165,7 +165,8 @@ class _RollDiceViewState extends State with TickerProviderStateMix ? '+0' : group.value.modifierWithSign), ), - style: textTheme.bodyText2!.copyWith(color: Colors.white.withOpacity(0.75)), + style: + textTheme.bodyMedium!.copyWith(color: Colors.white.withOpacity(0.75)), ), ], ), diff --git a/lib/core/utils/markdown_styles.dart b/lib/core/utils/markdown_styles.dart index c09dfed9..72735504 100644 --- a/lib/core/utils/markdown_styles.dart +++ b/lib/core/utils/markdown_styles.dart @@ -7,12 +7,12 @@ class MarkdownStyles { final textTheme = theme.textTheme; final mdTheme = MarkdownStyleSheet.fromTheme(theme); return mdTheme.copyWith( - h1: _headingTheme(textTheme.headline1!, mdTheme.h1!), - h2: _headingTheme(textTheme.headline2!, mdTheme.h2!), - h3: _headingTheme(textTheme.headline3!, mdTheme.h3!), - h4: _headingTheme(textTheme.headline4!, mdTheme.h4!, textScaleFactor: 0.93), - h5: _headingTheme(textTheme.headline5!, mdTheme.h5!, textScaleFactor: 0.88), - h6: _headingTheme(textTheme.headline6!, mdTheme.h6!, textScaleFactor: 0.8), + h1: _headingTheme(textTheme.displayLarge!, mdTheme.h1!), + h2: _headingTheme(textTheme.displayMedium!, mdTheme.h2!), + h3: _headingTheme(textTheme.displaySmall!, mdTheme.h3!), + h4: _headingTheme(textTheme.headlineMedium!, mdTheme.h4!, textScaleFactor: 0.93), + h5: _headingTheme(textTheme.headlineSmall!, mdTheme.h5!, textScaleFactor: 0.88), + h6: _headingTheme(textTheme.titleLarge!, mdTheme.h6!, textScaleFactor: 0.8), blockquotePadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 2), blockquoteDecoration: BoxDecoration( border: Border( diff --git a/macos/Podfile b/macos/Podfile index 2f632d31..94ce2b70 100644 --- a/macos/Podfile +++ b/macos/Podfile @@ -1,4 +1,4 @@ - platform :osx, "10.12" +platform :osx, "10.13" # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV["COCOAPODS_DISABLE_STATS"] = "true" diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 2442444b..3c0315ad 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -602,109 +602,104 @@ PODS: - BoringSSL-GRPC/Implementation (0.0.24): - BoringSSL-GRPC/Interface (= 0.0.24) - BoringSSL-GRPC/Interface (0.0.24) - - cloud_firestore (3.4.3): - - Firebase/CoreOnly (~> 9.3.0) - - Firebase/Firestore (~> 9.3.0) + - cloud_firestore (4.0.3): + - Firebase/CoreOnly (~> 10.0.0) + - Firebase/Firestore (~> 10.0.0) - firebase_core - FlutterMacOS - - Firebase/Analytics (9.3.0): + - nanopb (< 2.30910.0, >= 2.30908.0) + - Firebase/Analytics (10.0.0): - Firebase/Core - - Firebase/Auth (9.3.0): + - Firebase/Auth (10.0.0): - Firebase/CoreOnly - - FirebaseAuth (~> 9.3.0) - - Firebase/Core (9.3.0): + - FirebaseAuth (~> 10.0.0) + - Firebase/Core (10.0.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 9.3.0) - - Firebase/CoreOnly (9.3.0): - - FirebaseCore (= 9.3.0) - - Firebase/Crashlytics (9.3.0): + - FirebaseAnalytics (~> 10.0.0) + - Firebase/CoreOnly (10.0.0): + - FirebaseCore (= 10.0.0) + - Firebase/Crashlytics (10.0.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 9.3.0) - - Firebase/Firestore (9.3.0): + - FirebaseCrashlytics (~> 10.0.0) + - Firebase/Firestore (10.0.0): - Firebase/CoreOnly - - FirebaseFirestore (~> 9.3.0) - - Firebase/RemoteConfig (9.3.0): + - FirebaseFirestore (~> 10.0.0) + - Firebase/RemoteConfig (10.0.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 9.3.0) - - Firebase/Storage (9.3.0): + - FirebaseRemoteConfig (~> 10.0.0) + - Firebase/Storage (10.0.0): - Firebase/CoreOnly - - FirebaseStorage (~> 9.3.0) - - firebase_analytics (9.3.0): - - Firebase/Analytics (= 9.3.0) + - FirebaseStorage (~> 10.0.0) + - firebase_analytics (10.0.3): + - Firebase/Analytics (= 10.0.0) - firebase_core - FlutterMacOS - - firebase_auth (3.6.2): - - Firebase/Auth (~> 9.3.0) - - Firebase/CoreOnly (~> 9.3.0) + - firebase_auth (4.1.0): + - Firebase/Auth (~> 10.0.0) + - Firebase/CoreOnly (~> 10.0.0) - firebase_core - FlutterMacOS - - firebase_core (1.20.0): - - Firebase/CoreOnly (~> 9.3.0) + - firebase_core (2.1.1): + - Firebase/CoreOnly (~> 10.0.0) - FlutterMacOS - - firebase_crashlytics (2.8.6): - - Firebase/CoreOnly (~> 9.3.0) - - Firebase/Crashlytics (~> 9.3.0) + - firebase_crashlytics (3.0.3): + - Firebase/CoreOnly (~> 10.0.0) + - Firebase/Crashlytics (~> 10.0.0) - firebase_core - FlutterMacOS - - firebase_remote_config (2.0.13): - - Firebase/CoreOnly (~> 9.3.0) - - Firebase/RemoteConfig (~> 9.3.0) + - firebase_remote_config (3.0.3): + - Firebase/CoreOnly (~> 10.0.0) + - Firebase/RemoteConfig (~> 10.0.0) - firebase_core - FlutterMacOS - - firebase_storage (10.3.4): - - Firebase/CoreOnly (~> 9.3.0) - - Firebase/Storage (~> 9.3.0) + - firebase_storage (11.0.3): + - Firebase/CoreOnly (~> 10.0.0) + - Firebase/Storage (~> 10.0.0) - firebase_core - FlutterMacOS - - FirebaseABTesting (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseAnalytics (9.3.0): - - FirebaseAnalytics/AdIdSupport (= 9.3.0) - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseABTesting (10.0.0): + - FirebaseCore (~> 10.0) + - FirebaseAnalytics (10.0.0): + - FirebaseAnalytics/AdIdSupport (= 10.0.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleAppMeasurement (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseAnalytics/AdIdSupport (10.0.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleAppMeasurement (= 10.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAppCheckInterop (9.3.0) - - FirebaseAuth (9.3.0): - - FirebaseCore (~> 9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/Environment (~> 7.7) - - GTMSessionFetcher/Core (< 3.0, >= 1.7) - - FirebaseAuthInterop (9.3.0) - - FirebaseCore (9.3.0): - - FirebaseCoreDiagnostics (~> 9.0) - - FirebaseCoreInternal (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (9.3.0): - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCoreExtension (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseCoreInternal (9.3.0): - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseCrashlytics (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) + - FirebaseAppCheckInterop (10.0.0) + - FirebaseAuth (10.0.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/Environment (~> 7.8) + - GTMSessionFetcher/Core (~> 2.1) + - FirebaseAuthInterop (10.0.0) + - FirebaseCore (10.0.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreExtension (10.0.0): + - FirebaseCore (~> 10.0) + - FirebaseCoreInternal (10.0.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseCrashlytics (10.0.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (~> 2.1) - - FirebaseFirestore (9.3.0): + - FirebaseFirestore (10.0.0): - abseil/algorithm (~> 1.20211102.0) - abseil/base (~> 1.20211102.0) - abseil/container/flat_hash_map (~> 1.20211102.0) @@ -713,76 +708,73 @@ PODS: - abseil/strings/strings (~> 1.20211102.0) - abseil/time (~> 1.20211102.0) - abseil/types (~> 1.20211102.0) - - FirebaseCore (~> 9.0) + - FirebaseCore (~> 10.0) - "gRPC-C++ (~> 1.44.0)" - leveldb-library (~> 1.22) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseInstallations (9.3.0): - - FirebaseCore (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) + - FirebaseInstallations (10.0.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseRemoteConfig (9.3.0): - - FirebaseABTesting (~> 9.0) - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseStorage (9.3.0): - - FirebaseAppCheckInterop (~> 9.0) - - FirebaseAuthInterop (~> 9.0) - - FirebaseCore (~> 9.0) - - FirebaseCoreExtension (~> 9.0) - - FirebaseStorageInternal (~> 9.0) - - FirebaseStorageInternal (9.3.0): - - FirebaseCore (~> 9.0) - - GTMSessionFetcher/Core (< 3.0, >= 1.7) + - FirebaseRemoteConfig (10.0.0): + - FirebaseABTesting (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseStorage (10.0.0): + - FirebaseAppCheckInterop (~> 10.0) + - FirebaseAuthInterop (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseCoreExtension (~> 10.0) + - GTMSessionFetcher/Core (~> 2.1) - FlutterMacOS (1.0.0) - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) - - GoogleAppMeasurement (9.3.0): - - GoogleAppMeasurement/AdIdSupport (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement (10.0.0): + - GoogleAppMeasurement/AdIdSupport (= 10.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (9.3.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement/AdIdSupport (10.0.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (9.3.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement/WithoutAdIdSupport (10.0.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - GoogleDataTransport (9.2.0): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): + - GoogleUtilities/AppDelegateSwizzler (7.8.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.8.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/Logger (7.8.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.7.0): + - GoogleUtilities/MethodSwizzler (7.8.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.7.0): + - GoogleUtilities/Network (7.8.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): + - "GoogleUtilities/NSData+zlib (7.8.0)" + - GoogleUtilities/Reachability (7.8.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): + - GoogleUtilities/UserDefaults (7.8.0): - GoogleUtilities/Logger - "gRPC-C++ (1.44.0)": - "gRPC-C++/Implementation (= 1.44.0)" @@ -835,7 +827,7 @@ PODS: - gRPC-Core/Interface (= 1.44.0) - Libuv-gRPC (= 0.0.10) - gRPC-Core/Interface (1.44.0) - - GTMSessionFetcher/Core (2.0.0) + - GTMSessionFetcher/Core (2.1.0) - leveldb-library (1.22.1) - Libuv-gRPC (0.0.10): - Libuv-gRPC/Implementation (= 0.0.10) @@ -853,13 +845,13 @@ PODS: - path_provider_macos (0.0.1): - FlutterMacOS - PromisesObjC (2.1.1) - - Sentry (7.22.0): - - Sentry/Core (= 7.22.0) - - Sentry/Core (7.22.0) + - Sentry (7.28.0): + - Sentry/Core (= 7.28.0) + - Sentry/Core (7.28.0) - sentry_flutter (0.0.1): - Flutter - FlutterMacOS - - Sentry (~> 7.22.0) + - Sentry (~> 7.28.0) - shared_preferences_macos (0.0.1): - FlutterMacOS - sign_in_with_apple (0.0.1): @@ -901,7 +893,6 @@ SPEC REPOS: - FirebaseAuth - FirebaseAuthInterop - FirebaseCore - - FirebaseCoreDiagnostics - FirebaseCoreExtension - FirebaseCoreInternal - FirebaseCrashlytics @@ -909,7 +900,6 @@ SPEC REPOS: - FirebaseInstallations - FirebaseRemoteConfig - FirebaseStorage - - FirebaseStorageInternal - FMDB - GoogleAppMeasurement - GoogleDataTransport @@ -960,51 +950,49 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: abseil: ebe5b5529fb05d93a8bdb7951607be08b7fa71bc BoringSSL-GRPC: 3175b25143e648463a56daeaaa499c6cb86dad33 - cloud_firestore: c46005989fbdc902de05ee697e8bb35754788639 - Firebase: ef75abb1cdbc746d5a38f4e26c422c807b189b8c - firebase_analytics: f13c2f70c75bb283ed99f492d02823ee7e24a57f - firebase_auth: dc02cb252e349707c7d451fbc61b165b13c13299 - firebase_core: 30cff5dc3d110360ba97895b6bdb6fe70b4b4060 - firebase_crashlytics: 21b98b122d93d2d5ab68ebb74309838a53fa2b81 - firebase_remote_config: 9b0c46e1985416c4c25190ac7e3657b836dae968 - firebase_storage: cd91b8c962f715175e744d0673dad9bbc056e37f - FirebaseABTesting: d7383da017eff5dc4fccb40987fa76271fd1cdbf - FirebaseAnalytics: bf46f5163f44097ce2c789de0b3e6f87f1da834a - FirebaseAppCheckInterop: f6b9670fb1360cf12006ca426e9c3b9a35317d17 - FirebaseAuth: 9ebc3577fe0acf9092df21ac314024b70aebf21e - FirebaseAuthInterop: 79826b4edc64e1d10135947866ad4437657e8696 - FirebaseCore: c088995ece701a021a48a1348ea0174877de2a6a - FirebaseCoreDiagnostics: 060eb57cc56dfaf40b1b1b5874a5c17c41ce79f8 - FirebaseCoreExtension: 900b065a4970c31ce8de4e966cee910188e3a07b - FirebaseCoreInternal: 635d1c9a612a6502b6377a0c92af83758076ffff - FirebaseCrashlytics: 65a5b349e664e986e6c7486b0a9b5ed8c11d0491 - FirebaseFirestore: 5a72aa925528f67469b16a54a6cfc369467197e4 - FirebaseInstallations: 54b40022cb06e462740c9f2b9fbe38b5e78a825a - FirebaseRemoteConfig: 0a644c924b3339bcf3bc3ea253206f171672308e - FirebaseStorage: 1414d27e15fa04f6350ef6602accef0e951c8bca - FirebaseStorageInternal: f1a6d64cace780580d2b8ffa0a0c8cf3c376f3f8 - FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811 + cloud_firestore: 822267f0a75a6f0a65d96389d5f1ebcfe2ca67f6 + Firebase: 1b810f3d0c0532e27a48f1961f8c0400a668a2cf + firebase_analytics: 3e4a5d4b4b025f96a034d6d18632a6be074db9c3 + firebase_auth: 222427272a107d05ed68384a8168a6f22b55f45c + firebase_core: 2ad407221995257e47215d9ae92467db0dd48ced + firebase_crashlytics: b8977ed57bd8b306cec382bfebb0ae8898eb62c1 + firebase_remote_config: d6767c4b7a164a8ec57c17987f22d5057bf86236 + firebase_storage: feb8b1977874f369d831335dae20b39814e468e8 + FirebaseABTesting: 5a08a4d3060b7fb5638f60698bc2cb57996bcc73 + FirebaseAnalytics: 9921a52739f4ab66099da31b6e0243db78a3ac0a + FirebaseAppCheckInterop: 9a7af9d0a4d9197265cda30194f3644e8aea24f9 + FirebaseAuth: 493382cf533cc45e2862b00e9aa4cfe4c98daf71 + FirebaseAuthInterop: c342679f45bee2a665a3b9148a55fcdb10df8c66 + FirebaseCore: 97f48a3a567a72b8d4daa0f03c3aadb78df4e995 + FirebaseCoreExtension: 449595a035812f16314ca88cebf959e3bb77dd67 + FirebaseCoreInternal: 5eb3960335da5ea30115d57d39db6988c4ad06f3 + FirebaseCrashlytics: 6b0613b548fe096221b5ba6d2f7a9732b451233b + FirebaseFirestore: 5007583f3db2129de8e87f18ee63f4c86f07e7a3 + FirebaseInstallations: 7f1c9ae6bd9df6abe9c74124b38fa8740aba5df4 + FirebaseRemoteConfig: e4431ddba74ddf705e2aabd7d356a23d5b802853 + FirebaseStorage: 8b0b0630e11b9f3e4a479a26cfccb70ec790ec50 + FlutterMacOS: 85f90bfb3f1703249cf1539e4dfbff31e8584698 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - GoogleAppMeasurement: b907bdad775b6975a8108762345b2cfbf1a93c37 + GoogleAppMeasurement: 7e48a3249792ac35d6f18f107f63f199a7e9d0ce GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 + GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7 "gRPC-C++": 9675f953ace2b3de7c506039d77be1f2e77a8db2 gRPC-Core: 943e491cb0d45598b0b0eb9e910c88080369290b - GTMSessionFetcher: 681175626052e03fdde7952f7e9c7a9785719506 + GTMSessionFetcher: ffbb25ec00ebcb5201adab0a56d808f6f1902d9f leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729 Libuv-gRPC: 55e51798e14ef436ad9bc45d12d43b77b49df378 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19 PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb - Sentry: 30b51086ca9aac23337880152e95538f7e177f7f - sentry_flutter: eaca55af5c951f4be6c4b1daddce1744c37d8476 + Sentry: 2c6053e4cfe6dea6608135dea1928ffbb4ecfba5 + sentry_flutter: fad3ef0917dc1afa7d242af0743696ed9a9a8864 shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727 sign_in_with_apple: a9e97e744e8edc36aefc2723111f652102a7a727 sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9 -PODFILE CHECKSUM: 062124ab023c4aad638d34c2bd0bd1f81e9fd7bf +PODFILE CHECKSUM: 9ca3af0ce848e9c32ce4922ef527704f897ea2ab COCOAPODS: 1.11.3 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index efd21a9e..dfb990e7 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -319,6 +319,7 @@ }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -656,4 +657,4 @@ /* End XCConfigurationList section */ }; rootObject = 33CC10E52044A3C60003C045 /* Project object */; -} \ No newline at end of file +} diff --git a/pubspec.lock b/pubspec.lock index d75907f3..9e62e941 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,28 +7,35 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "43.0.0" + version: "47.0.0" + _flutterfire_internals: + dependency: transitive + description: + name: _flutterfire_internals + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.6" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "4.3.1" + version: "4.7.0" animations: dependency: "direct main" description: name: animations url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.7" archive: dependency: transitive description: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.3.1" + version: "3.3.2" args: dependency: "direct dev" description: @@ -56,21 +63,21 @@ packages: name: cached_network_image url: "https://pub.dartlang.org" source: hosted - version: "3.2.1" + version: "3.2.2" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "2.0.0" cached_network_image_web: dependency: transitive description: name: cached_network_image_web url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" characters: dependency: transitive description: @@ -78,13 +85,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.2.1" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" clock: dependency: transitive description: @@ -98,21 +98,21 @@ packages: name: cloud_firestore url: "https://pub.dartlang.org" source: hosted - version: "3.4.3" + version: "4.0.3" cloud_firestore_platform_interface: dependency: transitive description: name: cloud_firestore_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "5.7.0" + version: "5.8.3" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web url: "https://pub.dartlang.org" source: hosted - version: "2.8.3" + version: "3.0.3" collection: dependency: transitive description: @@ -126,14 +126,14 @@ packages: name: convert url: "https://pub.dartlang.org" source: hosted - version: "3.0.2" + version: "3.1.1" coverage: dependency: transitive description: name: coverage url: "https://pub.dartlang.org" source: hosted - version: "1.3.2" + version: "1.6.1" crypto: dependency: transitive description: @@ -141,6 +141,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.0.2" + csslib: + dependency: transitive + description: + name: csslib + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.2" cupertino_icons: dependency: "direct main" description: @@ -154,7 +161,7 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.2.3" + version: "2.2.4" dungeon_world_data: dependency: "direct main" description: @@ -196,126 +203,126 @@ packages: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.1.4" firebase_analytics: dependency: "direct main" description: name: firebase_analytics url: "https://pub.dartlang.org" source: hosted - version: "9.3.0" + version: "10.0.3" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "3.3.0" + version: "3.3.11" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.5.1+2" firebase_auth: dependency: "direct main" description: name: firebase_auth url: "https://pub.dartlang.org" source: hosted - version: "3.6.2" + version: "4.1.0" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "6.5.2" + version: "6.11.0" firebase_auth_web: dependency: transitive description: name: firebase_auth_web url: "https://pub.dartlang.org" source: hosted - version: "4.2.2" + version: "5.1.0" firebase_core: dependency: "direct main" description: name: firebase_core url: "https://pub.dartlang.org" source: hosted - version: "1.20.0" + version: "2.1.1" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.5.0" + version: "4.5.2" firebase_core_web: dependency: transitive description: name: firebase_core_web url: "https://pub.dartlang.org" source: hosted - version: "1.7.1" + version: "2.0.1" firebase_crashlytics: dependency: "direct main" description: name: firebase_crashlytics url: "https://pub.dartlang.org" source: hosted - version: "2.8.6" + version: "3.0.3" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "3.2.12" + version: "3.3.4" firebase_remote_config: dependency: "direct main" description: name: firebase_remote_config url: "https://pub.dartlang.org" source: hosted - version: "2.0.13" + version: "3.0.3" firebase_remote_config_platform_interface: dependency: transitive description: name: firebase_remote_config_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.1.12" + version: "1.1.23" firebase_remote_config_web: dependency: transitive description: name: firebase_remote_config_web url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.1.12" firebase_storage: dependency: "direct main" description: name: firebase_storage url: "https://pub.dartlang.org" source: hosted - version: "10.3.4" + version: "11.0.3" firebase_storage_platform_interface: dependency: transitive description: name: firebase_storage_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.1.12" + version: "4.1.22" firebase_storage_web: dependency: transitive description: name: firebase_storage_web url: "https://pub.dartlang.org" source: hosted - version: "3.3.2" + version: "3.3.13" flutter: dependency: "direct main" description: flutter @@ -341,7 +348,7 @@ packages: name: flutter_file_dialog url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.3.2" flutter_lints: dependency: "direct dev" description: @@ -355,21 +362,21 @@ packages: name: flutter_markdown url: "https://pub.dartlang.org" source: hosted - version: "0.6.10+3" + version: "0.6.12" flutter_native_splash: dependency: "direct main" description: name: flutter_native_splash url: "https://pub.dartlang.org" source: hosted - version: "2.2.7" + version: "2.2.12" flutter_svg: dependency: "direct main" description: name: flutter_svg url: "https://pub.dartlang.org" source: hosted - version: "1.1.1+1" + version: "1.1.6" flutter_test: dependency: "direct dev" description: flutter @@ -386,7 +393,7 @@ packages: name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "3.1.0" get: dependency: "direct main" description: @@ -407,28 +414,28 @@ packages: name: google_sign_in url: "https://pub.dartlang.org" source: hosted - version: "5.4.0" + version: "5.4.2" google_sign_in_android: dependency: transitive description: name: google_sign_in_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.1" + version: "6.1.1" google_sign_in_ios: dependency: transitive description: name: google_sign_in_ios url: "https://pub.dartlang.org" source: hosted - version: "5.4.0" + version: "5.5.0" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.3.0" google_sign_in_web: dependency: transitive description: @@ -436,13 +443,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.10.2" + html: + dependency: transitive + description: + name: html + url: "https://pub.dartlang.org" + source: hosted + version: "0.15.1" http: dependency: "direct main" description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.4" + version: "0.13.5" http_multi_server: dependency: transitive description: @@ -456,21 +470,21 @@ packages: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "4.0.1" + version: "4.0.2" icons_launcher: dependency: "direct main" description: name: icons_launcher url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.5" image: dependency: transitive description: name: image url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "3.2.2" image_cropper: dependency: "direct main" description: @@ -520,13 +534,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.6.4" - lint: - dependency: transitive - description: - name: lint - url: "https://pub.dartlang.org" - source: hosted - version: "1.10.0" lints: dependency: transitive description: @@ -547,14 +554,14 @@ packages: name: logging url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.1.0" markdown: dependency: transitive description: name: markdown url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "6.0.1" matcher: dependency: transitive description: @@ -568,7 +575,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.5" + version: "0.2.0" meta: dependency: transitive description: @@ -610,7 +617,7 @@ packages: name: package_info_plus url: "https://pub.dartlang.org" source: hosted - version: "1.4.3" + version: "1.4.3+1" package_info_plus_linux: dependency: transitive description: @@ -638,14 +645,14 @@ packages: name: package_info_plus_web url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.0.6" package_info_plus_windows: dependency: transitive description: name: package_info_plus_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" path: dependency: "direct main" description: @@ -659,14 +666,14 @@ packages: name: path_drawing url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" path_parsing: dependency: transitive description: name: path_parsing url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" path_provider: dependency: "direct main" description: @@ -680,7 +687,7 @@ packages: name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.17" + version: "2.0.20" path_provider_ios: dependency: transitive description: @@ -708,14 +715,14 @@ packages: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.3" pedantic: dependency: transitive description: @@ -729,7 +736,7 @@ packages: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "5.1.0" platform: dependency: transitive description: @@ -743,7 +750,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" pool: dependency: transitive description: @@ -757,7 +764,7 @@ packages: name: popover url: "https://pub.dartlang.org" source: hosted - version: "0.2.6+3" + version: "0.2.7" process: dependency: transitive description: @@ -771,7 +778,7 @@ packages: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" quiver: dependency: transitive description: @@ -792,14 +799,14 @@ packages: name: sentry url: "https://pub.dartlang.org" source: hosted - version: "6.9.0" + version: "6.13.1" sentry_flutter: dependency: "direct main" description: name: sentry_flutter url: "https://pub.dartlang.org" source: hosted - version: "6.9.0" + version: "6.13.1" shared_preferences: dependency: "direct main" description: @@ -813,7 +820,7 @@ packages: name: shared_preferences_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.12" + version: "2.0.14" shared_preferences_ios: dependency: transitive description: @@ -841,7 +848,7 @@ packages: name: shared_preferences_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" shared_preferences_web: dependency: transitive description: @@ -862,7 +869,7 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "1.3.2" + version: "1.4.0" shelf_packages_handler: dependency: transitive description: @@ -930,35 +937,35 @@ packages: name: source_map_stack_trace url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" source_maps: dependency: transitive description: name: source_maps url: "https://pub.dartlang.org" source: hosted - version: "0.10.10" + version: "0.10.11" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.9.0" + version: "1.9.1" sqflite: dependency: transitive description: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.2.0+2" sqflite_common: dependency: transitive description: name: sqflite_common url: "https://pub.dartlang.org" source: hosted - version: "2.2.1+1" + version: "2.4.0+2" stack_trace: dependency: transitive description: @@ -972,7 +979,7 @@ packages: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -993,7 +1000,7 @@ packages: name: synchronized url: "https://pub.dartlang.org" source: hosted - version: "3.0.0+2" + version: "3.0.0+3" term_glyph: dependency: transitive description: @@ -1007,21 +1014,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.21.4" + version: "1.21.6" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.12" + version: "0.4.14" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.4.16" + version: "0.4.18" typed_data: dependency: transitive description: @@ -1042,14 +1049,14 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.1.5" + version: "6.1.6" url_launcher_android: dependency: transitive description: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.17" + version: "6.0.20" url_launcher_ios: dependency: transitive description: @@ -1077,14 +1084,14 @@ packages: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.12" + version: "2.0.13" url_launcher_windows: dependency: transitive description: @@ -1105,14 +1112,14 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.4" vm_service: dependency: transitive description: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "8.3.0" + version: "9.4.0" wakelock: dependency: "direct main" description: @@ -1147,14 +1154,14 @@ packages: name: wakelock_windows url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.2.1" watcher: dependency: transitive description: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" web_socket_channel: dependency: transitive description: @@ -1168,7 +1175,7 @@ packages: name: webkit_inspection_protocol url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" wheel_spinner: dependency: "direct main" description: @@ -1182,14 +1189,14 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.7.0" + version: "3.0.1" xdg_directories: dependency: transitive description: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.2.0+1" + version: "0.2.0+2" xml: dependency: transitive description: @@ -1205,5 +1212,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.17.1 <3.0.0" - flutter: ">=3.0.0" + dart: ">=2.18.0 <3.0.0" + flutter: ">=3.3.0" diff --git a/pubspec.yaml b/pubspec.yaml index b0b498e0..535780bd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -27,18 +27,18 @@ environment: dependencies: animations: ^2.0.2 cached_network_image: ^3.2.0 - cloud_firestore: ^3.1.8 + cloud_firestore: ^4.0.3 cupertino_icons: ^1.0.2 dungeon_world_data: path: ../dungeon_world_data dynamic_themes: ^1.1.0 email_validator: ^2.0.1 - firebase_analytics: ^9.1.0 - firebase_auth: ^3.3.19 - firebase_core: ^1.12.0 - firebase_crashlytics: ^2.5.1 - firebase_remote_config: ^2.0.13 - firebase_storage: ^10.2.18 + firebase_analytics: ^10.0.3 + firebase_auth: ^4.1.0 + firebase_core: ^2.1.1 + firebase_crashlytics: ^3.0.3 + firebase_remote_config: ^3.0.3 + firebase_storage: ^11.0.3 flutter: sdk: flutter flutter_file_dialog: ^2.3.0