From 16bfa6b4f5d759b893fb6f67526d91d39109530d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cu=CC=9Bo=CC=9Bng=20Nguye=CC=82=CC=83n?= Date: Sun, 15 May 2022 00:15:34 +0700 Subject: [PATCH] Update to Flutter 3 --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- .run/DebugDev.run.xml | 2 +- README.md | 2 +- android/Gemfile.lock | 106 +- android/app/build.gradle | 7 +- android/app/src/main/AndroidManifest.xml | 3 + android/build.gradle | 8 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- functions/java/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ios/Flutter/AppFrameworkInfo.plist | 2 +- ios/Podfile | 2 +- ios/Podfile.lock | 966 ++++++++++++------ ios/Runner.xcodeproj/project.pbxproj | 30 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- ios/Runner/Info.plist | 8 +- .../authentication_controller.dart | 12 +- .../authentication_state.freezed.dart | 176 ++-- lib/authentication/authentication_widget.dart | 4 +- lib/game/center_text_paint.dart | 10 +- lib/game/game_controller.dart | 18 +- lib/game/game_page.dart | 32 +- lib/game/game_reward.freezed.dart | 112 +- lib/game/game_state.freezed.dart | 281 +++-- lib/game/note/note.freezed.dart | 92 +- lib/game/tile/tile_chunk.freezed.dart | 133 ++- lib/game_config/game_config_page.dart | 9 +- .../game_config_state.freezed.dart | 102 +- lib/home/home_page.dart | 5 +- lib/instrument/instrument.freezed.dart | 185 ++-- lib/instrument/instruments_controller.dart | 9 +- lib/instrument/instruments_page.dart | 8 +- lib/locale/locale_controller.dart | 6 +- lib/locale/locale_page.dart | 6 +- lib/log_provider_observer.dart | 2 +- lib/router/root_router.dart | 62 +- lib/router/root_router.gr.dart | 305 +++--- lib/search/search_widget.dart | 6 +- lib/setting/settings_page.dart | 15 +- lib/songs/song.freezed.dart | 254 +++-- lib/songs/song_widget.dart | 4 +- lib/songs/songs_controller.dart | 25 +- lib/songs/songs_widget.dart | 9 +- lib/splash_page.dart | 3 +- lib/theme/theme_controller.dart | 21 +- lib/theme/theme_page.dart | 6 +- lib/user/user.freezed.dart | 219 ++-- lib/user/user_controller.dart | 15 +- lib/user/user_page.dart | 14 +- macos/Flutter/GeneratedPluginRegistrant.swift | 12 +- macos/Podfile | 2 +- macos/Podfile.lock | 920 +++++++++++------ macos/Runner.xcodeproj/project.pbxproj | 12 +- pubspec.lock | 950 ++++++++++------- pubspec.yaml | 4 +- 56 files changed, 3021 insertions(+), 2191 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72c58db9..5edea043 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ name: Build branches: - master env: - flutter_version: 2.10.1 + flutter_version: 3.7.0 jobs: build: name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4faf3be..3b897dd1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ name: Release tags: - '*' env: - flutter_version: 2.10.1 + flutter_version: 3.7.0 jobs: build: name: Build diff --git a/.run/DebugDev.run.xml b/.run/DebugDev.run.xml index 347c95aa..b268db9f 100644 --- a/.run/DebugDev.run.xml +++ b/.run/DebugDev.run.xml @@ -1,6 +1,6 @@ - diff --git a/README.md b/README.md index 1fe6b214..8d2162fa 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Hit Notes - Play instruments +# Flutter Rhythm - Play instruments [![Build](https://github.com/cuong0993/HitNotes/actions/workflows/build.yml/badge.svg)](https://github.com/cuong0993/HitNotes/actions/workflows/build.yml) diff --git a/android/Gemfile.lock b/android/Gemfile.lock index f2206052..317312dd 100644 --- a/android/Gemfile.lock +++ b/android/Gemfile.lock @@ -1,30 +1,30 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.4) + CFPropertyList (3.0.5) rexml - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.518.0) - aws-sdk-core (3.121.3) + aws-partitions (1.639.0) + aws-sdk-core (3.157.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.50.0) - aws-sdk-core (~> 3, >= 3.121.2) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.58.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.104.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-s3 (1.114.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.4.0) + aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - claide (1.0.3) + claide (1.1.0) colored (1.2) colored2 (3.1.2) commander (4.6.0) @@ -34,19 +34,20 @@ GEM rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) + dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.87.0) - faraday (1.8.0) + excon (0.93.0) + faraday (1.10.2) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) @@ -55,14 +56,17 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) + faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.5) - fastlane (2.197.0) + fastimage (2.2.6) + fastlane (2.210.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -102,9 +106,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.12.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-core (0.4.1) + google-apis-androidpublisher_v3 (0.28.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-core (0.9.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -113,40 +117,40 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.7.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-playcustomapp_v1 (0.5.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.8.0) - google-apis-core (>= 0.4, < 2.a) + google-apis-iamcredentials_v1 (0.15.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-playcustomapp_v1 (0.11.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-env (1.5.0) - faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.2.0) - google-cloud-storage (1.34.1) - addressable (~> 2.5) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.3.0) + google-cloud-storage (1.43.0) + addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.19.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.0.0) - faraday (>= 0.17.3, < 2.0) + googleauth (1.2.0) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - jmespath (1.4.0) - json (2.6.0) - jwt (2.3.0) + jmespath (1.6.1) + json (2.6.2) + jwt (2.5.0) memoist (0.16.2) mini_magick (4.11.0) mini_mime (1.1.2) @@ -155,11 +159,11 @@ GEM nanaimo (0.3.0) naturally (2.2.1) optparse (0.1.1) - os (1.1.1) + os (1.1.4) plist (3.6.0) - public_suffix (4.0.6) + public_suffix (5.0.0) rake (13.0.6) - representable (3.1.1) + representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) @@ -169,9 +173,9 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.16.0) + signet (0.17.0) addressable (~> 2.8) - faraday (>= 0.17.3, < 2.0) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simctl (1.6.8) @@ -180,7 +184,7 @@ GEM terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - trailblazer-option (0.1.1) + trailblazer-option (0.1.2) tty-cursor (0.7.1) tty-screen (0.8.1) tty-spinner (0.9.3) @@ -188,11 +192,11 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.2) unicode-display_width (1.8.0) webrick (1.7.0) word_wrap (1.0.0) - xcodeproj (1.21.0) + xcodeproj (1.22.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -211,4 +215,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.2.3 + 2.3.22 diff --git a/android/app/build.gradle b/android/app/build.gradle index 2fe8d476..4ce1fc99 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -48,7 +48,7 @@ apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' android { - compileSdkVersion 32 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -66,9 +66,10 @@ android { defaultConfig { resValue "string", "app_name", dartEnvironmentVariables.ENV_APP_NAME ? dartEnvironmentVariables.ENV_APP_NAME : "hittick" resValue "string", "facebook_app_id", dartEnvironmentVariables.ENV_FACEBOOK_APP_ID ? dartEnvironmentVariables.ENV_FACEBOOK_APP_ID : "" + resValue "string", "facebook_client_token", dartEnvironmentVariables.ENV_FACEBOOK_APP_SECRET ? dartEnvironmentVariables.ENV_FACEBOOK_APP_SECRET : "" applicationId "com.chaomao.hittick" - minSdkVersion 19 - targetSdkVersion 32 + minSdkVersion 21 + targetSdkVersion 33 multiDexEnabled true versionCode 33 versionName "1.2.10" diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 47d95481..6e676ae6 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -44,6 +44,9 @@ + diff --git a/android/build.gradle b/android/build.gradle index 3e74f005..32405eb8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,15 +1,15 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.20' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.3.10' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' + classpath 'com.google.gms:google-services:4.3.14' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 595fb867..b776d4b5 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip diff --git a/functions/java/build.gradle b/functions/java/build.gradle index 1cc9b84f..aa9ba5fd 100644 --- a/functions/java/build.gradle +++ b/functions/java/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - kotlin_version = '1.5.30' + kotlin_version = '1.7.20' } repositories { mavenCentral() @@ -35,8 +35,8 @@ configurations { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "com.google.cloud.functions:functions-framework-api:1.0.4" - implementation 'com.google.firebase:firebase-admin:8.0.1' - invoker "com.google.cloud.functions.invoker:java-function-invoker:1.0.2" + implementation 'com.google.firebase:firebase-admin:9.0.0' + invoker "com.google.cloud.functions.invoker:java-function-invoker:1.1.1" } tasks.register("runFunction", JavaExec) { diff --git a/functions/java/gradle/wrapper/gradle-wrapper.properties b/functions/java/gradle/wrapper/gradle-wrapper.properties index ffed3a25..ae04661e 100644 --- a/functions/java/gradle/wrapper/gradle-wrapper.properties +++ b/functions/java/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 8d4492f9..9625e105 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/ios/Podfile b/ios/Podfile index 814fe9d2..42995c9f 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '10.0' +platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 79c58316..c453e80c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,35 +1,34 @@ PODS: - - abseil/algorithm (0.20200225.0): - - abseil/algorithm/algorithm (= 0.20200225.0) - - abseil/algorithm/container (= 0.20200225.0) - - abseil/algorithm/algorithm (0.20200225.0): + - abseil/algorithm (1.20211102.0): + - abseil/algorithm/algorithm (= 1.20211102.0) + - abseil/algorithm/container (= 1.20211102.0) + - abseil/algorithm/algorithm (1.20211102.0): - abseil/base/config - - abseil/algorithm/container (0.20200225.0): + - abseil/algorithm/container (1.20211102.0): - abseil/algorithm/algorithm - abseil/base/core_headers - abseil/meta/type_traits - - abseil/base (0.20200225.0): - - abseil/base/atomic_hook (= 0.20200225.0) - - abseil/base/base (= 0.20200225.0) - - abseil/base/base_internal (= 0.20200225.0) - - abseil/base/bits (= 0.20200225.0) - - abseil/base/config (= 0.20200225.0) - - abseil/base/core_headers (= 0.20200225.0) - - abseil/base/dynamic_annotations (= 0.20200225.0) - - abseil/base/endian (= 0.20200225.0) - - abseil/base/errno_saver (= 0.20200225.0) - - abseil/base/exponential_biased (= 0.20200225.0) - - abseil/base/log_severity (= 0.20200225.0) - - abseil/base/malloc_internal (= 0.20200225.0) - - abseil/base/periodic_sampler (= 0.20200225.0) - - abseil/base/pretty_function (= 0.20200225.0) - - abseil/base/raw_logging_internal (= 0.20200225.0) - - abseil/base/spinlock_wait (= 0.20200225.0) - - abseil/base/throw_delegate (= 0.20200225.0) - - abseil/base/atomic_hook (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/base (0.20200225.0): + - abseil/base (1.20211102.0): + - abseil/base/atomic_hook (= 1.20211102.0) + - abseil/base/base (= 1.20211102.0) + - abseil/base/base_internal (= 1.20211102.0) + - abseil/base/config (= 1.20211102.0) + - abseil/base/core_headers (= 1.20211102.0) + - abseil/base/dynamic_annotations (= 1.20211102.0) + - abseil/base/endian (= 1.20211102.0) + - abseil/base/errno_saver (= 1.20211102.0) + - abseil/base/fast_type_id (= 1.20211102.0) + - abseil/base/log_severity (= 1.20211102.0) + - abseil/base/malloc_internal (= 1.20211102.0) + - abseil/base/pretty_function (= 1.20211102.0) + - abseil/base/raw_logging_internal (= 1.20211102.0) + - abseil/base/spinlock_wait (= 1.20211102.0) + - abseil/base/strerror (= 1.20211102.0) + - abseil/base/throw_delegate (= 1.20211102.0) + - abseil/base/atomic_hook (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/base (1.20211102.0): - abseil/base/atomic_hook - abseil/base/base_internal - abseil/base/config @@ -39,113 +38,118 @@ PODS: - abseil/base/raw_logging_internal - abseil/base/spinlock_wait - abseil/meta/type_traits - - abseil/base/base_internal (0.20200225.0): + - abseil/base/base_internal (1.20211102.0): - abseil/base/config - abseil/meta/type_traits - - abseil/base/bits (0.20200225.0): + - abseil/base/config (1.20211102.0) + - abseil/base/core_headers (1.20211102.0): - abseil/base/config - - abseil/base/core_headers - - abseil/base/config (0.20200225.0) - - abseil/base/core_headers (0.20200225.0): + - abseil/base/dynamic_annotations (1.20211102.0): - abseil/base/config - - abseil/base/dynamic_annotations (0.20200225.0) - - abseil/base/endian (0.20200225.0): + - abseil/base/core_headers + - abseil/base/endian (1.20211102.0): + - abseil/base/base - abseil/base/config - abseil/base/core_headers - - abseil/base/errno_saver (0.20200225.0): + - abseil/base/errno_saver (1.20211102.0): - abseil/base/config - - abseil/base/exponential_biased (0.20200225.0): + - abseil/base/fast_type_id (1.20211102.0): - abseil/base/config - - abseil/base/core_headers - - abseil/base/log_severity (0.20200225.0): + - abseil/base/log_severity (1.20211102.0): - abseil/base/config - abseil/base/core_headers - - abseil/base/malloc_internal (0.20200225.0): + - abseil/base/malloc_internal (1.20211102.0): - abseil/base/base - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers - abseil/base/dynamic_annotations - abseil/base/raw_logging_internal - - abseil/base/periodic_sampler (0.20200225.0): - - abseil/base/core_headers - - abseil/base/exponential_biased - - abseil/base/pretty_function (0.20200225.0) - - abseil/base/raw_logging_internal (0.20200225.0): + - abseil/base/pretty_function (1.20211102.0) + - abseil/base/raw_logging_internal (1.20211102.0): - abseil/base/atomic_hook - abseil/base/config - abseil/base/core_headers - abseil/base/log_severity - - abseil/base/spinlock_wait (0.20200225.0): + - abseil/base/spinlock_wait (1.20211102.0): - abseil/base/base_internal - abseil/base/core_headers - abseil/base/errno_saver - - abseil/base/throw_delegate (0.20200225.0): + - abseil/base/strerror (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/errno_saver + - abseil/base/throw_delegate (1.20211102.0): - abseil/base/config - abseil/base/raw_logging_internal - - abseil/container/common (0.20200225.0): + - abseil/container/common (1.20211102.0): - abseil/meta/type_traits - abseil/types/optional - - abseil/container/compressed_tuple (0.20200225.0): + - abseil/container/compressed_tuple (1.20211102.0): - abseil/utility/utility - - abseil/container/container_memory (0.20200225.0): + - abseil/container/container_memory (1.20211102.0): + - abseil/base/config - abseil/memory/memory + - abseil/meta/type_traits - abseil/utility/utility - - abseil/container/fixed_array (0.20200225.0): + - abseil/container/fixed_array (1.20211102.0): - abseil/algorithm/algorithm + - abseil/base/config - abseil/base/core_headers - abseil/base/dynamic_annotations - abseil/base/throw_delegate - abseil/container/compressed_tuple - abseil/memory/memory - - abseil/container/flat_hash_map (0.20200225.0): + - abseil/container/flat_hash_map (1.20211102.0): - abseil/algorithm/container - abseil/container/container_memory - abseil/container/hash_function_defaults - abseil/container/raw_hash_map - abseil/memory/memory - - abseil/container/hash_function_defaults (0.20200225.0): + - abseil/container/hash_function_defaults (1.20211102.0): - abseil/base/config - abseil/hash/hash + - abseil/strings/cord - abseil/strings/strings - - abseil/container/hash_policy_traits (0.20200225.0): + - abseil/container/hash_policy_traits (1.20211102.0): - abseil/meta/type_traits - - abseil/container/hashtable_debug_hooks (0.20200225.0): + - abseil/container/hashtable_debug_hooks (1.20211102.0): - abseil/base/config - - abseil/container/hashtablez_sampler (0.20200225.0): + - abseil/container/hashtablez_sampler (1.20211102.0): - abseil/base/base - abseil/base/core_headers - - abseil/base/exponential_biased - abseil/container/have_sse - abseil/debugging/stacktrace - abseil/memory/memory + - abseil/profiling/exponential_biased + - abseil/profiling/sample_recorder - abseil/synchronization/synchronization - abseil/utility/utility - - abseil/container/have_sse (0.20200225.0) - - abseil/container/inlined_vector (0.20200225.0): + - abseil/container/have_sse (1.20211102.0) + - abseil/container/inlined_vector (1.20211102.0): - abseil/algorithm/algorithm - abseil/base/core_headers - abseil/base/throw_delegate - abseil/container/inlined_vector_internal - abseil/memory/memory - - abseil/container/inlined_vector_internal (0.20200225.0): + - abseil/container/inlined_vector_internal (1.20211102.0): - abseil/base/core_headers - abseil/container/compressed_tuple - abseil/memory/memory - abseil/meta/type_traits - abseil/types/span - - abseil/container/layout (0.20200225.0): + - abseil/container/layout (1.20211102.0): + - abseil/base/config - abseil/base/core_headers - abseil/meta/type_traits - abseil/strings/strings - abseil/types/span - abseil/utility/utility - - abseil/container/raw_hash_map (0.20200225.0): + - abseil/container/raw_hash_map (1.20211102.0): - abseil/base/throw_delegate - abseil/container/container_memory - abseil/container/raw_hash_set - - abseil/container/raw_hash_set (0.20200225.0): - - abseil/base/bits + - abseil/container/raw_hash_set (1.20211102.0): - abseil/base/config - abseil/base/core_headers - abseil/base/endian @@ -156,25 +160,25 @@ PODS: - abseil/container/hashtable_debug_hooks - abseil/container/hashtablez_sampler - abseil/container/have_sse - - abseil/container/layout - abseil/memory/memory - abseil/meta/type_traits + - abseil/numeric/bits - abseil/utility/utility - - abseil/debugging/debugging_internal (0.20200225.0): + - abseil/debugging/debugging_internal (1.20211102.0): - abseil/base/config - abseil/base/core_headers - abseil/base/dynamic_annotations - abseil/base/errno_saver - abseil/base/raw_logging_internal - - abseil/debugging/demangle_internal (0.20200225.0): + - abseil/debugging/demangle_internal (1.20211102.0): - abseil/base/base - abseil/base/config - abseil/base/core_headers - - abseil/debugging/stacktrace (0.20200225.0): + - abseil/debugging/stacktrace (1.20211102.0): - abseil/base/config - abseil/base/core_headers - abseil/debugging/debugging_internal - - abseil/debugging/symbolize (0.20200225.0): + - abseil/debugging/symbolize (1.20211102.0): - abseil/base/base - abseil/base/config - abseil/base/core_headers @@ -183,51 +187,303 @@ PODS: - abseil/base/raw_logging_internal - abseil/debugging/debugging_internal - abseil/debugging/demangle_internal - - abseil/hash/city (0.20200225.0): + - abseil/strings/strings + - abseil/functional/bind_front (1.20211102.0): + - abseil/base/base_internal + - abseil/container/compressed_tuple + - abseil/meta/type_traits + - abseil/utility/utility + - abseil/functional/function_ref (1.20211102.0): + - abseil/base/base_internal + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/hash/city (1.20211102.0): - abseil/base/config - abseil/base/core_headers - abseil/base/endian - - abseil/hash/hash (0.20200225.0): + - abseil/hash/hash (1.20211102.0): + - abseil/base/config - abseil/base/core_headers - abseil/base/endian - abseil/container/fixed_array - abseil/hash/city + - abseil/hash/low_level_hash - abseil/meta/type_traits - abseil/numeric/int128 - abseil/strings/strings - abseil/types/optional - abseil/types/variant - abseil/utility/utility - - abseil/memory (0.20200225.0): - - abseil/memory/memory (= 0.20200225.0) - - abseil/memory/memory (0.20200225.0): + - abseil/hash/low_level_hash (1.20211102.0): + - abseil/base/config + - abseil/base/endian + - abseil/numeric/bits + - abseil/numeric/int128 + - abseil/memory (1.20211102.0): + - abseil/memory/memory (= 1.20211102.0) + - abseil/memory/memory (1.20211102.0): - abseil/base/core_headers - abseil/meta/type_traits - - abseil/meta (0.20200225.0): - - abseil/meta/type_traits (= 0.20200225.0) - - abseil/meta/type_traits (0.20200225.0): + - abseil/meta (1.20211102.0): + - abseil/meta/type_traits (= 1.20211102.0) + - abseil/meta/type_traits (1.20211102.0): + - abseil/base/config + - abseil/numeric/bits (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/numeric/int128 (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/numeric/bits + - abseil/numeric/representation (1.20211102.0): - abseil/base/config - - abseil/numeric/int128 (0.20200225.0): + - abseil/profiling/exponential_biased (1.20211102.0): - abseil/base/config - abseil/base/core_headers - - abseil/strings/internal (0.20200225.0): + - abseil/profiling/sample_recorder (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/synchronization/synchronization + - abseil/time/time + - abseil/random/distributions (1.20211102.0): + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/numeric/bits + - abseil/random/internal/distribution_caller + - abseil/random/internal/fast_uniform_bits + - abseil/random/internal/fastmath + - abseil/random/internal/generate_real + - abseil/random/internal/iostream_state_saver + - abseil/random/internal/traits + - abseil/random/internal/uniform_helper + - abseil/random/internal/wide_multiply + - abseil/strings/strings + - abseil/random/internal/distribution_caller (1.20211102.0): + - abseil/base/config + - abseil/base/fast_type_id + - abseil/utility/utility + - abseil/random/internal/fast_uniform_bits (1.20211102.0): + - abseil/base/config + - abseil/meta/type_traits + - abseil/random/internal/fastmath (1.20211102.0): + - abseil/numeric/bits + - abseil/random/internal/generate_real (1.20211102.0): + - abseil/meta/type_traits + - abseil/numeric/bits + - abseil/random/internal/fastmath + - abseil/random/internal/traits + - abseil/random/internal/iostream_state_saver (1.20211102.0): + - abseil/meta/type_traits + - abseil/numeric/int128 + - abseil/random/internal/nonsecure_base (1.20211102.0): + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/random/internal/pool_urbg + - abseil/random/internal/salted_seed_seq + - abseil/random/internal/seed_material + - abseil/types/optional + - abseil/types/span + - abseil/random/internal/pcg_engine (1.20211102.0): + - abseil/base/config + - abseil/meta/type_traits + - abseil/numeric/bits + - abseil/numeric/int128 + - abseil/random/internal/fastmath + - abseil/random/internal/iostream_state_saver + - abseil/random/internal/platform (1.20211102.0): + - abseil/base/config + - abseil/random/internal/pool_urbg (1.20211102.0): + - abseil/base/base - abseil/base/config - abseil/base/core_headers - abseil/base/endian - abseil/base/raw_logging_internal + - abseil/random/internal/randen + - abseil/random/internal/seed_material + - abseil/random/internal/traits + - abseil/random/seed_gen_exception + - abseil/types/span + - abseil/random/internal/randen (1.20211102.0): + - abseil/base/raw_logging_internal + - abseil/random/internal/platform + - abseil/random/internal/randen_hwaes + - abseil/random/internal/randen_slow + - abseil/random/internal/randen_engine (1.20211102.0): + - abseil/base/endian - abseil/meta/type_traits - - abseil/strings/str_format (0.20200225.0): + - abseil/random/internal/iostream_state_saver + - abseil/random/internal/randen + - abseil/random/internal/randen_hwaes (1.20211102.0): + - abseil/base/config + - abseil/random/internal/platform + - abseil/random/internal/randen_hwaes_impl + - abseil/random/internal/randen_hwaes_impl (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/numeric/int128 + - abseil/random/internal/platform + - abseil/random/internal/randen_slow (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/numeric/int128 + - abseil/random/internal/platform + - abseil/random/internal/salted_seed_seq (1.20211102.0): + - abseil/container/inlined_vector + - abseil/meta/type_traits + - abseil/random/internal/seed_material + - abseil/types/optional + - abseil/types/span + - abseil/random/internal/seed_material (1.20211102.0): + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/raw_logging_internal + - abseil/random/internal/fast_uniform_bits + - abseil/strings/strings + - abseil/types/optional + - abseil/types/span + - abseil/random/internal/traits (1.20211102.0): + - abseil/base/config + - abseil/random/internal/uniform_helper (1.20211102.0): + - abseil/base/config + - abseil/meta/type_traits + - abseil/random/internal/traits + - abseil/random/internal/wide_multiply (1.20211102.0): + - abseil/base/config + - abseil/numeric/bits + - abseil/numeric/int128 + - abseil/random/internal/traits + - abseil/random/random (1.20211102.0): + - abseil/random/distributions + - abseil/random/internal/nonsecure_base + - abseil/random/internal/pcg_engine + - abseil/random/internal/pool_urbg + - abseil/random/internal/randen_engine + - abseil/random/seed_sequences + - abseil/random/seed_gen_exception (1.20211102.0): + - abseil/base/config + - abseil/random/seed_sequences (1.20211102.0): + - abseil/container/inlined_vector + - abseil/random/internal/nonsecure_base + - abseil/random/internal/pool_urbg + - abseil/random/internal/salted_seed_seq + - abseil/random/internal/seed_material + - abseil/random/seed_gen_exception + - abseil/types/span + - abseil/status/status (1.20211102.0): + - abseil/base/atomic_hook + - abseil/base/config + - abseil/base/core_headers + - abseil/base/raw_logging_internal + - abseil/container/inlined_vector + - abseil/debugging/stacktrace + - abseil/debugging/symbolize + - abseil/functional/function_ref + - abseil/strings/cord + - abseil/strings/str_format + - abseil/strings/strings + - abseil/types/optional + - abseil/status/statusor (1.20211102.0): + - abseil/base/base + - abseil/base/core_headers + - abseil/base/raw_logging_internal + - abseil/meta/type_traits + - abseil/status/status + - abseil/strings/strings + - abseil/types/variant + - abseil/utility/utility + - abseil/strings/cord (1.20211102.0): + - abseil/base/base + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/base/raw_logging_internal + - abseil/container/fixed_array + - abseil/container/inlined_vector + - abseil/functional/function_ref + - abseil/meta/type_traits + - abseil/strings/cord_internal + - abseil/strings/cordz_functions + - abseil/strings/cordz_info + - abseil/strings/cordz_statistics + - abseil/strings/cordz_update_scope + - abseil/strings/cordz_update_tracker + - abseil/strings/internal + - abseil/strings/str_format + - abseil/strings/strings + - abseil/types/optional + - abseil/strings/cord_internal (1.20211102.0): + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/base/raw_logging_internal + - abseil/base/throw_delegate + - abseil/container/compressed_tuple + - abseil/container/inlined_vector + - abseil/container/layout + - abseil/functional/function_ref + - abseil/meta/type_traits + - abseil/strings/strings + - abseil/types/span + - abseil/strings/cordz_functions (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/raw_logging_internal + - abseil/profiling/exponential_biased + - abseil/strings/cordz_handle (1.20211102.0): + - abseil/base/base + - abseil/base/config + - abseil/base/raw_logging_internal + - abseil/synchronization/synchronization + - abseil/strings/cordz_info (1.20211102.0): + - abseil/base/base + - abseil/base/config + - abseil/base/core_headers + - abseil/base/raw_logging_internal + - abseil/container/inlined_vector + - abseil/debugging/stacktrace + - abseil/strings/cord_internal + - abseil/strings/cordz_functions + - abseil/strings/cordz_handle + - abseil/strings/cordz_statistics + - abseil/strings/cordz_update_tracker + - abseil/synchronization/synchronization + - abseil/types/span + - abseil/strings/cordz_statistics (1.20211102.0): + - abseil/base/config + - abseil/strings/cordz_update_tracker + - abseil/strings/cordz_update_scope (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/strings/cord_internal + - abseil/strings/cordz_info + - abseil/strings/cordz_update_tracker + - abseil/strings/cordz_update_tracker (1.20211102.0): + - abseil/base/config + - abseil/strings/internal (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/base/raw_logging_internal + - abseil/meta/type_traits + - abseil/strings/str_format (1.20211102.0): - abseil/strings/str_format_internal - - abseil/strings/str_format_internal (0.20200225.0): + - abseil/strings/str_format_internal (1.20211102.0): - abseil/base/config - abseil/base/core_headers + - abseil/functional/function_ref - abseil/meta/type_traits + - abseil/numeric/bits - abseil/numeric/int128 + - abseil/numeric/representation - abseil/strings/strings + - abseil/types/optional - abseil/types/span - - abseil/strings/strings (0.20200225.0): + - abseil/strings/strings (1.20211102.0): - abseil/base/base - - abseil/base/bits - abseil/base/config - abseil/base/core_headers - abseil/base/endian @@ -235,20 +491,21 @@ PODS: - abseil/base/throw_delegate - abseil/memory/memory - abseil/meta/type_traits + - abseil/numeric/bits - abseil/numeric/int128 - abseil/strings/internal - - abseil/synchronization/graphcycles_internal (0.20200225.0): + - abseil/synchronization/graphcycles_internal (1.20211102.0): - abseil/base/base - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers - abseil/base/malloc_internal - abseil/base/raw_logging_internal - - abseil/synchronization/kernel_timeout_internal (0.20200225.0): + - abseil/synchronization/kernel_timeout_internal (1.20211102.0): - abseil/base/core_headers - abseil/base/raw_logging_internal - abseil/time/time - - abseil/synchronization/synchronization (0.20200225.0): + - abseil/synchronization/synchronization (1.20211102.0): - abseil/base/atomic_hook - abseil/base/base - abseil/base/base_internal @@ -262,20 +519,20 @@ PODS: - abseil/synchronization/graphcycles_internal - abseil/synchronization/kernel_timeout_internal - abseil/time/time - - abseil/time (0.20200225.0): - - abseil/time/internal (= 0.20200225.0) - - abseil/time/time (= 0.20200225.0) - - abseil/time/internal (0.20200225.0): - - abseil/time/internal/cctz (= 0.20200225.0) - - abseil/time/internal/cctz (0.20200225.0): - - abseil/time/internal/cctz/civil_time (= 0.20200225.0) - - abseil/time/internal/cctz/time_zone (= 0.20200225.0) - - abseil/time/internal/cctz/civil_time (0.20200225.0): - - abseil/base/config - - abseil/time/internal/cctz/time_zone (0.20200225.0): + - abseil/time (1.20211102.0): + - abseil/time/internal (= 1.20211102.0) + - abseil/time/time (= 1.20211102.0) + - abseil/time/internal (1.20211102.0): + - abseil/time/internal/cctz (= 1.20211102.0) + - abseil/time/internal/cctz (1.20211102.0): + - abseil/time/internal/cctz/civil_time (= 1.20211102.0) + - abseil/time/internal/cctz/time_zone (= 1.20211102.0) + - abseil/time/internal/cctz/civil_time (1.20211102.0): + - abseil/base/config + - abseil/time/internal/cctz/time_zone (1.20211102.0): - abseil/base/config - abseil/time/internal/cctz/civil_time - - abseil/time/time (0.20200225.0): + - abseil/time/time (1.20211102.0): - abseil/base/base - abseil/base/core_headers - abseil/base/raw_logging_internal @@ -283,38 +540,39 @@ PODS: - abseil/strings/strings - abseil/time/internal/cctz/civil_time - abseil/time/internal/cctz/time_zone - - abseil/types (0.20200225.0): - - abseil/types/any (= 0.20200225.0) - - abseil/types/bad_any_cast (= 0.20200225.0) - - abseil/types/bad_any_cast_impl (= 0.20200225.0) - - abseil/types/bad_optional_access (= 0.20200225.0) - - abseil/types/bad_variant_access (= 0.20200225.0) - - abseil/types/compare (= 0.20200225.0) - - abseil/types/optional (= 0.20200225.0) - - abseil/types/span (= 0.20200225.0) - - abseil/types/variant (= 0.20200225.0) - - abseil/types/any (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers + - abseil/types (1.20211102.0): + - abseil/types/any (= 1.20211102.0) + - abseil/types/bad_any_cast (= 1.20211102.0) + - abseil/types/bad_any_cast_impl (= 1.20211102.0) + - abseil/types/bad_optional_access (= 1.20211102.0) + - abseil/types/bad_variant_access (= 1.20211102.0) + - abseil/types/compare (= 1.20211102.0) + - abseil/types/optional (= 1.20211102.0) + - abseil/types/span (= 1.20211102.0) + - abseil/types/variant (= 1.20211102.0) + - abseil/types/any (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/fast_type_id - abseil/meta/type_traits - abseil/types/bad_any_cast - abseil/utility/utility - - abseil/types/bad_any_cast (0.20200225.0): + - abseil/types/bad_any_cast (1.20211102.0): - abseil/base/config - abseil/types/bad_any_cast_impl - - abseil/types/bad_any_cast_impl (0.20200225.0): + - abseil/types/bad_any_cast_impl (1.20211102.0): - abseil/base/config - abseil/base/raw_logging_internal - - abseil/types/bad_optional_access (0.20200225.0): + - abseil/types/bad_optional_access (1.20211102.0): - abseil/base/config - abseil/base/raw_logging_internal - - abseil/types/bad_variant_access (0.20200225.0): + - abseil/types/bad_variant_access (1.20211102.0): - abseil/base/config - abseil/base/raw_logging_internal - - abseil/types/compare (0.20200225.0): + - abseil/types/compare (1.20211102.0): - abseil/base/core_headers - abseil/meta/type_traits - - abseil/types/optional (0.20200225.0): + - abseil/types/optional (1.20211102.0): - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers @@ -322,209 +580,271 @@ PODS: - abseil/meta/type_traits - abseil/types/bad_optional_access - abseil/utility/utility - - abseil/types/span (0.20200225.0): + - abseil/types/span (1.20211102.0): - abseil/algorithm/algorithm - abseil/base/core_headers - abseil/base/throw_delegate - abseil/meta/type_traits - - abseil/types/variant (0.20200225.0): + - abseil/types/variant (1.20211102.0): - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers - abseil/meta/type_traits - abseil/types/bad_variant_access - abseil/utility/utility - - abseil/utility/utility (0.20200225.0): + - abseil/utility/utility (1.20211102.0): - abseil/base/base_internal - abseil/base/config - abseil/meta/type_traits - - AppAuth (1.4.0): - - AppAuth/Core (= 1.4.0) - - AppAuth/ExternalUserAgent (= 1.4.0) - - AppAuth/Core (1.4.0) - - AppAuth/ExternalUserAgent (1.4.0) - - BoringSSL-GRPC (0.0.7): - - BoringSSL-GRPC/Implementation (= 0.0.7) - - BoringSSL-GRPC/Interface (= 0.0.7) - - BoringSSL-GRPC/Implementation (0.0.7): - - BoringSSL-GRPC/Interface (= 0.0.7) - - BoringSSL-GRPC/Interface (0.0.7) - - cloud_firestore (3.1.8): - - Firebase/Firestore (= 8.11.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) + - BoringSSL-GRPC/Interface (= 0.0.24) + - BoringSSL-GRPC/Implementation (0.0.24): + - BoringSSL-GRPC/Interface (= 0.0.24) + - BoringSSL-GRPC/Interface (0.0.24) + - cloud_firestore (4.5.0): + - Firebase/Firestore (= 10.7.0) - firebase_core - Flutter - - cloud_functions (3.2.7): - - Firebase/Functions (= 8.11.0) + - nanopb (< 2.30910.0, >= 2.30908.0) + - cloud_functions (4.1.0): + - Firebase/Functions (= 10.7.0) - firebase_core - Flutter - device_info_plus (0.0.1): - Flutter - - FBAEMKit (12.2.1): - - FBSDKCoreKit_Basics (= 12.2.1) - - FBSDKCoreKit (12.2.1): - - FBAEMKit (= 12.2.1) - - FBSDKCoreKit_Basics (= 12.2.1) - - FBSDKCoreKit_Basics (12.2.1) - - FBSDKLoginKit (12.2.1): - - FBSDKCoreKit (= 12.2.1) - - Firebase/Auth (8.11.0): + - FBAEMKit (15.1.0): + - FBSDKCoreKit_Basics (= 15.1.0) + - FBSDKCoreKit (15.1.0): + - FBAEMKit (= 15.1.0) + - FBSDKCoreKit_Basics (= 15.1.0) + - FBSDKCoreKit_Basics (15.1.0) + - FBSDKLoginKit (15.1.0): + - FBSDKCoreKit (= 15.1.0) + - Firebase/Auth (10.7.0): - Firebase/CoreOnly - - FirebaseAuth (~> 8.11.0) - - Firebase/CoreOnly (8.11.0): - - FirebaseCore (= 8.11.0) - - Firebase/Crashlytics (8.11.0): + - FirebaseAuth (~> 10.7.0) + - Firebase/CoreOnly (10.7.0): + - FirebaseCore (= 10.7.0) + - Firebase/Crashlytics (10.7.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 8.11.0) - - Firebase/Firestore (8.11.0): + - FirebaseCrashlytics (~> 10.7.0) + - Firebase/Firestore (10.7.0): - Firebase/CoreOnly - - FirebaseFirestore (~> 8.11.0) - - Firebase/Functions (8.11.0): + - FirebaseFirestore (~> 10.7.0) + - Firebase/Functions (10.7.0): - Firebase/CoreOnly - - FirebaseFunctions (~> 8.11.0) - - Firebase/Storage (8.11.0): + - FirebaseFunctions (~> 10.7.0) + - Firebase/Storage (10.7.0): - Firebase/CoreOnly - - FirebaseStorage (~> 8.11.0) - - firebase_auth (3.3.7): - - Firebase/Auth (= 8.11.0) + - FirebaseStorage (~> 10.7.0) + - firebase_auth (4.4.0): + - Firebase/Auth (= 10.7.0) - firebase_core - Flutter - - firebase_core (1.12.0): - - Firebase/CoreOnly (= 8.11.0) + - firebase_core (2.9.0): + - Firebase/CoreOnly (= 10.7.0) - Flutter - - firebase_crashlytics (2.5.1): - - Firebase/Crashlytics (= 8.11.0) + - firebase_crashlytics (3.1.0): + - Firebase/Crashlytics (= 10.7.0) - firebase_core - Flutter - - firebase_storage (10.2.7): - - Firebase/Storage (= 8.11.0) + - firebase_storage (11.1.0): + - Firebase/Storage (= 10.7.0) - firebase_core - Flutter - - FirebaseAuth (8.11.0): - - FirebaseCore (~> 8.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/Environment (~> 7.7) - - GTMSessionFetcher/Core (~> 1.5) - - FirebaseCore (8.11.0): - - FirebaseCoreDiagnostics (~> 8.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (8.12.0): - - GoogleDataTransport (~> 9.1) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (~> 2.30908.0) - - FirebaseCrashlytics (8.11.0): - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleDataTransport (~> 9.1) - - GoogleUtilities/Environment (~> 7.7) - - nanopb (~> 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) - - FirebaseFirestore (8.11.0): - - abseil/algorithm (= 0.20200225.0) - - abseil/base (= 0.20200225.0) - - abseil/container/flat_hash_map (= 0.20200225.0) - - abseil/memory (= 0.20200225.0) - - abseil/meta (= 0.20200225.0) - - abseil/strings/strings (= 0.20200225.0) - - abseil/time (= 0.20200225.0) - - abseil/types (= 0.20200225.0) - - FirebaseCore (~> 8.0) - - "gRPC-C++ (~> 1.28.0)" + - FirebaseAppCheckInterop (10.7.0) + - FirebaseAuth (10.7.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/Environment (~> 7.8) + - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - FirebaseAuthInterop (10.7.0) + - FirebaseCore (10.7.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreExtension (10.7.0): + - FirebaseCore (~> 10.0) + - FirebaseCoreInternal (10.7.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseCrashlytics (10.7.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) + - FirebaseFirestore (10.7.0): + - abseil/algorithm (~> 1.20211102.0) + - abseil/base (~> 1.20211102.0) + - abseil/container/flat_hash_map (~> 1.20211102.0) + - abseil/memory (~> 1.20211102.0) + - abseil/meta (~> 1.20211102.0) + - abseil/strings/strings (~> 1.20211102.0) + - abseil/time (~> 1.20211102.0) + - abseil/types (~> 1.20211102.0) + - FirebaseCore (~> 10.0) + - "gRPC-C++ (~> 1.44.0)" - leveldb-library (~> 1.22) - - nanopb (~> 2.30908.0) - - FirebaseFunctions (8.11.0): - - FirebaseCore (~> 8.0) - - GTMSessionFetcher/Core (~> 1.5) - - FirebaseInstallations (8.12.0): - - FirebaseCore (~> 8.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) - - PromisesObjC (< 3.0, >= 1.2) - - FirebaseStorage (8.11.0): - - FirebaseCore (~> 8.0) - - GTMSessionFetcher/Core (~> 1.5) + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseFunctions (10.7.0): + - FirebaseAppCheckInterop (~> 10.0) + - FirebaseAuthInterop (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseCoreExtension (~> 10.0) + - FirebaseMessagingInterop (~> 10.0) + - FirebaseSharedSwift (~> 10.0) + - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - FirebaseInstallations (10.7.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) + - PromisesObjC (~> 2.1) + - FirebaseMessagingInterop (10.7.0) + - FirebaseSessions (10.7.0): + - FirebaseCore (~> 10.5) + - FirebaseCoreExtension (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.10) + - nanopb (< 2.30910.0, >= 2.30908.0) + - PromisesSwift (~> 2.1) + - FirebaseSharedSwift (10.7.0) + - FirebaseStorage (10.7.0): + - FirebaseAppCheckInterop (~> 10.0) + - FirebaseAuthInterop (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseCoreExtension (~> 10.0) + - GTMSessionFetcher/Core (< 4.0, >= 2.1) - Flutter (1.0.0) - flutter_email_sender (0.0.1): - Flutter - - flutter_facebook_auth (3.5.3): - - FBSDKCoreKit (~> 12.2.1) - - FBSDKLoginKit (~> 12.2.1) + - flutter_facebook_auth (5.0.4): + - FBSDKLoginKit (~> 15.1.0) + - Flutter + - flutter_native_splash (0.0.1): + - Flutter + - flutter_secure_storage (6.0.0): - Flutter - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) - - google_sign_in (0.0.1): + - google_sign_in_ios (0.0.1): - Flutter - - GoogleSignIn (~> 5.0) - - GoogleDataTransport (9.1.2): - - GoogleUtilities/Environment (~> 7.2) - - nanopb (~> 2.30908.0) + - GoogleSignIn (~> 6.2) + - GoogleDataTransport (9.2.1): + - GoogleUtilities/Environment (~> 7.7) + - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleSignIn (5.0.2): - - AppAuth (~> 1.2) - - GTMAppAuth (~> 1.0) - - GTMSessionFetcher/Core (~> 1.1) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): + - GoogleSignIn (6.2.4): + - AppAuth (~> 1.5) + - GTMAppAuth (~> 1.3) + - GTMSessionFetcher/Core (< 3.0, >= 1.1) + - GoogleUtilities/AppDelegateSwizzler (7.11.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.11.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/Logger (7.11.0): - GoogleUtilities/Environment - - GoogleUtilities/Network (7.7.0): + - GoogleUtilities/Network (7.11.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): + - "GoogleUtilities/NSData+zlib (7.11.0)" + - GoogleUtilities/Reachability (7.11.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): + - GoogleUtilities/UserDefaults (7.11.0): - GoogleUtilities/Logger - - "gRPC-C++ (1.28.2)": - - "gRPC-C++/Implementation (= 1.28.2)" - - "gRPC-C++/Interface (= 1.28.2)" - - "gRPC-C++/Implementation (1.28.2)": - - abseil/container/inlined_vector (= 0.20200225.0) - - abseil/memory/memory (= 0.20200225.0) - - abseil/strings/str_format (= 0.20200225.0) - - abseil/strings/strings (= 0.20200225.0) - - abseil/types/optional (= 0.20200225.0) - - "gRPC-C++/Interface (= 1.28.2)" - - gRPC-Core (= 1.28.2) - - "gRPC-C++/Interface (1.28.2)" - - gRPC-Core (1.28.2): - - gRPC-Core/Implementation (= 1.28.2) - - gRPC-Core/Interface (= 1.28.2) - - gRPC-Core/Implementation (1.28.2): - - abseil/container/inlined_vector (= 0.20200225.0) - - abseil/memory/memory (= 0.20200225.0) - - abseil/strings/str_format (= 0.20200225.0) - - abseil/strings/strings (= 0.20200225.0) - - abseil/types/optional (= 0.20200225.0) - - BoringSSL-GRPC (= 0.0.7) - - gRPC-Core/Interface (= 1.28.2) - - gRPC-Core/Interface (1.28.2) - - GTMAppAuth (1.2.2): - - AppAuth/Core (~> 1.4) - - GTMSessionFetcher/Core (~> 1.5) - - GTMSessionFetcher/Core (1.7.0) + - "gRPC-C++ (1.44.0)": + - "gRPC-C++/Implementation (= 1.44.0)" + - "gRPC-C++/Interface (= 1.44.0)" + - "gRPC-C++/Implementation (1.44.0)": + - abseil/base/base (= 1.20211102.0) + - abseil/base/core_headers (= 1.20211102.0) + - abseil/container/flat_hash_map (= 1.20211102.0) + - abseil/container/inlined_vector (= 1.20211102.0) + - abseil/functional/bind_front (= 1.20211102.0) + - abseil/hash/hash (= 1.20211102.0) + - abseil/memory/memory (= 1.20211102.0) + - abseil/random/random (= 1.20211102.0) + - abseil/status/status (= 1.20211102.0) + - abseil/status/statusor (= 1.20211102.0) + - abseil/strings/cord (= 1.20211102.0) + - abseil/strings/str_format (= 1.20211102.0) + - abseil/strings/strings (= 1.20211102.0) + - abseil/synchronization/synchronization (= 1.20211102.0) + - abseil/time/time (= 1.20211102.0) + - abseil/types/optional (= 1.20211102.0) + - abseil/types/variant (= 1.20211102.0) + - abseil/utility/utility (= 1.20211102.0) + - "gRPC-C++/Interface (= 1.44.0)" + - gRPC-Core (= 1.44.0) + - "gRPC-C++/Interface (1.44.0)" + - gRPC-Core (1.44.0): + - gRPC-Core/Implementation (= 1.44.0) + - gRPC-Core/Interface (= 1.44.0) + - gRPC-Core/Implementation (1.44.0): + - abseil/base/base (= 1.20211102.0) + - abseil/base/core_headers (= 1.20211102.0) + - abseil/container/flat_hash_map (= 1.20211102.0) + - abseil/container/inlined_vector (= 1.20211102.0) + - abseil/functional/bind_front (= 1.20211102.0) + - abseil/hash/hash (= 1.20211102.0) + - abseil/memory/memory (= 1.20211102.0) + - abseil/random/random (= 1.20211102.0) + - abseil/status/status (= 1.20211102.0) + - abseil/status/statusor (= 1.20211102.0) + - abseil/strings/cord (= 1.20211102.0) + - abseil/strings/str_format (= 1.20211102.0) + - abseil/strings/strings (= 1.20211102.0) + - abseil/synchronization/synchronization (= 1.20211102.0) + - abseil/time/time (= 1.20211102.0) + - abseil/types/optional (= 1.20211102.0) + - abseil/types/variant (= 1.20211102.0) + - abseil/utility/utility (= 1.20211102.0) + - BoringSSL-GRPC (= 0.0.24) + - gRPC-Core/Interface (= 1.44.0) + - Libuv-gRPC (= 0.0.10) + - gRPC-Core/Interface (1.44.0) + - GTMAppAuth (1.3.1): + - AppAuth/Core (~> 1.6) + - GTMSessionFetcher/Core (< 3.0, >= 1.5) + - GTMSessionFetcher/Core (2.3.0) - in_app_review (0.2.0): - Flutter - leveldb-library (1.22.1) - - nanopb (2.30908.0): - - nanopb/decode (= 2.30908.0) - - nanopb/encode (= 2.30908.0) - - nanopb/decode (2.30908.0) - - nanopb/encode (2.30908.0) + - Libuv-gRPC (0.0.10): + - Libuv-gRPC/Implementation (= 0.0.10) + - Libuv-gRPC/Interface (= 0.0.10) + - Libuv-gRPC/Implementation (0.0.10): + - Libuv-gRPC/Interface (= 0.0.10) + - Libuv-gRPC/Interface (0.0.10) + - nanopb (2.30909.0): + - nanopb/decode (= 2.30909.0) + - nanopb/encode (= 2.30909.0) + - nanopb/decode (2.30909.0) + - nanopb/encode (2.30909.0) - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter - - PromisesObjC (2.0.0) - - shared_preferences_ios (0.0.1): + - FlutterMacOS + - PromisesObjC (2.2.0) + - PromisesSwift (2.2.0): + - PromisesObjC (= 2.2.0) + - shared_preferences_foundation (0.0.1): - Flutter + - FlutterMacOS - sqflite (0.0.2): - Flutter - FMDB (>= 2.7.5) @@ -542,11 +862,13 @@ DEPENDENCIES: - Flutter (from `Flutter`) - flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`) - flutter_facebook_auth (from `.symlinks/plugins/flutter_facebook_auth/ios`) - - google_sign_in (from `.symlinks/plugins/google_sign_in/ios`) + - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) + - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) + - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/ios`) - in_app_review (from `.symlinks/plugins/in_app_review/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) @@ -560,13 +882,19 @@ SPEC REPOS: - FBSDKCoreKit_Basics - FBSDKLoginKit - Firebase + - FirebaseAppCheckInterop - FirebaseAuth + - FirebaseAuthInterop - FirebaseCore - - FirebaseCoreDiagnostics + - FirebaseCoreExtension + - FirebaseCoreInternal - FirebaseCrashlytics - FirebaseFirestore - FirebaseFunctions - FirebaseInstallations + - FirebaseMessagingInterop + - FirebaseSessions + - FirebaseSharedSwift - FirebaseStorage - FMDB - GoogleDataTransport @@ -577,8 +905,10 @@ SPEC REPOS: - GTMAppAuth - GTMSessionFetcher - leveldb-library + - Libuv-gRPC - nanopb - PromisesObjC + - PromisesSwift EXTERNAL SOURCES: cloud_firestore: @@ -601,67 +931,81 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_email_sender/ios" flutter_facebook_auth: :path: ".symlinks/plugins/flutter_facebook_auth/ios" - google_sign_in: - :path: ".symlinks/plugins/google_sign_in/ios" + flutter_native_splash: + :path: ".symlinks/plugins/flutter_native_splash/ios" + flutter_secure_storage: + :path: ".symlinks/plugins/flutter_secure_storage/ios" + google_sign_in_ios: + :path: ".symlinks/plugins/google_sign_in_ios/ios" in_app_review: :path: ".symlinks/plugins/in_app_review/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" - shared_preferences_ios: - :path: ".symlinks/plugins/shared_preferences_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/ios" sqflite: :path: ".symlinks/plugins/sqflite/ios" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: - abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f - AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7 - BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879 - cloud_firestore: 8bd22e19f6ccf3a0d1976ea298e0ce37c9ad5839 - cloud_functions: c024d02ed3046e5ee7f8cd03e6c306c56044678c + abseil: ebe5b5529fb05d93a8bdb7951607be08b7fa71bc + AppAuth: 8fca6b5563a5baef2c04bee27538025e4ceb2add + BoringSSL-GRPC: 3175b25143e648463a56daeaaa499c6cb86dad33 + cloud_firestore: 84f58b426bd8d21a22c4b19d9d18028fc4ff3eb1 + cloud_functions: 1013ced10d7b82cc7b4239f86236782fe3b9fc5b device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed - FBAEMKit: 4cea610d0bc1680572f2aad7b25db7a2f2690d82 - FBSDKCoreKit: 5b1992fe65802ca26be7e68bc4fac5f59fa39908 - FBSDKCoreKit_Basics: a6a92ca628e05f86f458a4721574c5ddfb058ba3 - FBSDKLoginKit: 7467b7f988ca4fdf48f12a839bcfce4264752429 - Firebase: 44dd9724c84df18b486639e874f31436eaa9a20c - firebase_auth: 20bf788012988ef04ce608fada5b8d8cd1069302 - firebase_core: 443bccfd6aa6b42f07be365b500773dc69db2d87 - firebase_crashlytics: 0df152ee2d96f5a4aeddf2288fb277bbd0833b18 - firebase_storage: 627bc138c31654fc1320b262e16e3fad770dea6f - FirebaseAuth: d96d73aba85d192d7a7aa0b86dd6d7f8ec170b4b - FirebaseCore: 2f4f85b453cc8fea4bb2b37e370007d2bcafe3f0 - FirebaseCoreDiagnostics: 3b40dfadef5b90433a60ae01f01e90fe87aa76aa - FirebaseCrashlytics: 62268addefae79601057818156e8bc69d71fee41 - FirebaseFirestore: 3b2e4b532c68809b3df5f8d39d28b3398ffc196b - FirebaseFunctions: 2bad3e4365dee72a85a6baa6ccd684f024d14696 - FirebaseInstallations: 25764cf322e77f99449395870a65b2bef88e1545 - FirebaseStorage: 4d05cb1112ff8822a0f9f5090da8bd6d550602ec - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + FBAEMKit: c7f82b5145d446bcbbcd50485c032689032fc6a2 + FBSDKCoreKit: 7542746fc63a2a38dd6a865eeb54268341f37b83 + FBSDKCoreKit_Basics: 92d6b26c0bed30ab09bbdd96dccaa26e6c9978d1 + FBSDKLoginKit: 4e275d30cf90e92bdf3a7c82857a8642abf23037 + Firebase: 0219acf760880eeec8ce479895bd7767466d9f81 + firebase_auth: 5984ebaf5463319e304ab1c0966b06994bd1c69a + firebase_core: d85432877e814811e040e7659f9c82faeab66e04 + firebase_crashlytics: 4c90334dc536ffa73b92f3e978426a0d1e339c74 + firebase_storage: 3419feab3ca832a07bdff5307477e0b9d20eb5f8 + FirebaseAppCheckInterop: 8e907eea79958960a8bd2058e067f31e03a7914b + FirebaseAuth: dd64c01631df724b09f33e584625775c52f7d71f + FirebaseAuthInterop: 46201190fe90ef1f581513eb0f9fa3d7820e7d6d + FirebaseCore: e317665b9d744727a97e623edbbed009320afdd7 + FirebaseCoreExtension: f17247ba8c61e4d3c8d136b5e2de3cb4ac6a85b6 + FirebaseCoreInternal: 8845798510aae74703467480f71ac613788d0696 + FirebaseCrashlytics: 35fdd1a433b31e28adcf5c8933f4c526691a1e0b + FirebaseFirestore: 3963a6edd1c84b4748dab3e2c62624a29d03eca1 + FirebaseFunctions: 6cede311274dd1e13ea4950fc9e57221d3538386 + FirebaseInstallations: 59c0e4c7a816a0f76710d83f77e5369b3e45eb96 + FirebaseMessagingInterop: c49e2766f4059ea4ef9e7c7764ed741a14aaeded + FirebaseSessions: 34e5c084da010ef3802cbc062b822e513c9e6318 + FirebaseSharedSwift: 993e46657e34f14fe497c4a43c1f9608dabfb2e5 + FirebaseStorage: 4841efa304543e1f9e4ca116c559c7a1ea2a9d0f + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b - flutter_facebook_auth: dbc47556cbdc61ced50e14473bd32461386a1425 + flutter_facebook_auth: c69f4e643b1d9cc9063ec87c9411bd9ec268108f + flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef + flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - google_sign_in: c5cecea71f3be43282263550556e311c4cc03582 - GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 - GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213 - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 - "gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2 - gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5 - GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89 - GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 - in_app_review: 4a97249f7a2f539a0f294c2d9196b7fe35e49541 + google_sign_in_ios: 1256ff9d941db546373826966720b0c24804bcdd + GoogleDataTransport: ea169759df570f4e37bdee1623ec32a7e64e67c4 + GoogleSignIn: 5651ce3a61e56ca864160e79b484cd9ed3f49b7a + GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f + "gRPC-C++": 9675f953ace2b3de7c506039d77be1f2e77a8db2 + gRPC-Core: 943e491cb0d45598b0b0eb9e910c88080369290b + GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd + GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2 + in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729 - nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 + Libuv-gRPC: 55e51798e14ef436ad9bc45d12d43b77b49df378 + nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5 - PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 - shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad + path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9 + PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef + PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959 + shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472 sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de + url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 -PODFILE CHECKSUM: 52850884bc4fe89b720ca304751837c651c6cba9 +PODFILE CHECKSUM: 22c4440197e12f62b9379d2f2de5f4953c85b90b -COCOAPODS: 1.11.2 +COCOAPODS: 1.12.0 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index c734dcef..f464793b 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -148,7 +148,6 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 7D4CFA0B199CC78C40FA5F1D /* [CP] Embed Pods Frameworks */, - 71D61F9E6CD42BFF3E0F148A /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -165,7 +164,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -211,6 +210,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -223,23 +223,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 71D61F9E6CD42BFF3E0F148A /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 7D4CFA0B199CC78C40FA5F1D /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -259,6 +242,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -369,7 +353,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -449,7 +433,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -498,7 +482,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 146664e2..519dbd11 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ FacebookAppID $(ENV_FACEBOOK_APP_ID) + FacebookClientToken + $(ENV_FACEBOOK_APP_SECRET) CFBundleVersion $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS @@ -52,5 +54,9 @@ UIStatusBarHidden - + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + diff --git a/lib/authentication/authentication_controller.dart b/lib/authentication/authentication_controller.dart index 41fa7b74..a1160bba 100644 --- a/lib/authentication/authentication_controller.dart +++ b/lib/authentication/authentication_controller.dart @@ -8,7 +8,7 @@ import 'authentication_state.dart'; final authenticationProvider = StateNotifierProvider( - (ref) => AuthenticationController(ref.read), + AuthenticationController.new, ); class AuthenticationController extends StateNotifier { @@ -28,7 +28,7 @@ class AuthenticationController extends StateNotifier { final _googleSignIn = GoogleSignIn(); final _facebookLogin = FacebookAuth.instance; - final Reader _read; + final StateNotifierProviderRef _read; Future signInWithGoogle() async { try { @@ -47,9 +47,7 @@ class AuthenticationController extends StateNotifier { Future signInWithFacebook() async { try { - final loginResult = await _facebookLogin.login( - loginBehavior: LoginBehavior.nativeWithFallback, - ); + final loginResult = await _facebookLogin.login(); final credential = FacebookAuthProvider.credential(loginResult.accessToken!.token); await _tryToLinkWithCurrentUser(credential); @@ -72,7 +70,7 @@ class AuthenticationController extends StateNotifier { // ignore: avoid_dynamic_calls photoUrl = userInfo.profile!['picture']['data']['url'] as String; } - _read(userRepositoryProvider).update(name, photoUrl); + _read.read(userRepositoryProvider).update(name, photoUrl); } on Exception { final userInfo = (await FirebaseAuth.instance.signInWithCredential(authCredential)) @@ -85,7 +83,7 @@ class AuthenticationController extends StateNotifier { // ignore: avoid_dynamic_calls photoUrl = userInfo.profile!['picture']['data']['url'] as String; } - _read(userRepositoryProvider).update(name, photoUrl); + _read.read(userRepositoryProvider).update(name, photoUrl); } } } diff --git a/lib/authentication/authentication_state.freezed.dart b/lib/authentication/authentication_state.freezed.dart index 469c533e..05feed0b 100644 --- a/lib/authentication/authentication_state.freezed.dart +++ b/lib/authentication/authentication_state.freezed.dart @@ -1,7 +1,7 @@ // coverage:ignore-file // GENERATED CODE - DO NOT MODIFY BY HAND // ignore_for_file: type=lint -// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark part of 'authentication_state.dart'; @@ -12,27 +12,7 @@ part of 'authentication_state.dart'; T _$identity(T value) => value; final _privateConstructorUsedError = UnsupportedError( - 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more informations: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); - -/// @nodoc -class _$AuthenticationStateTearOff { - const _$AuthenticationStateTearOff(); - - AuthenticationStateLoading loading() { - return AuthenticationStateLoading(); - } - - AuthenticationStateAuthenticated authenticated() { - return AuthenticationStateAuthenticated(); - } - - AuthenticationStateUnauthenticated unauthenticated() { - return AuthenticationStateUnauthenticated(); - } -} - -/// @nodoc -const $AuthenticationState = _$AuthenticationStateTearOff(); + 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); /// @nodoc mixin _$AuthenticationState { @@ -45,9 +25,9 @@ mixin _$AuthenticationState { throw _privateConstructorUsedError; @optionalTypeArgs TResult? whenOrNull({ - TResult Function()? loading, - TResult Function()? authenticated, - TResult Function()? unauthenticated, + TResult? Function()? loading, + TResult? Function()? authenticated, + TResult? Function()? unauthenticated, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -69,9 +49,10 @@ mixin _$AuthenticationState { throw _privateConstructorUsedError; @optionalTypeArgs TResult? mapOrNull({ - TResult Function(AuthenticationStateLoading value)? loading, - TResult Function(AuthenticationStateAuthenticated value)? authenticated, - TResult Function(AuthenticationStateUnauthenticated value)? unauthenticated, + TResult? Function(AuthenticationStateLoading value)? loading, + TResult? Function(AuthenticationStateAuthenticated value)? authenticated, + TResult? Function(AuthenticationStateUnauthenticated value)? + unauthenticated, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -88,37 +69,37 @@ mixin _$AuthenticationState { abstract class $AuthenticationStateCopyWith<$Res> { factory $AuthenticationStateCopyWith( AuthenticationState value, $Res Function(AuthenticationState) then) = - _$AuthenticationStateCopyWithImpl<$Res>; + _$AuthenticationStateCopyWithImpl<$Res, AuthenticationState>; } /// @nodoc -class _$AuthenticationStateCopyWithImpl<$Res> +class _$AuthenticationStateCopyWithImpl<$Res, $Val extends AuthenticationState> implements $AuthenticationStateCopyWith<$Res> { _$AuthenticationStateCopyWithImpl(this._value, this._then); - final AuthenticationState _value; // ignore: unused_field - final $Res Function(AuthenticationState) _then; + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; } /// @nodoc -abstract class $AuthenticationStateLoadingCopyWith<$Res> { - factory $AuthenticationStateLoadingCopyWith(AuthenticationStateLoading value, - $Res Function(AuthenticationStateLoading) then) = - _$AuthenticationStateLoadingCopyWithImpl<$Res>; +abstract class _$$AuthenticationStateLoadingCopyWith<$Res> { + factory _$$AuthenticationStateLoadingCopyWith( + _$AuthenticationStateLoading value, + $Res Function(_$AuthenticationStateLoading) then) = + __$$AuthenticationStateLoadingCopyWithImpl<$Res>; } /// @nodoc -class _$AuthenticationStateLoadingCopyWithImpl<$Res> - extends _$AuthenticationStateCopyWithImpl<$Res> - implements $AuthenticationStateLoadingCopyWith<$Res> { - _$AuthenticationStateLoadingCopyWithImpl(AuthenticationStateLoading _value, - $Res Function(AuthenticationStateLoading) _then) - : super(_value, (v) => _then(v as AuthenticationStateLoading)); - - @override - AuthenticationStateLoading get _value => - super._value as AuthenticationStateLoading; +class __$$AuthenticationStateLoadingCopyWithImpl<$Res> + extends _$AuthenticationStateCopyWithImpl<$Res, + _$AuthenticationStateLoading> + implements _$$AuthenticationStateLoadingCopyWith<$Res> { + __$$AuthenticationStateLoadingCopyWithImpl( + _$AuthenticationStateLoading _value, + $Res Function(_$AuthenticationStateLoading) _then) + : super(_value, _then); } /// @nodoc @@ -135,7 +116,7 @@ class _$AuthenticationStateLoading implements AuthenticationStateLoading { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is AuthenticationStateLoading); + other is _$AuthenticationStateLoading); } @override @@ -154,9 +135,9 @@ class _$AuthenticationStateLoading implements AuthenticationStateLoading { @override @optionalTypeArgs TResult? whenOrNull({ - TResult Function()? loading, - TResult Function()? authenticated, - TResult Function()? unauthenticated, + TResult? Function()? loading, + TResult? Function()? authenticated, + TResult? Function()? unauthenticated, }) { return loading?.call(); } @@ -190,9 +171,10 @@ class _$AuthenticationStateLoading implements AuthenticationStateLoading { @override @optionalTypeArgs TResult? mapOrNull({ - TResult Function(AuthenticationStateLoading value)? loading, - TResult Function(AuthenticationStateAuthenticated value)? authenticated, - TResult Function(AuthenticationStateUnauthenticated value)? unauthenticated, + TResult? Function(AuthenticationStateLoading value)? loading, + TResult? Function(AuthenticationStateAuthenticated value)? authenticated, + TResult? Function(AuthenticationStateUnauthenticated value)? + unauthenticated, }) { return loading?.call(this); } @@ -217,25 +199,22 @@ abstract class AuthenticationStateLoading implements AuthenticationState { } /// @nodoc -abstract class $AuthenticationStateAuthenticatedCopyWith<$Res> { - factory $AuthenticationStateAuthenticatedCopyWith( - AuthenticationStateAuthenticated value, - $Res Function(AuthenticationStateAuthenticated) then) = - _$AuthenticationStateAuthenticatedCopyWithImpl<$Res>; +abstract class _$$AuthenticationStateAuthenticatedCopyWith<$Res> { + factory _$$AuthenticationStateAuthenticatedCopyWith( + _$AuthenticationStateAuthenticated value, + $Res Function(_$AuthenticationStateAuthenticated) then) = + __$$AuthenticationStateAuthenticatedCopyWithImpl<$Res>; } /// @nodoc -class _$AuthenticationStateAuthenticatedCopyWithImpl<$Res> - extends _$AuthenticationStateCopyWithImpl<$Res> - implements $AuthenticationStateAuthenticatedCopyWith<$Res> { - _$AuthenticationStateAuthenticatedCopyWithImpl( - AuthenticationStateAuthenticated _value, - $Res Function(AuthenticationStateAuthenticated) _then) - : super(_value, (v) => _then(v as AuthenticationStateAuthenticated)); - - @override - AuthenticationStateAuthenticated get _value => - super._value as AuthenticationStateAuthenticated; +class __$$AuthenticationStateAuthenticatedCopyWithImpl<$Res> + extends _$AuthenticationStateCopyWithImpl<$Res, + _$AuthenticationStateAuthenticated> + implements _$$AuthenticationStateAuthenticatedCopyWith<$Res> { + __$$AuthenticationStateAuthenticatedCopyWithImpl( + _$AuthenticationStateAuthenticated _value, + $Res Function(_$AuthenticationStateAuthenticated) _then) + : super(_value, _then); } /// @nodoc @@ -253,7 +232,7 @@ class _$AuthenticationStateAuthenticated bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is AuthenticationStateAuthenticated); + other is _$AuthenticationStateAuthenticated); } @override @@ -272,9 +251,9 @@ class _$AuthenticationStateAuthenticated @override @optionalTypeArgs TResult? whenOrNull({ - TResult Function()? loading, - TResult Function()? authenticated, - TResult Function()? unauthenticated, + TResult? Function()? loading, + TResult? Function()? authenticated, + TResult? Function()? unauthenticated, }) { return authenticated?.call(); } @@ -308,9 +287,10 @@ class _$AuthenticationStateAuthenticated @override @optionalTypeArgs TResult? mapOrNull({ - TResult Function(AuthenticationStateLoading value)? loading, - TResult Function(AuthenticationStateAuthenticated value)? authenticated, - TResult Function(AuthenticationStateUnauthenticated value)? unauthenticated, + TResult? Function(AuthenticationStateLoading value)? loading, + TResult? Function(AuthenticationStateAuthenticated value)? authenticated, + TResult? Function(AuthenticationStateUnauthenticated value)? + unauthenticated, }) { return authenticated?.call(this); } @@ -336,25 +316,22 @@ abstract class AuthenticationStateAuthenticated implements AuthenticationState { } /// @nodoc -abstract class $AuthenticationStateUnauthenticatedCopyWith<$Res> { - factory $AuthenticationStateUnauthenticatedCopyWith( - AuthenticationStateUnauthenticated value, - $Res Function(AuthenticationStateUnauthenticated) then) = - _$AuthenticationStateUnauthenticatedCopyWithImpl<$Res>; +abstract class _$$AuthenticationStateUnauthenticatedCopyWith<$Res> { + factory _$$AuthenticationStateUnauthenticatedCopyWith( + _$AuthenticationStateUnauthenticated value, + $Res Function(_$AuthenticationStateUnauthenticated) then) = + __$$AuthenticationStateUnauthenticatedCopyWithImpl<$Res>; } /// @nodoc -class _$AuthenticationStateUnauthenticatedCopyWithImpl<$Res> - extends _$AuthenticationStateCopyWithImpl<$Res> - implements $AuthenticationStateUnauthenticatedCopyWith<$Res> { - _$AuthenticationStateUnauthenticatedCopyWithImpl( - AuthenticationStateUnauthenticated _value, - $Res Function(AuthenticationStateUnauthenticated) _then) - : super(_value, (v) => _then(v as AuthenticationStateUnauthenticated)); - - @override - AuthenticationStateUnauthenticated get _value => - super._value as AuthenticationStateUnauthenticated; +class __$$AuthenticationStateUnauthenticatedCopyWithImpl<$Res> + extends _$AuthenticationStateCopyWithImpl<$Res, + _$AuthenticationStateUnauthenticated> + implements _$$AuthenticationStateUnauthenticatedCopyWith<$Res> { + __$$AuthenticationStateUnauthenticatedCopyWithImpl( + _$AuthenticationStateUnauthenticated _value, + $Res Function(_$AuthenticationStateUnauthenticated) _then) + : super(_value, _then); } /// @nodoc @@ -372,7 +349,7 @@ class _$AuthenticationStateUnauthenticated bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is AuthenticationStateUnauthenticated); + other is _$AuthenticationStateUnauthenticated); } @override @@ -391,9 +368,9 @@ class _$AuthenticationStateUnauthenticated @override @optionalTypeArgs TResult? whenOrNull({ - TResult Function()? loading, - TResult Function()? authenticated, - TResult Function()? unauthenticated, + TResult? Function()? loading, + TResult? Function()? authenticated, + TResult? Function()? unauthenticated, }) { return unauthenticated?.call(); } @@ -427,9 +404,10 @@ class _$AuthenticationStateUnauthenticated @override @optionalTypeArgs TResult? mapOrNull({ - TResult Function(AuthenticationStateLoading value)? loading, - TResult Function(AuthenticationStateAuthenticated value)? authenticated, - TResult Function(AuthenticationStateUnauthenticated value)? unauthenticated, + TResult? Function(AuthenticationStateLoading value)? loading, + TResult? Function(AuthenticationStateAuthenticated value)? authenticated, + TResult? Function(AuthenticationStateUnauthenticated value)? + unauthenticated, }) { return unauthenticated?.call(this); } diff --git a/lib/authentication/authentication_widget.dart b/lib/authentication/authentication_widget.dart index ea885912..878ba86f 100644 --- a/lib/authentication/authentication_widget.dart +++ b/lib/authentication/authentication_widget.dart @@ -33,7 +33,7 @@ class AuthenticationWidget extends ConsumerWidget { const SizedBox(width: 8), Text( L10n.of(context)!.txt_button_sign_in_google, - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), ], ), @@ -56,7 +56,7 @@ class AuthenticationWidget extends ConsumerWidget { const SizedBox(width: 8), Text( L10n.of(context)!.txt_button_sign_in_facebook, - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), ], ), diff --git a/lib/game/center_text_paint.dart b/lib/game/center_text_paint.dart index 227d84b7..690c3a3b 100644 --- a/lib/game/center_text_paint.dart +++ b/lib/game/center_text_paint.dart @@ -18,14 +18,14 @@ class CenterTextPaint extends TextPaint { void render( Canvas canvas, String text, - Vector2 p, { + Vector2 position, { Anchor anchor = Anchor.topLeft, }) { final tp = toTextPainter(text); - final translatedPosition = - anchor.translate(p, Vector2(tp.size.width, tp.size.height)) - ..x -= tp.size.width / 2 - ..y -= tp.size.height / 2; + final translatedPosition = (position - anchor.toVector2() + ..multiply(Vector2(tp.size.width, tp.size.height))) + ..x -= tp.size.width / 2 + ..y -= tp.size.height / 2; tp.paint(canvas, translatedPosition.toOffset()); } } diff --git a/lib/game/game_controller.dart b/lib/game/game_controller.dart index 8ea92954..a3ad179c 100644 --- a/lib/game/game_controller.dart +++ b/lib/game/game_controller.dart @@ -28,12 +28,12 @@ final gameStateFamilyProvider = StateNotifierProvider.autoDispose final difficulty = arguments['difficulty'] as int; final speed = arguments['speed'] as int; - return GameController(ref.read).._startGame(song, difficulty, speed); + return GameController(ref).._startGame(song, difficulty, speed); }); class GameController extends StateNotifier { GameController(this._read) : super(GameState.loading()); - final Reader _read; + final StateNotifierProviderRef _read; List _tileChunks = []; int _unitDuration = 0; var _difficulty = 0; @@ -96,11 +96,11 @@ class GameController extends StateNotifier { void _onTouchTile(Tile? tile) { var guideText = ''; if (tile != null) { - _read(midiLoadedProvider.notifier).playNote(tile.note); + _read.read(midiLoadedProvider.notifier).playNote(tile.note); _tilesCount += 1; _time = (0.0 - tile.initialY) / _speedDpsPerSecond; - _read(tilesCountProvider.state).state = _tilesCount; - _read(timeProvider.state).state = _time; + _read.read(tilesCountProvider.notifier).state = _tilesCount; + _read.read(timeProvider.notifier).state = _time; if (tile.y >= pauseY) { _errorCount++; guideText = 'txt_too_late'; @@ -112,7 +112,7 @@ class GameController extends StateNotifier { _errorCount++; guideText = 'txt_too_many_fingers'; } - _read(guideTextProvider.state).state = guideText; + _read.read(guideTextProvider.notifier).state = guideText; } Future _onComplete() async { @@ -138,8 +138,8 @@ class GameController extends StateNotifier { final tiles = createTiles(_tileChunks, _unitDuration, _numberTileColumn); await game.start(tiles, _speedDpsPerSecond, _onTouchTile, _onComplete); state = GameState.playing(_duration, _songName); - _read(tilesCountProvider.state).state = _tilesCount; - _read(timeProvider.state).state = _time; - _read(guideTextProvider.state).state = ''; + _read.read(tilesCountProvider.notifier).state = _tilesCount; + _read.read(timeProvider.notifier).state = _time; + _read.read(guideTextProvider.notifier).state = ''; } } diff --git a/lib/game/game_page.dart b/lib/game/game_page.dart index d098a104..00c9b3fa 100644 --- a/lib/game/game_page.dart +++ b/lib/game/game_page.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:flame/game.dart' as flame; import 'package:flutter/material.dart'; // ignore: depend_on_referenced_packages @@ -11,6 +12,7 @@ import 'game_controller.dart'; import 'game_state.dart'; import 'pause_dialog.dart'; +@RoutePage() class GamePage extends ConsumerWidget { const GamePage({ required this.arguments, @@ -42,7 +44,7 @@ class GamePage extends ConsumerWidget { return WillPopScope( onWillPop: () { - ref.read(isPausedProvider.state).state = true; + ref.read(isPausedProvider.notifier).state = true; return Future.value(false); }, @@ -70,7 +72,7 @@ class GamePage extends ConsumerWidget { children: [ Consumer( builder: (context, ref, child) { - final time = ref.watch(timeProvider.state).state; + final time = ref.watch(timeProvider.notifier).state; return LinearProgressIndicator( backgroundColor: @@ -92,18 +94,19 @@ class GamePage extends ConsumerWidget { Text( gameState.songName, style: - Theme.of(context).textTheme.headline6, + Theme.of(context).textTheme.titleLarge, ), Consumer( builder: (context, ref, child) { - final time = - ref.watch(timeProvider.state).state; + final time = ref + .watch(timeProvider.notifier) + .state; return Text( '${time.toInt() ~/ 60}:${(time.toInt() % 60).toString().padLeft(2, '0')}/${gameState.duration ~/ 60}:${(gameState.duration % 60).toString().padLeft(2, '0')}', style: Theme.of(context) .textTheme - .headline6, + .titleLarge, ); }, ), @@ -119,21 +122,22 @@ class GamePage extends ConsumerWidget { Icons.pause_circle_outline_rounded, ), onPressed: () { - ref.read(isPausedProvider.state).state = - true; + ref + .read(isPausedProvider.notifier) + .state = true; }, ), Consumer( builder: (context, ref, child) { final tilesCount = ref - .watch(tilesCountProvider.state) + .watch(tilesCountProvider.notifier) .state; return Text( tilesCount.toString(), style: Theme.of(context) .textTheme - .headline4! + .headlineMedium! .copyWith(color: secondaryColor), ); }, @@ -167,7 +171,7 @@ class GuideTextWidget extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final guideText = ref.watch(guideTextProvider.state).state; + final guideText = ref.watch(guideTextProvider.notifier).state; var text = ''; if (guideText == 'txt_too_late') { text = L10n.of(context)!.txt_too_late; @@ -179,8 +183,10 @@ class GuideTextWidget extends ConsumerWidget { return Text( text, - style: - Theme.of(context).textTheme.headline5!.copyWith(color: primaryColor), + style: Theme.of(context) + .textTheme + .headlineSmall! + .copyWith(color: primaryColor), ); } } diff --git a/lib/game/game_reward.freezed.dart b/lib/game/game_reward.freezed.dart index da4c06b1..b36f61de 100644 --- a/lib/game/game_reward.freezed.dart +++ b/lib/game/game_reward.freezed.dart @@ -1,7 +1,7 @@ // coverage:ignore-file // GENERATED CODE - DO NOT MODIFY BY HAND // ignore_for_file: type=lint -// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark part of 'game_reward.dart'; @@ -12,31 +12,12 @@ part of 'game_reward.dart'; T _$identity(T value) => value; final _privateConstructorUsedError = UnsupportedError( - 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more informations: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); + 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); GameReward _$GameRewardFromJson(Map json) { return _GameReward.fromJson(json); } -/// @nodoc -class _$GameRewardTearOff { - const _$GameRewardTearOff(); - - _GameReward call({required int stars, required int playedNotes}) { - return _GameReward( - stars: stars, - playedNotes: playedNotes, - ); - } - - GameReward fromJson(Map json) { - return GameReward.fromJson(json); - } -} - -/// @nodoc -const $GameReward = _$GameRewardTearOff(); - /// @nodoc mixin _$GameReward { int get stars => throw _privateConstructorUsedError; @@ -52,66 +33,71 @@ mixin _$GameReward { abstract class $GameRewardCopyWith<$Res> { factory $GameRewardCopyWith( GameReward value, $Res Function(GameReward) then) = - _$GameRewardCopyWithImpl<$Res>; + _$GameRewardCopyWithImpl<$Res, GameReward>; + @useResult $Res call({int stars, int playedNotes}); } /// @nodoc -class _$GameRewardCopyWithImpl<$Res> implements $GameRewardCopyWith<$Res> { +class _$GameRewardCopyWithImpl<$Res, $Val extends GameReward> + implements $GameRewardCopyWith<$Res> { _$GameRewardCopyWithImpl(this._value, this._then); - final GameReward _value; // ignore: unused_field - final $Res Function(GameReward) _then; + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; + @pragma('vm:prefer-inline') @override $Res call({ - Object? stars = freezed, - Object? playedNotes = freezed, + Object? stars = null, + Object? playedNotes = null, }) { return _then(_value.copyWith( - stars: stars == freezed + stars: null == stars ? _value.stars : stars // ignore: cast_nullable_to_non_nullable as int, - playedNotes: playedNotes == freezed + playedNotes: null == playedNotes ? _value.playedNotes : playedNotes // ignore: cast_nullable_to_non_nullable as int, - )); + ) as $Val); } } /// @nodoc -abstract class _$GameRewardCopyWith<$Res> implements $GameRewardCopyWith<$Res> { - factory _$GameRewardCopyWith( - _GameReward value, $Res Function(_GameReward) then) = - __$GameRewardCopyWithImpl<$Res>; +abstract class _$$_GameRewardCopyWith<$Res> + implements $GameRewardCopyWith<$Res> { + factory _$$_GameRewardCopyWith( + _$_GameReward value, $Res Function(_$_GameReward) then) = + __$$_GameRewardCopyWithImpl<$Res>; @override + @useResult $Res call({int stars, int playedNotes}); } /// @nodoc -class __$GameRewardCopyWithImpl<$Res> extends _$GameRewardCopyWithImpl<$Res> - implements _$GameRewardCopyWith<$Res> { - __$GameRewardCopyWithImpl( - _GameReward _value, $Res Function(_GameReward) _then) - : super(_value, (v) => _then(v as _GameReward)); - - @override - _GameReward get _value => super._value as _GameReward; - +class __$$_GameRewardCopyWithImpl<$Res> + extends _$GameRewardCopyWithImpl<$Res, _$_GameReward> + implements _$$_GameRewardCopyWith<$Res> { + __$$_GameRewardCopyWithImpl( + _$_GameReward _value, $Res Function(_$_GameReward) _then) + : super(_value, _then); + + @pragma('vm:prefer-inline') @override $Res call({ - Object? stars = freezed, - Object? playedNotes = freezed, + Object? stars = null, + Object? playedNotes = null, }) { - return _then(_GameReward( - stars: stars == freezed + return _then(_$_GameReward( + stars: null == stars ? _value.stars : stars // ignore: cast_nullable_to_non_nullable as int, - playedNotes: playedNotes == freezed + playedNotes: null == playedNotes ? _value.playedNotes : playedNotes // ignore: cast_nullable_to_non_nullable as int, @@ -141,32 +127,34 @@ class _$_GameReward implements _GameReward { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _GameReward && - const DeepCollectionEquality().equals(other.stars, stars) && - const DeepCollectionEquality() - .equals(other.playedNotes, playedNotes)); + other is _$_GameReward && + (identical(other.stars, stars) || other.stars == stars) && + (identical(other.playedNotes, playedNotes) || + other.playedNotes == playedNotes)); } + @JsonKey(ignore: true) @override - int get hashCode => Object.hash( - runtimeType, - const DeepCollectionEquality().hash(stars), - const DeepCollectionEquality().hash(playedNotes)); + int get hashCode => Object.hash(runtimeType, stars, playedNotes); @JsonKey(ignore: true) @override - _$GameRewardCopyWith<_GameReward> get copyWith => - __$GameRewardCopyWithImpl<_GameReward>(this, _$identity); + @pragma('vm:prefer-inline') + _$$_GameRewardCopyWith<_$_GameReward> get copyWith => + __$$_GameRewardCopyWithImpl<_$_GameReward>(this, _$identity); @override Map toJson() { - return _$$_GameRewardToJson(this); + return _$$_GameRewardToJson( + this, + ); } } abstract class _GameReward implements GameReward { - factory _GameReward({required int stars, required int playedNotes}) = - _$_GameReward; + factory _GameReward( + {required final int stars, + required final int playedNotes}) = _$_GameReward; factory _GameReward.fromJson(Map json) = _$_GameReward.fromJson; @@ -177,6 +165,6 @@ abstract class _GameReward implements GameReward { int get playedNotes; @override @JsonKey(ignore: true) - _$GameRewardCopyWith<_GameReward> get copyWith => + _$$_GameRewardCopyWith<_$_GameReward> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/game/game_state.freezed.dart b/lib/game/game_state.freezed.dart index 5c60425b..e677ba21 100644 --- a/lib/game/game_state.freezed.dart +++ b/lib/game/game_state.freezed.dart @@ -1,7 +1,7 @@ // coverage:ignore-file // GENERATED CODE - DO NOT MODIFY BY HAND // ignore_for_file: type=lint -// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark part of 'game_state.dart'; @@ -12,36 +12,7 @@ part of 'game_state.dart'; T _$identity(T value) => value; final _privateConstructorUsedError = UnsupportedError( - 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more informations: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); - -/// @nodoc -class _$GameStateTearOff { - const _$GameStateTearOff(); - - GameStateLoading loading() { - return GameStateLoading(); - } - - GameStatePlaying playing(int duration, String songName) { - return GameStatePlaying( - duration, - songName, - ); - } - - GameStateGettingGift gettingGift() { - return GameStateGettingGift(); - } - - GameStateCompleted completed(GameReward gameReward) { - return GameStateCompleted( - gameReward, - ); - } -} - -/// @nodoc -const $GameState = _$GameStateTearOff(); + 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); /// @nodoc mixin _$GameState { @@ -55,10 +26,10 @@ mixin _$GameState { throw _privateConstructorUsedError; @optionalTypeArgs TResult? whenOrNull({ - TResult Function()? loading, - TResult Function(int duration, String songName)? playing, - TResult Function()? gettingGift, - TResult Function(GameReward gameReward)? completed, + TResult? Function()? loading, + TResult? Function(int duration, String songName)? playing, + TResult? Function()? gettingGift, + TResult? Function(GameReward gameReward)? completed, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -80,10 +51,10 @@ mixin _$GameState { throw _privateConstructorUsedError; @optionalTypeArgs TResult? mapOrNull({ - TResult Function(GameStateLoading value)? loading, - TResult Function(GameStatePlaying value)? playing, - TResult Function(GameStateGettingGift value)? gettingGift, - TResult Function(GameStateCompleted value)? completed, + TResult? Function(GameStateLoading value)? loading, + TResult? Function(GameStatePlaying value)? playing, + TResult? Function(GameStateGettingGift value)? gettingGift, + TResult? Function(GameStateCompleted value)? completed, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -100,34 +71,34 @@ mixin _$GameState { /// @nodoc abstract class $GameStateCopyWith<$Res> { factory $GameStateCopyWith(GameState value, $Res Function(GameState) then) = - _$GameStateCopyWithImpl<$Res>; + _$GameStateCopyWithImpl<$Res, GameState>; } /// @nodoc -class _$GameStateCopyWithImpl<$Res> implements $GameStateCopyWith<$Res> { +class _$GameStateCopyWithImpl<$Res, $Val extends GameState> + implements $GameStateCopyWith<$Res> { _$GameStateCopyWithImpl(this._value, this._then); - final GameState _value; // ignore: unused_field - final $Res Function(GameState) _then; + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; } /// @nodoc -abstract class $GameStateLoadingCopyWith<$Res> { - factory $GameStateLoadingCopyWith( - GameStateLoading value, $Res Function(GameStateLoading) then) = - _$GameStateLoadingCopyWithImpl<$Res>; +abstract class _$$GameStateLoadingCopyWith<$Res> { + factory _$$GameStateLoadingCopyWith( + _$GameStateLoading value, $Res Function(_$GameStateLoading) then) = + __$$GameStateLoadingCopyWithImpl<$Res>; } /// @nodoc -class _$GameStateLoadingCopyWithImpl<$Res> extends _$GameStateCopyWithImpl<$Res> - implements $GameStateLoadingCopyWith<$Res> { - _$GameStateLoadingCopyWithImpl( - GameStateLoading _value, $Res Function(GameStateLoading) _then) - : super(_value, (v) => _then(v as GameStateLoading)); - - @override - GameStateLoading get _value => super._value as GameStateLoading; +class __$$GameStateLoadingCopyWithImpl<$Res> + extends _$GameStateCopyWithImpl<$Res, _$GameStateLoading> + implements _$$GameStateLoadingCopyWith<$Res> { + __$$GameStateLoadingCopyWithImpl( + _$GameStateLoading _value, $Res Function(_$GameStateLoading) _then) + : super(_value, _then); } /// @nodoc @@ -143,7 +114,7 @@ class _$GameStateLoading implements GameStateLoading { @override bool operator ==(dynamic other) { return identical(this, other) || - (other.runtimeType == runtimeType && other is GameStateLoading); + (other.runtimeType == runtimeType && other is _$GameStateLoading); } @override @@ -163,10 +134,10 @@ class _$GameStateLoading implements GameStateLoading { @override @optionalTypeArgs TResult? whenOrNull({ - TResult Function()? loading, - TResult Function(int duration, String songName)? playing, - TResult Function()? gettingGift, - TResult Function(GameReward gameReward)? completed, + TResult? Function()? loading, + TResult? Function(int duration, String songName)? playing, + TResult? Function()? gettingGift, + TResult? Function(GameReward gameReward)? completed, }) { return loading?.call(); } @@ -200,10 +171,10 @@ class _$GameStateLoading implements GameStateLoading { @override @optionalTypeArgs TResult? mapOrNull({ - TResult Function(GameStateLoading value)? loading, - TResult Function(GameStatePlaying value)? playing, - TResult Function(GameStateGettingGift value)? gettingGift, - TResult Function(GameStateCompleted value)? completed, + TResult? Function(GameStateLoading value)? loading, + TResult? Function(GameStatePlaying value)? playing, + TResult? Function(GameStateGettingGift value)? gettingGift, + TResult? Function(GameStateCompleted value)? completed, }) { return loading?.call(this); } @@ -229,34 +200,34 @@ abstract class GameStateLoading implements GameState { } /// @nodoc -abstract class $GameStatePlayingCopyWith<$Res> { - factory $GameStatePlayingCopyWith( - GameStatePlaying value, $Res Function(GameStatePlaying) then) = - _$GameStatePlayingCopyWithImpl<$Res>; +abstract class _$$GameStatePlayingCopyWith<$Res> { + factory _$$GameStatePlayingCopyWith( + _$GameStatePlaying value, $Res Function(_$GameStatePlaying) then) = + __$$GameStatePlayingCopyWithImpl<$Res>; + @useResult $Res call({int duration, String songName}); } /// @nodoc -class _$GameStatePlayingCopyWithImpl<$Res> extends _$GameStateCopyWithImpl<$Res> - implements $GameStatePlayingCopyWith<$Res> { - _$GameStatePlayingCopyWithImpl( - GameStatePlaying _value, $Res Function(GameStatePlaying) _then) - : super(_value, (v) => _then(v as GameStatePlaying)); - - @override - GameStatePlaying get _value => super._value as GameStatePlaying; +class __$$GameStatePlayingCopyWithImpl<$Res> + extends _$GameStateCopyWithImpl<$Res, _$GameStatePlaying> + implements _$$GameStatePlayingCopyWith<$Res> { + __$$GameStatePlayingCopyWithImpl( + _$GameStatePlaying _value, $Res Function(_$GameStatePlaying) _then) + : super(_value, _then); + @pragma('vm:prefer-inline') @override $Res call({ - Object? duration = freezed, - Object? songName = freezed, + Object? duration = null, + Object? songName = null, }) { - return _then(GameStatePlaying( - duration == freezed + return _then(_$GameStatePlaying( + null == duration ? _value.duration : duration // ignore: cast_nullable_to_non_nullable as int, - songName == freezed + null == songName ? _value.songName : songName // ignore: cast_nullable_to_non_nullable as String, @@ -283,21 +254,21 @@ class _$GameStatePlaying implements GameStatePlaying { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is GameStatePlaying && - const DeepCollectionEquality().equals(other.duration, duration) && - const DeepCollectionEquality().equals(other.songName, songName)); + other is _$GameStatePlaying && + (identical(other.duration, duration) || + other.duration == duration) && + (identical(other.songName, songName) || + other.songName == songName)); } @override - int get hashCode => Object.hash( - runtimeType, - const DeepCollectionEquality().hash(duration), - const DeepCollectionEquality().hash(songName)); + int get hashCode => Object.hash(runtimeType, duration, songName); @JsonKey(ignore: true) @override - $GameStatePlayingCopyWith get copyWith => - _$GameStatePlayingCopyWithImpl(this, _$identity); + @pragma('vm:prefer-inline') + _$$GameStatePlayingCopyWith<_$GameStatePlaying> get copyWith => + __$$GameStatePlayingCopyWithImpl<_$GameStatePlaying>(this, _$identity); @override @optionalTypeArgs @@ -313,10 +284,10 @@ class _$GameStatePlaying implements GameStatePlaying { @override @optionalTypeArgs TResult? whenOrNull({ - TResult Function()? loading, - TResult Function(int duration, String songName)? playing, - TResult Function()? gettingGift, - TResult Function(GameReward gameReward)? completed, + TResult? Function()? loading, + TResult? Function(int duration, String songName)? playing, + TResult? Function()? gettingGift, + TResult? Function(GameReward gameReward)? completed, }) { return playing?.call(duration, songName); } @@ -350,10 +321,10 @@ class _$GameStatePlaying implements GameStatePlaying { @override @optionalTypeArgs TResult? mapOrNull({ - TResult Function(GameStateLoading value)? loading, - TResult Function(GameStatePlaying value)? playing, - TResult Function(GameStateGettingGift value)? gettingGift, - TResult Function(GameStateCompleted value)? completed, + TResult? Function(GameStateLoading value)? loading, + TResult? Function(GameStatePlaying value)? playing, + TResult? Function(GameStateGettingGift value)? gettingGift, + TResult? Function(GameStateCompleted value)? completed, }) { return playing?.call(this); } @@ -375,32 +346,30 @@ class _$GameStatePlaying implements GameStatePlaying { } abstract class GameStatePlaying implements GameState { - factory GameStatePlaying(int duration, String songName) = _$GameStatePlaying; + factory GameStatePlaying(final int duration, final String songName) = + _$GameStatePlaying; int get duration; String get songName; @JsonKey(ignore: true) - $GameStatePlayingCopyWith get copyWith => + _$$GameStatePlayingCopyWith<_$GameStatePlaying> get copyWith => throw _privateConstructorUsedError; } /// @nodoc -abstract class $GameStateGettingGiftCopyWith<$Res> { - factory $GameStateGettingGiftCopyWith(GameStateGettingGift value, - $Res Function(GameStateGettingGift) then) = - _$GameStateGettingGiftCopyWithImpl<$Res>; +abstract class _$$GameStateGettingGiftCopyWith<$Res> { + factory _$$GameStateGettingGiftCopyWith(_$GameStateGettingGift value, + $Res Function(_$GameStateGettingGift) then) = + __$$GameStateGettingGiftCopyWithImpl<$Res>; } /// @nodoc -class _$GameStateGettingGiftCopyWithImpl<$Res> - extends _$GameStateCopyWithImpl<$Res> - implements $GameStateGettingGiftCopyWith<$Res> { - _$GameStateGettingGiftCopyWithImpl( - GameStateGettingGift _value, $Res Function(GameStateGettingGift) _then) - : super(_value, (v) => _then(v as GameStateGettingGift)); - - @override - GameStateGettingGift get _value => super._value as GameStateGettingGift; +class __$$GameStateGettingGiftCopyWithImpl<$Res> + extends _$GameStateCopyWithImpl<$Res, _$GameStateGettingGift> + implements _$$GameStateGettingGiftCopyWith<$Res> { + __$$GameStateGettingGiftCopyWithImpl(_$GameStateGettingGift _value, + $Res Function(_$GameStateGettingGift) _then) + : super(_value, _then); } /// @nodoc @@ -416,7 +385,7 @@ class _$GameStateGettingGift implements GameStateGettingGift { @override bool operator ==(dynamic other) { return identical(this, other) || - (other.runtimeType == runtimeType && other is GameStateGettingGift); + (other.runtimeType == runtimeType && other is _$GameStateGettingGift); } @override @@ -436,10 +405,10 @@ class _$GameStateGettingGift implements GameStateGettingGift { @override @optionalTypeArgs TResult? whenOrNull({ - TResult Function()? loading, - TResult Function(int duration, String songName)? playing, - TResult Function()? gettingGift, - TResult Function(GameReward gameReward)? completed, + TResult? Function()? loading, + TResult? Function(int duration, String songName)? playing, + TResult? Function()? gettingGift, + TResult? Function(GameReward gameReward)? completed, }) { return gettingGift?.call(); } @@ -473,10 +442,10 @@ class _$GameStateGettingGift implements GameStateGettingGift { @override @optionalTypeArgs TResult? mapOrNull({ - TResult Function(GameStateLoading value)? loading, - TResult Function(GameStatePlaying value)? playing, - TResult Function(GameStateGettingGift value)? gettingGift, - TResult Function(GameStateCompleted value)? completed, + TResult? Function(GameStateLoading value)? loading, + TResult? Function(GameStatePlaying value)? playing, + TResult? Function(GameStateGettingGift value)? gettingGift, + TResult? Function(GameStateCompleted value)? completed, }) { return gettingGift?.call(this); } @@ -502,32 +471,31 @@ abstract class GameStateGettingGift implements GameState { } /// @nodoc -abstract class $GameStateCompletedCopyWith<$Res> { - factory $GameStateCompletedCopyWith( - GameStateCompleted value, $Res Function(GameStateCompleted) then) = - _$GameStateCompletedCopyWithImpl<$Res>; +abstract class _$$GameStateCompletedCopyWith<$Res> { + factory _$$GameStateCompletedCopyWith(_$GameStateCompleted value, + $Res Function(_$GameStateCompleted) then) = + __$$GameStateCompletedCopyWithImpl<$Res>; + @useResult $Res call({GameReward gameReward}); $GameRewardCopyWith<$Res> get gameReward; } /// @nodoc -class _$GameStateCompletedCopyWithImpl<$Res> - extends _$GameStateCopyWithImpl<$Res> - implements $GameStateCompletedCopyWith<$Res> { - _$GameStateCompletedCopyWithImpl( - GameStateCompleted _value, $Res Function(GameStateCompleted) _then) - : super(_value, (v) => _then(v as GameStateCompleted)); - - @override - GameStateCompleted get _value => super._value as GameStateCompleted; +class __$$GameStateCompletedCopyWithImpl<$Res> + extends _$GameStateCopyWithImpl<$Res, _$GameStateCompleted> + implements _$$GameStateCompletedCopyWith<$Res> { + __$$GameStateCompletedCopyWithImpl( + _$GameStateCompleted _value, $Res Function(_$GameStateCompleted) _then) + : super(_value, _then); + @pragma('vm:prefer-inline') @override $Res call({ - Object? gameReward = freezed, + Object? gameReward = null, }) { - return _then(GameStateCompleted( - gameReward == freezed + return _then(_$GameStateCompleted( + null == gameReward ? _value.gameReward : gameReward // ignore: cast_nullable_to_non_nullable as GameReward, @@ -535,6 +503,7 @@ class _$GameStateCompletedCopyWithImpl<$Res> } @override + @pragma('vm:prefer-inline') $GameRewardCopyWith<$Res> get gameReward { return $GameRewardCopyWith<$Res>(_value.gameReward, (value) { return _then(_value.copyWith(gameReward: value)); @@ -559,19 +528,20 @@ class _$GameStateCompleted implements GameStateCompleted { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is GameStateCompleted && - const DeepCollectionEquality() - .equals(other.gameReward, gameReward)); + other is _$GameStateCompleted && + (identical(other.gameReward, gameReward) || + other.gameReward == gameReward)); } @override - int get hashCode => - Object.hash(runtimeType, const DeepCollectionEquality().hash(gameReward)); + int get hashCode => Object.hash(runtimeType, gameReward); @JsonKey(ignore: true) @override - $GameStateCompletedCopyWith get copyWith => - _$GameStateCompletedCopyWithImpl(this, _$identity); + @pragma('vm:prefer-inline') + _$$GameStateCompletedCopyWith<_$GameStateCompleted> get copyWith => + __$$GameStateCompletedCopyWithImpl<_$GameStateCompleted>( + this, _$identity); @override @optionalTypeArgs @@ -587,10 +557,10 @@ class _$GameStateCompleted implements GameStateCompleted { @override @optionalTypeArgs TResult? whenOrNull({ - TResult Function()? loading, - TResult Function(int duration, String songName)? playing, - TResult Function()? gettingGift, - TResult Function(GameReward gameReward)? completed, + TResult? Function()? loading, + TResult? Function(int duration, String songName)? playing, + TResult? Function()? gettingGift, + TResult? Function(GameReward gameReward)? completed, }) { return completed?.call(gameReward); } @@ -624,10 +594,10 @@ class _$GameStateCompleted implements GameStateCompleted { @override @optionalTypeArgs TResult? mapOrNull({ - TResult Function(GameStateLoading value)? loading, - TResult Function(GameStatePlaying value)? playing, - TResult Function(GameStateGettingGift value)? gettingGift, - TResult Function(GameStateCompleted value)? completed, + TResult? Function(GameStateLoading value)? loading, + TResult? Function(GameStatePlaying value)? playing, + TResult? Function(GameStateGettingGift value)? gettingGift, + TResult? Function(GameStateCompleted value)? completed, }) { return completed?.call(this); } @@ -649,10 +619,11 @@ class _$GameStateCompleted implements GameStateCompleted { } abstract class GameStateCompleted implements GameState { - factory GameStateCompleted(GameReward gameReward) = _$GameStateCompleted; + factory GameStateCompleted(final GameReward gameReward) = + _$GameStateCompleted; GameReward get gameReward; @JsonKey(ignore: true) - $GameStateCompletedCopyWith get copyWith => + _$$GameStateCompletedCopyWith<_$GameStateCompleted> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/game/note/note.freezed.dart b/lib/game/note/note.freezed.dart index d579aa53..84a3289e 100644 --- a/lib/game/note/note.freezed.dart +++ b/lib/game/note/note.freezed.dart @@ -1,7 +1,7 @@ // coverage:ignore-file // GENERATED CODE - DO NOT MODIFY BY HAND // ignore_for_file: type=lint -// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark part of 'note.dart'; @@ -12,22 +12,7 @@ part of 'note.dart'; T _$identity(T value) => value; final _privateConstructorUsedError = UnsupportedError( - 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more informations: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); - -/// @nodoc -class _$NoteTearOff { - const _$NoteTearOff(); - - _Note call({required int note, required int startTick}) { - return _Note( - note: note, - startTick: startTick, - ); - } -} - -/// @nodoc -const $Note = _$NoteTearOff(); + 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); /// @nodoc mixin _$Note { @@ -41,64 +26,67 @@ mixin _$Note { /// @nodoc abstract class $NoteCopyWith<$Res> { factory $NoteCopyWith(Note value, $Res Function(Note) then) = - _$NoteCopyWithImpl<$Res>; + _$NoteCopyWithImpl<$Res, Note>; + @useResult $Res call({int note, int startTick}); } /// @nodoc -class _$NoteCopyWithImpl<$Res> implements $NoteCopyWith<$Res> { +class _$NoteCopyWithImpl<$Res, $Val extends Note> + implements $NoteCopyWith<$Res> { _$NoteCopyWithImpl(this._value, this._then); - final Note _value; // ignore: unused_field - final $Res Function(Note) _then; + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; + @pragma('vm:prefer-inline') @override $Res call({ - Object? note = freezed, - Object? startTick = freezed, + Object? note = null, + Object? startTick = null, }) { return _then(_value.copyWith( - note: note == freezed + note: null == note ? _value.note : note // ignore: cast_nullable_to_non_nullable as int, - startTick: startTick == freezed + startTick: null == startTick ? _value.startTick : startTick // ignore: cast_nullable_to_non_nullable as int, - )); + ) as $Val); } } /// @nodoc -abstract class _$NoteCopyWith<$Res> implements $NoteCopyWith<$Res> { - factory _$NoteCopyWith(_Note value, $Res Function(_Note) then) = - __$NoteCopyWithImpl<$Res>; +abstract class _$$_NoteCopyWith<$Res> implements $NoteCopyWith<$Res> { + factory _$$_NoteCopyWith(_$_Note value, $Res Function(_$_Note) then) = + __$$_NoteCopyWithImpl<$Res>; @override + @useResult $Res call({int note, int startTick}); } /// @nodoc -class __$NoteCopyWithImpl<$Res> extends _$NoteCopyWithImpl<$Res> - implements _$NoteCopyWith<$Res> { - __$NoteCopyWithImpl(_Note _value, $Res Function(_Note) _then) - : super(_value, (v) => _then(v as _Note)); - - @override - _Note get _value => super._value as _Note; +class __$$_NoteCopyWithImpl<$Res> extends _$NoteCopyWithImpl<$Res, _$_Note> + implements _$$_NoteCopyWith<$Res> { + __$$_NoteCopyWithImpl(_$_Note _value, $Res Function(_$_Note) _then) + : super(_value, _then); + @pragma('vm:prefer-inline') @override $Res call({ - Object? note = freezed, - Object? startTick = freezed, + Object? note = null, + Object? startTick = null, }) { - return _then(_Note( - note: note == freezed + return _then(_$_Note( + note: null == note ? _value.note : note // ignore: cast_nullable_to_non_nullable as int, - startTick: startTick == freezed + startTick: null == startTick ? _value.startTick : startTick // ignore: cast_nullable_to_non_nullable as int, @@ -125,25 +113,25 @@ class _$_Note implements _Note { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _Note && - const DeepCollectionEquality().equals(other.note, note) && - const DeepCollectionEquality().equals(other.startTick, startTick)); + other is _$_Note && + (identical(other.note, note) || other.note == note) && + (identical(other.startTick, startTick) || + other.startTick == startTick)); } @override - int get hashCode => Object.hash( - runtimeType, - const DeepCollectionEquality().hash(note), - const DeepCollectionEquality().hash(startTick)); + int get hashCode => Object.hash(runtimeType, note, startTick); @JsonKey(ignore: true) @override - _$NoteCopyWith<_Note> get copyWith => - __$NoteCopyWithImpl<_Note>(this, _$identity); + @pragma('vm:prefer-inline') + _$$_NoteCopyWith<_$_Note> get copyWith => + __$$_NoteCopyWithImpl<_$_Note>(this, _$identity); } abstract class _Note implements Note { - factory _Note({required int note, required int startTick}) = _$_Note; + factory _Note({required final int note, required final int startTick}) = + _$_Note; @override int get note; @@ -151,5 +139,5 @@ abstract class _Note implements Note { int get startTick; @override @JsonKey(ignore: true) - _$NoteCopyWith<_Note> get copyWith => throw _privateConstructorUsedError; + _$$_NoteCopyWith<_$_Note> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/game/tile/tile_chunk.freezed.dart b/lib/game/tile/tile_chunk.freezed.dart index c2f9e473..e2ba7659 100644 --- a/lib/game/tile/tile_chunk.freezed.dart +++ b/lib/game/tile/tile_chunk.freezed.dart @@ -1,7 +1,7 @@ // coverage:ignore-file // GENERATED CODE - DO NOT MODIFY BY HAND // ignore_for_file: type=lint -// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark part of 'tile_chunk.dart'; @@ -12,26 +12,7 @@ part of 'tile_chunk.dart'; T _$identity(T value) => value; final _privateConstructorUsedError = UnsupportedError( - 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more informations: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); - -/// @nodoc -class _$TileChunkTearOff { - const _$TileChunkTearOff(); - - _TileChunk call( - {required List notes, - required int durationToPrevious, - required int startTick}) { - return _TileChunk( - notes: notes, - durationToPrevious: durationToPrevious, - startTick: startTick, - ); - } -} - -/// @nodoc -const $TileChunk = _$TileChunkTearOff(); + 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); /// @nodoc mixin _$TileChunk { @@ -47,75 +28,80 @@ mixin _$TileChunk { /// @nodoc abstract class $TileChunkCopyWith<$Res> { factory $TileChunkCopyWith(TileChunk value, $Res Function(TileChunk) then) = - _$TileChunkCopyWithImpl<$Res>; + _$TileChunkCopyWithImpl<$Res, TileChunk>; + @useResult $Res call({List notes, int durationToPrevious, int startTick}); } /// @nodoc -class _$TileChunkCopyWithImpl<$Res> implements $TileChunkCopyWith<$Res> { +class _$TileChunkCopyWithImpl<$Res, $Val extends TileChunk> + implements $TileChunkCopyWith<$Res> { _$TileChunkCopyWithImpl(this._value, this._then); - final TileChunk _value; // ignore: unused_field - final $Res Function(TileChunk) _then; + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; + @pragma('vm:prefer-inline') @override $Res call({ - Object? notes = freezed, - Object? durationToPrevious = freezed, - Object? startTick = freezed, + Object? notes = null, + Object? durationToPrevious = null, + Object? startTick = null, }) { return _then(_value.copyWith( - notes: notes == freezed + notes: null == notes ? _value.notes : notes // ignore: cast_nullable_to_non_nullable as List, - durationToPrevious: durationToPrevious == freezed + durationToPrevious: null == durationToPrevious ? _value.durationToPrevious : durationToPrevious // ignore: cast_nullable_to_non_nullable as int, - startTick: startTick == freezed + startTick: null == startTick ? _value.startTick : startTick // ignore: cast_nullable_to_non_nullable as int, - )); + ) as $Val); } } /// @nodoc -abstract class _$TileChunkCopyWith<$Res> implements $TileChunkCopyWith<$Res> { - factory _$TileChunkCopyWith( - _TileChunk value, $Res Function(_TileChunk) then) = - __$TileChunkCopyWithImpl<$Res>; +abstract class _$$_TileChunkCopyWith<$Res> implements $TileChunkCopyWith<$Res> { + factory _$$_TileChunkCopyWith( + _$_TileChunk value, $Res Function(_$_TileChunk) then) = + __$$_TileChunkCopyWithImpl<$Res>; @override + @useResult $Res call({List notes, int durationToPrevious, int startTick}); } /// @nodoc -class __$TileChunkCopyWithImpl<$Res> extends _$TileChunkCopyWithImpl<$Res> - implements _$TileChunkCopyWith<$Res> { - __$TileChunkCopyWithImpl(_TileChunk _value, $Res Function(_TileChunk) _then) - : super(_value, (v) => _then(v as _TileChunk)); - - @override - _TileChunk get _value => super._value as _TileChunk; - +class __$$_TileChunkCopyWithImpl<$Res> + extends _$TileChunkCopyWithImpl<$Res, _$_TileChunk> + implements _$$_TileChunkCopyWith<$Res> { + __$$_TileChunkCopyWithImpl( + _$_TileChunk _value, $Res Function(_$_TileChunk) _then) + : super(_value, _then); + + @pragma('vm:prefer-inline') @override $Res call({ - Object? notes = freezed, - Object? durationToPrevious = freezed, - Object? startTick = freezed, + Object? notes = null, + Object? durationToPrevious = null, + Object? startTick = null, }) { - return _then(_TileChunk( - notes: notes == freezed - ? _value.notes + return _then(_$_TileChunk( + notes: null == notes + ? _value._notes : notes // ignore: cast_nullable_to_non_nullable as List, - durationToPrevious: durationToPrevious == freezed + durationToPrevious: null == durationToPrevious ? _value.durationToPrevious : durationToPrevious // ignore: cast_nullable_to_non_nullable as int, - startTick: startTick == freezed + startTick: null == startTick ? _value.startTick : startTick // ignore: cast_nullable_to_non_nullable as int, @@ -127,12 +113,19 @@ class __$TileChunkCopyWithImpl<$Res> extends _$TileChunkCopyWithImpl<$Res> class _$_TileChunk implements _TileChunk { _$_TileChunk( - {required this.notes, + {required final List notes, required this.durationToPrevious, - required this.startTick}); + required this.startTick}) + : _notes = notes; + final List _notes; @override - final List notes; + List get notes { + if (_notes is EqualUnmodifiableListView) return _notes; + // ignore: implicit_dynamic_type + return EqualUnmodifiableListView(_notes); + } + @override final int durationToPrevious; @override @@ -147,31 +140,33 @@ class _$_TileChunk implements _TileChunk { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _TileChunk && - const DeepCollectionEquality().equals(other.notes, notes) && - const DeepCollectionEquality() - .equals(other.durationToPrevious, durationToPrevious) && - const DeepCollectionEquality().equals(other.startTick, startTick)); + other is _$_TileChunk && + const DeepCollectionEquality().equals(other._notes, _notes) && + (identical(other.durationToPrevious, durationToPrevious) || + other.durationToPrevious == durationToPrevious) && + (identical(other.startTick, startTick) || + other.startTick == startTick)); } @override int get hashCode => Object.hash( runtimeType, - const DeepCollectionEquality().hash(notes), - const DeepCollectionEquality().hash(durationToPrevious), - const DeepCollectionEquality().hash(startTick)); + const DeepCollectionEquality().hash(_notes), + durationToPrevious, + startTick); @JsonKey(ignore: true) @override - _$TileChunkCopyWith<_TileChunk> get copyWith => - __$TileChunkCopyWithImpl<_TileChunk>(this, _$identity); + @pragma('vm:prefer-inline') + _$$_TileChunkCopyWith<_$_TileChunk> get copyWith => + __$$_TileChunkCopyWithImpl<_$_TileChunk>(this, _$identity); } abstract class _TileChunk implements TileChunk { factory _TileChunk( - {required List notes, - required int durationToPrevious, - required int startTick}) = _$_TileChunk; + {required final List notes, + required final int durationToPrevious, + required final int startTick}) = _$_TileChunk; @override List get notes; @@ -181,6 +176,6 @@ abstract class _TileChunk implements TileChunk { int get startTick; @override @JsonKey(ignore: true) - _$TileChunkCopyWith<_TileChunk> get copyWith => + _$$_TileChunkCopyWith<_$_TileChunk> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/game_config/game_config_page.dart b/lib/game_config/game_config_page.dart index fce65a34..9b150664 100644 --- a/lib/game_config/game_config_page.dart +++ b/lib/game_config/game_config_page.dart @@ -6,10 +6,11 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:sprintf/sprintf.dart'; import '../game/colors.dart'; -import '../router/root_router.dart'; +import '../router/root_router.gr.dart'; import '../songs/song.dart'; import 'game_config_controller.dart'; +@RoutePage() class GameConfigPage extends ConsumerWidget { const GameConfigPage({ required this.song, @@ -31,7 +32,7 @@ class GameConfigPage extends ConsumerWidget { ), body: SafeArea( child: Scrollbar( - isAlwaysShown: true, + thumbVisibility: true, child: SingleChildScrollView( child: Column( children: [ @@ -39,7 +40,7 @@ class GameConfigPage extends ConsumerWidget { children: [ Text( L10n.of(context)!.txt_difficulty, - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox(height: 8), Row( @@ -87,7 +88,7 @@ class GameConfigPage extends ConsumerWidget { children: [ Text( L10n.of(context)!.txt_speed, - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox(height: 8), Row( diff --git a/lib/game_config/game_config_state.freezed.dart b/lib/game_config/game_config_state.freezed.dart index 05f14577..f0d6f0b7 100644 --- a/lib/game_config/game_config_state.freezed.dart +++ b/lib/game_config/game_config_state.freezed.dart @@ -1,7 +1,7 @@ // coverage:ignore-file // GENERATED CODE - DO NOT MODIFY BY HAND // ignore_for_file: type=lint -// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark part of 'game_config_state.dart'; @@ -12,22 +12,7 @@ part of 'game_config_state.dart'; T _$identity(T value) => value; final _privateConstructorUsedError = UnsupportedError( - 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more informations: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); - -/// @nodoc -class _$GameConfigStateTearOff { - const _$GameConfigStateTearOff(); - - _GameConfigState call({required int difficulty, required int speed}) { - return _GameConfigState( - difficulty: difficulty, - speed: speed, - ); - } -} - -/// @nodoc -const $GameConfigState = _$GameConfigStateTearOff(); + 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); /// @nodoc mixin _$GameConfigState { @@ -43,69 +28,71 @@ mixin _$GameConfigState { abstract class $GameConfigStateCopyWith<$Res> { factory $GameConfigStateCopyWith( GameConfigState value, $Res Function(GameConfigState) then) = - _$GameConfigStateCopyWithImpl<$Res>; + _$GameConfigStateCopyWithImpl<$Res, GameConfigState>; + @useResult $Res call({int difficulty, int speed}); } /// @nodoc -class _$GameConfigStateCopyWithImpl<$Res> +class _$GameConfigStateCopyWithImpl<$Res, $Val extends GameConfigState> implements $GameConfigStateCopyWith<$Res> { _$GameConfigStateCopyWithImpl(this._value, this._then); - final GameConfigState _value; // ignore: unused_field - final $Res Function(GameConfigState) _then; + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; + @pragma('vm:prefer-inline') @override $Res call({ - Object? difficulty = freezed, - Object? speed = freezed, + Object? difficulty = null, + Object? speed = null, }) { return _then(_value.copyWith( - difficulty: difficulty == freezed + difficulty: null == difficulty ? _value.difficulty : difficulty // ignore: cast_nullable_to_non_nullable as int, - speed: speed == freezed + speed: null == speed ? _value.speed : speed // ignore: cast_nullable_to_non_nullable as int, - )); + ) as $Val); } } /// @nodoc -abstract class _$GameConfigStateCopyWith<$Res> +abstract class _$$_GameConfigStateCopyWith<$Res> implements $GameConfigStateCopyWith<$Res> { - factory _$GameConfigStateCopyWith( - _GameConfigState value, $Res Function(_GameConfigState) then) = - __$GameConfigStateCopyWithImpl<$Res>; + factory _$$_GameConfigStateCopyWith( + _$_GameConfigState value, $Res Function(_$_GameConfigState) then) = + __$$_GameConfigStateCopyWithImpl<$Res>; @override + @useResult $Res call({int difficulty, int speed}); } /// @nodoc -class __$GameConfigStateCopyWithImpl<$Res> - extends _$GameConfigStateCopyWithImpl<$Res> - implements _$GameConfigStateCopyWith<$Res> { - __$GameConfigStateCopyWithImpl( - _GameConfigState _value, $Res Function(_GameConfigState) _then) - : super(_value, (v) => _then(v as _GameConfigState)); - - @override - _GameConfigState get _value => super._value as _GameConfigState; - +class __$$_GameConfigStateCopyWithImpl<$Res> + extends _$GameConfigStateCopyWithImpl<$Res, _$_GameConfigState> + implements _$$_GameConfigStateCopyWith<$Res> { + __$$_GameConfigStateCopyWithImpl( + _$_GameConfigState _value, $Res Function(_$_GameConfigState) _then) + : super(_value, _then); + + @pragma('vm:prefer-inline') @override $Res call({ - Object? difficulty = freezed, - Object? speed = freezed, + Object? difficulty = null, + Object? speed = null, }) { - return _then(_GameConfigState( - difficulty: difficulty == freezed + return _then(_$_GameConfigState( + difficulty: null == difficulty ? _value.difficulty : difficulty // ignore: cast_nullable_to_non_nullable as int, - speed: speed == freezed + speed: null == speed ? _value.speed : speed // ignore: cast_nullable_to_non_nullable as int, @@ -132,27 +119,26 @@ class _$_GameConfigState implements _GameConfigState { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _GameConfigState && - const DeepCollectionEquality() - .equals(other.difficulty, difficulty) && - const DeepCollectionEquality().equals(other.speed, speed)); + other is _$_GameConfigState && + (identical(other.difficulty, difficulty) || + other.difficulty == difficulty) && + (identical(other.speed, speed) || other.speed == speed)); } @override - int get hashCode => Object.hash( - runtimeType, - const DeepCollectionEquality().hash(difficulty), - const DeepCollectionEquality().hash(speed)); + int get hashCode => Object.hash(runtimeType, difficulty, speed); @JsonKey(ignore: true) @override - _$GameConfigStateCopyWith<_GameConfigState> get copyWith => - __$GameConfigStateCopyWithImpl<_GameConfigState>(this, _$identity); + @pragma('vm:prefer-inline') + _$$_GameConfigStateCopyWith<_$_GameConfigState> get copyWith => + __$$_GameConfigStateCopyWithImpl<_$_GameConfigState>(this, _$identity); } abstract class _GameConfigState implements GameConfigState { - factory _GameConfigState({required int difficulty, required int speed}) = - _$_GameConfigState; + factory _GameConfigState( + {required final int difficulty, + required final int speed}) = _$_GameConfigState; @override int get difficulty; @@ -160,6 +146,6 @@ abstract class _GameConfigState implements GameConfigState { int get speed; @override @JsonKey(ignore: true) - _$GameConfigStateCopyWith<_GameConfigState> get copyWith => + _$$_GameConfigStateCopyWith<_$_GameConfigState> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index f2c9aa06..5cb2fc1c 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -6,12 +6,13 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import '../midi/midi_controller.dart'; -import '../router/root_router.dart'; +import '../router/root_router.gr.dart'; import '../search/search_widget.dart'; import '../songs/songs_controller.dart'; import '../songs/songs_widget.dart'; import '../user/user_controller.dart'; +@RoutePage() class HomePage extends StatelessWidget { const HomePage({Key? key}) : super(key: key); @@ -40,7 +41,7 @@ class HomePage extends StatelessWidget { onPressed: () { showSearch( context: context, - delegate: SearchWidget(ref.read), + delegate: SearchWidget(ref), ); }, ), diff --git a/lib/instrument/instrument.freezed.dart b/lib/instrument/instrument.freezed.dart index 8b087e46..729f66c5 100644 --- a/lib/instrument/instrument.freezed.dart +++ b/lib/instrument/instrument.freezed.dart @@ -1,7 +1,7 @@ // coverage:ignore-file // GENERATED CODE - DO NOT MODIFY BY HAND // ignore_for_file: type=lint -// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark part of 'instrument.dart'; @@ -12,39 +12,12 @@ part of 'instrument.dart'; T _$identity(T value) => value; final _privateConstructorUsedError = UnsupportedError( - 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more informations: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); + 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); Instrument _$InstrumentFromJson(Map json) { return _Instrument.fromJson(json); } -/// @nodoc -class _$InstrumentTearOff { - const _$InstrumentTearOff(); - - _Instrument call( - {required String id, - required Map soundPaths, - required Map baseNotes, - required int minNote, - required int maxNote}) { - return _Instrument( - id: id, - soundPaths: soundPaths, - baseNotes: baseNotes, - minNote: minNote, - maxNote: maxNote, - ); - } - - Instrument fromJson(Map json) { - return Instrument.fromJson(json); - } -} - -/// @nodoc -const $Instrument = _$InstrumentTearOff(); - /// @nodoc mixin _$Instrument { String get id => throw _privateConstructorUsedError; @@ -63,7 +36,8 @@ mixin _$Instrument { abstract class $InstrumentCopyWith<$Res> { factory $InstrumentCopyWith( Instrument value, $Res Function(Instrument) then) = - _$InstrumentCopyWithImpl<$Res>; + _$InstrumentCopyWithImpl<$Res, Instrument>; + @useResult $Res call( {String id, Map soundPaths, @@ -73,52 +47,57 @@ abstract class $InstrumentCopyWith<$Res> { } /// @nodoc -class _$InstrumentCopyWithImpl<$Res> implements $InstrumentCopyWith<$Res> { +class _$InstrumentCopyWithImpl<$Res, $Val extends Instrument> + implements $InstrumentCopyWith<$Res> { _$InstrumentCopyWithImpl(this._value, this._then); - final Instrument _value; // ignore: unused_field - final $Res Function(Instrument) _then; + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; + @pragma('vm:prefer-inline') @override $Res call({ - Object? id = freezed, - Object? soundPaths = freezed, - Object? baseNotes = freezed, - Object? minNote = freezed, - Object? maxNote = freezed, + Object? id = null, + Object? soundPaths = null, + Object? baseNotes = null, + Object? minNote = null, + Object? maxNote = null, }) { return _then(_value.copyWith( - id: id == freezed + id: null == id ? _value.id : id // ignore: cast_nullable_to_non_nullable as String, - soundPaths: soundPaths == freezed + soundPaths: null == soundPaths ? _value.soundPaths : soundPaths // ignore: cast_nullable_to_non_nullable as Map, - baseNotes: baseNotes == freezed + baseNotes: null == baseNotes ? _value.baseNotes : baseNotes // ignore: cast_nullable_to_non_nullable as Map, - minNote: minNote == freezed + minNote: null == minNote ? _value.minNote : minNote // ignore: cast_nullable_to_non_nullable as int, - maxNote: maxNote == freezed + maxNote: null == maxNote ? _value.maxNote : maxNote // ignore: cast_nullable_to_non_nullable as int, - )); + ) as $Val); } } /// @nodoc -abstract class _$InstrumentCopyWith<$Res> implements $InstrumentCopyWith<$Res> { - factory _$InstrumentCopyWith( - _Instrument value, $Res Function(_Instrument) then) = - __$InstrumentCopyWithImpl<$Res>; +abstract class _$$_InstrumentCopyWith<$Res> + implements $InstrumentCopyWith<$Res> { + factory _$$_InstrumentCopyWith( + _$_Instrument value, $Res Function(_$_Instrument) then) = + __$$_InstrumentCopyWithImpl<$Res>; @override + @useResult $Res call( {String id, Map soundPaths, @@ -128,41 +107,40 @@ abstract class _$InstrumentCopyWith<$Res> implements $InstrumentCopyWith<$Res> { } /// @nodoc -class __$InstrumentCopyWithImpl<$Res> extends _$InstrumentCopyWithImpl<$Res> - implements _$InstrumentCopyWith<$Res> { - __$InstrumentCopyWithImpl( - _Instrument _value, $Res Function(_Instrument) _then) - : super(_value, (v) => _then(v as _Instrument)); - - @override - _Instrument get _value => super._value as _Instrument; +class __$$_InstrumentCopyWithImpl<$Res> + extends _$InstrumentCopyWithImpl<$Res, _$_Instrument> + implements _$$_InstrumentCopyWith<$Res> { + __$$_InstrumentCopyWithImpl( + _$_Instrument _value, $Res Function(_$_Instrument) _then) + : super(_value, _then); + @pragma('vm:prefer-inline') @override $Res call({ - Object? id = freezed, - Object? soundPaths = freezed, - Object? baseNotes = freezed, - Object? minNote = freezed, - Object? maxNote = freezed, + Object? id = null, + Object? soundPaths = null, + Object? baseNotes = null, + Object? minNote = null, + Object? maxNote = null, }) { - return _then(_Instrument( - id: id == freezed + return _then(_$_Instrument( + id: null == id ? _value.id : id // ignore: cast_nullable_to_non_nullable as String, - soundPaths: soundPaths == freezed - ? _value.soundPaths + soundPaths: null == soundPaths + ? _value._soundPaths : soundPaths // ignore: cast_nullable_to_non_nullable as Map, - baseNotes: baseNotes == freezed - ? _value.baseNotes + baseNotes: null == baseNotes + ? _value._baseNotes : baseNotes // ignore: cast_nullable_to_non_nullable as Map, - minNote: minNote == freezed + minNote: null == minNote ? _value.minNote : minNote // ignore: cast_nullable_to_non_nullable as int, - maxNote: maxNote == freezed + maxNote: null == maxNote ? _value.maxNote : maxNote // ignore: cast_nullable_to_non_nullable as int, @@ -175,20 +153,34 @@ class __$InstrumentCopyWithImpl<$Res> extends _$InstrumentCopyWithImpl<$Res> class _$_Instrument implements _Instrument { _$_Instrument( {required this.id, - required this.soundPaths, - required this.baseNotes, + required final Map soundPaths, + required final Map baseNotes, required this.minNote, - required this.maxNote}); + required this.maxNote}) + : _soundPaths = soundPaths, + _baseNotes = baseNotes; factory _$_Instrument.fromJson(Map json) => _$$_InstrumentFromJson(json); @override final String id; + final Map _soundPaths; @override - final Map soundPaths; + Map get soundPaths { + if (_soundPaths is EqualUnmodifiableMapView) return _soundPaths; + // ignore: implicit_dynamic_type + return EqualUnmodifiableMapView(_soundPaths); + } + + final Map _baseNotes; @override - final Map baseNotes; + Map get baseNotes { + if (_baseNotes is EqualUnmodifiableMapView) return _baseNotes; + // ignore: implicit_dynamic_type + return EqualUnmodifiableMapView(_baseNotes); + } + @override final int minNote; @override @@ -203,42 +195,47 @@ class _$_Instrument implements _Instrument { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _Instrument && - const DeepCollectionEquality().equals(other.id, id) && + other is _$_Instrument && + (identical(other.id, id) || other.id == id) && + const DeepCollectionEquality() + .equals(other._soundPaths, _soundPaths) && const DeepCollectionEquality() - .equals(other.soundPaths, soundPaths) && - const DeepCollectionEquality().equals(other.baseNotes, baseNotes) && - const DeepCollectionEquality().equals(other.minNote, minNote) && - const DeepCollectionEquality().equals(other.maxNote, maxNote)); + .equals(other._baseNotes, _baseNotes) && + (identical(other.minNote, minNote) || other.minNote == minNote) && + (identical(other.maxNote, maxNote) || other.maxNote == maxNote)); } + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, - const DeepCollectionEquality().hash(id), - const DeepCollectionEquality().hash(soundPaths), - const DeepCollectionEquality().hash(baseNotes), - const DeepCollectionEquality().hash(minNote), - const DeepCollectionEquality().hash(maxNote)); + id, + const DeepCollectionEquality().hash(_soundPaths), + const DeepCollectionEquality().hash(_baseNotes), + minNote, + maxNote); @JsonKey(ignore: true) @override - _$InstrumentCopyWith<_Instrument> get copyWith => - __$InstrumentCopyWithImpl<_Instrument>(this, _$identity); + @pragma('vm:prefer-inline') + _$$_InstrumentCopyWith<_$_Instrument> get copyWith => + __$$_InstrumentCopyWithImpl<_$_Instrument>(this, _$identity); @override Map toJson() { - return _$$_InstrumentToJson(this); + return _$$_InstrumentToJson( + this, + ); } } abstract class _Instrument implements Instrument { factory _Instrument( - {required String id, - required Map soundPaths, - required Map baseNotes, - required int minNote, - required int maxNote}) = _$_Instrument; + {required final String id, + required final Map soundPaths, + required final Map baseNotes, + required final int minNote, + required final int maxNote}) = _$_Instrument; factory _Instrument.fromJson(Map json) = _$_Instrument.fromJson; @@ -255,6 +252,6 @@ abstract class _Instrument implements Instrument { int get maxNote; @override @JsonKey(ignore: true) - _$InstrumentCopyWith<_Instrument> get copyWith => + _$$_InstrumentCopyWith<_$_Instrument> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/instrument/instruments_controller.dart b/lib/instrument/instruments_controller.dart index 46e69f2f..9f43a324 100644 --- a/lib/instrument/instruments_controller.dart +++ b/lib/instrument/instruments_controller.dart @@ -8,7 +8,7 @@ final selectedInstrumentIdProvider = StateProvider((_) => null); final selectedInstrumentProvider = Provider((ref) { final selectedInstrumentId = - ref.watch(selectedInstrumentIdProvider.state).state; + ref.watch(selectedInstrumentIdProvider.notifier).state; final instruments = ref.watch(instrumentsProvider); return instruments.when( @@ -21,17 +21,18 @@ final selectedInstrumentProvider = Provider((ref) { final instrumentsProvider = StateNotifierProvider>>( - (ref) => InstrumentsController(ref.read).._loadInstruments(), + (ref) => InstrumentsController(ref).._loadInstruments(), ); class InstrumentsController extends StateNotifier>> { InstrumentsController(this._read) : super(const AsyncValue.loading()); - final Reader _read; + final StateNotifierProviderRef _read; Future _loadInstruments() async { - final instruments = await _read(instrumentRepositoryProvider).instruments(); + final instruments = + await _read.read(instrumentRepositoryProvider).instruments(); state = AsyncValue.data(instruments); } } diff --git a/lib/instrument/instruments_page.dart b/lib/instrument/instruments_page.dart index 6ddbddc1..ccaace83 100644 --- a/lib/instrument/instruments_page.dart +++ b/lib/instrument/instruments_page.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; // ignore: depend_on_referenced_packages import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -7,6 +8,7 @@ import '../loading_widget.dart'; import 'instruments_controller.dart'; import 'instruments_repository_impl.dart'; +@RoutePage() class InstrumentsPage extends ConsumerWidget { const InstrumentsPage({Key? key}) : super(key: key); @@ -14,7 +16,7 @@ class InstrumentsPage extends ConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { final instruments = ref.watch(instrumentsProvider); final selectedInstrumentId = - ref.watch(selectedInstrumentIdProvider.state).state; + ref.watch(selectedInstrumentIdProvider.notifier).state; return Scaffold( appBar: AppBar( @@ -32,7 +34,7 @@ class InstrumentsPage extends ConsumerWidget { return RadioListTile( title: Text( getInstrumentName(context, instrument.id), - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), value: instrument.id, groupValue: selectedInstrumentId, @@ -40,7 +42,7 @@ class InstrumentsPage extends ConsumerWidget { ref .watch(instrumentRepositoryProvider) .changeInstrument(value!); - ref.read(selectedInstrumentIdProvider.state).state = value; + ref.read(selectedInstrumentIdProvider.notifier).state = value; }, ); }, diff --git a/lib/locale/locale_controller.dart b/lib/locale/locale_controller.dart index eb3585b7..0dc8b96a 100644 --- a/lib/locale/locale_controller.dart +++ b/lib/locale/locale_controller.dart @@ -9,16 +9,16 @@ final localeProvider = StateNotifierProvider((ref) { ? Locale.fromSubtags(languageCode: localeName) : null; - return LocaleController(ref.read, locale); + return LocaleController(ref, locale); }); class LocaleController extends StateNotifier { LocaleController(this._read, Locale? defaultLocale) : super(defaultLocale); - final Reader _read; + final StateNotifierProviderRef _read; Future setLocale(Locale locale) async { - await _read(sharedUtilityProvider).setLocaleName(locale.toString()); + await _read.read(sharedUtilityProvider).setLocaleName(locale.toString()); state = locale; } } diff --git a/lib/locale/locale_page.dart b/lib/locale/locale_page.dart index 079508ed..a41c5bea 100644 --- a/lib/locale/locale_page.dart +++ b/lib/locale/locale_page.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; // ignore: depend_on_referenced_packages import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -12,6 +13,7 @@ const localeStrings = { 'zh': '汉语', }; +@RoutePage() class LocalePage extends ConsumerWidget { const LocalePage({Key? key}) : super(key: key); @@ -24,13 +26,13 @@ class LocalePage extends ConsumerWidget { ), ), body: Scrollbar( - isAlwaysShown: true, + thumbVisibility: true, child: ListView.builder( itemCount: L10n.supportedLocales.length, itemBuilder: (context, index) => RadioListTile( title: Text( localeStrings[L10n.supportedLocales[index].languageCode]!, - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), value: L10n.supportedLocales[index], groupValue: Localizations.localeOf(context), diff --git a/lib/log_provider_observer.dart b/lib/log_provider_observer.dart index 4465ad45..017294b4 100644 --- a/lib/log_provider_observer.dart +++ b/lib/log_provider_observer.dart @@ -38,7 +38,7 @@ Update @override void didDisposeProvider( ProviderBase provider, - ProviderContainer containers, + ProviderContainer container, ) { Logger.root.info( ''' diff --git a/lib/router/root_router.dart b/lib/router/root_router.dart index b0ef32b2..29907623 100644 --- a/lib/router/root_router.dart +++ b/lib/router/root_router.dart @@ -1,49 +1,23 @@ import 'package:auto_route/auto_route.dart'; -import '../game/game_page.dart'; -import '../game_config/game_config_page.dart'; -import '../home/home_page.dart'; -import '../instrument/instruments_page.dart'; -import '../locale/locale_page.dart'; -import '../setting/settings_page.dart'; -import '../splash_page.dart'; -import '../theme/theme_page.dart'; -import '../user/user_page.dart'; +import 'root_router.gr.dart'; -export 'root_router.gr.dart'; - -@MaterialAutoRouter( +@AutoRouterConfig( replaceInRouteName: 'Page,Route', - routes: [ - // app stack - AutoRoute( - path: '/', - page: SplashPage, - ), - AutoRoute( - page: HomePage, - ), - AutoRoute( - page: GameConfigPage, - ), - AutoRoute( - page: GamePage, - ), - AutoRoute( - page: UserPage, - ), - AutoRoute( - page: LocalePage, - ), - AutoRoute( - page: ThemePage, - ), - AutoRoute( - page: InstrumentsPage, - ), - AutoRoute( - page: SettingsPage, - ), - ], ) -class $RootRouter {} +class RootRouter extends $RootRouter { + @override + RouteType get defaultRouteType => const RouteType.material(); + @override + final List routes = [ + AutoRoute(path: '/', page: SplashRoute.page), + AutoRoute(page: HomeRoute.page), + AutoRoute(page: GameConfigRoute.page), + AutoRoute(page: GameRoute.page), + AutoRoute(page: UserRoute.page), + AutoRoute(page: LocaleRoute.page), + AutoRoute(page: ThemeRoute.page), + AutoRoute(page: InstrumentsRoute.page), + AutoRoute(page: SettingsRoute.page), + ]; +} diff --git a/lib/router/root_router.gr.dart b/lib/router/root_router.gr.dart index d2caddba..6c159dca 100644 --- a/lib/router/root_router.gr.dart +++ b/lib/router/root_router.gr.dart @@ -1,144 +1,232 @@ -// ************************************************************************** -// AutoRouteGenerator -// ************************************************************************** - // GENERATED CODE - DO NOT MODIFY BY HAND // ************************************************************************** -// AutoRouteGenerator +// AutoRouterGenerator // ************************************************************************** -// + // ignore_for_file: type=lint +// coverage:ignore-file +// ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:auto_route/auto_route.dart' as _i10; import 'package:flutter/material.dart' as _i11; - -import '../game/game_page.dart' as _i4; -import '../game_config/game_config_page.dart' as _i3; -import '../home/home_page.dart' as _i2; -import '../instrument/instruments_page.dart' as _i8; -import '../locale/locale_page.dart' as _i6; -import '../setting/settings_page.dart' as _i9; -import '../songs/song.dart' as _i12; -import '../splash_page.dart' as _i1; -import '../theme/theme_page.dart' as _i7; -import '../user/user_page.dart' as _i5; - -class RootRouter extends _i10.RootStackRouter { - RootRouter([_i11.GlobalKey<_i11.NavigatorState>? navigatorKey]) +import 'package:hitnotes/game/game_page.dart' as _i7; +import 'package:hitnotes/game_config/game_config_page.dart' as _i1; +import 'package:hitnotes/home/home_page.dart' as _i2; +import 'package:hitnotes/instrument/instruments_page.dart' as _i4; +import 'package:hitnotes/locale/locale_page.dart' as _i3; +import 'package:hitnotes/setting/settings_page.dart' as _i9; +import 'package:hitnotes/songs/song.dart' as _i12; +import 'package:hitnotes/splash_page.dart' as _i5; +import 'package:hitnotes/theme/theme_page.dart' as _i8; +import 'package:hitnotes/user/user_page.dart' as _i6; + +abstract class $RootRouter extends _i10.RootStackRouter { + $RootRouter([_i11.GlobalKey<_i11.NavigatorState>? navigatorKey]) : super(navigatorKey); @override final Map pagesMap = { - SplashRoute.name: (routeData) { - return _i10.MaterialPageX( - routeData: routeData, child: const _i1.SplashPage()); + GameConfigRoute.name: (routeData) { + final args = routeData.argsAs(); + return _i10.AutoRoutePage( + routeData: routeData, + child: _i1.GameConfigPage( + song: args.song, + key: args.key, + ), + ); }, HomeRoute.name: (routeData) { - return _i10.MaterialPageX( - routeData: routeData, child: const _i2.HomePage()); + return _i10.AutoRoutePage( + routeData: routeData, + child: const _i2.HomePage(), + ); }, - GameConfigRoute.name: (routeData) { - final args = routeData.argsAs(); - return _i10.MaterialPageX( - routeData: routeData, - child: _i3.GameConfigPage(song: args.song, key: args.key)); + LocaleRoute.name: (routeData) { + return _i10.AutoRoutePage( + routeData: routeData, + child: const _i3.LocalePage(), + ); }, - GameRoute.name: (routeData) { - final args = routeData.argsAs(); - return _i10.MaterialPageX( - routeData: routeData, - child: _i4.GamePage(arguments: args.arguments, key: args.key)); + InstrumentsRoute.name: (routeData) { + return _i10.AutoRoutePage( + routeData: routeData, + child: const _i4.InstrumentsPage(), + ); + }, + SplashRoute.name: (routeData) { + return _i10.AutoRoutePage( + routeData: routeData, + child: const _i5.SplashPage(), + ); }, UserRoute.name: (routeData) { - return _i10.MaterialPageX( - routeData: routeData, child: const _i5.UserPage()); + return _i10.AutoRoutePage( + routeData: routeData, + child: const _i6.UserPage(), + ); }, - LocaleRoute.name: (routeData) { - return _i10.MaterialPageX( - routeData: routeData, child: const _i6.LocalePage()); + GameRoute.name: (routeData) { + final args = routeData.argsAs(); + return _i10.AutoRoutePage( + routeData: routeData, + child: _i7.GamePage( + arguments: args.arguments, + key: args.key, + ), + ); }, ThemeRoute.name: (routeData) { - return _i10.MaterialPageX( - routeData: routeData, child: const _i7.ThemePage()); - }, - InstrumentsRoute.name: (routeData) { - return _i10.MaterialPageX( - routeData: routeData, child: const _i8.InstrumentsPage()); + return _i10.AutoRoutePage( + routeData: routeData, + child: const _i8.ThemePage(), + ); }, SettingsRoute.name: (routeData) { - return _i10.MaterialPageX( - routeData: routeData, child: const _i9.SettingsPage()); - } + return _i10.AutoRoutePage( + routeData: routeData, + child: const _i9.SettingsPage(), + ); + }, }; - - @override - List<_i10.RouteConfig> get routes => [ - _i10.RouteConfig(SplashRoute.name, path: '/'), - _i10.RouteConfig(HomeRoute.name, path: '/home-page'), - _i10.RouteConfig(GameConfigRoute.name, path: '/game-config-page'), - _i10.RouteConfig(GameRoute.name, path: '/game-page'), - _i10.RouteConfig(UserRoute.name, path: '/user-page'), - _i10.RouteConfig(LocaleRoute.name, path: '/locale-page'), - _i10.RouteConfig(ThemeRoute.name, path: '/theme-page'), - _i10.RouteConfig(InstrumentsRoute.name, path: '/instruments-page'), - _i10.RouteConfig(SettingsRoute.name, path: '/settings-page') - ]; } /// generated route for -/// [_i1.SplashPage] -class SplashRoute extends _i10.PageRouteInfo { - const SplashRoute() : super(SplashRoute.name, path: '/'); +/// [_i1.GameConfigPage] +class GameConfigRoute extends _i10.PageRouteInfo { + GameConfigRoute({ + required _i12.Song song, + _i11.Key? key, + List<_i10.PageRouteInfo>? children, + }) : super( + GameConfigRoute.name, + args: GameConfigRouteArgs( + song: song, + key: key, + ), + initialChildren: children, + ); - static const String name = 'SplashRoute'; + static const String name = 'GameConfigRoute'; + + static const _i10.PageInfo page = + _i10.PageInfo(name); +} + +class GameConfigRouteArgs { + const GameConfigRouteArgs({ + required this.song, + this.key, + }); + + final _i12.Song song; + + final _i11.Key? key; + + @override + String toString() { + return 'GameConfigRouteArgs{song: $song, key: $key}'; + } } /// generated route for /// [_i2.HomePage] class HomeRoute extends _i10.PageRouteInfo { - const HomeRoute() : super(HomeRoute.name, path: '/home-page'); + const HomeRoute({List<_i10.PageRouteInfo>? children}) + : super( + HomeRoute.name, + initialChildren: children, + ); static const String name = 'HomeRoute'; + + static const _i10.PageInfo page = _i10.PageInfo(name); } /// generated route for -/// [_i3.GameConfigPage] -class GameConfigRoute extends _i10.PageRouteInfo { - GameConfigRoute({required _i12.Song song, _i11.Key? key}) - : super(GameConfigRoute.name, - path: '/game-config-page', - args: GameConfigRouteArgs(song: song, key: key)); +/// [_i3.LocalePage] +class LocaleRoute extends _i10.PageRouteInfo { + const LocaleRoute({List<_i10.PageRouteInfo>? children}) + : super( + LocaleRoute.name, + initialChildren: children, + ); - static const String name = 'GameConfigRoute'; + static const String name = 'LocaleRoute'; + + static const _i10.PageInfo page = _i10.PageInfo(name); } -class GameConfigRouteArgs { - const GameConfigRouteArgs({required this.song, this.key}); +/// generated route for +/// [_i4.InstrumentsPage] +class InstrumentsRoute extends _i10.PageRouteInfo { + const InstrumentsRoute({List<_i10.PageRouteInfo>? children}) + : super( + InstrumentsRoute.name, + initialChildren: children, + ); - final _i12.Song song; + static const String name = 'InstrumentsRoute'; - final _i11.Key? key; + static const _i10.PageInfo page = _i10.PageInfo(name); +} - @override - String toString() { - return 'GameConfigRouteArgs{song: $song, key: $key}'; - } +/// generated route for +/// [_i5.SplashPage] +class SplashRoute extends _i10.PageRouteInfo { + const SplashRoute({List<_i10.PageRouteInfo>? children}) + : super( + SplashRoute.name, + initialChildren: children, + ); + + static const String name = 'SplashRoute'; + + static const _i10.PageInfo page = _i10.PageInfo(name); +} + +/// generated route for +/// [_i6.UserPage] +class UserRoute extends _i10.PageRouteInfo { + const UserRoute({List<_i10.PageRouteInfo>? children}) + : super( + UserRoute.name, + initialChildren: children, + ); + + static const String name = 'UserRoute'; + + static const _i10.PageInfo page = _i10.PageInfo(name); } /// generated route for -/// [_i4.GamePage] +/// [_i7.GamePage] class GameRoute extends _i10.PageRouteInfo { - GameRoute({required Map arguments, _i11.Key? key}) - : super(GameRoute.name, - path: '/game-page', - args: GameRouteArgs(arguments: arguments, key: key)); + GameRoute({ + required Map arguments, + _i11.Key? key, + List<_i10.PageRouteInfo>? children, + }) : super( + GameRoute.name, + args: GameRouteArgs( + arguments: arguments, + key: key, + ), + initialChildren: children, + ); static const String name = 'GameRoute'; + + static const _i10.PageInfo page = + _i10.PageInfo(name); } class GameRouteArgs { - const GameRouteArgs({required this.arguments, this.key}); + const GameRouteArgs({ + required this.arguments, + this.key, + }); final Map arguments; @@ -151,42 +239,29 @@ class GameRouteArgs { } /// generated route for -/// [_i5.UserPage] -class UserRoute extends _i10.PageRouteInfo { - const UserRoute() : super(UserRoute.name, path: '/user-page'); - - static const String name = 'UserRoute'; -} - -/// generated route for -/// [_i6.LocalePage] -class LocaleRoute extends _i10.PageRouteInfo { - const LocaleRoute() : super(LocaleRoute.name, path: '/locale-page'); - - static const String name = 'LocaleRoute'; -} - -/// generated route for -/// [_i7.ThemePage] +/// [_i8.ThemePage] class ThemeRoute extends _i10.PageRouteInfo { - const ThemeRoute() : super(ThemeRoute.name, path: '/theme-page'); + const ThemeRoute({List<_i10.PageRouteInfo>? children}) + : super( + ThemeRoute.name, + initialChildren: children, + ); static const String name = 'ThemeRoute'; -} -/// generated route for -/// [_i8.InstrumentsPage] -class InstrumentsRoute extends _i10.PageRouteInfo { - const InstrumentsRoute() - : super(InstrumentsRoute.name, path: '/instruments-page'); - - static const String name = 'InstrumentsRoute'; + static const _i10.PageInfo page = _i10.PageInfo(name); } /// generated route for /// [_i9.SettingsPage] class SettingsRoute extends _i10.PageRouteInfo { - const SettingsRoute() : super(SettingsRoute.name, path: '/settings-page'); + const SettingsRoute({List<_i10.PageRouteInfo>? children}) + : super( + SettingsRoute.name, + initialChildren: children, + ); static const String name = 'SettingsRoute'; + + static const _i10.PageInfo page = _i10.PageInfo(name); } diff --git a/lib/search/search_widget.dart b/lib/search/search_widget.dart index e7afc882..3aa5af01 100644 --- a/lib/search/search_widget.dart +++ b/lib/search/search_widget.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../loading_widget.dart'; -import '../router/root_router.dart'; +import '../router/root_router.gr.dart'; import '../songs/song.dart'; import '../songs/song_widget.dart'; import '../songs/songs_repository_impl.dart'; @@ -11,7 +11,7 @@ import '../songs/songs_repository_impl.dart'; class SearchWidget extends SearchDelegate { SearchWidget(this._read); - final Reader _read; + final WidgetRef _read; @override List buildActions(BuildContext context) => [ @@ -44,7 +44,7 @@ class SearchWidget extends SearchDelegate { Widget buildResults(BuildContext context) => query.isEmpty ? const SizedBox.shrink() : FutureBuilder>( - future: _read(songRepositoryProvider).searchSongs(query), + future: _read.read(songRepositoryProvider).searchSongs(query), builder: (context, recentList) { if (recentList.connectionState == ConnectionState.done) { final songs = recentList.requireData; diff --git a/lib/setting/settings_page.dart b/lib/setting/settings_page.dart index e1cb0af3..a537a512 100644 --- a/lib/setting/settings_page.dart +++ b/lib/setting/settings_page.dart @@ -11,10 +11,11 @@ import 'package:in_app_review/in_app_review.dart'; import 'package:package_info_plus/package_info_plus.dart'; import '../locale/locale_page.dart'; -import '../router/root_router.dart'; +import '../router/root_router.gr.dart'; import '../theme/theme_controller.dart'; import '../theme/theme_page.dart'; +@RoutePage() class SettingsPage extends StatelessWidget { const SettingsPage({Key? key}) : super(key: key); @@ -31,18 +32,18 @@ class SettingsPage extends StatelessWidget { ListTile( title: Text( L10n.of(context)!.txt_language, - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), subtitle: Text( localeStrings[Localizations.localeOf(context).languageCode]!, - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), onTap: () => AutoRouter.of(context).push(const LocaleRoute()), ), ListTile( title: Text( L10n.of(context)!.txt_theme, - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), subtitle: Consumer( builder: (context, ref, child) { @@ -50,7 +51,7 @@ class SettingsPage extends StatelessWidget { return Text( getThemeName(context, themeMode), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ); }, ), @@ -59,7 +60,7 @@ class SettingsPage extends StatelessWidget { ListTile( title: Text( L10n.of(context)!.txt_button_feedback, - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), onTap: () async { final packageInfo = await PackageInfo.fromPlatform(); @@ -101,7 +102,7 @@ class SettingsPage extends StatelessWidget { ListTile( title: Text( L10n.of(context)!.txt_about_rate, - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), onTap: () async { final _inAppReview = InAppReview.instance; diff --git a/lib/songs/song.freezed.dart b/lib/songs/song.freezed.dart index 8ab344c2..467a3777 100644 --- a/lib/songs/song.freezed.dart +++ b/lib/songs/song.freezed.dart @@ -1,7 +1,7 @@ // coverage:ignore-file // GENERATED CODE - DO NOT MODIFY BY HAND // ignore_for_file: type=lint -// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark part of 'song.dart'; @@ -12,47 +12,12 @@ part of 'song.dart'; T _$identity(T value) => value; final _privateConstructorUsedError = UnsupportedError( - 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more informations: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); + 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); Song _$SongFromJson(Map json) { return _Song.fromJson(json); } -/// @nodoc -class _$SongTearOff { - const _$SongTearOff(); - - _Song call( - {required String id, - required String title, - required String artist, - required String url, - required int bpm, - required int unitDuration, - required List tilesCount, - required List duration, - required List tags}) { - return _Song( - id: id, - title: title, - artist: artist, - url: url, - bpm: bpm, - unitDuration: unitDuration, - tilesCount: tilesCount, - duration: duration, - tags: tags, - ); - } - - Song fromJson(Map json) { - return Song.fromJson(json); - } -} - -/// @nodoc -const $Song = _$SongTearOff(); - /// @nodoc mixin _$Song { String get id => throw _privateConstructorUsedError; @@ -73,7 +38,8 @@ mixin _$Song { /// @nodoc abstract class $SongCopyWith<$Res> { factory $SongCopyWith(Song value, $Res Function(Song) then) = - _$SongCopyWithImpl<$Res>; + _$SongCopyWithImpl<$Res, Song>; + @useResult $Res call( {String id, String title, @@ -87,71 +53,75 @@ abstract class $SongCopyWith<$Res> { } /// @nodoc -class _$SongCopyWithImpl<$Res> implements $SongCopyWith<$Res> { +class _$SongCopyWithImpl<$Res, $Val extends Song> + implements $SongCopyWith<$Res> { _$SongCopyWithImpl(this._value, this._then); - final Song _value; // ignore: unused_field - final $Res Function(Song) _then; + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; + @pragma('vm:prefer-inline') @override $Res call({ - Object? id = freezed, - Object? title = freezed, - Object? artist = freezed, - Object? url = freezed, - Object? bpm = freezed, - Object? unitDuration = freezed, - Object? tilesCount = freezed, - Object? duration = freezed, - Object? tags = freezed, + Object? id = null, + Object? title = null, + Object? artist = null, + Object? url = null, + Object? bpm = null, + Object? unitDuration = null, + Object? tilesCount = null, + Object? duration = null, + Object? tags = null, }) { return _then(_value.copyWith( - id: id == freezed + id: null == id ? _value.id : id // ignore: cast_nullable_to_non_nullable as String, - title: title == freezed + title: null == title ? _value.title : title // ignore: cast_nullable_to_non_nullable as String, - artist: artist == freezed + artist: null == artist ? _value.artist : artist // ignore: cast_nullable_to_non_nullable as String, - url: url == freezed + url: null == url ? _value.url : url // ignore: cast_nullable_to_non_nullable as String, - bpm: bpm == freezed + bpm: null == bpm ? _value.bpm : bpm // ignore: cast_nullable_to_non_nullable as int, - unitDuration: unitDuration == freezed + unitDuration: null == unitDuration ? _value.unitDuration : unitDuration // ignore: cast_nullable_to_non_nullable as int, - tilesCount: tilesCount == freezed + tilesCount: null == tilesCount ? _value.tilesCount : tilesCount // ignore: cast_nullable_to_non_nullable as List, - duration: duration == freezed + duration: null == duration ? _value.duration : duration // ignore: cast_nullable_to_non_nullable as List, - tags: tags == freezed + tags: null == tags ? _value.tags : tags // ignore: cast_nullable_to_non_nullable as List, - )); + ) as $Val); } } /// @nodoc -abstract class _$SongCopyWith<$Res> implements $SongCopyWith<$Res> { - factory _$SongCopyWith(_Song value, $Res Function(_Song) then) = - __$SongCopyWithImpl<$Res>; +abstract class _$$_SongCopyWith<$Res> implements $SongCopyWith<$Res> { + factory _$$_SongCopyWith(_$_Song value, $Res Function(_$_Song) then) = + __$$_SongCopyWithImpl<$Res>; @override + @useResult $Res call( {String id, String title, @@ -165,61 +135,59 @@ abstract class _$SongCopyWith<$Res> implements $SongCopyWith<$Res> { } /// @nodoc -class __$SongCopyWithImpl<$Res> extends _$SongCopyWithImpl<$Res> - implements _$SongCopyWith<$Res> { - __$SongCopyWithImpl(_Song _value, $Res Function(_Song) _then) - : super(_value, (v) => _then(v as _Song)); - - @override - _Song get _value => super._value as _Song; +class __$$_SongCopyWithImpl<$Res> extends _$SongCopyWithImpl<$Res, _$_Song> + implements _$$_SongCopyWith<$Res> { + __$$_SongCopyWithImpl(_$_Song _value, $Res Function(_$_Song) _then) + : super(_value, _then); + @pragma('vm:prefer-inline') @override $Res call({ - Object? id = freezed, - Object? title = freezed, - Object? artist = freezed, - Object? url = freezed, - Object? bpm = freezed, - Object? unitDuration = freezed, - Object? tilesCount = freezed, - Object? duration = freezed, - Object? tags = freezed, + Object? id = null, + Object? title = null, + Object? artist = null, + Object? url = null, + Object? bpm = null, + Object? unitDuration = null, + Object? tilesCount = null, + Object? duration = null, + Object? tags = null, }) { - return _then(_Song( - id: id == freezed + return _then(_$_Song( + id: null == id ? _value.id : id // ignore: cast_nullable_to_non_nullable as String, - title: title == freezed + title: null == title ? _value.title : title // ignore: cast_nullable_to_non_nullable as String, - artist: artist == freezed + artist: null == artist ? _value.artist : artist // ignore: cast_nullable_to_non_nullable as String, - url: url == freezed + url: null == url ? _value.url : url // ignore: cast_nullable_to_non_nullable as String, - bpm: bpm == freezed + bpm: null == bpm ? _value.bpm : bpm // ignore: cast_nullable_to_non_nullable as int, - unitDuration: unitDuration == freezed + unitDuration: null == unitDuration ? _value.unitDuration : unitDuration // ignore: cast_nullable_to_non_nullable as int, - tilesCount: tilesCount == freezed - ? _value.tilesCount + tilesCount: null == tilesCount + ? _value._tilesCount : tilesCount // ignore: cast_nullable_to_non_nullable as List, - duration: duration == freezed - ? _value.duration + duration: null == duration + ? _value._duration : duration // ignore: cast_nullable_to_non_nullable as List, - tags: tags == freezed - ? _value.tags + tags: null == tags + ? _value._tags : tags // ignore: cast_nullable_to_non_nullable as List, )); @@ -236,9 +204,12 @@ class _$_Song implements _Song { required this.url, required this.bpm, required this.unitDuration, - required this.tilesCount, - required this.duration, - required this.tags}); + required final List tilesCount, + required final List duration, + required final List tags}) + : _tilesCount = tilesCount, + _duration = duration, + _tags = tags; factory _$_Song.fromJson(Map json) => _$$_SongFromJson(json); @@ -254,12 +225,29 @@ class _$_Song implements _Song { final int bpm; @override final int unitDuration; + final List _tilesCount; @override - final List tilesCount; + List get tilesCount { + if (_tilesCount is EqualUnmodifiableListView) return _tilesCount; + // ignore: implicit_dynamic_type + return EqualUnmodifiableListView(_tilesCount); + } + + final List _duration; @override - final List duration; + List get duration { + if (_duration is EqualUnmodifiableListView) return _duration; + // ignore: implicit_dynamic_type + return EqualUnmodifiableListView(_duration); + } + + final List _tags; @override - final List tags; + List get tags { + if (_tags is EqualUnmodifiableListView) return _tags; + // ignore: implicit_dynamic_type + return EqualUnmodifiableListView(_tags); + } @override String toString() { @@ -270,55 +258,59 @@ class _$_Song implements _Song { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _Song && - const DeepCollectionEquality().equals(other.id, id) && - const DeepCollectionEquality().equals(other.title, title) && - const DeepCollectionEquality().equals(other.artist, artist) && - const DeepCollectionEquality().equals(other.url, url) && - const DeepCollectionEquality().equals(other.bpm, bpm) && + other is _$_Song && + (identical(other.id, id) || other.id == id) && + (identical(other.title, title) || other.title == title) && + (identical(other.artist, artist) || other.artist == artist) && + (identical(other.url, url) || other.url == url) && + (identical(other.bpm, bpm) || other.bpm == bpm) && + (identical(other.unitDuration, unitDuration) || + other.unitDuration == unitDuration) && const DeepCollectionEquality() - .equals(other.unitDuration, unitDuration) && - const DeepCollectionEquality() - .equals(other.tilesCount, tilesCount) && - const DeepCollectionEquality().equals(other.duration, duration) && - const DeepCollectionEquality().equals(other.tags, tags)); + .equals(other._tilesCount, _tilesCount) && + const DeepCollectionEquality().equals(other._duration, _duration) && + const DeepCollectionEquality().equals(other._tags, _tags)); } + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, - const DeepCollectionEquality().hash(id), - const DeepCollectionEquality().hash(title), - const DeepCollectionEquality().hash(artist), - const DeepCollectionEquality().hash(url), - const DeepCollectionEquality().hash(bpm), - const DeepCollectionEquality().hash(unitDuration), - const DeepCollectionEquality().hash(tilesCount), - const DeepCollectionEquality().hash(duration), - const DeepCollectionEquality().hash(tags)); + id, + title, + artist, + url, + bpm, + unitDuration, + const DeepCollectionEquality().hash(_tilesCount), + const DeepCollectionEquality().hash(_duration), + const DeepCollectionEquality().hash(_tags)); @JsonKey(ignore: true) @override - _$SongCopyWith<_Song> get copyWith => - __$SongCopyWithImpl<_Song>(this, _$identity); + @pragma('vm:prefer-inline') + _$$_SongCopyWith<_$_Song> get copyWith => + __$$_SongCopyWithImpl<_$_Song>(this, _$identity); @override Map toJson() { - return _$$_SongToJson(this); + return _$$_SongToJson( + this, + ); } } abstract class _Song implements Song { factory _Song( - {required String id, - required String title, - required String artist, - required String url, - required int bpm, - required int unitDuration, - required List tilesCount, - required List duration, - required List tags}) = _$_Song; + {required final String id, + required final String title, + required final String artist, + required final String url, + required final int bpm, + required final int unitDuration, + required final List tilesCount, + required final List duration, + required final List tags}) = _$_Song; factory _Song.fromJson(Map json) = _$_Song.fromJson; @@ -342,5 +334,5 @@ abstract class _Song implements Song { List get tags; @override @JsonKey(ignore: true) - _$SongCopyWith<_Song> get copyWith => throw _privateConstructorUsedError; + _$$_SongCopyWith<_$_Song> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/songs/song_widget.dart b/lib/songs/song_widget.dart index 91f10a33..1e0e9d2f 100644 --- a/lib/songs/song_widget.dart +++ b/lib/songs/song_widget.dart @@ -17,14 +17,14 @@ class SongWidget extends StatelessWidget { onTap: onTap, title: Text( song.title, - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), subtitle: song.artist.isNotEmpty ? Text( song.artist, maxLines: 1, overflow: TextOverflow.ellipsis, - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ) : null, ); diff --git a/lib/songs/songs_controller.dart b/lib/songs/songs_controller.dart index 25d67c28..0d5add11 100644 --- a/lib/songs/songs_controller.dart +++ b/lib/songs/songs_controller.dart @@ -16,26 +16,26 @@ final isLoadingNextPageByTagProvider = final isLoadedByTagsProvider = StateProvider.family((_, __) => false); -final songsByTagProvider = StateNotifierProvider.family< - SongsController, - AsyncValue>, - String>((ref, tag) => SongsController(ref.read, tag)); +final songsByTagProvider = StateNotifierProvider.family>, String>(SongsController.new); class SongsController extends StateNotifier>> { SongsController(this._read, this._tag) : super(const AsyncValue.loading()) { - _read(songRepositoryProvider) + _read + .read(songRepositoryProvider) .getSongsByTag(_tag, '', 20) .then((songs) => {state = AsyncValue.data(songs)}); } final String _tag; - final Reader _read; + final StateNotifierProviderRef _read; Future loadMoreSongs() async { - final isLoading = _read(isLoadingNextPageByTagProvider(_tag).state).state; - final isLoaded = _read(isLoadedByTagsProvider(_tag).state).state; + final isLoading = + _read.read(isLoadingNextPageByTagProvider(_tag).notifier).state; + final isLoaded = _read.read(isLoadedByTagsProvider(_tag).notifier).state; if (!isLoading && !isLoaded) { - _read(isLoadingNextPageByTagProvider(_tag).state).state = true; + _read.read(isLoadingNextPageByTagProvider(_tag).notifier).state = true; final titleStart = state.when( data: (songs) => songs.isEmpty ? '' : songs.last.title, loading: () => '', @@ -46,10 +46,11 @@ class SongsController extends StateNotifier>> { loading: () => [], error: (_, __) => [], ); - final songs = await _read(songRepositoryProvider) + final songs = await _read + .read(songRepositoryProvider) .getSongsByTag(_tag, titleStart, 20); - _read(isLoadingNextPageByTagProvider(_tag).state).state = false; - _read(isLoadedByTagsProvider(_tag).state).state = songs.isEmpty; + _read.read(isLoadingNextPageByTagProvider(_tag).notifier).state = false; + _read.read(isLoadedByTagsProvider(_tag).notifier).state = songs.isEmpty; state = AsyncValue.data(loadedSongs + songs); } } diff --git a/lib/songs/songs_widget.dart b/lib/songs/songs_widget.dart index 52559752..8d09d687 100644 --- a/lib/songs/songs_widget.dart +++ b/lib/songs/songs_widget.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../loading_widget.dart'; -import '../router/root_router.dart'; +import '../router/root_router.gr.dart'; import 'song_widget.dart'; import 'songs_controller.dart'; @@ -25,7 +25,7 @@ class SongsWidget extends ConsumerWidget { children: [ Expanded( child: Scrollbar( - isAlwaysShown: true, + thumbVisibility: true, child: NotificationListener( onNotification: (notification) { if (notification.metrics.pixels > 0 && @@ -55,8 +55,9 @@ class SongsWidget extends ConsumerWidget { ), Consumer( builder: (context, ref, child) { - final isLoadingNextPage = - ref.watch(isLoadingNextPageByTagProvider(_tag).state).state; + final isLoadingNextPage = ref + .watch(isLoadingNextPageByTagProvider(_tag).notifier) + .state; return isLoadingNextPage ? const Center( diff --git a/lib/splash_page.dart b/lib/splash_page.dart index 36ddfed8..9d02955d 100644 --- a/lib/splash_page.dart +++ b/lib/splash_page.dart @@ -4,8 +4,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'authentication/authentication_controller.dart'; import 'authentication/authentication_state.dart'; -import 'router/root_router.dart'; +import 'router/root_router.gr.dart'; +@RoutePage() class SplashPage extends ConsumerWidget { const SplashPage({Key? key}) : super(key: key); diff --git a/lib/theme/theme_controller.dart b/lib/theme/theme_controller.dart index 61cb69fe..dcf17e24 100644 --- a/lib/theme/theme_controller.dart +++ b/lib/theme/theme_controller.dart @@ -11,16 +11,16 @@ final themeModeProvider = orElse: () => ThemeMode.system, ); - return ThemeController(ref.read, themeMode); + return ThemeController(ref, themeMode); }); class ThemeController extends StateNotifier { ThemeController(this._read, ThemeMode defaultThemeMode) : super(defaultThemeMode); - final Reader _read; + final StateNotifierProviderRef _read; Future setThemeMode(ThemeMode themeMode) async { - await _read(sharedUtilityProvider).setThemeName(themeMode.toString()); + await _read.read(sharedUtilityProvider).setThemeName(themeMode.toString()); state = themeMode; } } @@ -37,22 +37,22 @@ ThemeData buildTheme({bool isDark = false}) { final screenTaskDurationTextStyle = TextStyle(fontSize: 16, color: onBackgroundColor); final textTheme = TextTheme( - headline5: screenHeadingTextStyle, - bodyText2: screenTaskNameTextStyle, - bodyText1: screenTaskDurationTextStyle, + headlineSmall: screenHeadingTextStyle, + bodyMedium: screenTaskNameTextStyle, + bodyLarge: screenTaskDurationTextStyle, ); return ThemeData( elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( - primary: primaryColor, - onPrimary: onPrimaryColor, + backgroundColor: primaryColor, + foregroundColor: onPrimaryColor, ), ), outlinedButtonTheme: OutlinedButtonThemeData( style: OutlinedButton.styleFrom( - primary: onBackgroundColor, - onSurface: onBackgroundColor, + foregroundColor: onBackgroundColor, + disabledForegroundColor: onBackgroundColor, ), ), scaffoldBackgroundColor: backgroundColor, @@ -88,7 +88,6 @@ ThemeData buildTheme({bool isDark = false}) { brightness: isDark ? Brightness.dark : Brightness.light, surface: backgroundColor, ), - toggleableActiveColor: primaryColor, iconTheme: const IconThemeData( color: primaryColor, ), diff --git a/lib/theme/theme_page.dart b/lib/theme/theme_page.dart index 0e358fa7..d52bafe2 100644 --- a/lib/theme/theme_page.dart +++ b/lib/theme/theme_page.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; // ignore: depend_on_referenced_packages import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -5,6 +6,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'theme_controller.dart'; +@RoutePage() class ThemePage extends StatelessWidget { const ThemePage({Key? key}) : super(key: key); @@ -21,13 +23,13 @@ class ThemePage extends StatelessWidget { final themeMode = ref.watch(themeModeProvider); return Scrollbar( - isAlwaysShown: true, + thumbVisibility: true, child: ListView.builder( itemCount: ThemeMode.values.length, itemBuilder: (context, index) => RadioListTile( title: Text( getThemeName(context, ThemeMode.values[index]), - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), value: ThemeMode.values[index], groupValue: themeMode, diff --git a/lib/user/user.freezed.dart b/lib/user/user.freezed.dart index e04a074a..4283644c 100644 --- a/lib/user/user.freezed.dart +++ b/lib/user/user.freezed.dart @@ -1,7 +1,7 @@ // coverage:ignore-file // GENERATED CODE - DO NOT MODIFY BY HAND // ignore_for_file: type=lint -// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark part of 'user.dart'; @@ -12,47 +12,12 @@ part of 'user.dart'; T _$identity(T value) => value; final _privateConstructorUsedError = UnsupportedError( - 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more informations: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); + 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); User _$UserFromJson(Map json) { return _User.fromJson(json); } -/// @nodoc -class _$UserTearOff { - const _$UserTearOff(); - - _User call( - {required String id, - required int playedNotes, - required int stars, - required Duration playedTime, - required String instrumentId, - required String name, - required String photoUrl, - required bool anonymous, - @TimestampConverter() required DateTime creationTime}) { - return _User( - id: id, - playedNotes: playedNotes, - stars: stars, - playedTime: playedTime, - instrumentId: instrumentId, - name: name, - photoUrl: photoUrl, - anonymous: anonymous, - creationTime: creationTime, - ); - } - - User fromJson(Map json) { - return User.fromJson(json); - } -} - -/// @nodoc -const $User = _$UserTearOff(); - /// @nodoc mixin _$User { String get id => throw _privateConstructorUsedError; @@ -74,7 +39,8 @@ mixin _$User { /// @nodoc abstract class $UserCopyWith<$Res> { factory $UserCopyWith(User value, $Res Function(User) then) = - _$UserCopyWithImpl<$Res>; + _$UserCopyWithImpl<$Res, User>; + @useResult $Res call( {String id, int playedNotes, @@ -88,71 +54,75 @@ abstract class $UserCopyWith<$Res> { } /// @nodoc -class _$UserCopyWithImpl<$Res> implements $UserCopyWith<$Res> { +class _$UserCopyWithImpl<$Res, $Val extends User> + implements $UserCopyWith<$Res> { _$UserCopyWithImpl(this._value, this._then); - final User _value; // ignore: unused_field - final $Res Function(User) _then; + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; + @pragma('vm:prefer-inline') @override $Res call({ - Object? id = freezed, - Object? playedNotes = freezed, - Object? stars = freezed, - Object? playedTime = freezed, - Object? instrumentId = freezed, - Object? name = freezed, - Object? photoUrl = freezed, - Object? anonymous = freezed, - Object? creationTime = freezed, + Object? id = null, + Object? playedNotes = null, + Object? stars = null, + Object? playedTime = null, + Object? instrumentId = null, + Object? name = null, + Object? photoUrl = null, + Object? anonymous = null, + Object? creationTime = null, }) { return _then(_value.copyWith( - id: id == freezed + id: null == id ? _value.id : id // ignore: cast_nullable_to_non_nullable as String, - playedNotes: playedNotes == freezed + playedNotes: null == playedNotes ? _value.playedNotes : playedNotes // ignore: cast_nullable_to_non_nullable as int, - stars: stars == freezed + stars: null == stars ? _value.stars : stars // ignore: cast_nullable_to_non_nullable as int, - playedTime: playedTime == freezed + playedTime: null == playedTime ? _value.playedTime : playedTime // ignore: cast_nullable_to_non_nullable as Duration, - instrumentId: instrumentId == freezed + instrumentId: null == instrumentId ? _value.instrumentId : instrumentId // ignore: cast_nullable_to_non_nullable as String, - name: name == freezed + name: null == name ? _value.name : name // ignore: cast_nullable_to_non_nullable as String, - photoUrl: photoUrl == freezed + photoUrl: null == photoUrl ? _value.photoUrl : photoUrl // ignore: cast_nullable_to_non_nullable as String, - anonymous: anonymous == freezed + anonymous: null == anonymous ? _value.anonymous : anonymous // ignore: cast_nullable_to_non_nullable as bool, - creationTime: creationTime == freezed + creationTime: null == creationTime ? _value.creationTime : creationTime // ignore: cast_nullable_to_non_nullable as DateTime, - )); + ) as $Val); } } /// @nodoc -abstract class _$UserCopyWith<$Res> implements $UserCopyWith<$Res> { - factory _$UserCopyWith(_User value, $Res Function(_User) then) = - __$UserCopyWithImpl<$Res>; +abstract class _$$_UserCopyWith<$Res> implements $UserCopyWith<$Res> { + factory _$$_UserCopyWith(_$_User value, $Res Function(_$_User) then) = + __$$_UserCopyWithImpl<$Res>; @override + @useResult $Res call( {String id, int playedNotes, @@ -166,60 +136,58 @@ abstract class _$UserCopyWith<$Res> implements $UserCopyWith<$Res> { } /// @nodoc -class __$UserCopyWithImpl<$Res> extends _$UserCopyWithImpl<$Res> - implements _$UserCopyWith<$Res> { - __$UserCopyWithImpl(_User _value, $Res Function(_User) _then) - : super(_value, (v) => _then(v as _User)); - - @override - _User get _value => super._value as _User; +class __$$_UserCopyWithImpl<$Res> extends _$UserCopyWithImpl<$Res, _$_User> + implements _$$_UserCopyWith<$Res> { + __$$_UserCopyWithImpl(_$_User _value, $Res Function(_$_User) _then) + : super(_value, _then); + @pragma('vm:prefer-inline') @override $Res call({ - Object? id = freezed, - Object? playedNotes = freezed, - Object? stars = freezed, - Object? playedTime = freezed, - Object? instrumentId = freezed, - Object? name = freezed, - Object? photoUrl = freezed, - Object? anonymous = freezed, - Object? creationTime = freezed, + Object? id = null, + Object? playedNotes = null, + Object? stars = null, + Object? playedTime = null, + Object? instrumentId = null, + Object? name = null, + Object? photoUrl = null, + Object? anonymous = null, + Object? creationTime = null, }) { - return _then(_User( - id: id == freezed + return _then(_$_User( + id: null == id ? _value.id : id // ignore: cast_nullable_to_non_nullable as String, - playedNotes: playedNotes == freezed + playedNotes: null == playedNotes ? _value.playedNotes : playedNotes // ignore: cast_nullable_to_non_nullable as int, - stars: stars == freezed + stars: null == stars ? _value.stars : stars // ignore: cast_nullable_to_non_nullable as int, - playedTime: playedTime == freezed + playedTime: null == playedTime ? _value.playedTime : playedTime // ignore: cast_nullable_to_non_nullable as Duration, - instrumentId: instrumentId == freezed + instrumentId: null == instrumentId ? _value.instrumentId : instrumentId // ignore: cast_nullable_to_non_nullable as String, - name: name == freezed + name: null == name ? _value.name : name // ignore: cast_nullable_to_non_nullable as String, - photoUrl: photoUrl == freezed + photoUrl: null == photoUrl ? _value.photoUrl : photoUrl // ignore: cast_nullable_to_non_nullable as String, - anonymous: anonymous == freezed + anonymous: null == anonymous ? _value.anonymous : anonymous // ignore: cast_nullable_to_non_nullable as bool, - creationTime: creationTime == freezed + creationTime: null == creationTime ? _value.creationTime : creationTime // ignore: cast_nullable_to_non_nullable as DateTime, @@ -272,57 +240,54 @@ class _$_User implements _User { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _User && - const DeepCollectionEquality().equals(other.id, id) && - const DeepCollectionEquality() - .equals(other.playedNotes, playedNotes) && - const DeepCollectionEquality().equals(other.stars, stars) && - const DeepCollectionEquality() - .equals(other.playedTime, playedTime) && - const DeepCollectionEquality() - .equals(other.instrumentId, instrumentId) && - const DeepCollectionEquality().equals(other.name, name) && - const DeepCollectionEquality().equals(other.photoUrl, photoUrl) && - const DeepCollectionEquality().equals(other.anonymous, anonymous) && - const DeepCollectionEquality() - .equals(other.creationTime, creationTime)); + other is _$_User && + (identical(other.id, id) || other.id == id) && + (identical(other.playedNotes, playedNotes) || + other.playedNotes == playedNotes) && + (identical(other.stars, stars) || other.stars == stars) && + (identical(other.playedTime, playedTime) || + other.playedTime == playedTime) && + (identical(other.instrumentId, instrumentId) || + other.instrumentId == instrumentId) && + (identical(other.name, name) || other.name == name) && + (identical(other.photoUrl, photoUrl) || + other.photoUrl == photoUrl) && + (identical(other.anonymous, anonymous) || + other.anonymous == anonymous) && + (identical(other.creationTime, creationTime) || + other.creationTime == creationTime)); } + @JsonKey(ignore: true) @override - int get hashCode => Object.hash( - runtimeType, - const DeepCollectionEquality().hash(id), - const DeepCollectionEquality().hash(playedNotes), - const DeepCollectionEquality().hash(stars), - const DeepCollectionEquality().hash(playedTime), - const DeepCollectionEquality().hash(instrumentId), - const DeepCollectionEquality().hash(name), - const DeepCollectionEquality().hash(photoUrl), - const DeepCollectionEquality().hash(anonymous), - const DeepCollectionEquality().hash(creationTime)); + int get hashCode => Object.hash(runtimeType, id, playedNotes, stars, + playedTime, instrumentId, name, photoUrl, anonymous, creationTime); @JsonKey(ignore: true) @override - _$UserCopyWith<_User> get copyWith => - __$UserCopyWithImpl<_User>(this, _$identity); + @pragma('vm:prefer-inline') + _$$_UserCopyWith<_$_User> get copyWith => + __$$_UserCopyWithImpl<_$_User>(this, _$identity); @override Map toJson() { - return _$$_UserToJson(this); + return _$$_UserToJson( + this, + ); } } abstract class _User implements User { factory _User( - {required String id, - required int playedNotes, - required int stars, - required Duration playedTime, - required String instrumentId, - required String name, - required String photoUrl, - required bool anonymous, - @TimestampConverter() required DateTime creationTime}) = _$_User; + {required final String id, + required final int playedNotes, + required final int stars, + required final Duration playedTime, + required final String instrumentId, + required final String name, + required final String photoUrl, + required final bool anonymous, + @TimestampConverter() required final DateTime creationTime}) = _$_User; factory _User.fromJson(Map json) = _$_User.fromJson; @@ -347,5 +312,5 @@ abstract class _User implements User { DateTime get creationTime; @override @JsonKey(ignore: true) - _$UserCopyWith<_User> get copyWith => throw _privateConstructorUsedError; + _$$_UserCopyWith<_$_User> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/user/user_controller.dart b/lib/user/user_controller.dart index 9c489699..fcac2458 100644 --- a/lib/user/user_controller.dart +++ b/lib/user/user_controller.dart @@ -12,7 +12,7 @@ final userProvider = StateNotifierProvider>((ref) { ref.watch(authenticationProvider); - return UserController(ref.read); + return UserController(ref); }); class UserController extends StateNotifier> { @@ -21,19 +21,22 @@ class UserController extends StateNotifier> { final firebaseUser = firebase.FirebaseAuth.instance.currentUser; if (firebaseUser != null) { _subscription?.cancel(); - _subscription = - _read(userRepositoryProvider).observeCurrentUser().listen((user) { - _read(selectedInstrumentIdProvider.state).state = user.instrumentId; + _subscription = _read + .read(userRepositoryProvider) + .observeCurrentUser() + .listen((user) { + _read.read(selectedInstrumentIdProvider.notifier).state = + user.instrumentId; state = AsyncValue.data(user); }); } else { - state = const AsyncValue.error('Unauthenticated'); + state = const AsyncValue.error('Unauthenticated', StackTrace.empty); } } } StreamSubscription? _subscription; - final Reader _read; + final StateNotifierProviderRef _read; @override void dispose() { diff --git a/lib/user/user_page.dart b/lib/user/user_page.dart index 6456174a..ae703b0e 100644 --- a/lib/user/user_page.dart +++ b/lib/user/user_page.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; // ignore: depend_on_referenced_packages import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -11,6 +12,7 @@ import '../loading_widget.dart'; import 'user.dart'; import 'user_controller.dart'; +@RoutePage() class UserPage extends StatelessWidget { const UserPage({Key? key}) : super(key: key); @@ -30,7 +32,7 @@ class UserPage extends StatelessWidget { data: (user) => Padding( padding: const EdgeInsets.all(8), child: Scrollbar( - isAlwaysShown: true, + thumbVisibility: true, child: SingleChildScrollView( child: _buildUI(user, context), ), @@ -83,7 +85,7 @@ class UserPage extends StatelessWidget { const SizedBox(height: 8), Text( user.stars.toString(), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), const SizedBox(height: 8), ], @@ -108,7 +110,7 @@ class UserPage extends StatelessWidget { const SizedBox(height: 8), Text( user.playedNotes.toString(), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), const SizedBox(height: 8), ], @@ -133,7 +135,7 @@ class UserPage extends StatelessWidget { const SizedBox(height: 8), Text( user.playedTime.toString().substring(0, 4), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), const SizedBox(height: 8), ], @@ -167,7 +169,7 @@ class UserPage extends StatelessWidget { children: [ Text( user.name, - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox(height: 8), Row( @@ -182,7 +184,7 @@ class UserPage extends StatelessWidget { L10n.of(context)!.txt_joined, [DateFormat.yMMMd().format(user.creationTime)], ), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), ], ), diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 7508c8ae..b9a8d141 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,15 +7,17 @@ import Foundation import cloud_firestore import cloud_functions -import device_info_plus_macos +import device_info_plus +import facebook_auth_desktop import firebase_auth import firebase_core import firebase_crashlytics import firebase_storage +import flutter_secure_storage_macos import in_app_review -import package_info_plus_macos -import path_provider_macos -import shared_preferences_macos +import package_info_plus +import path_provider_foundation +import shared_preferences_foundation import sqflite import url_launcher_macos @@ -23,10 +25,12 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin")) FLTFirebaseFunctionsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFunctionsPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) + FacebookAuthDesktopPlugin.register(with: registry.registrar(forPlugin: "FacebookAuthDesktopPlugin")) FLTFirebaseAuthPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAuthPlugin")) FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin")) FLTFirebaseStoragePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseStoragePlugin")) + FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) InAppReviewPlugin.register(with: registry.registrar(forPlugin: "InAppReviewPlugin")) FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) diff --git a/macos/Podfile b/macos/Podfile index 22d9caad..9ec46f8c 100644 --- a/macos/Podfile +++ b/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.12' +platform :osx, '10.15' # 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 f981f380..4f7448a9 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -1,35 +1,34 @@ PODS: - - abseil/algorithm (0.20200225.0): - - abseil/algorithm/algorithm (= 0.20200225.0) - - abseil/algorithm/container (= 0.20200225.0) - - abseil/algorithm/algorithm (0.20200225.0): + - abseil/algorithm (1.20211102.0): + - abseil/algorithm/algorithm (= 1.20211102.0) + - abseil/algorithm/container (= 1.20211102.0) + - abseil/algorithm/algorithm (1.20211102.0): - abseil/base/config - - abseil/algorithm/container (0.20200225.0): + - abseil/algorithm/container (1.20211102.0): - abseil/algorithm/algorithm - abseil/base/core_headers - abseil/meta/type_traits - - abseil/base (0.20200225.0): - - abseil/base/atomic_hook (= 0.20200225.0) - - abseil/base/base (= 0.20200225.0) - - abseil/base/base_internal (= 0.20200225.0) - - abseil/base/bits (= 0.20200225.0) - - abseil/base/config (= 0.20200225.0) - - abseil/base/core_headers (= 0.20200225.0) - - abseil/base/dynamic_annotations (= 0.20200225.0) - - abseil/base/endian (= 0.20200225.0) - - abseil/base/errno_saver (= 0.20200225.0) - - abseil/base/exponential_biased (= 0.20200225.0) - - abseil/base/log_severity (= 0.20200225.0) - - abseil/base/malloc_internal (= 0.20200225.0) - - abseil/base/periodic_sampler (= 0.20200225.0) - - abseil/base/pretty_function (= 0.20200225.0) - - abseil/base/raw_logging_internal (= 0.20200225.0) - - abseil/base/spinlock_wait (= 0.20200225.0) - - abseil/base/throw_delegate (= 0.20200225.0) - - abseil/base/atomic_hook (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/base (0.20200225.0): + - abseil/base (1.20211102.0): + - abseil/base/atomic_hook (= 1.20211102.0) + - abseil/base/base (= 1.20211102.0) + - abseil/base/base_internal (= 1.20211102.0) + - abseil/base/config (= 1.20211102.0) + - abseil/base/core_headers (= 1.20211102.0) + - abseil/base/dynamic_annotations (= 1.20211102.0) + - abseil/base/endian (= 1.20211102.0) + - abseil/base/errno_saver (= 1.20211102.0) + - abseil/base/fast_type_id (= 1.20211102.0) + - abseil/base/log_severity (= 1.20211102.0) + - abseil/base/malloc_internal (= 1.20211102.0) + - abseil/base/pretty_function (= 1.20211102.0) + - abseil/base/raw_logging_internal (= 1.20211102.0) + - abseil/base/spinlock_wait (= 1.20211102.0) + - abseil/base/strerror (= 1.20211102.0) + - abseil/base/throw_delegate (= 1.20211102.0) + - abseil/base/atomic_hook (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/base (1.20211102.0): - abseil/base/atomic_hook - abseil/base/base_internal - abseil/base/config @@ -39,113 +38,118 @@ PODS: - abseil/base/raw_logging_internal - abseil/base/spinlock_wait - abseil/meta/type_traits - - abseil/base/base_internal (0.20200225.0): + - abseil/base/base_internal (1.20211102.0): - abseil/base/config - abseil/meta/type_traits - - abseil/base/bits (0.20200225.0): + - abseil/base/config (1.20211102.0) + - abseil/base/core_headers (1.20211102.0): - abseil/base/config - - abseil/base/core_headers - - abseil/base/config (0.20200225.0) - - abseil/base/core_headers (0.20200225.0): + - abseil/base/dynamic_annotations (1.20211102.0): - abseil/base/config - - abseil/base/dynamic_annotations (0.20200225.0) - - abseil/base/endian (0.20200225.0): + - abseil/base/core_headers + - abseil/base/endian (1.20211102.0): + - abseil/base/base - abseil/base/config - abseil/base/core_headers - - abseil/base/errno_saver (0.20200225.0): + - abseil/base/errno_saver (1.20211102.0): - abseil/base/config - - abseil/base/exponential_biased (0.20200225.0): + - abseil/base/fast_type_id (1.20211102.0): - abseil/base/config - - abseil/base/core_headers - - abseil/base/log_severity (0.20200225.0): + - abseil/base/log_severity (1.20211102.0): - abseil/base/config - abseil/base/core_headers - - abseil/base/malloc_internal (0.20200225.0): + - abseil/base/malloc_internal (1.20211102.0): - abseil/base/base - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers - abseil/base/dynamic_annotations - abseil/base/raw_logging_internal - - abseil/base/periodic_sampler (0.20200225.0): - - abseil/base/core_headers - - abseil/base/exponential_biased - - abseil/base/pretty_function (0.20200225.0) - - abseil/base/raw_logging_internal (0.20200225.0): + - abseil/base/pretty_function (1.20211102.0) + - abseil/base/raw_logging_internal (1.20211102.0): - abseil/base/atomic_hook - abseil/base/config - abseil/base/core_headers - abseil/base/log_severity - - abseil/base/spinlock_wait (0.20200225.0): + - abseil/base/spinlock_wait (1.20211102.0): - abseil/base/base_internal - abseil/base/core_headers - abseil/base/errno_saver - - abseil/base/throw_delegate (0.20200225.0): + - abseil/base/strerror (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/errno_saver + - abseil/base/throw_delegate (1.20211102.0): - abseil/base/config - abseil/base/raw_logging_internal - - abseil/container/common (0.20200225.0): + - abseil/container/common (1.20211102.0): - abseil/meta/type_traits - abseil/types/optional - - abseil/container/compressed_tuple (0.20200225.0): + - abseil/container/compressed_tuple (1.20211102.0): - abseil/utility/utility - - abseil/container/container_memory (0.20200225.0): + - abseil/container/container_memory (1.20211102.0): + - abseil/base/config - abseil/memory/memory + - abseil/meta/type_traits - abseil/utility/utility - - abseil/container/fixed_array (0.20200225.0): + - abseil/container/fixed_array (1.20211102.0): - abseil/algorithm/algorithm + - abseil/base/config - abseil/base/core_headers - abseil/base/dynamic_annotations - abseil/base/throw_delegate - abseil/container/compressed_tuple - abseil/memory/memory - - abseil/container/flat_hash_map (0.20200225.0): + - abseil/container/flat_hash_map (1.20211102.0): - abseil/algorithm/container - abseil/container/container_memory - abseil/container/hash_function_defaults - abseil/container/raw_hash_map - abseil/memory/memory - - abseil/container/hash_function_defaults (0.20200225.0): + - abseil/container/hash_function_defaults (1.20211102.0): - abseil/base/config - abseil/hash/hash + - abseil/strings/cord - abseil/strings/strings - - abseil/container/hash_policy_traits (0.20200225.0): + - abseil/container/hash_policy_traits (1.20211102.0): - abseil/meta/type_traits - - abseil/container/hashtable_debug_hooks (0.20200225.0): + - abseil/container/hashtable_debug_hooks (1.20211102.0): - abseil/base/config - - abseil/container/hashtablez_sampler (0.20200225.0): + - abseil/container/hashtablez_sampler (1.20211102.0): - abseil/base/base - abseil/base/core_headers - - abseil/base/exponential_biased - abseil/container/have_sse - abseil/debugging/stacktrace - abseil/memory/memory + - abseil/profiling/exponential_biased + - abseil/profiling/sample_recorder - abseil/synchronization/synchronization - abseil/utility/utility - - abseil/container/have_sse (0.20200225.0) - - abseil/container/inlined_vector (0.20200225.0): + - abseil/container/have_sse (1.20211102.0) + - abseil/container/inlined_vector (1.20211102.0): - abseil/algorithm/algorithm - abseil/base/core_headers - abseil/base/throw_delegate - abseil/container/inlined_vector_internal - abseil/memory/memory - - abseil/container/inlined_vector_internal (0.20200225.0): + - abseil/container/inlined_vector_internal (1.20211102.0): - abseil/base/core_headers - abseil/container/compressed_tuple - abseil/memory/memory - abseil/meta/type_traits - abseil/types/span - - abseil/container/layout (0.20200225.0): + - abseil/container/layout (1.20211102.0): + - abseil/base/config - abseil/base/core_headers - abseil/meta/type_traits - abseil/strings/strings - abseil/types/span - abseil/utility/utility - - abseil/container/raw_hash_map (0.20200225.0): + - abseil/container/raw_hash_map (1.20211102.0): - abseil/base/throw_delegate - abseil/container/container_memory - abseil/container/raw_hash_set - - abseil/container/raw_hash_set (0.20200225.0): - - abseil/base/bits + - abseil/container/raw_hash_set (1.20211102.0): - abseil/base/config - abseil/base/core_headers - abseil/base/endian @@ -156,25 +160,25 @@ PODS: - abseil/container/hashtable_debug_hooks - abseil/container/hashtablez_sampler - abseil/container/have_sse - - abseil/container/layout - abseil/memory/memory - abseil/meta/type_traits + - abseil/numeric/bits - abseil/utility/utility - - abseil/debugging/debugging_internal (0.20200225.0): + - abseil/debugging/debugging_internal (1.20211102.0): - abseil/base/config - abseil/base/core_headers - abseil/base/dynamic_annotations - abseil/base/errno_saver - abseil/base/raw_logging_internal - - abseil/debugging/demangle_internal (0.20200225.0): + - abseil/debugging/demangle_internal (1.20211102.0): - abseil/base/base - abseil/base/config - abseil/base/core_headers - - abseil/debugging/stacktrace (0.20200225.0): + - abseil/debugging/stacktrace (1.20211102.0): - abseil/base/config - abseil/base/core_headers - abseil/debugging/debugging_internal - - abseil/debugging/symbolize (0.20200225.0): + - abseil/debugging/symbolize (1.20211102.0): - abseil/base/base - abseil/base/config - abseil/base/core_headers @@ -183,51 +187,303 @@ PODS: - abseil/base/raw_logging_internal - abseil/debugging/debugging_internal - abseil/debugging/demangle_internal - - abseil/hash/city (0.20200225.0): + - abseil/strings/strings + - abseil/functional/bind_front (1.20211102.0): + - abseil/base/base_internal + - abseil/container/compressed_tuple + - abseil/meta/type_traits + - abseil/utility/utility + - abseil/functional/function_ref (1.20211102.0): + - abseil/base/base_internal + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/hash/city (1.20211102.0): - abseil/base/config - abseil/base/core_headers - abseil/base/endian - - abseil/hash/hash (0.20200225.0): + - abseil/hash/hash (1.20211102.0): + - abseil/base/config - abseil/base/core_headers - abseil/base/endian - abseil/container/fixed_array - abseil/hash/city + - abseil/hash/low_level_hash - abseil/meta/type_traits - abseil/numeric/int128 - abseil/strings/strings - abseil/types/optional - abseil/types/variant - abseil/utility/utility - - abseil/memory (0.20200225.0): - - abseil/memory/memory (= 0.20200225.0) - - abseil/memory/memory (0.20200225.0): + - abseil/hash/low_level_hash (1.20211102.0): + - abseil/base/config + - abseil/base/endian + - abseil/numeric/bits + - abseil/numeric/int128 + - abseil/memory (1.20211102.0): + - abseil/memory/memory (= 1.20211102.0) + - abseil/memory/memory (1.20211102.0): - abseil/base/core_headers - abseil/meta/type_traits - - abseil/meta (0.20200225.0): - - abseil/meta/type_traits (= 0.20200225.0) - - abseil/meta/type_traits (0.20200225.0): + - abseil/meta (1.20211102.0): + - abseil/meta/type_traits (= 1.20211102.0) + - abseil/meta/type_traits (1.20211102.0): + - abseil/base/config + - abseil/numeric/bits (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/numeric/int128 (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/numeric/bits + - abseil/numeric/representation (1.20211102.0): - abseil/base/config - - abseil/numeric/int128 (0.20200225.0): + - abseil/profiling/exponential_biased (1.20211102.0): - abseil/base/config - abseil/base/core_headers - - abseil/strings/internal (0.20200225.0): + - abseil/profiling/sample_recorder (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/synchronization/synchronization + - abseil/time/time + - abseil/random/distributions (1.20211102.0): + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/numeric/bits + - abseil/random/internal/distribution_caller + - abseil/random/internal/fast_uniform_bits + - abseil/random/internal/fastmath + - abseil/random/internal/generate_real + - abseil/random/internal/iostream_state_saver + - abseil/random/internal/traits + - abseil/random/internal/uniform_helper + - abseil/random/internal/wide_multiply + - abseil/strings/strings + - abseil/random/internal/distribution_caller (1.20211102.0): + - abseil/base/config + - abseil/base/fast_type_id + - abseil/utility/utility + - abseil/random/internal/fast_uniform_bits (1.20211102.0): + - abseil/base/config + - abseil/meta/type_traits + - abseil/random/internal/fastmath (1.20211102.0): + - abseil/numeric/bits + - abseil/random/internal/generate_real (1.20211102.0): + - abseil/meta/type_traits + - abseil/numeric/bits + - abseil/random/internal/fastmath + - abseil/random/internal/traits + - abseil/random/internal/iostream_state_saver (1.20211102.0): + - abseil/meta/type_traits + - abseil/numeric/int128 + - abseil/random/internal/nonsecure_base (1.20211102.0): + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/random/internal/pool_urbg + - abseil/random/internal/salted_seed_seq + - abseil/random/internal/seed_material + - abseil/types/optional + - abseil/types/span + - abseil/random/internal/pcg_engine (1.20211102.0): + - abseil/base/config + - abseil/meta/type_traits + - abseil/numeric/bits + - abseil/numeric/int128 + - abseil/random/internal/fastmath + - abseil/random/internal/iostream_state_saver + - abseil/random/internal/platform (1.20211102.0): + - abseil/base/config + - abseil/random/internal/pool_urbg (1.20211102.0): + - abseil/base/base - abseil/base/config - abseil/base/core_headers - abseil/base/endian - abseil/base/raw_logging_internal + - abseil/random/internal/randen + - abseil/random/internal/seed_material + - abseil/random/internal/traits + - abseil/random/seed_gen_exception + - abseil/types/span + - abseil/random/internal/randen (1.20211102.0): + - abseil/base/raw_logging_internal + - abseil/random/internal/platform + - abseil/random/internal/randen_hwaes + - abseil/random/internal/randen_slow + - abseil/random/internal/randen_engine (1.20211102.0): + - abseil/base/endian - abseil/meta/type_traits - - abseil/strings/str_format (0.20200225.0): + - abseil/random/internal/iostream_state_saver + - abseil/random/internal/randen + - abseil/random/internal/randen_hwaes (1.20211102.0): + - abseil/base/config + - abseil/random/internal/platform + - abseil/random/internal/randen_hwaes_impl + - abseil/random/internal/randen_hwaes_impl (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/numeric/int128 + - abseil/random/internal/platform + - abseil/random/internal/randen_slow (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/numeric/int128 + - abseil/random/internal/platform + - abseil/random/internal/salted_seed_seq (1.20211102.0): + - abseil/container/inlined_vector + - abseil/meta/type_traits + - abseil/random/internal/seed_material + - abseil/types/optional + - abseil/types/span + - abseil/random/internal/seed_material (1.20211102.0): + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/raw_logging_internal + - abseil/random/internal/fast_uniform_bits + - abseil/strings/strings + - abseil/types/optional + - abseil/types/span + - abseil/random/internal/traits (1.20211102.0): + - abseil/base/config + - abseil/random/internal/uniform_helper (1.20211102.0): + - abseil/base/config + - abseil/meta/type_traits + - abseil/random/internal/traits + - abseil/random/internal/wide_multiply (1.20211102.0): + - abseil/base/config + - abseil/numeric/bits + - abseil/numeric/int128 + - abseil/random/internal/traits + - abseil/random/random (1.20211102.0): + - abseil/random/distributions + - abseil/random/internal/nonsecure_base + - abseil/random/internal/pcg_engine + - abseil/random/internal/pool_urbg + - abseil/random/internal/randen_engine + - abseil/random/seed_sequences + - abseil/random/seed_gen_exception (1.20211102.0): + - abseil/base/config + - abseil/random/seed_sequences (1.20211102.0): + - abseil/container/inlined_vector + - abseil/random/internal/nonsecure_base + - abseil/random/internal/pool_urbg + - abseil/random/internal/salted_seed_seq + - abseil/random/internal/seed_material + - abseil/random/seed_gen_exception + - abseil/types/span + - abseil/status/status (1.20211102.0): + - abseil/base/atomic_hook + - abseil/base/config + - abseil/base/core_headers + - abseil/base/raw_logging_internal + - abseil/container/inlined_vector + - abseil/debugging/stacktrace + - abseil/debugging/symbolize + - abseil/functional/function_ref + - abseil/strings/cord + - abseil/strings/str_format + - abseil/strings/strings + - abseil/types/optional + - abseil/status/statusor (1.20211102.0): + - abseil/base/base + - abseil/base/core_headers + - abseil/base/raw_logging_internal + - abseil/meta/type_traits + - abseil/status/status + - abseil/strings/strings + - abseil/types/variant + - abseil/utility/utility + - abseil/strings/cord (1.20211102.0): + - abseil/base/base + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/base/raw_logging_internal + - abseil/container/fixed_array + - abseil/container/inlined_vector + - abseil/functional/function_ref + - abseil/meta/type_traits + - abseil/strings/cord_internal + - abseil/strings/cordz_functions + - abseil/strings/cordz_info + - abseil/strings/cordz_statistics + - abseil/strings/cordz_update_scope + - abseil/strings/cordz_update_tracker + - abseil/strings/internal + - abseil/strings/str_format + - abseil/strings/strings + - abseil/types/optional + - abseil/strings/cord_internal (1.20211102.0): + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/base/raw_logging_internal + - abseil/base/throw_delegate + - abseil/container/compressed_tuple + - abseil/container/inlined_vector + - abseil/container/layout + - abseil/functional/function_ref + - abseil/meta/type_traits + - abseil/strings/strings + - abseil/types/span + - abseil/strings/cordz_functions (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/raw_logging_internal + - abseil/profiling/exponential_biased + - abseil/strings/cordz_handle (1.20211102.0): + - abseil/base/base + - abseil/base/config + - abseil/base/raw_logging_internal + - abseil/synchronization/synchronization + - abseil/strings/cordz_info (1.20211102.0): + - abseil/base/base + - abseil/base/config + - abseil/base/core_headers + - abseil/base/raw_logging_internal + - abseil/container/inlined_vector + - abseil/debugging/stacktrace + - abseil/strings/cord_internal + - abseil/strings/cordz_functions + - abseil/strings/cordz_handle + - abseil/strings/cordz_statistics + - abseil/strings/cordz_update_tracker + - abseil/synchronization/synchronization + - abseil/types/span + - abseil/strings/cordz_statistics (1.20211102.0): + - abseil/base/config + - abseil/strings/cordz_update_tracker + - abseil/strings/cordz_update_scope (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/strings/cord_internal + - abseil/strings/cordz_info + - abseil/strings/cordz_update_tracker + - abseil/strings/cordz_update_tracker (1.20211102.0): + - abseil/base/config + - abseil/strings/internal (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/base/raw_logging_internal + - abseil/meta/type_traits + - abseil/strings/str_format (1.20211102.0): - abseil/strings/str_format_internal - - abseil/strings/str_format_internal (0.20200225.0): + - abseil/strings/str_format_internal (1.20211102.0): - abseil/base/config - abseil/base/core_headers + - abseil/functional/function_ref - abseil/meta/type_traits + - abseil/numeric/bits - abseil/numeric/int128 + - abseil/numeric/representation - abseil/strings/strings + - abseil/types/optional - abseil/types/span - - abseil/strings/strings (0.20200225.0): + - abseil/strings/strings (1.20211102.0): - abseil/base/base - - abseil/base/bits - abseil/base/config - abseil/base/core_headers - abseil/base/endian @@ -235,20 +491,21 @@ PODS: - abseil/base/throw_delegate - abseil/memory/memory - abseil/meta/type_traits + - abseil/numeric/bits - abseil/numeric/int128 - abseil/strings/internal - - abseil/synchronization/graphcycles_internal (0.20200225.0): + - abseil/synchronization/graphcycles_internal (1.20211102.0): - abseil/base/base - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers - abseil/base/malloc_internal - abseil/base/raw_logging_internal - - abseil/synchronization/kernel_timeout_internal (0.20200225.0): + - abseil/synchronization/kernel_timeout_internal (1.20211102.0): - abseil/base/core_headers - abseil/base/raw_logging_internal - abseil/time/time - - abseil/synchronization/synchronization (0.20200225.0): + - abseil/synchronization/synchronization (1.20211102.0): - abseil/base/atomic_hook - abseil/base/base - abseil/base/base_internal @@ -262,20 +519,20 @@ PODS: - abseil/synchronization/graphcycles_internal - abseil/synchronization/kernel_timeout_internal - abseil/time/time - - abseil/time (0.20200225.0): - - abseil/time/internal (= 0.20200225.0) - - abseil/time/time (= 0.20200225.0) - - abseil/time/internal (0.20200225.0): - - abseil/time/internal/cctz (= 0.20200225.0) - - abseil/time/internal/cctz (0.20200225.0): - - abseil/time/internal/cctz/civil_time (= 0.20200225.0) - - abseil/time/internal/cctz/time_zone (= 0.20200225.0) - - abseil/time/internal/cctz/civil_time (0.20200225.0): - - abseil/base/config - - abseil/time/internal/cctz/time_zone (0.20200225.0): + - abseil/time (1.20211102.0): + - abseil/time/internal (= 1.20211102.0) + - abseil/time/time (= 1.20211102.0) + - abseil/time/internal (1.20211102.0): + - abseil/time/internal/cctz (= 1.20211102.0) + - abseil/time/internal/cctz (1.20211102.0): + - abseil/time/internal/cctz/civil_time (= 1.20211102.0) + - abseil/time/internal/cctz/time_zone (= 1.20211102.0) + - abseil/time/internal/cctz/civil_time (1.20211102.0): + - abseil/base/config + - abseil/time/internal/cctz/time_zone (1.20211102.0): - abseil/base/config - abseil/time/internal/cctz/civil_time - - abseil/time/time (0.20200225.0): + - abseil/time/time (1.20211102.0): - abseil/base/base - abseil/base/core_headers - abseil/base/raw_logging_internal @@ -283,38 +540,39 @@ PODS: - abseil/strings/strings - abseil/time/internal/cctz/civil_time - abseil/time/internal/cctz/time_zone - - abseil/types (0.20200225.0): - - abseil/types/any (= 0.20200225.0) - - abseil/types/bad_any_cast (= 0.20200225.0) - - abseil/types/bad_any_cast_impl (= 0.20200225.0) - - abseil/types/bad_optional_access (= 0.20200225.0) - - abseil/types/bad_variant_access (= 0.20200225.0) - - abseil/types/compare (= 0.20200225.0) - - abseil/types/optional (= 0.20200225.0) - - abseil/types/span (= 0.20200225.0) - - abseil/types/variant (= 0.20200225.0) - - abseil/types/any (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers + - abseil/types (1.20211102.0): + - abseil/types/any (= 1.20211102.0) + - abseil/types/bad_any_cast (= 1.20211102.0) + - abseil/types/bad_any_cast_impl (= 1.20211102.0) + - abseil/types/bad_optional_access (= 1.20211102.0) + - abseil/types/bad_variant_access (= 1.20211102.0) + - abseil/types/compare (= 1.20211102.0) + - abseil/types/optional (= 1.20211102.0) + - abseil/types/span (= 1.20211102.0) + - abseil/types/variant (= 1.20211102.0) + - abseil/types/any (1.20211102.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/fast_type_id - abseil/meta/type_traits - abseil/types/bad_any_cast - abseil/utility/utility - - abseil/types/bad_any_cast (0.20200225.0): + - abseil/types/bad_any_cast (1.20211102.0): - abseil/base/config - abseil/types/bad_any_cast_impl - - abseil/types/bad_any_cast_impl (0.20200225.0): + - abseil/types/bad_any_cast_impl (1.20211102.0): - abseil/base/config - abseil/base/raw_logging_internal - - abseil/types/bad_optional_access (0.20200225.0): + - abseil/types/bad_optional_access (1.20211102.0): - abseil/base/config - abseil/base/raw_logging_internal - - abseil/types/bad_variant_access (0.20200225.0): + - abseil/types/bad_variant_access (1.20211102.0): - abseil/base/config - abseil/base/raw_logging_internal - - abseil/types/compare (0.20200225.0): + - abseil/types/compare (1.20211102.0): - abseil/base/core_headers - abseil/meta/type_traits - - abseil/types/optional (0.20200225.0): + - abseil/types/optional (1.20211102.0): - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers @@ -322,184 +580,246 @@ PODS: - abseil/meta/type_traits - abseil/types/bad_optional_access - abseil/utility/utility - - abseil/types/span (0.20200225.0): + - abseil/types/span (1.20211102.0): - abseil/algorithm/algorithm - abseil/base/core_headers - abseil/base/throw_delegate - abseil/meta/type_traits - - abseil/types/variant (0.20200225.0): + - abseil/types/variant (1.20211102.0): - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers - abseil/meta/type_traits - abseil/types/bad_variant_access - abseil/utility/utility - - abseil/utility/utility (0.20200225.0): + - abseil/utility/utility (1.20211102.0): - abseil/base/base_internal - abseil/base/config - abseil/meta/type_traits - - BoringSSL-GRPC (0.0.7): - - BoringSSL-GRPC/Implementation (= 0.0.7) - - BoringSSL-GRPC/Interface (= 0.0.7) - - BoringSSL-GRPC/Implementation (0.0.7): - - BoringSSL-GRPC/Interface (= 0.0.7) - - BoringSSL-GRPC/Interface (0.0.7) - - cloud_firestore (3.1.8): - - Firebase/CoreOnly (~> 8.11.0) - - Firebase/Firestore (~> 8.11.0) + - BoringSSL-GRPC (0.0.24): + - BoringSSL-GRPC/Implementation (= 0.0.24) + - BoringSSL-GRPC/Interface (= 0.0.24) + - BoringSSL-GRPC/Implementation (0.0.24): + - BoringSSL-GRPC/Interface (= 0.0.24) + - BoringSSL-GRPC/Interface (0.0.24) + - cloud_firestore (4.5.0): + - Firebase/CoreOnly (~> 10.7.0) + - Firebase/Firestore (~> 10.7.0) - firebase_core - FlutterMacOS - - cloud_functions (3.2.7): - - Firebase/CoreOnly (~> 8.11.0) - - Firebase/Functions (~> 8.11.0) + - nanopb (< 2.30910.0, >= 2.30908.0) + - cloud_functions (4.1.0): + - Firebase/CoreOnly (~> 10.7.0) + - Firebase/Functions (~> 10.7.0) - firebase_core - FlutterMacOS - - device_info_plus_macos (0.0.1): + - device_info_plus (0.0.1): + - FlutterMacOS + - facebook_auth_desktop (0.0.3): - FlutterMacOS - - Firebase/Auth (8.11.0): + - Firebase/Auth (10.7.0): - Firebase/CoreOnly - - FirebaseAuth (~> 8.11.0) - - Firebase/CoreOnly (8.11.0): - - FirebaseCore (= 8.11.0) - - Firebase/Crashlytics (8.11.0): + - FirebaseAuth (~> 10.7.0) + - Firebase/CoreOnly (10.7.0): + - FirebaseCore (= 10.7.0) + - Firebase/Crashlytics (10.7.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 8.11.0) - - Firebase/Firestore (8.11.0): + - FirebaseCrashlytics (~> 10.7.0) + - Firebase/Firestore (10.7.0): - Firebase/CoreOnly - - FirebaseFirestore (~> 8.11.0) - - Firebase/Functions (8.11.0): + - FirebaseFirestore (~> 10.7.0) + - Firebase/Functions (10.7.0): - Firebase/CoreOnly - - FirebaseFunctions (~> 8.11.0) - - Firebase/Storage (8.11.0): + - FirebaseFunctions (~> 10.7.0) + - Firebase/Storage (10.7.0): - Firebase/CoreOnly - - FirebaseStorage (~> 8.11.0) - - firebase_auth (3.3.7): - - Firebase/Auth (~> 8.11.0) - - Firebase/CoreOnly (~> 8.11.0) + - FirebaseStorage (~> 10.7.0) + - firebase_auth (4.4.0): + - Firebase/Auth (~> 10.7.0) + - Firebase/CoreOnly (~> 10.7.0) - firebase_core - FlutterMacOS - - firebase_core (1.12.0): - - Firebase/CoreOnly (~> 8.11.0) + - firebase_core (2.9.0): + - Firebase/CoreOnly (~> 10.7.0) - FlutterMacOS - - firebase_crashlytics (2.5.1): - - Firebase/CoreOnly (~> 8.11.0) - - Firebase/Crashlytics (~> 8.11.0) + - firebase_crashlytics (3.1.0): + - Firebase/CoreOnly (~> 10.7.0) + - Firebase/Crashlytics (~> 10.7.0) - firebase_core - FlutterMacOS - - firebase_storage (10.2.7): - - Firebase/CoreOnly (~> 8.11.0) - - Firebase/Storage (~> 8.11.0) + - firebase_storage (11.1.0): + - Firebase/CoreOnly (~> 10.7.0) + - Firebase/Storage (~> 10.7.0) - firebase_core - FlutterMacOS - - FirebaseAuth (8.11.0): - - FirebaseCore (~> 8.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/Environment (~> 7.7) - - GTMSessionFetcher/Core (~> 1.5) - - FirebaseCore (8.11.0): - - FirebaseCoreDiagnostics (~> 8.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (8.12.0): - - GoogleDataTransport (~> 9.1) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (~> 2.30908.0) - - FirebaseCrashlytics (8.11.0): - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleDataTransport (~> 9.1) - - GoogleUtilities/Environment (~> 7.7) - - nanopb (~> 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) - - FirebaseFirestore (8.11.0): - - abseil/algorithm (= 0.20200225.0) - - abseil/base (= 0.20200225.0) - - abseil/container/flat_hash_map (= 0.20200225.0) - - abseil/memory (= 0.20200225.0) - - abseil/meta (= 0.20200225.0) - - abseil/strings/strings (= 0.20200225.0) - - abseil/time (= 0.20200225.0) - - abseil/types (= 0.20200225.0) - - FirebaseCore (~> 8.0) - - "gRPC-C++ (~> 1.28.0)" + - FirebaseAppCheckInterop (10.7.0) + - FirebaseAuth (10.7.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/Environment (~> 7.8) + - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - FirebaseAuthInterop (10.7.0) + - FirebaseCore (10.7.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreExtension (10.7.0): + - FirebaseCore (~> 10.0) + - FirebaseCoreInternal (10.7.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseCrashlytics (10.7.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) + - FirebaseFirestore (10.7.0): + - abseil/algorithm (~> 1.20211102.0) + - abseil/base (~> 1.20211102.0) + - abseil/container/flat_hash_map (~> 1.20211102.0) + - abseil/memory (~> 1.20211102.0) + - abseil/meta (~> 1.20211102.0) + - abseil/strings/strings (~> 1.20211102.0) + - abseil/time (~> 1.20211102.0) + - abseil/types (~> 1.20211102.0) + - FirebaseCore (~> 10.0) + - "gRPC-C++ (~> 1.44.0)" - leveldb-library (~> 1.22) - - nanopb (~> 2.30908.0) - - FirebaseFunctions (8.11.0): - - FirebaseCore (~> 8.0) - - GTMSessionFetcher/Core (~> 1.5) - - FirebaseInstallations (8.12.0): - - FirebaseCore (~> 8.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) - - PromisesObjC (< 3.0, >= 1.2) - - FirebaseStorage (8.11.0): - - FirebaseCore (~> 8.0) - - GTMSessionFetcher/Core (~> 1.5) + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseFunctions (10.7.0): + - FirebaseAppCheckInterop (~> 10.0) + - FirebaseAuthInterop (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseCoreExtension (~> 10.0) + - FirebaseMessagingInterop (~> 10.0) + - FirebaseSharedSwift (~> 10.0) + - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - FirebaseInstallations (10.7.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) + - PromisesObjC (~> 2.1) + - FirebaseMessagingInterop (10.7.0) + - FirebaseSessions (10.7.0): + - FirebaseCore (~> 10.5) + - FirebaseCoreExtension (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.10) + - nanopb (< 2.30910.0, >= 2.30908.0) + - PromisesSwift (~> 2.1) + - FirebaseSharedSwift (10.7.0) + - FirebaseStorage (10.7.0): + - FirebaseAppCheckInterop (~> 10.0) + - FirebaseAuthInterop (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseCoreExtension (~> 10.0) + - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - flutter_secure_storage_macos (6.1.1): + - FlutterMacOS - FlutterMacOS (1.0.0) - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) - - GoogleDataTransport (9.1.2): - - GoogleUtilities/Environment (~> 7.2) - - nanopb (~> 2.30908.0) + - GoogleDataTransport (9.2.1): + - GoogleUtilities/Environment (~> 7.7) + - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): + - GoogleUtilities/AppDelegateSwizzler (7.11.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.11.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/Logger (7.11.0): - GoogleUtilities/Environment - - GoogleUtilities/Network (7.7.0): + - GoogleUtilities/Network (7.11.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): + - "GoogleUtilities/NSData+zlib (7.11.0)" + - GoogleUtilities/Reachability (7.11.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): + - GoogleUtilities/UserDefaults (7.11.0): - GoogleUtilities/Logger - - "gRPC-C++ (1.28.2)": - - "gRPC-C++/Implementation (= 1.28.2)" - - "gRPC-C++/Interface (= 1.28.2)" - - "gRPC-C++/Implementation (1.28.2)": - - abseil/container/inlined_vector (= 0.20200225.0) - - abseil/memory/memory (= 0.20200225.0) - - abseil/strings/str_format (= 0.20200225.0) - - abseil/strings/strings (= 0.20200225.0) - - abseil/types/optional (= 0.20200225.0) - - "gRPC-C++/Interface (= 1.28.2)" - - gRPC-Core (= 1.28.2) - - "gRPC-C++/Interface (1.28.2)" - - gRPC-Core (1.28.2): - - gRPC-Core/Implementation (= 1.28.2) - - gRPC-Core/Interface (= 1.28.2) - - gRPC-Core/Implementation (1.28.2): - - abseil/container/inlined_vector (= 0.20200225.0) - - abseil/memory/memory (= 0.20200225.0) - - abseil/strings/str_format (= 0.20200225.0) - - abseil/strings/strings (= 0.20200225.0) - - abseil/types/optional (= 0.20200225.0) - - BoringSSL-GRPC (= 0.0.7) - - gRPC-Core/Interface (= 1.28.2) - - gRPC-Core/Interface (1.28.2) - - GTMSessionFetcher/Core (1.7.0) + - "gRPC-C++ (1.44.0)": + - "gRPC-C++/Implementation (= 1.44.0)" + - "gRPC-C++/Interface (= 1.44.0)" + - "gRPC-C++/Implementation (1.44.0)": + - abseil/base/base (= 1.20211102.0) + - abseil/base/core_headers (= 1.20211102.0) + - abseil/container/flat_hash_map (= 1.20211102.0) + - abseil/container/inlined_vector (= 1.20211102.0) + - abseil/functional/bind_front (= 1.20211102.0) + - abseil/hash/hash (= 1.20211102.0) + - abseil/memory/memory (= 1.20211102.0) + - abseil/random/random (= 1.20211102.0) + - abseil/status/status (= 1.20211102.0) + - abseil/status/statusor (= 1.20211102.0) + - abseil/strings/cord (= 1.20211102.0) + - abseil/strings/str_format (= 1.20211102.0) + - abseil/strings/strings (= 1.20211102.0) + - abseil/synchronization/synchronization (= 1.20211102.0) + - abseil/time/time (= 1.20211102.0) + - abseil/types/optional (= 1.20211102.0) + - abseil/types/variant (= 1.20211102.0) + - abseil/utility/utility (= 1.20211102.0) + - "gRPC-C++/Interface (= 1.44.0)" + - gRPC-Core (= 1.44.0) + - "gRPC-C++/Interface (1.44.0)" + - gRPC-Core (1.44.0): + - gRPC-Core/Implementation (= 1.44.0) + - gRPC-Core/Interface (= 1.44.0) + - gRPC-Core/Implementation (1.44.0): + - abseil/base/base (= 1.20211102.0) + - abseil/base/core_headers (= 1.20211102.0) + - abseil/container/flat_hash_map (= 1.20211102.0) + - abseil/container/inlined_vector (= 1.20211102.0) + - abseil/functional/bind_front (= 1.20211102.0) + - abseil/hash/hash (= 1.20211102.0) + - abseil/memory/memory (= 1.20211102.0) + - abseil/random/random (= 1.20211102.0) + - abseil/status/status (= 1.20211102.0) + - abseil/status/statusor (= 1.20211102.0) + - abseil/strings/cord (= 1.20211102.0) + - abseil/strings/str_format (= 1.20211102.0) + - abseil/strings/strings (= 1.20211102.0) + - abseil/synchronization/synchronization (= 1.20211102.0) + - abseil/time/time (= 1.20211102.0) + - abseil/types/optional (= 1.20211102.0) + - abseil/types/variant (= 1.20211102.0) + - abseil/utility/utility (= 1.20211102.0) + - BoringSSL-GRPC (= 0.0.24) + - gRPC-Core/Interface (= 1.44.0) + - Libuv-gRPC (= 0.0.10) + - gRPC-Core/Interface (1.44.0) + - GTMSessionFetcher/Core (3.1.0) - in_app_review (0.2.0): - FlutterMacOS - leveldb-library (1.22.1) - - nanopb (2.30908.0): - - nanopb/decode (= 2.30908.0) - - nanopb/encode (= 2.30908.0) - - nanopb/decode (2.30908.0) - - nanopb/encode (2.30908.0) - - package_info_plus_macos (0.0.1): + - Libuv-gRPC (0.0.10): + - Libuv-gRPC/Implementation (= 0.0.10) + - Libuv-gRPC/Interface (= 0.0.10) + - Libuv-gRPC/Implementation (0.0.10): + - Libuv-gRPC/Interface (= 0.0.10) + - Libuv-gRPC/Interface (0.0.10) + - nanopb (2.30909.0): + - nanopb/decode (= 2.30909.0) + - nanopb/encode (= 2.30909.0) + - nanopb/decode (2.30909.0) + - nanopb/encode (2.30909.0) + - package_info_plus (0.0.1): - FlutterMacOS - - path_provider_macos (0.0.1): + - path_provider_foundation (0.0.1): + - Flutter - FlutterMacOS - - PromisesObjC (2.0.0) - - shared_preferences_macos (0.0.1): + - PromisesObjC (2.2.0) + - PromisesSwift (2.2.0): + - PromisesObjC (= 2.2.0) + - shared_preferences_foundation (0.0.1): + - Flutter - FlutterMacOS - sqflite (0.0.2): - FlutterMacOS @@ -510,16 +830,18 @@ PODS: DEPENDENCIES: - cloud_firestore (from `Flutter/ephemeral/.symlinks/plugins/cloud_firestore/macos`) - cloud_functions (from `Flutter/ephemeral/.symlinks/plugins/cloud_functions/macos`) - - device_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus_macos/macos`) + - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`) + - facebook_auth_desktop (from `Flutter/ephemeral/.symlinks/plugins/facebook_auth_desktop/macos`) - firebase_auth (from `Flutter/ephemeral/.symlinks/plugins/firebase_auth/macos`) - firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`) - firebase_crashlytics (from `Flutter/ephemeral/.symlinks/plugins/firebase_crashlytics/macos`) - firebase_storage (from `Flutter/ephemeral/.symlinks/plugins/firebase_storage/macos`) + - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - in_app_review (from `Flutter/ephemeral/.symlinks/plugins/in_app_review/macos`) - - package_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos`) - - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - - shared_preferences_macos (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos`) + - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) + - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/macos`) + - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/macos`) - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) @@ -528,13 +850,19 @@ SPEC REPOS: - abseil - BoringSSL-GRPC - Firebase + - FirebaseAppCheckInterop - FirebaseAuth + - FirebaseAuthInterop - FirebaseCore - - FirebaseCoreDiagnostics + - FirebaseCoreExtension + - FirebaseCoreInternal - FirebaseCrashlytics - FirebaseFirestore - FirebaseFunctions - FirebaseInstallations + - FirebaseMessagingInterop + - FirebaseSessions + - FirebaseSharedSwift - FirebaseStorage - FMDB - GoogleDataTransport @@ -543,16 +871,20 @@ SPEC REPOS: - gRPC-Core - GTMSessionFetcher - leveldb-library + - Libuv-gRPC - nanopb - PromisesObjC + - PromisesSwift EXTERNAL SOURCES: cloud_firestore: :path: Flutter/ephemeral/.symlinks/plugins/cloud_firestore/macos cloud_functions: :path: Flutter/ephemeral/.symlinks/plugins/cloud_functions/macos - device_info_plus_macos: - :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus_macos/macos + device_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos + facebook_auth_desktop: + :path: Flutter/ephemeral/.symlinks/plugins/facebook_auth_desktop/macos firebase_auth: :path: Flutter/ephemeral/.symlinks/plugins/firebase_auth/macos firebase_core: @@ -561,57 +893,69 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/firebase_crashlytics/macos firebase_storage: :path: Flutter/ephemeral/.symlinks/plugins/firebase_storage/macos + flutter_secure_storage_macos: + :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos FlutterMacOS: :path: Flutter/ephemeral in_app_review: :path: Flutter/ephemeral/.symlinks/plugins/in_app_review/macos - package_info_plus_macos: - :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos - path_provider_macos: - :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos - shared_preferences_macos: - :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos + package_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos + path_provider_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/macos + shared_preferences_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/macos sqflite: :path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos url_launcher_macos: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos SPEC CHECKSUMS: - abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f - BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879 - cloud_firestore: b06c819c840a148bc51c8cc5719d5cf981ebc9ba - cloud_functions: 28618471a8b18db182facfcac32258df4df2dd20 - device_info_plus_macos: 1ad388a1ef433505c4038e7dd9605aadd1e2e9c7 - Firebase: 44dd9724c84df18b486639e874f31436eaa9a20c - firebase_auth: ae95c9dac06919282c6a5e86fb07b4921d6fa6dc - firebase_core: 76a7538b389ae1231102dbbdd4f3772eec9abbf8 - firebase_crashlytics: 43d2c0c0999c16be5fe3d67bc5e49f9ab8b40626 - firebase_storage: 4f16b268dc297f9096b29209a0a1191ebf07d4ba - FirebaseAuth: d96d73aba85d192d7a7aa0b86dd6d7f8ec170b4b - FirebaseCore: 2f4f85b453cc8fea4bb2b37e370007d2bcafe3f0 - FirebaseCoreDiagnostics: 3b40dfadef5b90433a60ae01f01e90fe87aa76aa - FirebaseCrashlytics: 62268addefae79601057818156e8bc69d71fee41 - FirebaseFirestore: 3b2e4b532c68809b3df5f8d39d28b3398ffc196b - FirebaseFunctions: 2bad3e4365dee72a85a6baa6ccd684f024d14696 - FirebaseInstallations: 25764cf322e77f99449395870a65b2bef88e1545 - FirebaseStorage: 4d05cb1112ff8822a0f9f5090da8bd6d550602ec - FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 + abseil: ebe5b5529fb05d93a8bdb7951607be08b7fa71bc + BoringSSL-GRPC: 3175b25143e648463a56daeaaa499c6cb86dad33 + cloud_firestore: ada6b6cea885ad634105e3d9af0e327bfafa1a4f + cloud_functions: a471c0a155e0fb5209ee5fca040673690cea6a97 + device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f + facebook_auth_desktop: 0ec755e3b01669ec14776af18b6945671a788916 + Firebase: 0219acf760880eeec8ce479895bd7767466d9f81 + firebase_auth: 245a4653f4f49249a5db759970e57ec27cdcd88d + firebase_core: b2f73bfbb070109d2149e257a786e3093f99a9da + firebase_crashlytics: cbedebc00a21aa1b12c06d7fc6241f051bf2abdd + firebase_storage: 2d688398517fa6493b0e74c53b30bc56b14e9d04 + FirebaseAppCheckInterop: 8e907eea79958960a8bd2058e067f31e03a7914b + FirebaseAuth: dd64c01631df724b09f33e584625775c52f7d71f + FirebaseAuthInterop: 46201190fe90ef1f581513eb0f9fa3d7820e7d6d + FirebaseCore: e317665b9d744727a97e623edbbed009320afdd7 + FirebaseCoreExtension: f17247ba8c61e4d3c8d136b5e2de3cb4ac6a85b6 + FirebaseCoreInternal: 8845798510aae74703467480f71ac613788d0696 + FirebaseCrashlytics: 35fdd1a433b31e28adcf5c8933f4c526691a1e0b + FirebaseFirestore: 3963a6edd1c84b4748dab3e2c62624a29d03eca1 + FirebaseFunctions: 6cede311274dd1e13ea4950fc9e57221d3538386 + FirebaseInstallations: 59c0e4c7a816a0f76710d83f77e5369b3e45eb96 + FirebaseMessagingInterop: c49e2766f4059ea4ef9e7c7764ed741a14aaeded + FirebaseSessions: 34e5c084da010ef3802cbc062b822e513c9e6318 + FirebaseSharedSwift: 993e46657e34f14fe497c4a43c1f9608dabfb2e5 + FirebaseStorage: 4841efa304543e1f9e4ca116c559c7a1ea2a9d0f + flutter_secure_storage_macos: d56e2d218c1130b262bef8b4a7d64f88d7f9c9ea + FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 - "gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2 - gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5 - GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 + GoogleDataTransport: ea169759df570f4e37bdee1623ec32a7e64e67c4 + GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f + "gRPC-C++": 9675f953ace2b3de7c506039d77be1f2e77a8db2 + gRPC-Core: 943e491cb0d45598b0b0eb9e910c88080369290b + GTMSessionFetcher: c9e714f7eec91a55641e2bab9f45fd83a219b882 in_app_review: a850789fad746e89bce03d4aeee8078b45a53fd0 leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729 - nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 - package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c - path_provider_macos: 160cab0d5461f0c0e02995469a98f24bdb9a3f1f - PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 - shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727 + Libuv-gRPC: 55e51798e14ef436ad9bc45d12d43b77b49df378 + nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 + package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce + path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9 + PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef + PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959 + shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472 sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea - url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 + url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451 -PODFILE CHECKSUM: c7161fcf45d4fd9025dc0f48a76d6e64e52f8176 +PODFILE CHECKSUM: 0d3963a09fc94f580682bd88480486da345dc3f0 -COCOAPODS: 1.11.2 +COCOAPODS: 1.12.0 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 960cc458..3e78b975 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 */ @@ -259,6 +259,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -407,7 +408,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -429,6 +430,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 13.1; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; @@ -486,7 +488,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -533,7 +535,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -555,6 +557,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 13.1; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -575,6 +578,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 13.1; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; diff --git a/pubspec.lock b/pubspec.lock index 4bf40081..9f930495 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,240 +5,290 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: "503361166f4a100e0d7eb7fb5a62c6f0322512f2bcb48d6922caf98f24b0ab90" + url: "https://pub.dev" source: hosted - version: "34.0.0" + version: "56.0.0" + _flutterfire_internals: + dependency: transitive + description: + name: _flutterfire_internals + sha256: f175bc1414e4edf8c5b83372c98eeabecf8353f39c9da423c2cfdf1f1f508788 + url: "https://pub.dev" + source: hosted + version: "1.1.0" analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + sha256: "93fcd81a6716e69864516750590cf1e699420615046bda19100238aa7b429785" + url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "5.8.0" analyzer_plugin: dependency: transitive description: name: analyzer_plugin - url: "https://pub.dartlang.org" + sha256: c1d5f167683de03d5ab6c3b53fc9aeefc5d59476e7810ba7bbddff50c6f4392d + url: "https://pub.dev" source: hosted - version: "0.9.0" + version: "0.11.2" ansicolor: dependency: transitive description: name: ansicolor - url: "https://pub.dartlang.org" + sha256: "607f8fa9786f392043f169898923e6c59b4518242b68b8862eb8a8b7d9c30b4a" + url: "https://pub.dev" source: hosted version: "2.0.1" archive: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: d6347d54a2d8028e0437e3c099f66fdb8ae02c4720c1e7534c9f24c10351f85d + url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.3.6" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.10.0" auto_route: dependency: "direct main" description: name: auto_route - url: "https://pub.dartlang.org" + sha256: dea16e1d7ab19eb7025b7cb924a7b3ad03d08e0b749082355ef30d3cb988a37c + url: "https://pub.dev" source: hosted - version: "3.2.2" + version: "6.0.5" auto_route_generator: dependency: "direct dev" description: name: auto_route_generator - url: "https://pub.dartlang.org" + sha256: a3f11c3b1e6e884d1592924f3b7212855f1c7c8791c12d3b41b87ab81fb9d3b8 + url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "6.0.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" + source: hosted + version: "2.1.1" build: dependency: transitive description: name: build - url: "https://pub.dartlang.org" + sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" + url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.1" build_config: dependency: transitive description: name: build_config - url: "https://pub.dartlang.org" + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.1" build_daemon: dependency: transitive description: name: build_daemon - url: "https://pub.dartlang.org" + sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.1" build_resolvers: dependency: transitive description: name: build_resolvers - url: "https://pub.dartlang.org" + sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 + url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.2.0" build_runner: dependency: "direct dev" description: name: build_runner - url: "https://pub.dartlang.org" + sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727 + url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.3.3" build_runner_core: dependency: transitive description: name: build_runner_core - url: "https://pub.dartlang.org" + sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292" + url: "https://pub.dev" source: hosted - version: "7.2.3" + version: "7.2.7" built_collection: dependency: transitive description: name: built_collection - url: "https://pub.dartlang.org" + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" source: hosted version: "5.1.1" built_value: dependency: transitive description: name: built_value - url: "https://pub.dartlang.org" + sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0" + url: "https://pub.dev" source: hosted - version: "8.1.4" + version: "8.4.4" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.2.1" checked_yaml: dependency: transitive description: name: checked_yaml - url: "https://pub.dartlang.org" + sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311" + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" cli_util: dependency: transitive description: name: cli_util - url: "https://pub.dartlang.org" + sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c" + url: "https://pub.dev" source: hosted version: "0.3.5" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" cloud_firestore: dependency: "direct main" description: name: cloud_firestore - url: "https://pub.dartlang.org" + sha256: "3a2dba23d7d084a2d3c2dfd240d2122908cca40bab2d142f7e107f40df174ab5" + url: "https://pub.dev" source: hosted - version: "3.1.8" + version: "4.5.0" cloud_firestore_platform_interface: dependency: transitive description: name: cloud_firestore_platform_interface - url: "https://pub.dartlang.org" + sha256: "29349a0687bc31290ab81d1de2b1cdadb40d0ea3ab30d247323c6c5be0d4c6fc" + url: "https://pub.dev" source: hosted - version: "5.4.13" + version: "5.12.0" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web - url: "https://pub.dartlang.org" + sha256: bc1fbcd6287acedded1139c9b13cfd47e792d5198f130f98759464839ea510a7 + url: "https://pub.dev" source: hosted - version: "2.6.8" + version: "3.4.0" cloud_functions: dependency: "direct main" description: name: cloud_functions - url: "https://pub.dartlang.org" + sha256: "414a3189b5890c954a11b67bdde3507f7b3f9b6f78b7c677a5ce12c34d3b38d3" + url: "https://pub.dev" source: hosted - version: "3.2.7" + version: "4.1.0" cloud_functions_platform_interface: dependency: transitive description: name: cloud_functions_platform_interface - url: "https://pub.dartlang.org" + sha256: "969dbb274f71a8e2c0443ac59ffbae43dfd8702b9e2dea772e29c2008bd1cc09" + url: "https://pub.dev" source: hosted - version: "5.0.21" + version: "5.2.0" cloud_functions_web: dependency: transitive description: name: cloud_functions_web - url: "https://pub.dartlang.org" + sha256: "9cf56cdd3cd74821451d0ff8a9eea7a4062c8d0f40c241b544d9286853f8c4cf" + url: "https://pub.dev" source: hosted - version: "4.2.7" + version: "4.4.0" code_builder: dependency: transitive description: name: code_builder - url: "https://pub.dartlang.org" + sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "4.4.0" collection: dependency: "direct main" description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.17.0" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + url: "https://pub.dev" source: hosted - version: "0.17.1" + version: "0.17.2" dart_code_metrics: dependency: "direct dev" description: name: dart_code_metrics - url: "https://pub.dartlang.org" + sha256: "728b1835a8c5b994ae8111148b427236f2f89954eebcb62baf4c476909b3d02d" + url: "https://pub.dev" source: hosted - version: "4.10.1" + version: "5.7.0" + dart_code_metrics_presets: + dependency: transitive + description: + name: dart_code_metrics_presets + sha256: "1b841b3ab3e7b942683a706cfbcef55fe9f38e7d01b690dbcd2e9f3c8e268525" + url: "https://pub.dev" + source: hosted + version: "1.5.0" dart_midi: dependency: "direct main" description: @@ -252,156 +302,162 @@ packages: dependency: transitive description: name: dart_style - url: "https://pub.dartlang.org" + sha256: "6d691edde054969f0e0f26abb1b30834b5138b963793e56f69d3a9a4435e6352" + url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" device_info_plus: dependency: "direct main" description: name: device_info_plus - url: "https://pub.dartlang.org" + sha256: "1d6e5a61674ba3a68fb048a7c7b4ff4bebfed8d7379dbe8f2b718231be9a7c95" + url: "https://pub.dev" source: hosted - version: "3.2.1" - device_info_plus_linux: - dependency: transitive - description: - name: device_info_plus_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.1" - device_info_plus_macos: - dependency: transitive - description: - name: device_info_plus_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.2" + version: "8.1.0" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - url: "https://pub.dartlang.org" + sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64 + url: "https://pub.dev" source: hosted - version: "2.3.0+1" - device_info_plus_web: + version: "7.0.0" + facebook_auth_desktop: dependency: transitive description: - name: device_info_plus_web - url: "https://pub.dartlang.org" + name: facebook_auth_desktop + sha256: "35ff7b8c62ad37c4bc08eed7d58cf301ab8770a2f4eed46573843ae1e1a1aac3" + url: "https://pub.dev" source: hosted - version: "2.1.0" - device_info_plus_windows: + version: "0.0.9" + fake_async: dependency: transitive description: - name: device_info_plus_windows - url: "https://pub.dartlang.org" + name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "2.0.1" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.4" firebase_auth: dependency: "direct main" description: name: firebase_auth - url: "https://pub.dartlang.org" + sha256: "3d33d6646f08407122cd2cbd292d274b98035d93f59c9e341ba992ebefd59ffa" + url: "https://pub.dev" source: hosted - version: "3.3.7" + version: "4.4.0" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - url: "https://pub.dartlang.org" + sha256: "5d5f283517ba34afd69ef448cc81ea23bcf8887393bedae4f70f45060b045fb9" + url: "https://pub.dev" source: hosted - version: "6.1.11" + version: "6.13.0" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - url: "https://pub.dartlang.org" + sha256: f50f7026b95c62dba3f0b28bdb3ab3601ea402b4908c1469103f16ae2b0f5281 + url: "https://pub.dev" source: hosted - version: "3.3.7" + version: "5.3.0" firebase_core: dependency: "direct main" description: name: firebase_core - url: "https://pub.dartlang.org" + sha256: ed611fb8e67e43ecc7956f242cecca383d87cf71aace27287aa5dd4bdba4ac07 + url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "2.9.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - url: "https://pub.dartlang.org" + sha256: "0df0a064ab0cad7f8836291ca6f3272edd7b83ad5b3540478ee46a0849d8022b" + url: "https://pub.dev" source: hosted - version: "4.2.4" + version: "4.6.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - url: "https://pub.dartlang.org" + sha256: "347351a8f0518f3343d79a9a0690fa67ad232fc32e2ea270677791949eac792b" + url: "https://pub.dev" source: hosted - version: "1.5.4" + version: "2.3.0" firebase_crashlytics: dependency: "direct main" description: name: firebase_crashlytics - url: "https://pub.dartlang.org" + sha256: "42cf6a137eaae7e485e6cc9794336e8e518c506b691aa6e19ff918206c535bec" + url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "3.1.0" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - url: "https://pub.dartlang.org" + sha256: baa4c3d4af426d29800f0d80d165f31df4548985db151fd761346e07ed433d31 + url: "https://pub.dev" source: hosted - version: "3.1.13" + version: "3.4.0" firebase_storage: dependency: "direct main" description: name: firebase_storage - url: "https://pub.dartlang.org" + sha256: a27909491c25acef90acc932be4d87bafb9d33fb98678edd2f81eaec9568a109 + url: "https://pub.dev" source: hosted - version: "10.2.7" + version: "11.1.0" firebase_storage_platform_interface: dependency: transitive description: name: firebase_storage_platform_interface - url: "https://pub.dartlang.org" + sha256: f254e064890df4ee588f10bea06d679e047018910451a4bc3c529b9791adb0a9 + url: "https://pub.dev" source: hosted - version: "4.0.14" + version: "4.2.0" firebase_storage_web: dependency: transitive description: name: firebase_storage_web - url: "https://pub.dartlang.org" + sha256: b6d3c104fecafdce5fe1795306d33856c9a11fa76f73fe7eb062430fc151d686 + url: "https://pub.dev" source: hosted - version: "3.2.8" + version: "3.4.0" fixnum: dependency: transitive description: name: fixnum - url: "https://pub.dartlang.org" + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" flame: dependency: "direct main" description: name: flame - url: "https://pub.dartlang.org" + sha256: "2e9545698e75534e2bf79d542df604f6fb8de0184825ea5a5e1f781449054d70" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.7.0" flutter: dependency: "direct main" description: flutter @@ -411,51 +467,58 @@ packages: dependency: "direct main" description: name: flutter_cache_manager - url: "https://pub.dartlang.org" + sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3" + url: "https://pub.dev" source: hosted version: "3.3.0" flutter_email_sender: dependency: "direct main" description: name: flutter_email_sender - url: "https://pub.dartlang.org" + sha256: "9e253c69617f43d4cb5de672e93a7a19c12a21fb6a75e66c6ce7626336c4c1bc" + url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.2.0" flutter_facebook_auth: dependency: "direct main" description: name: flutter_facebook_auth - url: "https://pub.dartlang.org" + sha256: "865752fb264e18f5246626d0cc8c1b6b5217cba8fa12f6704204c471695913b9" + url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "5.0.8" flutter_facebook_auth_platform_interface: dependency: transitive description: name: flutter_facebook_auth_platform_interface - url: "https://pub.dartlang.org" + sha256: "0bc5fefc89b012635c4424a34334215e81e0ff38c5b413f869fd9c14a10c6135" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "4.1.1" flutter_facebook_auth_web: dependency: transitive description: name: flutter_facebook_auth_web - url: "https://pub.dartlang.org" + sha256: "6dfd4a3844137fbf7eb4c8d753add1ca15233b280a73a3360d9af46b87680678" + url: "https://pub.dev" source: hosted - version: "3.0.0+1" + version: "4.1.1" flutter_hooks: dependency: "direct main" description: name: flutter_hooks - url: "https://pub.dartlang.org" + sha256: "6a126f703b89499818d73305e4ce1e3de33b4ae1c5512e3b8eab4b986f46774c" + url: "https://pub.dev" source: hosted - version: "0.18.2+1" + version: "0.18.6" flutter_launcher_icons: dependency: "direct dev" description: name: flutter_launcher_icons - url: "https://pub.dartlang.org" + sha256: "02dcaf49d405f652b7160e882bacfc02cb497041bb2eab2a49b1c393cf9aac12" + url: "https://pub.dev" source: hosted - version: "0.9.2" + version: "0.12.0" flutter_localizations: dependency: "direct main" description: flutter @@ -465,16 +528,71 @@ packages: dependency: "direct dev" description: name: flutter_native_splash - url: "https://pub.dartlang.org" + sha256: af665ef80a213a9ed502845a3d7a61b9acca4100ee7e9f067a7440bc3acd6730 + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.2.19" flutter_riverpod: dependency: "direct main" description: name: flutter_riverpod - url: "https://pub.dartlang.org" + sha256: b3c3a8a9714b7f88dd2a41e1efbc47f76d620b06ab427c62ae7bc82298cd7dbb + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "2.3.2" + flutter_secure_storage: + dependency: transitive + description: + name: flutter_secure_storage + sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5" + url: "https://pub.dev" + source: hosted + version: "8.0.0" + flutter_secure_storage_linux: + dependency: transitive + description: + name: flutter_secure_storage_linux + sha256: "0912ae29a572230ad52d8a4697e5518d7f0f429052fd51df7e5a7952c7efe2a3" + url: "https://pub.dev" + source: hosted + version: "1.1.3" + flutter_secure_storage_macos: + dependency: transitive + description: + name: flutter_secure_storage_macos + sha256: "083add01847fc1c80a07a08e1ed6927e9acd9618a35e330239d4422cd2a58c50" + url: "https://pub.dev" + source: hosted + version: "3.0.0" + flutter_secure_storage_platform_interface: + dependency: transitive + description: + name: flutter_secure_storage_platform_interface + sha256: b3773190e385a3c8a382007893d678ae95462b3c2279e987b55d140d3b0cb81b + url: "https://pub.dev" + source: hosted + version: "1.0.1" + flutter_secure_storage_web: + dependency: transitive + description: + name: flutter_secure_storage_web + sha256: "42938e70d4b872e856e678c423cc0e9065d7d294f45bc41fc1981a4eb4beaffe" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + flutter_secure_storage_windows: + dependency: transitive + description: + name: flutter_secure_storage_windows + sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee + url: "https://pub.dev" + source: hosted + version: "2.0.0" + flutter_test: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_web_plugins: dependency: transitive description: flutter @@ -484,443 +602,498 @@ packages: dependency: "direct dev" description: name: freezed - url: "https://pub.dartlang.org" + sha256: e819441678f1679b719008ff2ff0ef045d66eed9f9ec81166ca0d9b02a187454 + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "2.3.2" freezed_annotation: dependency: "direct main" description: name: freezed_annotation - url: "https://pub.dartlang.org" + sha256: aeac15850ef1b38ee368d4c53ba9a847e900bb2c53a4db3f6881cbb3cb684338 + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "2.2.0" frontend_server_client: dependency: transitive description: name: frontend_server_client - url: "https://pub.dartlang.org" + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "3.2.0" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.1" + google_identity_services_web: + dependency: transitive + description: + name: google_identity_services_web + sha256: "7940fdc3b1035db4d65d387c1bdd6f9574deaa6777411569c05ecc25672efacd" + url: "https://pub.dev" + source: hosted + version: "0.2.1" google_sign_in: dependency: "direct main" description: name: google_sign_in - url: "https://pub.dartlang.org" + sha256: "750d08ffb4cd469f13068d15844ffd1d60c7ac1ca3c815918ba4ce4af22a2ddb" + url: "https://pub.dev" + source: hosted + version: "6.0.2" + google_sign_in_android: + dependency: transitive + description: + name: google_sign_in_android + sha256: "6a740e8498920ecf5fc2849ae0e4412536d700230bc3169493a1d031fdfe1cca" + url: "https://pub.dev" + source: hosted + version: "6.1.8" + google_sign_in_ios: + dependency: transitive + description: + name: google_sign_in_ios + sha256: "2e1df687b17f7fddcaf9a0c7f994d0d19b5d41e8ce1d943013befd0a0ae67403" + url: "https://pub.dev" source: hosted - version: "5.2.3" + version: "5.6.1" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface - url: "https://pub.dartlang.org" + sha256: fece762f0d2dd762ebde43ad70662a209ff6ee034111976549c392f7763d9264 + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.1" google_sign_in_web: dependency: transitive description: name: google_sign_in_web - url: "https://pub.dartlang.org" + sha256: "9f883b9b525297663510dfbbe8b04d39715aa0abba430851f501b7d1e4b0f465" + url: "https://pub.dev" source: hosted - version: "0.10.0+4" + version: "0.11.0+2" graphs: dependency: transitive description: name: graphs - url: "https://pub.dartlang.org" + sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.2.0" hooks_riverpod: dependency: "direct main" description: name: hooks_riverpod - url: "https://pub.dartlang.org" + sha256: "7e673817a7db4d6403a079882485affd3156d79c06209389353d0977d513f905" + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "2.3.2" html: dependency: transitive description: name: html - url: "https://pub.dartlang.org" + sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb" + url: "https://pub.dev" source: hosted - version: "0.15.0" + version: "0.15.2" http: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + url: "https://pub.dev" source: hosted - version: "0.13.4" + version: "0.13.5" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.2" image: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + sha256: "483a389d6ccb292b570c31b3a193779b1b0178e7eb571986d9a49904b6861227" + url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "4.0.15" in_app_review: dependency: "direct main" description: name: in_app_review - url: "https://pub.dartlang.org" + sha256: "16328b8202d36522322b95804ae5d975577aa9f584d634985849ba1099645850" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.0.6" in_app_review_platform_interface: dependency: transitive description: name: in_app_review_platform_interface - url: "https://pub.dartlang.org" + sha256: b12ec9aaf6b34d3a72aa95895eb252b381896246bdad4ef378d444affe8410ef + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.0.4" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + url: "https://pub.dev" source: hosted version: "0.17.0" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" source: hosted - version: "0.6.3" + version: "0.6.5" json_annotation: dependency: "direct main" description: name: json_annotation - url: "https://pub.dartlang.org" + sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.8.0" json_serializable: dependency: "direct dev" description: name: json_serializable - url: "https://pub.dartlang.org" + sha256: dadc08bd61f72559f938dd08ec20dbfec6c709bba83515085ea943d2078d187a + url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "6.6.1" logging: dependency: "direct main" description: name: logging - url: "https://pub.dartlang.org" + sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.8.0" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.4" ordered_set: dependency: transitive description: name: ordered_set - url: "https://pub.dartlang.org" + sha256: "74b0454418f58c34c8e527d91fb1ef571297dbcd5d3b4e5f983dc884e39cdf85" + url: "https://pub.dev" source: hosted version: "5.0.0" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" package_info_plus: dependency: "direct main" description: name: package_info_plus - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" - package_info_plus_linux: - dependency: transitive - description: - name: package_info_plus_linux - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" - package_info_plus_macos: - dependency: transitive - description: - name: package_info_plus_macos - url: "https://pub.dartlang.org" + sha256: "8df5ab0a481d7dc20c0e63809e90a588e496d276ba53358afc4c4443d0a00697" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "3.0.3" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - url: "https://pub.dartlang.org" + sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + url: "https://pub.dev" source: hosted - version: "1.0.2" - package_info_plus_web: - dependency: transitive - description: - name: package_info_plus_web - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.4" - package_info_plus_windows: - dependency: transitive - description: - name: package_info_plus_windows - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.4" + version: "2.0.1" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.8.2" path_provider: dependency: "direct main" description: name: path_provider - url: "https://pub.dartlang.org" + sha256: c7edf82217d4b2952b2129a61d3ad60f1075b9299e629e149a8d2e39c2e6aad4 + url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.0.14" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7" + url: "https://pub.dev" source: hosted - version: "2.0.11" - path_provider_ios: + version: "2.0.24" + path_provider_foundation: dependency: transitive description: - name: path_provider_ios - url: "https://pub.dartlang.org" + name: path_provider_foundation + sha256: "818b2dc38b0f178e0ea3f7cf3b28146faab11375985d815942a68eee11c2d0f7" + url: "https://pub.dev" source: hosted - version: "2.0.7" + version: "2.2.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" + url: "https://pub.dev" source: hosted - version: "2.1.5" - path_provider_macos: - dependency: transitive - description: - name: path_provider_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" + version: "2.1.10" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.0.6" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130 + url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.1.5" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.dartlang.org" + sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602" + url: "https://pub.dev" source: hosted version: "1.11.1" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "5.1.0" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" source: hosted version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" + pointycastle: + dependency: transitive + description: + name: pointycastle + sha256: c3120a968135aead39699267f4c74bc9a08e4e909e86bc1b0af5bfd78691123c + url: "https://pub.dev" + source: hosted + version: "3.7.2" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "1.5.1" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" source: hosted version: "4.2.4" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.3" + pub_updater: + dependency: transitive + description: + name: pub_updater + sha256: "42890302ab2672adf567dc2b20e55b4ecc29d7e19c63b6b98143ab68dd717d3a" + url: "https://pub.dev" + source: hosted + version: "0.2.4" pubspec_parse: dependency: transitive description: name: pubspec_parse - url: "https://pub.dartlang.org" + sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.2" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + url: "https://pub.dev" source: hosted - version: "3.0.1+1" + version: "3.2.1" riverpod: dependency: transitive description: name: riverpod - url: "https://pub.dartlang.org" + sha256: b0fbf7927333c5c318f7e2c22c8b4fd2542ba294de0373e80ecdb34e0dcd8dc4 + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "2.3.2" rxdart: dependency: transitive description: name: rxdart - url: "https://pub.dartlang.org" + sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + url: "https://pub.dev" source: hosted - version: "0.27.3" + version: "0.27.7" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: "858aaa72d8f61637d64e776aca82e1c67e6d9ee07979123c5d17115031c1b13b" + url: "https://pub.dev" source: hosted - version: "2.0.13" + version: "2.1.0" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + sha256: "8304d8a1f7d21a429f91dee552792249362b68a331ac5c3c1caf370f658873f6" + url: "https://pub.dev" source: hosted - version: "2.0.11" - shared_preferences_ios: + version: "2.1.0" + shared_preferences_foundation: dependency: transitive description: - name: shared_preferences_ios - url: "https://pub.dartlang.org" + name: shared_preferences_foundation + sha256: cf2a42fb20148502022861f71698db12d937c7459345a1bdaa88fc91a91b3603 + url: "https://pub.dev" source: hosted - version: "2.0.10" + version: "2.2.0" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - shared_preferences_macos: - dependency: transitive - description: - name: shared_preferences_macos - url: "https://pub.dartlang.org" + sha256: "9d387433ca65717bbf1be88f4d5bb18f10508917a8fa2fb02e0fd0d7479a9afa" + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.2.0" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: fb5cf25c0235df2d0640ac1b1174f6466bd311f621574997ac59018a6664548d + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.2.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: "74083203a8eae241e0de4a0d597dbedab3b8fef5563f33cf3c12d7e93c655ca5" + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.1.0" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: "5e588e2efef56916a3b229c3bfe81e6a525665a454519ca51dbcc4236a274173" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.2.0" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.0" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8 + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.3" sky_engine: dependency: transitive description: flutter @@ -930,233 +1103,266 @@ packages: dependency: transitive description: name: source_gen - url: "https://pub.dartlang.org" + sha256: c2bea18c95cfa0276a366270afaa2850b09b4a76db95d546f3d003dcc7011298 + url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.7" source_helper: dependency: transitive description: name: source_helper - url: "https://pub.dartlang.org" + sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f" + url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.1" sprintf: dependency: "direct main" description: name: sprintf - url: "https://pub.dartlang.org" + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "7.0.0" sqflite: dependency: transitive description: name: sqflite - url: "https://pub.dartlang.org" + sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.2.6" sqflite_common: dependency: transitive description: name: sqflite_common - url: "https://pub.dartlang.org" + sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684" + url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.3" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" state_notifier: dependency: transitive description: name: state_notifier - url: "https://pub.dartlang.org" + sha256: "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289" + url: "https://pub.dev" source: hosted version: "0.7.2+1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" stream_transform: dependency: transitive description: name: stream_transform - url: "https://pub.dartlang.org" + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.dartlang.org" + sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" + test_api: + dependency: transitive + description: + name: test_api + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" + source: hosted + version: "0.4.16" timing: dependency: transitive description: name: timing - url: "https://pub.dartlang.org" + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.1" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" - universal_html: - dependency: transitive - description: - name: universal_html - url: "https://pub.dartlang.org" + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted - version: "2.0.8" + version: "1.3.1" universal_io: dependency: transitive description: name: universal_io - url: "https://pub.dartlang.org" + sha256: "06866290206d196064fd61df4c7aea1ffe9a4e7c4ccaa8fcded42dd41948005d" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.2.0" url_launcher: dependency: transitive description: name: url_launcher - url: "https://pub.dartlang.org" + sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e" + url: "https://pub.dev" source: hosted - version: "6.0.20" + version: "6.1.10" url_launcher_android: dependency: transitive description: name: url_launcher_android - url: "https://pub.dartlang.org" + sha256: dd729390aa936bf1bdf5cd1bc7468ff340263f80a2c4f569416507667de8e3c8 + url: "https://pub.dev" source: hosted - version: "6.0.15" + version: "6.0.26" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - url: "https://pub.dartlang.org" + sha256: "3dedc66ca3c0bef9e6a93c0999aee102556a450afcc1b7bcfeace7a424927d92" + url: "https://pub.dev" source: hosted - version: "6.0.15" + version: "6.1.3" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.4" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.4" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370" + url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.1.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa" + url: "https://pub.dev" source: hosted - version: "2.0.8" + version: "2.0.16" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.5" uuid: dependency: transitive description: name: uuid - url: "https://pub.dartlang.org" + sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.7" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.4" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.3.0" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46 + url: "https://pub.dev" source: hosted - version: "2.3.11" + version: "3.1.3" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 + url: "https://pub.dev" source: hosted - version: "0.2.0+1" + version: "1.0.0" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + url: "https://pub.dev" source: hosted - version: "5.3.1" + version: "6.2.2" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.1" sdks: - dart: ">=2.15.1 <3.0.0" - flutter: ">=2.10.0" + dart: ">=2.19.0 <3.0.0" + flutter: ">=3.3.0" diff --git a/pubspec.yaml b/pubspec.yaml index 4764f987..c8931194 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: hitnotes environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: auto_route: any @@ -13,7 +13,7 @@ dependencies: url: 'https://github.com/feelfreelinux/dart_midi' device_info_plus: any firebase_auth: any - firebase_core: any + firebase_core: ^2.0.0 firebase_crashlytics: any firebase_storage: any flame: any