diff --git a/.github/workflows/default-functions.yaml b/.github/workflows/default-functions.yaml index ed16df29..dd7801d1 100644 --- a/.github/workflows/default-functions.yaml +++ b/.github/workflows/default-functions.yaml @@ -13,6 +13,4 @@ jobs: uses: ./.github/workflows/functions.action.yaml with: deploy: false - secrets: - passphrase: ${{ secrets.PASSPHRASE }} - firebase_token: ${{ secrets.FIREBASE_TOKEN }} \ No newline at end of file + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index 1ceed26d..d8bad434 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -12,14 +12,12 @@ jobs: flutter-test-analyze: uses: ./.github/workflows/flutter.analyze-test.action.yaml with: - flutter_version: '3.16.5' - secrets: - passphrase: ${{ secrets.PASSPHRASE }} + flutter_version: '3.22.2' + secrets: inherit flutter-build: needs: [ flutter-test-analyze ] uses: ./.github/workflows/flutter.build.action.yaml with: - flutter_version: '3.16.5' + flutter_version: '3.22.2' android_output: 'apk' - secrets: - passphrase: ${{ secrets.PASSPHRASE }} \ No newline at end of file + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/dev-functions.yaml b/.github/workflows/dev-functions.yaml index f87c2d7e..61e88369 100644 --- a/.github/workflows/dev-functions.yaml +++ b/.github/workflows/dev-functions.yaml @@ -12,6 +12,4 @@ jobs: uses: ./.github/workflows/functions.action.yaml with: deploy: true - secrets: - passphrase: ${{ secrets.PASSPHRASE }} - firebase_token: ${{ secrets.FIREBASE_TOKEN }} \ No newline at end of file + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index 35b8b645..6ba98eca 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -8,25 +8,26 @@ on: branches: - dev +concurrency: + group: ci-${{ github.ref }} + cancel-in-progress: true + jobs: flutter-test-analyze: uses: ./.github/workflows/flutter.analyze-test.action.yaml with: - flutter_version: '3.16.5' - secrets: - passphrase: ${{ secrets.PASSPHRASE }} + flutter_version: '3.22.2' + secrets: inherit flutter-build: needs: [ flutter-test-analyze ] uses: ./.github/workflows/flutter.build.action.yaml with: - flutter_version: '3.16.5' + flutter_version: '3.22.2' android_output: 'aab' - secrets: - passphrase: ${{ secrets.PASSPHRASE }} + secrets: inherit fastlane-dry-run: needs: [ flutter-build ] uses: ./.github/workflows/fastlane.action.yaml with: lane: 'dry_run' - secrets: - passphrase: ${{ secrets.PASSPHRASE }} \ No newline at end of file + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/fastlane.action.yaml b/.github/workflows/fastlane.action.yaml index 67c63522..fc43ec9f 100644 --- a/.github/workflows/fastlane.action.yaml +++ b/.github/workflows/fastlane.action.yaml @@ -7,10 +7,6 @@ on: description: 'Lane version (alpha, beta, or production)' required: true type: string - secrets: - passphrase: - description: 'The passphrase to decrypt the configuration' - required: true jobs: play_store: @@ -24,7 +20,7 @@ jobs: - name: 'Decrypt secret configuration' run: ./.github/scripts/decrypt_secret.sh env: - PASSPHRASE: ${{ secrets.passphrase }} + PASSPHRASE: ${{ secrets.PASSPHRASE }} - name: 'Check secret configuration' run: ./.github/scripts/check_secrets_decryption.sh - name: 'Download Artifact' @@ -34,20 +30,20 @@ jobs: - name: 'Generate changelog' run: ./.github/scripts/generate_changelog.sh - name: 'Setup Ruby' - uses: ruby/setup-ruby@v1.165.1 + uses: ruby/setup-ruby@v1.187.0 with: ruby-version: '3.0' bundler-cache: true env: BUNDLE_GEMFILE: 'android/Gemfile' - name: 'Fastlane deploy ${{ inputs.lane }} lane' - uses: maierj/fastlane-action@v3.0.0 + uses: maierj/fastlane-action@v3.1.0 with: lane: ${{ inputs.lane }} subdirectory: 'android' - name: 'Generate Github release' # Only run on new tag if: startsWith(github.ref, 'refs/tags/') - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: body_path: ${{ env.CHANGELOG_PATH }} \ No newline at end of file diff --git a/.github/workflows/flutter.analyze-test.action.yaml b/.github/workflows/flutter.analyze-test.action.yaml index f8d97de9..1ce481bd 100644 --- a/.github/workflows/flutter.analyze-test.action.yaml +++ b/.github/workflows/flutter.analyze-test.action.yaml @@ -7,10 +7,6 @@ on: description: 'The Flutter used (ex: 2.5.1)' required: true type: string - secrets: - passphrase: - description: 'The passphrase to decrypt the configuration' - required: true jobs: @@ -21,11 +17,14 @@ jobs: - name: 'Checkout source code' uses: actions/checkout@v4 - name: 'Setup flutter action' - uses: subosito/flutter-action@v2.12.0 + uses: subosito/flutter-action@v2.16.0 with: flutter-version: ${{ inputs.flutter_version }} - name: 'Flutter analyze' - run: flutter analyze + run: | + flutter config --no-analytics + flutter config --no-cli-animations + flutter analyze format: name: 'Format' runs-on: ubuntu-latest @@ -33,7 +32,7 @@ jobs: - name: 'Checkout source code' uses: actions/checkout@v4 - name: 'Setup flutter action' - uses: subosito/flutter-action@v2.12.0 + uses: subosito/flutter-action@v2.16.0 with: flutter-version: ${{ inputs.flutter_version }} - name: 'Flutter format' @@ -47,17 +46,20 @@ jobs: - name: 'Decrypt secret configuration' run: ./.github/scripts/decrypt_secret.sh env: - PASSPHRASE: ${{ secrets.passphrase }} + PASSPHRASE: ${{ secrets.PASSPHRASE }} - name: 'Check secret configuration' run: ./.github/scripts/check_secrets_decryption.sh - name: 'Setup flutter action' - uses: subosito/flutter-action@v2.12.0 + uses: subosito/flutter-action@v2.16.0 with: flutter-version: ${{ inputs.flutter_version }} - name: 'Flutter test (with coverage)' - run: flutter test --coverage --test-randomize-ordering-seed random + run: | + flutter config --no-analytics + flutter config --no-cli-animations + flutter test --coverage --test-randomize-ordering-seed random - name: 'Upload coverage report' - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4 + uses: codecov/codecov-action@v4.5.0 with: token: ${{ secrets.CODECOV_TOKEN }} directory: ./coverage/ \ No newline at end of file diff --git a/.github/workflows/flutter.build.action.yaml b/.github/workflows/flutter.build.action.yaml index 62d0c0f2..52d91144 100644 --- a/.github/workflows/flutter.build.action.yaml +++ b/.github/workflows/flutter.build.action.yaml @@ -11,10 +11,6 @@ on: description: 'Android build file type output (apk or abb)' required: true type: string - secrets: - passphrase: - description: 'The passphrase to decrypt the configuration' - required: true jobs: @@ -29,22 +25,25 @@ jobs: - name: 'Decrypt secret configuration' run: ./.github/scripts/decrypt_secret.sh env: - PASSPHRASE: ${{ secrets.passphrase }} + PASSPHRASE: ${{ secrets.PASSPHRASE }} - name: 'Check secret configuration' run: ./.github/scripts/check_secrets_decryption.sh - name: 'Set up JAVA' uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '11.x' + java-version: '17.x' - name: 'Setup Flutter' - uses: subosito/flutter-action@v2.12.0 + uses: subosito/flutter-action@v2.16.0 with: flutter-version: ${{ inputs.flutter_version }} - name: 'Build Android APK' if: ${{ inputs.android_output == 'apk' }} # Build APK version of the app - run: flutter build apk --split-per-abi + run: | + flutter config --no-analytics + flutter config --no-cli-animations + flutter build apk --split-per-abi - name: 'Save APK' if: ${{ inputs.android_output == 'apk' }} uses: actions/upload-artifact@v4 @@ -60,7 +59,10 @@ jobs: echo "This build is tagged as $BUILD_NUMBER on $GITHUB_REF" - name: 'Build Android App Bundle' if: ${{ inputs.android_output == 'aab' }} - run: flutter build appbundle --dart-define=FLAVOR=prod --build-number="$BUILD_NUMBER" + run: | + flutter config --no-analytics + flutter config --no-cli-animations + flutter build appbundle --dart-define=FLAVOR=prod --build-number="$BUILD_NUMBER" env: BUILD_NUMBER: ${{ env.BUILD_NUMBER }} - name: 'Save AAB' @@ -78,7 +80,7 @@ jobs: - name: 'Decrypt secret configuration' run: ./.github/scripts/decrypt_secret.sh env: - PASSPHRASE: ${{ secrets.passphrase }} + PASSPHRASE: ${{ secrets.PASSPHRASE }} - name: 'Check secret configuration' run: ./.github/scripts/check_secrets_decryption.sh - name: '🥺' @@ -92,7 +94,7 @@ jobs: - name: 'Decrypt secret configuration' run: ./.github/scripts/decrypt_secret.sh env: - PASSPHRASE: ${{ secrets.passphrase }} + PASSPHRASE: ${{ secrets.PASSPHRASE }} - name: 'Check secret configuration' run: ./.github/scripts/check_secrets_decryption.sh - name: '🥺' diff --git a/.github/workflows/functions.action.yaml b/.github/workflows/functions.action.yaml index f3812b24..ba6f2524 100644 --- a/.github/workflows/functions.action.yaml +++ b/.github/workflows/functions.action.yaml @@ -7,13 +7,6 @@ on: description: 'Whether or not deploy the Firebase function' required: true type: boolean - secrets: - passphrase: - description: 'The passphrase to decrypt the configuration' - required: true - firebase_token: - description: 'Token used by firebase login' - required: true jobs: build_deploy: @@ -29,7 +22,7 @@ jobs: - name: 'Check secret configuration' run: ./.github/scripts/check_secrets_decryption.sh - name: 'Setup Node / NPM' - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '20.x' - run: npm install -g firebase-tools @@ -49,4 +42,4 @@ jobs: cd ./firebase_functions firebase deploy --only functions env: - GOOGLE_APPLICATION_CREDENTIALS: '${{ github.workspace }}/${{ vars.GOOGLE_APPLICATION_CREDENTIALS }}' \ No newline at end of file + GOOGLE_APPLICATION_CREDENTIALS: '${{ github.workspace }}/${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}' \ No newline at end of file diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 2707a4b2..8b577120 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -5,25 +5,26 @@ on: branches: - main +concurrency: + group: ci-${{ github.ref }} + cancel-in-progress: true + jobs: flutter-test-analyze: uses: ./.github/workflows/flutter.analyze-test.action.yaml with: - flutter_version: '3.16.5' - secrets: - passphrase: ${{ secrets.PASSPHRASE }} + flutter_version: '3.22.2' + secrets: inherit flutter-build: needs: [ flutter-test-analyze ] uses: ./.github/workflows/flutter.build.action.yaml with: - flutter_version: '3.16.5' + flutter_version: '3.22.2' android_output: 'aab' - secrets: - passphrase: ${{ secrets.PASSPHRASE }} + secrets: inherit fastlane: needs: [ flutter-build ] uses: ./.github/workflows/fastlane.action.yaml with: lane: 'production' - secrets: - passphrase: ${{ secrets.PASSPHRASE }} \ No newline at end of file + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/pages.deploy.yaml b/.github/workflows/pages.deploy.yaml index f3e6a6e3..ef727cd3 100644 --- a/.github/workflows/pages.deploy.yaml +++ b/.github/workflows/pages.deploy.yaml @@ -18,7 +18,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Setup Pages - uses: actions/configure-pages@v4 + uses: actions/configure-pages@v5 - name: Upload artifact uses: actions/upload-pages-artifact@v3 with: diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml index 94bc4ee4..d5fbc475 100644 --- a/.github/workflows/tag.yaml +++ b/.github/workflows/tag.yaml @@ -5,25 +5,26 @@ on: tags: - v* +concurrency: + group: ci-${{ github.ref }} + cancel-in-progress: true + jobs: flutter-test-analyze: uses: ./.github/workflows/flutter.analyze-test.action.yaml with: - flutter_version: '3.16.5' - secrets: - passphrase: ${{ secrets.PASSPHRASE }} + flutter_version: '3.22.2' + secrets: inherit flutter-build: needs: [ flutter-test-analyze ] uses: ./.github/workflows/flutter.build.action.yaml with: - flutter_version: '3.16.5' + flutter_version: '3.22.2' android_output: 'aab' - secrets: - passphrase: ${{ secrets.PASSPHRASE }} + secrets: inherit fastlane: needs: [ flutter-build ] uses: ./.github/workflows/fastlane.action.yaml with: lane: 'beta' - secrets: - passphrase: ${{ secrets.PASSPHRASE }} \ No newline at end of file + secrets: inherit \ No newline at end of file diff --git a/analysis_options.yaml b/analysis_options.yaml index acfa95e7..b9f3cf7f 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -8,4 +8,5 @@ analyzer: exclude: - "**.g.dart" - "**.mocks.dart" + - "**register**" # DeepLink is deprecated but wont be updated :( - "lib/generated_plugin_registrant.dart" \ No newline at end of file diff --git a/android/Gemfile b/android/Gemfile index b576f479..b43c997b 100644 --- a/android/Gemfile +++ b/android/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem 'fastlane', '2.219.0' +gem 'fastlane', '2.221.1' plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/android/Gemfile.lock b/android/Gemfile.lock index 804a1ed9..5835f688 100644 --- a/android/Gemfile.lock +++ b/android/Gemfile.lock @@ -1,29 +1,32 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.6) + CFPropertyList (3.0.7) + base64 + nkf rexml - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - artifactory (3.0.15) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.877.0) - aws-sdk-core (3.190.1) + aws-partitions (1.949.0) + aws-sdk-core (3.200.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.76.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-kms (1.87.0) + aws-sdk-core (~> 3, >= 3.199.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.142.0) - aws-sdk-core (~> 3, >= 3.189.0) + aws-sdk-s3 (1.155.0) + aws-sdk-core (~> 3, >= 3.199.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) + base64 (0.2.0) claide (1.1.0) colored (1.2) colored2 (3.1.2) @@ -32,10 +35,10 @@ GEM declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.6.20231109) + domain_name (0.6.20240107) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.109.0) + excon (0.110.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -64,15 +67,15 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.3.0) - fastlane (2.219.0) + fastimage (2.3.1) + fastlane (2.221.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) - colored + colored (~> 1.2) commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) @@ -93,10 +96,10 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (>= 0.1.1) + optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) + security (= 0.1.5) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (~> 3) @@ -105,11 +108,11 @@ GEM word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.2) + google-apis-core (0.11.3) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -117,24 +120,23 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - webrick google-apis-iamcredentials_v1 (0.17.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.13.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.29.0) + google-apis-storage_v1 (0.31.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.1) + google-cloud-core (1.7.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.1) - google-cloud-storage (1.45.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.29.0) + google-apis-storage_v1 (~> 0.31.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) @@ -145,34 +147,37 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.2) - json (2.7.1) - jwt (2.7.1) - mini_magick (4.12.0) + json (2.7.2) + jwt (2.8.2) + base64 + mini_magick (4.13.1) mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.3.0) + multipart-post (2.4.1) nanaimo (0.3.0) naturally (2.2.1) - optparse (0.4.0) + nkf (0.2.0) + optparse (0.5.0) os (1.1.4) plist (3.7.1) - public_suffix (5.0.4) - rake (13.1.0) + public_suffix (5.1.1) + rake (13.2.1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.6) + rexml (3.2.9) + strscan rouge (2.0.7) ruby2_keywords (0.0.5) rubyzip (2.3.2) - security (0.1.3) - signet (0.18.0) + security (0.1.5) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -180,6 +185,7 @@ GEM simctl (1.6.10) CFPropertyList naturally + strscan (3.1.0) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -190,9 +196,8 @@ GEM tty-cursor (~> 0.7) uber (0.1.0) unicode-display_width (2.5.0) - webrick (1.8.1) word_wrap (1.0.0) - xcodeproj (1.23.0) + xcodeproj (1.24.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -210,7 +215,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - fastlane (= 2.219.0) + fastlane (= 2.221.1) BUNDLED WITH 2.2.27 diff --git a/android/app/build.gradle b/android/app/build.gradle index 65603b99..ef7b1d39 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,3 +1,12 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" + id "com.google.gms.google-services" + id "com.google.firebase.crashlytics" + id "com.google.firebase.firebase-perf" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +15,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,13 +25,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'com.google.gms.google-services' -apply plugin: 'com.google.firebase.crashlytics' -apply plugin: 'com.google.firebase.firebase-perf' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - def keystoreProperties = new Properties() def keystorePropertiesFile = rootProject.file('key.properties') if (keystorePropertiesFile.exists()) { @@ -35,16 +32,42 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdkVersion 33 + namespace = "fr.vareversat.carg" + + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' } + // https://github.com/acoutts/flutter_libphonenumber/issues/45 + project(':flutter_libphonenumber_android').afterEvaluate { + project(':flutter_libphonenumber_android').android { + compileSdkVersion 30 + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = '17' + } + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = '17' + } + + defaultConfig { applicationId "fr.vareversat.carg" - minSdkVersion 21 - targetSdkVersion 33 + minSdkVersion 23 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -71,20 +94,20 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation platform('com.google.firebase:firebase-bom:31.5.0') + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24" + implementation platform('com.google.firebase:firebase-bom:33.1.2') implementation 'com.google.firebase:firebase-perf-ktx' implementation 'com.google.firebase:firebase-crashlytics-ktx' implementation 'com.google.firebase:firebase-analytics-ktx' implementation 'com.google.firebase:firebase-auth-ktx' implementation 'com.google.firebase:firebase-appcheck-playintegrity' - implementation 'com.google.android.gms:play-services-base:18.3.0' - implementation 'com.google.android.gms:play-services-auth:20.7.0' + implementation 'com.google.android.gms:play-services-base:18.5.0' + implementation 'com.google.android.gms:play-services-auth:21.2.0' implementation 'com.google.firebase:firebase-appcheck-safetynet:16.1.2' implementation 'androidx.multidex:multidex:2.0.1' // For deeplink integration - implementation 'androidx.browser:browser:1.5.0' + implementation 'androidx.browser:browser:1.8.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.5.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test:runner:1.6.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } diff --git a/android/build.gradle b/android/build.gradle index 5dd1cdc1..bc157bd1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,19 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.22' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.4.0' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9' - classpath 'com.google.firebase:perf-plugin:1.4.2' - } -} - allprojects { repositories { google() diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index aeaff6f8..2aaed3a1 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.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 44e62bcf..59af1578 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,11 +1,28 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.2" apply false + id "org.jetbrains.kotlin.android" version "1.9.24" apply false + id "com.google.gms.google-services" version "4.4.2" apply false + id "com.google.firebase.crashlytics" version "2.9.9" apply false + id "com.google.firebase.firebase-perf" version "1.4.2" apply false +} + +include ":app" diff --git a/firebase_functions/functions/package-lock.json b/firebase_functions/functions/package-lock.json index 759c3821..c2081d69 100644 --- a/firebase_functions/functions/package-lock.json +++ b/firebase_functions/functions/package-lock.json @@ -7,135 +7,153 @@ "name": "functions", "dependencies": { "@google-cloud/firestore": "6.8.0", - "algoliasearch": "4.22.1", + "algoliasearch": "4.24.0", "firebase-admin": "11.11.1", - "firebase-functions": "4.6.0" + "firebase-functions": "4.9.0" }, "devDependencies": { - "date-and-time": "2.4.3", - "firebase-functions-test": "3.1.1", + "date-and-time": "3.4.1", + "firebase-functions-test": "3.3.0", "node-forge": "1.3.1", "path-parse": "1.0.7", "tslint": "5.20.1", "typescript": "4.9.5" }, "engines": { - "node": "18" + "node": "20" } }, "node_modules/@algolia/cache-browser-local-storage": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.22.1.tgz", - "integrity": "sha512-Sw6IAmOCvvP6QNgY9j+Hv09mvkvEIDKjYW8ow0UDDAxSXy664RBNQk3i/0nt7gvceOJ6jGmOTimaZoY1THmU7g==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.24.0.tgz", + "integrity": "sha512-t63W9BnoXVrGy9iYHBgObNXqYXM3tYXCjDSHeNwnsc324r4o5UiVKUiAB4THQ5z9U5hTj6qUvwg/Ez43ZD85ww==", "dependencies": { - "@algolia/cache-common": "4.22.1" + "@algolia/cache-common": "4.24.0" } }, "node_modules/@algolia/cache-common": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.22.1.tgz", - "integrity": "sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA==" + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.24.0.tgz", + "integrity": "sha512-emi+v+DmVLpMGhp0V9q9h5CdkURsNmFC+cOS6uK9ndeJm9J4TiqSvPYVu+THUP8P/S08rxf5x2P+p3CfID0Y4g==" }, "node_modules/@algolia/cache-in-memory": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.22.1.tgz", - "integrity": "sha512-ve+6Ac2LhwpufuWavM/aHjLoNz/Z/sYSgNIXsinGofWOysPilQZPUetqLj8vbvi+DHZZaYSEP9H5SRVXnpsNNw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.24.0.tgz", + "integrity": "sha512-gDrt2so19jW26jY3/MkFg5mEypFIPbPoXsQGQWAi6TrCPsNOSEYepBMPlucqWigsmEy/prp5ug2jy/N3PVG/8w==", "dependencies": { - "@algolia/cache-common": "4.22.1" + "@algolia/cache-common": "4.24.0" } }, "node_modules/@algolia/client-account": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.22.1.tgz", - "integrity": "sha512-k8m+oegM2zlns/TwZyi4YgCtyToackkOpE+xCaKCYfBfDtdGOaVZCM5YvGPtK+HGaJMIN/DoTL8asbM3NzHonw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.24.0.tgz", + "integrity": "sha512-adcvyJ3KjPZFDybxlqnf+5KgxJtBjwTPTeyG2aOyoJvx0Y8dUQAEOEVOJ/GBxX0WWNbmaSrhDURMhc+QeevDsA==", "dependencies": { - "@algolia/client-common": "4.22.1", - "@algolia/client-search": "4.22.1", - "@algolia/transporter": "4.22.1" + "@algolia/client-common": "4.24.0", + "@algolia/client-search": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "node_modules/@algolia/client-analytics": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.22.1.tgz", - "integrity": "sha512-1ssi9pyxyQNN4a7Ji9R50nSdISIumMFDwKNuwZipB6TkauJ8J7ha/uO60sPJFqQyqvvI+px7RSNRQT3Zrvzieg==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.24.0.tgz", + "integrity": "sha512-y8jOZt1OjwWU4N2qr8G4AxXAzaa8DBvyHTWlHzX/7Me1LX8OayfgHexqrsL4vSBcoMmVw2XnVW9MhL+Y2ZDJXg==", "dependencies": { - "@algolia/client-common": "4.22.1", - "@algolia/client-search": "4.22.1", - "@algolia/requester-common": "4.22.1", - "@algolia/transporter": "4.22.1" + "@algolia/client-common": "4.24.0", + "@algolia/client-search": "4.24.0", + "@algolia/requester-common": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "node_modules/@algolia/client-common": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.22.1.tgz", - "integrity": "sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.24.0.tgz", + "integrity": "sha512-bc2ROsNL6w6rqpl5jj/UywlIYC21TwSSoFHKl01lYirGMW+9Eek6r02Tocg4gZ8HAw3iBvu6XQiM3BEbmEMoiA==", "dependencies": { - "@algolia/requester-common": "4.22.1", - "@algolia/transporter": "4.22.1" + "@algolia/requester-common": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "node_modules/@algolia/client-personalization": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.22.1.tgz", - "integrity": "sha512-sl+/klQJ93+4yaqZ7ezOttMQ/nczly/3GmgZXJ1xmoewP5jmdP/X/nV5U7EHHH3hCUEHeN7X1nsIhGPVt9E1cQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.24.0.tgz", + "integrity": "sha512-l5FRFm/yngztweU0HdUzz1rC4yoWCFo3IF+dVIVTfEPg906eZg5BOd1k0K6rZx5JzyyoP4LdmOikfkfGsKVE9w==", "dependencies": { - "@algolia/client-common": "4.22.1", - "@algolia/requester-common": "4.22.1", - "@algolia/transporter": "4.22.1" + "@algolia/client-common": "4.24.0", + "@algolia/requester-common": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "node_modules/@algolia/client-search": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.22.1.tgz", - "integrity": "sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.24.0.tgz", + "integrity": "sha512-uRW6EpNapmLAD0mW47OXqTP8eiIx5F6qN9/x/7HHO6owL3N1IXqydGwW5nhDFBrV+ldouro2W1VX3XlcUXEFCA==", "dependencies": { - "@algolia/client-common": "4.22.1", - "@algolia/requester-common": "4.22.1", - "@algolia/transporter": "4.22.1" + "@algolia/client-common": "4.24.0", + "@algolia/requester-common": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "node_modules/@algolia/logger-common": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.22.1.tgz", - "integrity": "sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg==" + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.24.0.tgz", + "integrity": "sha512-LLUNjkahj9KtKYrQhFKCzMx0BY3RnNP4FEtO+sBybCjJ73E8jNdaKJ/Dd8A/VA4imVHP5tADZ8pn5B8Ga/wTMA==" }, "node_modules/@algolia/logger-console": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.22.1.tgz", - "integrity": "sha512-O99rcqpVPKN1RlpgD6H3khUWylU24OXlzkavUAMy6QZd1776QAcauE3oP8CmD43nbaTjBexZj2nGsBH9Tc0FVA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.24.0.tgz", + "integrity": "sha512-X4C8IoHgHfiUROfoRCV+lzSy+LHMgkoEEU1BbKcsfnV0i0S20zyy0NLww9dwVHUWNfPPxdMU+/wKmLGYf96yTg==", "dependencies": { - "@algolia/logger-common": "4.22.1" + "@algolia/logger-common": "4.24.0" + } + }, + "node_modules/@algolia/recommend": { + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-4.24.0.tgz", + "integrity": "sha512-P9kcgerfVBpfYHDfVZDvvdJv0lEoCvzNlOy2nykyt5bK8TyieYyiD0lguIJdRZZYGre03WIAFf14pgE+V+IBlw==", + "dependencies": { + "@algolia/cache-browser-local-storage": "4.24.0", + "@algolia/cache-common": "4.24.0", + "@algolia/cache-in-memory": "4.24.0", + "@algolia/client-common": "4.24.0", + "@algolia/client-search": "4.24.0", + "@algolia/logger-common": "4.24.0", + "@algolia/logger-console": "4.24.0", + "@algolia/requester-browser-xhr": "4.24.0", + "@algolia/requester-common": "4.24.0", + "@algolia/requester-node-http": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "node_modules/@algolia/requester-browser-xhr": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.22.1.tgz", - "integrity": "sha512-dtQGYIg6MteqT1Uay3J/0NDqD+UciHy3QgRbk7bNddOJu+p3hzjTRYESqEnoX/DpEkaNYdRHUKNylsqMpgwaEw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.24.0.tgz", + "integrity": "sha512-Z2NxZMb6+nVXSjF13YpjYTdvV3032YTBSGm2vnYvYPA6mMxzM3v5rsCiSspndn9rzIW4Qp1lPHBvuoKJV6jnAA==", "dependencies": { - "@algolia/requester-common": "4.22.1" + "@algolia/requester-common": "4.24.0" } }, "node_modules/@algolia/requester-common": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.22.1.tgz", - "integrity": "sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg==" + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.24.0.tgz", + "integrity": "sha512-k3CXJ2OVnvgE3HMwcojpvY6d9kgKMPRxs/kVohrwF5WMr2fnqojnycZkxPoEg+bXm8fi5BBfFmOqgYztRtHsQA==" }, "node_modules/@algolia/requester-node-http": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.22.1.tgz", - "integrity": "sha512-JfmZ3MVFQkAU+zug8H3s8rZ6h0ahHZL/SpMaSasTCGYR5EEJsCc8SI5UZ6raPN2tjxa5bxS13BRpGSBUens7EA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.24.0.tgz", + "integrity": "sha512-JF18yTjNOVYvU/L3UosRcvbPMGT9B+/GQWNWnenIImglzNVGpyzChkXLnrSf6uxwVNO6ESGu6oN8MqcGQcjQJw==", "dependencies": { - "@algolia/requester-common": "4.22.1" + "@algolia/requester-common": "4.24.0" } }, "node_modules/@algolia/transporter": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.22.1.tgz", - "integrity": "sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.24.0.tgz", + "integrity": "sha512-86nI7w6NzWxd1Zp9q3413dRshDqAzSbsQjhcDhPIatEFiZrL1/TjnHL8S7jVKFePlIMzDsZWXAXwXzcok9c5oA==", "dependencies": { - "@algolia/cache-common": "4.22.1", - "@algolia/logger-common": "4.22.1", - "@algolia/requester-common": "4.22.1" + "@algolia/cache-common": "4.24.0", + "@algolia/logger-common": "4.24.0", + "@algolia/requester-common": "4.24.0" } }, "node_modules/@ampproject/remapping": { @@ -1787,24 +1805,25 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/algoliasearch": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.22.1.tgz", - "integrity": "sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg==", - "dependencies": { - "@algolia/cache-browser-local-storage": "4.22.1", - "@algolia/cache-common": "4.22.1", - "@algolia/cache-in-memory": "4.22.1", - "@algolia/client-account": "4.22.1", - "@algolia/client-analytics": "4.22.1", - "@algolia/client-common": "4.22.1", - "@algolia/client-personalization": "4.22.1", - "@algolia/client-search": "4.22.1", - "@algolia/logger-common": "4.22.1", - "@algolia/logger-console": "4.22.1", - "@algolia/requester-browser-xhr": "4.22.1", - "@algolia/requester-common": "4.22.1", - "@algolia/requester-node-http": "4.22.1", - "@algolia/transporter": "4.22.1" + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.24.0.tgz", + "integrity": "sha512-bf0QV/9jVejssFBmz2HQLxUadxk574t4iwjCKp5E7NBzwKkrDEhKPISIIjAU/p6K5qDx3qoeh4+26zWN1jmw3g==", + "dependencies": { + "@algolia/cache-browser-local-storage": "4.24.0", + "@algolia/cache-common": "4.24.0", + "@algolia/cache-in-memory": "4.24.0", + "@algolia/client-account": "4.24.0", + "@algolia/client-analytics": "4.24.0", + "@algolia/client-common": "4.24.0", + "@algolia/client-personalization": "4.24.0", + "@algolia/client-search": "4.24.0", + "@algolia/logger-common": "4.24.0", + "@algolia/logger-console": "4.24.0", + "@algolia/recommend": "4.24.0", + "@algolia/requester-browser-xhr": "4.24.0", + "@algolia/requester-common": "4.24.0", + "@algolia/requester-node-http": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "node_modules/ansi-escapes": { @@ -2379,9 +2398,9 @@ } }, "node_modules/date-and-time": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-2.4.3.tgz", - "integrity": "sha512-xkS/imTmsyEdpp9ie5oV5UWolg3XkYWNySbT2W4ESWr6v4V8YrsHbhpk9fIeQcr0NFTnYbQJLXlgU1zrLItysA==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-3.4.1.tgz", + "integrity": "sha512-i/paYORS8KPiisAP22TJR9XutKi2O2uzqs/+Tey7cTKcXQWYp4S5hjcI/aqWy1awDpiK45+i660nVZty8ln5UQ==", "dev": true }, "node_modules/debug": { @@ -2874,15 +2893,14 @@ } }, "node_modules/firebase-functions": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-4.6.0.tgz", - "integrity": "sha512-mY3wuU/Qe+vjVyoCIv0TGXcqr5iQhsMlccLBSAHJ+cWgbszo915mcFP8E9adtXoitqf/4CVzzTwYcfPdCQo2RQ==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-4.9.0.tgz", + "integrity": "sha512-IqxOEsVAWGcRv9KRGzWQR5mOFuNsil3vsfkRPPiaV1U/ATC27/jbahh4z8I4rW8Xqa6cQE5xqnw0ueyMH7i7Ag==", "dependencies": { "@types/cors": "^2.8.5", "@types/express": "4.17.3", "cors": "^2.8.5", "express": "^4.17.1", - "node-fetch": "^2.6.7", "protobufjs": "^7.2.2" }, "bin": { @@ -2896,9 +2914,9 @@ } }, "node_modules/firebase-functions-test": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/firebase-functions-test/-/firebase-functions-test-3.1.1.tgz", - "integrity": "sha512-IlDzcd+8rUd87hD1ZAPXsc3cX5JGdfpKmKlUJWdZJlErdyznwXssPQzbRPX8rh929ZhwmzGpubFBt7itkXAg+A==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/firebase-functions-test/-/firebase-functions-test-3.3.0.tgz", + "integrity": "sha512-X+OOA34MGrsTimFXTDnWT0psAqnmBkJ85bGCoLMwjgei5Prfkqh3bv5QASnXC/cmIVBSF2Qw9uW1+mF/t3kFlw==", "dev": true, "dependencies": { "@types/lodash": "^4.14.104", @@ -2910,7 +2928,7 @@ }, "peerDependencies": { "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0", - "firebase-functions": ">=4.3.0", + "firebase-functions": ">=4.9.0", "jest": ">=28.0.0" } }, @@ -6270,118 +6288,136 @@ }, "dependencies": { "@algolia/cache-browser-local-storage": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.22.1.tgz", - "integrity": "sha512-Sw6IAmOCvvP6QNgY9j+Hv09mvkvEIDKjYW8ow0UDDAxSXy664RBNQk3i/0nt7gvceOJ6jGmOTimaZoY1THmU7g==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.24.0.tgz", + "integrity": "sha512-t63W9BnoXVrGy9iYHBgObNXqYXM3tYXCjDSHeNwnsc324r4o5UiVKUiAB4THQ5z9U5hTj6qUvwg/Ez43ZD85ww==", "requires": { - "@algolia/cache-common": "4.22.1" + "@algolia/cache-common": "4.24.0" } }, "@algolia/cache-common": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.22.1.tgz", - "integrity": "sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA==" + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.24.0.tgz", + "integrity": "sha512-emi+v+DmVLpMGhp0V9q9h5CdkURsNmFC+cOS6uK9ndeJm9J4TiqSvPYVu+THUP8P/S08rxf5x2P+p3CfID0Y4g==" }, "@algolia/cache-in-memory": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.22.1.tgz", - "integrity": "sha512-ve+6Ac2LhwpufuWavM/aHjLoNz/Z/sYSgNIXsinGofWOysPilQZPUetqLj8vbvi+DHZZaYSEP9H5SRVXnpsNNw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.24.0.tgz", + "integrity": "sha512-gDrt2so19jW26jY3/MkFg5mEypFIPbPoXsQGQWAi6TrCPsNOSEYepBMPlucqWigsmEy/prp5ug2jy/N3PVG/8w==", "requires": { - "@algolia/cache-common": "4.22.1" + "@algolia/cache-common": "4.24.0" } }, "@algolia/client-account": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.22.1.tgz", - "integrity": "sha512-k8m+oegM2zlns/TwZyi4YgCtyToackkOpE+xCaKCYfBfDtdGOaVZCM5YvGPtK+HGaJMIN/DoTL8asbM3NzHonw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.24.0.tgz", + "integrity": "sha512-adcvyJ3KjPZFDybxlqnf+5KgxJtBjwTPTeyG2aOyoJvx0Y8dUQAEOEVOJ/GBxX0WWNbmaSrhDURMhc+QeevDsA==", "requires": { - "@algolia/client-common": "4.22.1", - "@algolia/client-search": "4.22.1", - "@algolia/transporter": "4.22.1" + "@algolia/client-common": "4.24.0", + "@algolia/client-search": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "@algolia/client-analytics": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.22.1.tgz", - "integrity": "sha512-1ssi9pyxyQNN4a7Ji9R50nSdISIumMFDwKNuwZipB6TkauJ8J7ha/uO60sPJFqQyqvvI+px7RSNRQT3Zrvzieg==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.24.0.tgz", + "integrity": "sha512-y8jOZt1OjwWU4N2qr8G4AxXAzaa8DBvyHTWlHzX/7Me1LX8OayfgHexqrsL4vSBcoMmVw2XnVW9MhL+Y2ZDJXg==", "requires": { - "@algolia/client-common": "4.22.1", - "@algolia/client-search": "4.22.1", - "@algolia/requester-common": "4.22.1", - "@algolia/transporter": "4.22.1" + "@algolia/client-common": "4.24.0", + "@algolia/client-search": "4.24.0", + "@algolia/requester-common": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "@algolia/client-common": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.22.1.tgz", - "integrity": "sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.24.0.tgz", + "integrity": "sha512-bc2ROsNL6w6rqpl5jj/UywlIYC21TwSSoFHKl01lYirGMW+9Eek6r02Tocg4gZ8HAw3iBvu6XQiM3BEbmEMoiA==", "requires": { - "@algolia/requester-common": "4.22.1", - "@algolia/transporter": "4.22.1" + "@algolia/requester-common": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "@algolia/client-personalization": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.22.1.tgz", - "integrity": "sha512-sl+/klQJ93+4yaqZ7ezOttMQ/nczly/3GmgZXJ1xmoewP5jmdP/X/nV5U7EHHH3hCUEHeN7X1nsIhGPVt9E1cQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.24.0.tgz", + "integrity": "sha512-l5FRFm/yngztweU0HdUzz1rC4yoWCFo3IF+dVIVTfEPg906eZg5BOd1k0K6rZx5JzyyoP4LdmOikfkfGsKVE9w==", "requires": { - "@algolia/client-common": "4.22.1", - "@algolia/requester-common": "4.22.1", - "@algolia/transporter": "4.22.1" + "@algolia/client-common": "4.24.0", + "@algolia/requester-common": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "@algolia/client-search": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.22.1.tgz", - "integrity": "sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.24.0.tgz", + "integrity": "sha512-uRW6EpNapmLAD0mW47OXqTP8eiIx5F6qN9/x/7HHO6owL3N1IXqydGwW5nhDFBrV+ldouro2W1VX3XlcUXEFCA==", "requires": { - "@algolia/client-common": "4.22.1", - "@algolia/requester-common": "4.22.1", - "@algolia/transporter": "4.22.1" + "@algolia/client-common": "4.24.0", + "@algolia/requester-common": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "@algolia/logger-common": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.22.1.tgz", - "integrity": "sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg==" + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.24.0.tgz", + "integrity": "sha512-LLUNjkahj9KtKYrQhFKCzMx0BY3RnNP4FEtO+sBybCjJ73E8jNdaKJ/Dd8A/VA4imVHP5tADZ8pn5B8Ga/wTMA==" }, "@algolia/logger-console": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.22.1.tgz", - "integrity": "sha512-O99rcqpVPKN1RlpgD6H3khUWylU24OXlzkavUAMy6QZd1776QAcauE3oP8CmD43nbaTjBexZj2nGsBH9Tc0FVA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.24.0.tgz", + "integrity": "sha512-X4C8IoHgHfiUROfoRCV+lzSy+LHMgkoEEU1BbKcsfnV0i0S20zyy0NLww9dwVHUWNfPPxdMU+/wKmLGYf96yTg==", "requires": { - "@algolia/logger-common": "4.22.1" + "@algolia/logger-common": "4.24.0" + } + }, + "@algolia/recommend": { + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-4.24.0.tgz", + "integrity": "sha512-P9kcgerfVBpfYHDfVZDvvdJv0lEoCvzNlOy2nykyt5bK8TyieYyiD0lguIJdRZZYGre03WIAFf14pgE+V+IBlw==", + "requires": { + "@algolia/cache-browser-local-storage": "4.24.0", + "@algolia/cache-common": "4.24.0", + "@algolia/cache-in-memory": "4.24.0", + "@algolia/client-common": "4.24.0", + "@algolia/client-search": "4.24.0", + "@algolia/logger-common": "4.24.0", + "@algolia/logger-console": "4.24.0", + "@algolia/requester-browser-xhr": "4.24.0", + "@algolia/requester-common": "4.24.0", + "@algolia/requester-node-http": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "@algolia/requester-browser-xhr": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.22.1.tgz", - "integrity": "sha512-dtQGYIg6MteqT1Uay3J/0NDqD+UciHy3QgRbk7bNddOJu+p3hzjTRYESqEnoX/DpEkaNYdRHUKNylsqMpgwaEw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.24.0.tgz", + "integrity": "sha512-Z2NxZMb6+nVXSjF13YpjYTdvV3032YTBSGm2vnYvYPA6mMxzM3v5rsCiSspndn9rzIW4Qp1lPHBvuoKJV6jnAA==", "requires": { - "@algolia/requester-common": "4.22.1" + "@algolia/requester-common": "4.24.0" } }, "@algolia/requester-common": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.22.1.tgz", - "integrity": "sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg==" + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.24.0.tgz", + "integrity": "sha512-k3CXJ2OVnvgE3HMwcojpvY6d9kgKMPRxs/kVohrwF5WMr2fnqojnycZkxPoEg+bXm8fi5BBfFmOqgYztRtHsQA==" }, "@algolia/requester-node-http": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.22.1.tgz", - "integrity": "sha512-JfmZ3MVFQkAU+zug8H3s8rZ6h0ahHZL/SpMaSasTCGYR5EEJsCc8SI5UZ6raPN2tjxa5bxS13BRpGSBUens7EA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.24.0.tgz", + "integrity": "sha512-JF18yTjNOVYvU/L3UosRcvbPMGT9B+/GQWNWnenIImglzNVGpyzChkXLnrSf6uxwVNO6ESGu6oN8MqcGQcjQJw==", "requires": { - "@algolia/requester-common": "4.22.1" + "@algolia/requester-common": "4.24.0" } }, "@algolia/transporter": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.22.1.tgz", - "integrity": "sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.24.0.tgz", + "integrity": "sha512-86nI7w6NzWxd1Zp9q3413dRshDqAzSbsQjhcDhPIatEFiZrL1/TjnHL8S7jVKFePlIMzDsZWXAXwXzcok9c5oA==", "requires": { - "@algolia/cache-common": "4.22.1", - "@algolia/logger-common": "4.22.1", - "@algolia/requester-common": "4.22.1" + "@algolia/cache-common": "4.24.0", + "@algolia/logger-common": "4.24.0", + "@algolia/requester-common": "4.24.0" } }, "@ampproject/remapping": { @@ -7754,24 +7790,25 @@ } }, "algoliasearch": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.22.1.tgz", - "integrity": "sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg==", - "requires": { - "@algolia/cache-browser-local-storage": "4.22.1", - "@algolia/cache-common": "4.22.1", - "@algolia/cache-in-memory": "4.22.1", - "@algolia/client-account": "4.22.1", - "@algolia/client-analytics": "4.22.1", - "@algolia/client-common": "4.22.1", - "@algolia/client-personalization": "4.22.1", - "@algolia/client-search": "4.22.1", - "@algolia/logger-common": "4.22.1", - "@algolia/logger-console": "4.22.1", - "@algolia/requester-browser-xhr": "4.22.1", - "@algolia/requester-common": "4.22.1", - "@algolia/requester-node-http": "4.22.1", - "@algolia/transporter": "4.22.1" + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.24.0.tgz", + "integrity": "sha512-bf0QV/9jVejssFBmz2HQLxUadxk574t4iwjCKp5E7NBzwKkrDEhKPISIIjAU/p6K5qDx3qoeh4+26zWN1jmw3g==", + "requires": { + "@algolia/cache-browser-local-storage": "4.24.0", + "@algolia/cache-common": "4.24.0", + "@algolia/cache-in-memory": "4.24.0", + "@algolia/client-account": "4.24.0", + "@algolia/client-analytics": "4.24.0", + "@algolia/client-common": "4.24.0", + "@algolia/client-personalization": "4.24.0", + "@algolia/client-search": "4.24.0", + "@algolia/logger-common": "4.24.0", + "@algolia/logger-console": "4.24.0", + "@algolia/recommend": "4.24.0", + "@algolia/requester-browser-xhr": "4.24.0", + "@algolia/requester-common": "4.24.0", + "@algolia/requester-node-http": "4.24.0", + "@algolia/transporter": "4.24.0" } }, "ansi-escapes": { @@ -8204,9 +8241,9 @@ } }, "date-and-time": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-2.4.3.tgz", - "integrity": "sha512-xkS/imTmsyEdpp9ie5oV5UWolg3XkYWNySbT2W4ESWr6v4V8YrsHbhpk9fIeQcr0NFTnYbQJLXlgU1zrLItysA==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-3.4.1.tgz", + "integrity": "sha512-i/paYORS8KPiisAP22TJR9XutKi2O2uzqs/+Tey7cTKcXQWYp4S5hjcI/aqWy1awDpiK45+i660nVZty8ln5UQ==", "dev": true }, "debug": { @@ -8592,22 +8629,21 @@ } }, "firebase-functions": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-4.6.0.tgz", - "integrity": "sha512-mY3wuU/Qe+vjVyoCIv0TGXcqr5iQhsMlccLBSAHJ+cWgbszo915mcFP8E9adtXoitqf/4CVzzTwYcfPdCQo2RQ==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-4.9.0.tgz", + "integrity": "sha512-IqxOEsVAWGcRv9KRGzWQR5mOFuNsil3vsfkRPPiaV1U/ATC27/jbahh4z8I4rW8Xqa6cQE5xqnw0ueyMH7i7Ag==", "requires": { "@types/cors": "^2.8.5", "@types/express": "4.17.3", "cors": "^2.8.5", "express": "^4.17.1", - "node-fetch": "^2.6.7", "protobufjs": "^7.2.2" } }, "firebase-functions-test": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/firebase-functions-test/-/firebase-functions-test-3.1.1.tgz", - "integrity": "sha512-IlDzcd+8rUd87hD1ZAPXsc3cX5JGdfpKmKlUJWdZJlErdyznwXssPQzbRPX8rh929ZhwmzGpubFBt7itkXAg+A==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/firebase-functions-test/-/firebase-functions-test-3.3.0.tgz", + "integrity": "sha512-X+OOA34MGrsTimFXTDnWT0psAqnmBkJ85bGCoLMwjgei5Prfkqh3bv5QASnXC/cmIVBSF2Qw9uW1+mF/t3kFlw==", "dev": true, "requires": { "@types/lodash": "^4.14.104", diff --git a/firebase_functions/functions/package.json b/firebase_functions/functions/package.json index 60ef3b4c..61ac3ec6 100644 --- a/firebase_functions/functions/package.json +++ b/firebase_functions/functions/package.json @@ -10,21 +10,21 @@ "logs": "firebase functions:log" }, "engines": { - "node": "18" + "node": "20" }, "main": "lib/index.js", "dependencies": { "@google-cloud/firestore": "6.8.0", - "algoliasearch": "4.22.1", + "algoliasearch": "4.24.0", "firebase-admin": "11.11.1", - "firebase-functions": "4.6.0" + "firebase-functions": "4.9.0" }, "devDependencies": { - "firebase-functions-test": "3.1.1", + "firebase-functions-test": "3.3.0", "node-forge": "1.3.1", "tslint": "5.20.1", "typescript": "4.9.5", - "date-and-time": "2.4.3", + "date-and-time": "3.4.1", "path-parse": "1.0.7" }, "private": true diff --git a/lib/helpers/correct_instance.dart b/lib/helpers/correct_instance.dart index 8ddad3af..ea16befa 100644 --- a/lib/helpers/correct_instance.dart +++ b/lib/helpers/correct_instance.dart @@ -22,14 +22,14 @@ import 'package:carg/services/impl/score/tarot_score_service.dart'; class CorrectInstance { static ofGameService(Game game) { - switch (game.runtimeType) { - case FrenchBelote: + switch (game) { + case FrenchBelote _: return FrenchBeloteGameService(); - case CoincheBelote: + case CoincheBelote _: return CoincheBeloteGameService(); - case ContreeBelote: + case ContreeBelote _: return ContreeBeloteGameService(); - case Tarot: + case Tarot _: return TarotGameService(); default: throw Exception( @@ -38,14 +38,14 @@ class CorrectInstance { } static ofRoundService(Game game) { - switch (game.runtimeType) { - case FrenchBelote: + switch (game) { + case FrenchBelote _: return FrenchBeloteRoundService(); - case CoincheBelote: + case CoincheBelote _: return CoincheBeloteRoundService(); - case ContreeBelote: + case ContreeBelote _: return ContreeBeloteRoundService(); - case Tarot: + case Tarot _: return TarotRoundService(); default: throw Exception( @@ -54,14 +54,14 @@ class CorrectInstance { } static ofScoreService(Game game) { - switch (game.runtimeType) { - case FrenchBelote: + switch (game) { + case FrenchBelote _: return FrenchBeloteScoreService(); - case CoincheBelote: + case CoincheBelote _: return CoincheBeloteScoreService(); - case ContreeBelote: + case ContreeBelote _: return ContreeBeloteScoreService(); - case Tarot: + case Tarot _: return TarotScoreService(); default: throw Exception( @@ -71,12 +71,12 @@ class CorrectInstance { static ofSpecialRound( Game game, BeloteSpecialRound beloteSpecialRound, String playerID) { - switch (game.runtimeType) { - case FrenchBelote: + switch (game) { + case FrenchBelote _: return FrenchBeloteRound.specialRound(beloteSpecialRound, playerID); - case CoincheBelote: + case CoincheBelote _: return CoincheBeloteRound.specialRound(beloteSpecialRound, playerID); - case ContreeBelote: + case ContreeBelote _: return ContreeBeloteRound.specialRound(beloteSpecialRound, playerID); default: throw Exception( diff --git a/lib/models/score/round/belote_round.dart b/lib/models/score/round/belote_round.dart index ff9261ea..e70260e0 100644 --- a/lib/models/score/round/belote_round.dart +++ b/lib/models/score/round/belote_round.dart @@ -25,6 +25,7 @@ abstract class BeloteRound extends Round { late int _defenderScore; late int _usTrickScore; late int _themTrickScore; + late String _scoreExplanation; BeloteRound( {super.index, @@ -50,6 +51,14 @@ abstract class BeloteRound extends Round { _themTrickScore = themTrickScore ?? totalTrickScore; _takerScore = takerScore ?? 0; _defenderScore = defenderScore ?? totalTrickScore; + _scoreExplanation = ""; + } + + String get scoreExplanation => _scoreExplanation; + + set scoreExplanation(String value) { + _scoreExplanation = value; + notifyListeners(); } int get usTrickScore => _usTrickScore; @@ -141,10 +150,16 @@ abstract class BeloteRound extends Round { int getTotalPointsOfTeam(BeloteTeamEnum team) { // Check the settings to check the score computation if (settings != null && settings!.sumTrickPointsAndContract) { + // Used to display explanation about the displayed score + scoreExplanation = "$team : ${getTrickPointsOfTeam(team)} + ${getDixDeDerOfTeam(team)} + ${getBeloteRebeloteOfTeam(team)} ======= "; + print(scoreExplanation); return getTrickPointsOfTeam(team) + getDixDeDerOfTeam(team) + getBeloteRebeloteOfTeam(team); } else { + // Used to display explanation about the displayed score + scoreExplanation += "$team : ${getDixDeDerOfTeam(team)} + ${getBeloteRebeloteOfTeam(team)} ======= "; + print(scoreExplanation); return getDixDeDerOfTeam(team) + getBeloteRebeloteOfTeam(team); } } @@ -167,7 +182,12 @@ abstract class BeloteRound extends Round { @override String realTimeDisplay(BuildContext context) { - return '${taker.name(context)} : ${takerScore.toString()} | ${defender.name(context)} : ${defenderScore.toString()}'; + return '${taker.name(context)} ${takerScore.toString()} | ${defenderScore.toString()} ${defender.name(context)}'; + } + + @override + String realTimeInfoDisplay(BuildContext context) { + return scoreExplanation; } Map toJSON() { diff --git a/lib/models/score/round/coinche_belote_round.dart b/lib/models/score/round/coinche_belote_round.dart index 2cead0e6..70c56687 100644 --- a/lib/models/score/round/coinche_belote_round.dart +++ b/lib/models/score/round/coinche_belote_round.dart @@ -76,6 +76,7 @@ class CoincheBeloteRound extends BeloteRound { @override void computeRound() { + print('YOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO ///'); if (contractFulfilled) { var takerScoreTmp = getTotalPointsOfTeam(taker) + contract; var defenderScoreTmp = getTotalPointsOfTeam(defender); diff --git a/lib/models/score/round/round.dart b/lib/models/score/round/round.dart index 8be64c7f..1444a804 100644 --- a/lib/models/score/round/round.dart +++ b/lib/models/score/round/round.dart @@ -9,5 +9,7 @@ abstract class Round with ChangeNotifier { String realTimeDisplay(BuildContext context); + String realTimeInfoDisplay(BuildContext context); + Round({this.index, this.settings}); } diff --git a/lib/models/score/round/tarot_round.dart b/lib/models/score/round/tarot_round.dart index ba9d4e1d..3678ea71 100644 --- a/lib/models/score/round/tarot_round.dart +++ b/lib/models/score/round/tarot_round.dart @@ -236,6 +236,11 @@ class TarotRound extends Round { } } + @override + String realTimeInfoDisplay(BuildContext context) { + return "hey yo"; + } + Map toJSON() { return { 'index': index, diff --git a/lib/views/dialogs/carg_about_dialog.dart b/lib/views/dialogs/carg_about_dialog.dart index 62849f6d..395686e0 100644 --- a/lib/views/dialogs/carg_about_dialog.dart +++ b/lib/views/dialogs/carg_about_dialog.dart @@ -92,11 +92,10 @@ class CargAboutDialog extends StatelessWidget { key: const ValueKey('sourceCodeButton'), onPressed: () => _launchURL(Const.githubLink, context), style: ButtonStyle( - backgroundColor: - MaterialStateProperty.all(Colors.black), - foregroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all(Colors.black), + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -116,11 +115,11 @@ class CargAboutDialog extends StatelessWidget { )), ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.secondary), - foregroundColor: MaterialStateProperty.all( - Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + foregroundColor: + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -147,11 +146,11 @@ class CargAboutDialog extends StatelessWidget { ), ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -188,10 +187,10 @@ class CargAboutDialog extends StatelessWidget { onPressed: () => _launchURL(Const.privacyInfoLink, context), style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(Colors.blueAccent), - foregroundColor: MaterialStateProperty.all( + WidgetStateProperty.all(Colors.blueAccent), + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -209,10 +208,10 @@ class CargAboutDialog extends StatelessWidget { actions: [ ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all(Colors.white), - foregroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all(Colors.white), + foregroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, diff --git a/lib/views/dialogs/game_info_dialog.dart b/lib/views/dialogs/game_info_dialog.dart index aef0df07..d7572890 100644 --- a/lib/views/dialogs/game_info_dialog.dart +++ b/lib/views/dialogs/game_info_dialog.dart @@ -103,11 +103,11 @@ class _GameInfoDialogState extends State { actions: [ ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( - Theme.of(context).primaryColor), + backgroundColor: + WidgetStateProperty.all(Theme.of(context).primaryColor), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, diff --git a/lib/views/dialogs/notes_dialog.dart b/lib/views/dialogs/notes_dialog.dart index 679010f2..ca8ff983 100644 --- a/lib/views/dialogs/notes_dialog.dart +++ b/lib/views/dialogs/notes_dialog.dart @@ -63,11 +63,11 @@ class _NotesDialogState extends State { actions: [ ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.secondary), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -89,10 +89,10 @@ class _NotesDialogState extends State { ElevatedButton.icon( style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - foregroundColor: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + foregroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.secondary), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, diff --git a/lib/views/dialogs/player_color_explanation_dialog.dart b/lib/views/dialogs/player_color_explanation_dialog.dart index ea7705d2..1cf674a6 100644 --- a/lib/views/dialogs/player_color_explanation_dialog.dart +++ b/lib/views/dialogs/player_color_explanation_dialog.dart @@ -104,10 +104,10 @@ class PlayerColorExplanationDialog extends StatelessWidget { ElevatedButton.icon( key: const ValueKey('closeButton'), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all(Colors.white), - foregroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all(Colors.white), + foregroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius)))), diff --git a/lib/views/dialogs/player_info_dialog.dart b/lib/views/dialogs/player_info_dialog.dart index c36cfef4..49459b83 100644 --- a/lib/views/dialogs/player_info_dialog.dart +++ b/lib/views/dialogs/player_info_dialog.dart @@ -81,10 +81,10 @@ class PlayerInfoDialog extends StatelessWidget { key: const ValueKey('copyIDButton'), style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(Colors.white), - foregroundColor: MaterialStateProperty.all( + WidgetStateProperty.all(Colors.white), + foregroundColor: WidgetStateProperty.all( player.getSideColor(context)), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius)))), @@ -236,11 +236,11 @@ class PlayerInfoDialog extends StatelessWidget { ElevatedButton.icon( key: const ValueKey('saveButton'), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( player.getSideColor(context)), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius)))), @@ -251,10 +251,10 @@ class PlayerInfoDialog extends StatelessWidget { ElevatedButton.icon( key: const ValueKey('closeButton'), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all(Colors.white), - foregroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all(Colors.white), + foregroundColor: WidgetStateProperty.all( player.getSideColor(context)), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius)))), diff --git a/lib/views/dialogs/score_info_dialog.dart b/lib/views/dialogs/score_info_dialog.dart new file mode 100644 index 00000000..182b21a1 --- /dev/null +++ b/lib/views/dialogs/score_info_dialog.dart @@ -0,0 +1,42 @@ +import 'package:carg/models/score/round/belote_round.dart'; +import 'package:carg/models/score/round/round.dart'; +import 'package:carg/styles/properties.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:provider/provider.dart'; + +class ScoreInfoDialog extends StatelessWidget { + final Round round; + + const ScoreInfoDialog({super.key, required this.round}); + + @override + Widget build(BuildContext context) { + return AlertDialog( + insetPadding: const EdgeInsets.symmetric(horizontal: 20), + titlePadding: const EdgeInsets.all(0), + contentPadding: const EdgeInsets.all(20), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)), + content: ChangeNotifierProvider.value( + value: round, + child: Consumer( + builder: (context, roundData, child) => Column( + mainAxisAlignment: MainAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + roundData.realTimeInfoDisplay(context), + style: Theme.of(context).textTheme.titleMedium, + ), + const SizedBox( + height: 20, + ), + const SizedBox.shrink() + ], + ), + ), + ), + actionsAlignment: MainAxisAlignment.center, + ); + } +} diff --git a/lib/views/dialogs/special_roud_dialog.dart b/lib/views/dialogs/special_roud_dialog.dart index 87e6be18..785d11bd 100644 --- a/lib/views/dialogs/special_roud_dialog.dart +++ b/lib/views/dialogs/special_roud_dialog.dart @@ -37,11 +37,11 @@ class SpecialRoundDialog extends StatelessWidget { children: [ ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(CustomProperties.borderRadius), @@ -58,11 +58,11 @@ class SpecialRoundDialog extends StatelessWidget { ), ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(CustomProperties.borderRadius), @@ -79,11 +79,11 @@ class SpecialRoundDialog extends StatelessWidget { ), ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.error), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(CustomProperties.borderRadius), diff --git a/lib/views/dialogs/team_stat_dialog.dart b/lib/views/dialogs/team_stat_dialog.dart index 030b9c6b..ae726ac3 100644 --- a/lib/views/dialogs/team_stat_dialog.dart +++ b/lib/views/dialogs/team_stat_dialog.dart @@ -94,9 +94,9 @@ class TeamStatDialog extends StatelessWidget { Flexible( child: ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius)))), @@ -179,10 +179,10 @@ class TeamStatDialog extends StatelessWidget { ElevatedButton.icon( key: const ValueKey('closeButton'), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all(Colors.white), - foregroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all(Colors.white), + foregroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius)))), diff --git a/lib/views/dialogs/warning_dialog.dart b/lib/views/dialogs/warning_dialog.dart index ecab57fe..4d907d4d 100644 --- a/lib/views/dialogs/warning_dialog.dart +++ b/lib/views/dialogs/warning_dialog.dart @@ -81,11 +81,11 @@ class _WarningDialogState extends State { else ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( widget.color ?? Theme.of(context).colorScheme.error), - foregroundColor: MaterialStateProperty.all( - Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + foregroundColor: + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -103,10 +103,10 @@ class _WarningDialogState extends State { ElevatedButton.icon( style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - foregroundColor: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + foregroundColor: WidgetStateProperty.all( widget.color ?? Theme.of(context).colorScheme.error), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, diff --git a/lib/views/screens/add_round/add_belote_round_screen.dart b/lib/views/screens/add_round/add_belote_round_screen.dart index 26a65db6..cad5e5f6 100644 --- a/lib/views/screens/add_round/add_belote_round_screen.dart +++ b/lib/views/screens/add_round/add_belote_round_screen.dart @@ -104,11 +104,11 @@ class AddBeloteRoundScreen extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 8.0), child: ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.onPrimary), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, diff --git a/lib/views/screens/add_round/add_tarot_round_screen.dart b/lib/views/screens/add_round/add_tarot_round_screen.dart index 060d60b8..695212d4 100644 --- a/lib/views/screens/add_round/add_tarot_round_screen.dart +++ b/lib/views/screens/add_round/add_tarot_round_screen.dart @@ -145,11 +145,11 @@ class AddTarotRoundScreen extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 8.0), child: ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.onPrimary), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, diff --git a/lib/views/screens/add_round/widget/real_time_display_widget.dart b/lib/views/screens/add_round/widget/real_time_display_widget.dart index e555ae27..3b9c03b8 100644 --- a/lib/views/screens/add_round/widget/real_time_display_widget.dart +++ b/lib/views/screens/add_round/widget/real_time_display_widget.dart @@ -1,4 +1,5 @@ import 'package:carg/models/score/round/round.dart'; +import 'package:carg/views/dialogs/score_info_dialog.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -13,13 +14,29 @@ class RealTimeDisplayWidget extends StatelessWidget { value: round, child: Consumer( builder: (context, roundData, child) => Center( - child: Text( - roundData.realTimeDisplay(context), - textAlign: TextAlign.center, - style: TextStyle( - color: Theme.of(context).colorScheme.onPrimary, - fontSize: 23, - ), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + roundData.realTimeDisplay(context), + textAlign: TextAlign.center, + style: TextStyle( + color: Theme.of(context).colorScheme.onPrimary, + fontSize: 23, + ), + ), + IconButton( + icon: Icon( + Icons.info, + color: Theme.of(context).colorScheme.onPrimary, + ), + onPressed: () async => await showDialog( + context: context, + builder: (BuildContext context) => + ScoreInfoDialog(round: round), + ), + ), + ], ), ), ), diff --git a/lib/views/screens/add_round/widget/team_game/contract_coinche_widget.dart b/lib/views/screens/add_round/widget/team_game/contract_coinche_widget.dart index 1024a361..bb911bcd 100644 --- a/lib/views/screens/add_round/widget/team_game/contract_coinche_widget.dart +++ b/lib/views/screens/add_round/widget/team_game/contract_coinche_widget.dart @@ -155,7 +155,7 @@ class _ContractTypeWidget extends StatelessWidget { labelStyle: TextStyle( color: roundData.contractType == contractType ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, ), onPressed: () => {roundData.contractType = contractType}, @@ -206,7 +206,7 @@ class _ContractNameWidget extends StatelessWidget { labelStyle: TextStyle( color: roundData.contractName == contractName ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, ), onPressed: () => {roundData.contractName = contractName}, diff --git a/lib/views/screens/add_round/widget/team_game/contract_contree_widget.dart b/lib/views/screens/add_round/widget/team_game/contract_contree_widget.dart index d9e22e3d..62a2df90 100644 --- a/lib/views/screens/add_round/widget/team_game/contract_contree_widget.dart +++ b/lib/views/screens/add_round/widget/team_game/contract_contree_widget.dart @@ -160,7 +160,7 @@ class _ContractTypeWidget extends StatelessWidget { labelStyle: TextStyle( color: roundData.contractType == contractType ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, ), onPressed: () => {roundData.contractType = contractType}, @@ -211,7 +211,7 @@ class _ContractNameWidget extends StatelessWidget { labelStyle: TextStyle( color: roundData.contractName == contractName ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, ), onPressed: () => {roundData.contractName = contractName}, diff --git a/lib/views/screens/add_round/widget/team_game/trick_points_belote_widget.dart b/lib/views/screens/add_round/widget/team_game/trick_points_belote_widget.dart index b4fb8b5e..60de251e 100644 --- a/lib/views/screens/add_round/widget/team_game/trick_points_belote_widget.dart +++ b/lib/views/screens/add_round/widget/team_game/trick_points_belote_widget.dart @@ -136,7 +136,7 @@ class _BeloteRebeloteWidget extends StatelessWidget { labelStyle: TextStyle( color: round?.beloteRebelote == BeloteTeamEnum.US ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, ), onPressed: () => { if (round?.beloteRebelote != BeloteTeamEnum.US) @@ -158,7 +158,7 @@ class _BeloteRebeloteWidget extends StatelessWidget { labelStyle: TextStyle( color: round?.beloteRebelote == BeloteTeamEnum.THEM ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, ), onPressed: () => { if (round?.beloteRebelote != BeloteTeamEnum.THEM) @@ -195,7 +195,7 @@ class _DixDeDerWidget extends StatelessWidget { labelStyle: TextStyle( color: round?.dixDeDer == BeloteTeamEnum.US ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, ), label: Text( BeloteTeamEnum.US.name(context), @@ -212,7 +212,7 @@ class _DixDeDerWidget extends StatelessWidget { labelStyle: TextStyle( color: round?.dixDeDer == BeloteTeamEnum.THEM ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, ), label: Text( BeloteTeamEnum.THEM.name(context), diff --git a/lib/views/screens/game_list_screen.dart b/lib/views/screens/game_list_screen.dart index 32598ca0..5acfc79e 100644 --- a/lib/views/screens/game_list_screen.dart +++ b/lib/views/screens/game_list_screen.dart @@ -39,11 +39,11 @@ class GameListScreen extends StatelessWidget { ), FilledButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).cardColor), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, diff --git a/lib/views/screens/game_mode_picker_screen.dart b/lib/views/screens/game_mode_picker_screen.dart index bcf55337..c9f0df20 100644 --- a/lib/views/screens/game_mode_picker_screen.dart +++ b/lib/views/screens/game_mode_picker_screen.dart @@ -93,13 +93,13 @@ class _GameModeButton extends StatelessWidget { height: 55, child: ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor, ), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor, ), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(CustomProperties.borderRadius), diff --git a/lib/views/screens/game_settings_screen.dart b/lib/views/screens/game_settings_screen.dart index 8ea7fb0f..8d92df9a 100644 --- a/lib/views/screens/game_settings_screen.dart +++ b/lib/views/screens/game_settings_screen.dart @@ -117,20 +117,17 @@ class GameSettingsScreen extends StatelessWidget { !settingsData.isInfinite }, style: ButtonStyle( - backgroundColor: - MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( settingsData.isInfinite ? Theme.of(context).cardColor : Theme.of(context).primaryColor, ), - foregroundColor: - MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( settingsData.isInfinite ? Theme.of(context).primaryColor : Theme.of(context).cardColor, ), - shape: - MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -255,13 +252,13 @@ class GameSettingsScreen extends StatelessWidget { height: 50, child: ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor, ), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor, ), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, diff --git a/lib/views/screens/play/play_screen_button_block.dart b/lib/views/screens/play/play_screen_button_block.dart index 0f87290b..4e855c59 100644 --- a/lib/views/screens/play/play_screen_button_block.dart +++ b/lib/views/screens/play/play_screen_button_block.dart @@ -32,7 +32,7 @@ class PlayScreenButtonBlock extends StatelessWidget { ElevatedButton( onPressed: () async => {deleteLastRound()}, style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -48,7 +48,7 @@ class PlayScreenButtonBlock extends StatelessWidget { ElevatedButton( onPressed: editLastRound, style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -64,7 +64,7 @@ class PlayScreenButtonBlock extends StatelessWidget { ElevatedButton( onPressed: () async => {addNotes()}, style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -84,7 +84,7 @@ class PlayScreenButtonBlock extends StatelessWidget { ? ElevatedButton( onPressed: () async => {endGame()}, style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -124,11 +124,11 @@ class PlayScreenButtonBlock extends StatelessWidget { ElevatedButton( key: const ValueKey("addRoundButton"), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius), @@ -150,11 +150,11 @@ class PlayScreenButtonBlock extends StatelessWidget { : ElevatedButton.icon( key: const ValueKey("endGameButton"), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.error), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius), diff --git a/lib/views/screens/player_order_screen.dart b/lib/views/screens/player_order_screen.dart index 53580dce..c1d08bf7 100644 --- a/lib/views/screens/player_order_screen.dart +++ b/lib/views/screens/player_order_screen.dart @@ -120,11 +120,11 @@ class _PlayerOrderScreenState extends State { textDirection: TextDirection.rtl, child: ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, diff --git a/lib/views/screens/player_picker_screen.dart b/lib/views/screens/player_picker_screen.dart index c1f77659..9efa7c52 100644 --- a/lib/views/screens/player_picker_screen.dart +++ b/lib/views/screens/player_picker_screen.dart @@ -138,13 +138,13 @@ class _PlayerPickerScreenState extends State { height: 50, child: ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor, ), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor, ), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, diff --git a/lib/views/screens/register/register_screen.dart b/lib/views/screens/register/register_screen.dart index a9fe4af9..7eff82a2 100644 --- a/lib/views/screens/register/register_screen.dart +++ b/lib/views/screens/register/register_screen.dart @@ -104,17 +104,17 @@ class _RegisterScreenState extends State key: const ValueKey('emailButton'), icon: const Icon(Icons.mail_outline), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( registerData.selectedRegisterMethod is _EmailRegisterMethod ? Theme.of(context).primaryColor : Theme.of(context).cardColor), - foregroundColor: MaterialStateProperty.all(registerData + foregroundColor: WidgetStateProperty.all(registerData .selectedRegisterMethod is _EmailRegisterMethod ? Theme.of(context).cardColor : Theme.of(context).primaryColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( side: BorderSide(width: 2, color: Theme.of(context).primaryColor), borderRadius: BorderRadius.circular(CustomProperties.borderRadius)))), @@ -144,17 +144,17 @@ class _RegisterScreenState extends State key: const ValueKey('phoneButton'), icon: const Icon(Icons.phone), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( registerData.selectedRegisterMethod is _PhoneRegisterMethod ? Theme.of(context).primaryColor : Theme.of(context).cardColor), - foregroundColor: MaterialStateProperty.all(registerData + foregroundColor: WidgetStateProperty.all(registerData .selectedRegisterMethod is _PhoneRegisterMethod ? Theme.of(context).cardColor : Theme.of(context).primaryColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( side: BorderSide(width: 2, color: Theme.of(context).primaryColor), borderRadius: BorderRadius.circular(CustomProperties.borderRadius)))), @@ -183,17 +183,17 @@ class _RegisterScreenState extends State icon: const FaIcon(FontAwesomeIcons.google, size: 22), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( - registerData.selectedRegisterMethod is _GoogleRegisterMethod - ? Theme.of(context).primaryColor - : Theme.of(context).cardColor), - foregroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( registerData.selectedRegisterMethod is _GoogleRegisterMethod - ? Theme.of(context).cardColor - : Theme.of(context) - .primaryColor), - shape: MaterialStateProperty.all( + ? Theme.of(context).primaryColor + : Theme.of(context).cardColor), + foregroundColor: WidgetStateProperty.all(registerData + .selectedRegisterMethod + is _GoogleRegisterMethod + ? Theme.of(context).cardColor + : Theme.of(context).primaryColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( side: BorderSide(width: 2, color: Theme.of(context).primaryColor), borderRadius: BorderRadius.circular(CustomProperties.borderRadius)))), diff --git a/lib/views/screens/register/welcome_screen.dart b/lib/views/screens/register/welcome_screen.dart index 4b4bf825..50c9cace 100644 --- a/lib/views/screens/register/welcome_screen.dart +++ b/lib/views/screens/register/welcome_screen.dart @@ -76,12 +76,12 @@ class _WelcomeScreenState extends State icon: const Icon(Icons.add), style: ButtonStyle( backgroundColor: - MaterialStateProperty.all( + WidgetStateProperty.all( Theme.of(context).primaryColor), foregroundColor: - MaterialStateProperty.all( + WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all< + shape: WidgetStateProperty.all< OutlinedBorder>( RoundedRectangleBorder( side: BorderSide( @@ -132,16 +132,14 @@ class _WelcomeScreenState extends State icon: const Icon(Icons.link), style: ButtonStyle( backgroundColor: - MaterialStateProperty.all< - Color>( + WidgetStateProperty.all( Theme.of(context) .primaryColor), foregroundColor: - MaterialStateProperty.all< - Color>( + WidgetStateProperty.all( Theme.of(context) .cardColor), - shape: MaterialStateProperty.all< + shape: WidgetStateProperty.all< OutlinedBorder>( RoundedRectangleBorder( side: BorderSide( @@ -190,12 +188,12 @@ class _WelcomeScreenState extends State ? ElevatedButton.icon( icon: const Icon(Icons.close), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.error), foregroundColor: - MaterialStateProperty.all( + WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( side: BorderSide( width: 2, @@ -218,14 +216,14 @@ class _WelcomeScreenState extends State : ElevatedButton.icon( icon: const Icon(Icons.arrow_back), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context) .colorScheme .secondary), foregroundColor: - MaterialStateProperty.all( + WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( side: BorderSide( width: 2, @@ -370,11 +368,11 @@ class _EnterUsernameWidget extends StatelessWidget { ElevatedButton.icon( icon: const Icon(Icons.check), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - foregroundColor: MaterialStateProperty.all( - Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + foregroundColor: + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( side: BorderSide( width: 2, color: Theme.of(context).primaryColor), @@ -482,11 +480,11 @@ class _LinkPlayerWidget extends StatelessWidget { ElevatedButton.icon( icon: const Icon(Icons.check), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( side: BorderSide( width: 2, color: Theme.of(context).primaryColor), diff --git a/lib/views/screens/user_screen.dart b/lib/views/screens/user_screen.dart index a4560294..928080a2 100644 --- a/lib/views/screens/user_screen.dart +++ b/lib/views/screens/user_screen.dart @@ -124,11 +124,11 @@ class _UserScreenState extends State AppLocalizations.of(context)!.youDontHaveAnyPlayer), ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - foregroundColor: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all( Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, @@ -444,10 +444,10 @@ class _AppBarTitle extends StatelessWidget { FilledButton( style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - foregroundColor: MaterialStateProperty.all( - Theme.of(context).primaryColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + foregroundColor: + WidgetStateProperty.all(Theme.of(context).primaryColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius, diff --git a/lib/views/tabs/game_list_tab.dart b/lib/views/tabs/game_list_tab.dart index 0ad6501d..6649fe10 100644 --- a/lib/views/tabs/game_list_tab.dart +++ b/lib/views/tabs/game_list_tab.dart @@ -71,9 +71,9 @@ class _GameListTabWidgetState extends State { Widget build(BuildContext context) { return RefreshIndicator( onRefresh: () => Future.sync( - () => { - widget.gameService.resetLastPointedDocument(), - _pagingController.refresh() + () { + widget.gameService.resetLastPointedDocument(); + _pagingController.refresh(); }, ), backgroundColor: Theme.of(context).primaryColor, diff --git a/lib/views/tabs/team_list_tab.dart b/lib/views/tabs/team_list_tab.dart index bd24a3c3..50768802 100644 --- a/lib/views/tabs/team_list_tab.dart +++ b/lib/views/tabs/team_list_tab.dart @@ -67,9 +67,9 @@ class _TeamListTabWidget extends State { Widget build(BuildContext context) { return RefreshIndicator( onRefresh: () => Future.sync( - () => { - widget.teamService.resetLastPointedDocument(), - _pagingController.refresh() + () { + widget.teamService.resetLastPointedDocument(); + _pagingController.refresh(); }, ), backgroundColor: Theme.of(context).primaryColor, diff --git a/lib/views/widgets/belote_widget.dart b/lib/views/widgets/belote_widget.dart index 30cd73b6..7ad77f98 100644 --- a/lib/views/widgets/belote_widget.dart +++ b/lib/views/widgets/belote_widget.dart @@ -195,10 +195,10 @@ class _ButtonRowWidget extends StatelessWidget { ElevatedButton.icon( key: const ValueKey('stopButton'), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all(Colors.black), - foregroundColor: MaterialStateProperty.all( - Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all(Colors.black), + foregroundColor: + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius)))), @@ -225,11 +225,11 @@ class _ButtonRowWidget extends StatelessWidget { ElevatedButton.icon( key: const ValueKey('deleteButton'), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.error), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius)))), @@ -249,11 +249,11 @@ class _ButtonRowWidget extends StatelessWidget { ElevatedButton.icon( key: const ValueKey('continueButton'), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(CustomProperties.borderRadius), @@ -282,11 +282,11 @@ class _ButtonRowWidget extends StatelessWidget { ElevatedButton( key: const ValueKey('showScoreButton'), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(CustomProperties.borderRadius), diff --git a/lib/views/widgets/players/player_widget.dart b/lib/views/widgets/players/player_widget.dart index 13934383..36201a7a 100644 --- a/lib/views/widgets/players/player_widget.dart +++ b/lib/views/widgets/players/player_widget.dart @@ -32,10 +32,10 @@ class PlayerWidget extends StatelessWidget { onPressed: () => onTap == null ? _showEditPlayerDialog(context) : onTap!(), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( - Theme.of(context).cardColor), - foregroundColor: MaterialStateProperty.all(Colors.black), - shape: MaterialStateProperty.all( + backgroundColor: + WidgetStateProperty.all(Theme.of(context).cardColor), + foregroundColor: WidgetStateProperty.all(Colors.black), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius), @@ -43,7 +43,7 @@ class PlayerWidget extends StatelessWidget { ? BorderSide( width: 2, color: player.getSideColor(context)) : BorderSide.none)), - padding: MaterialStateProperty.all( + padding: WidgetStateProperty.all( const EdgeInsets.only(right: 0, left: 15))), child: SizedBox( height: 60, diff --git a/lib/views/widgets/register/register_phone_widget.dart b/lib/views/widgets/register/register_phone_widget.dart index 1ec9eef6..4fac9da7 100644 --- a/lib/views/widgets/register/register_phone_widget.dart +++ b/lib/views/widgets/register/register_phone_widget.dart @@ -139,12 +139,13 @@ class _RegisterPhoneWidgetState extends State ? const CircularProgressIndicator(strokeWidth: 5) : ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( - Theme.of(context).cardColor), + backgroundColor: + WidgetStateProperty.all( + Theme.of(context).cardColor), foregroundColor: - MaterialStateProperty.all( + WidgetStateProperty.all( Theme.of(context).primaryColor), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( side: BorderSide( width: 2, diff --git a/lib/views/widgets/remove_ads_list_tile.dart b/lib/views/widgets/remove_ads_list_tile.dart index 15400fb1..f6a74956 100644 --- a/lib/views/widgets/remove_ads_list_tile.dart +++ b/lib/views/widgets/remove_ads_list_tile.dart @@ -57,11 +57,11 @@ class _RemoveAdsListTileState extends State { children: [ TextButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - foregroundColor: MaterialStateProperty.all( - Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + foregroundColor: + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius)))), @@ -73,11 +73,11 @@ class _RemoveAdsListTileState extends State { ), TextButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), - foregroundColor: MaterialStateProperty.all( - Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + foregroundColor: + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular( CustomProperties.borderRadius)))), diff --git a/lib/views/widgets/tarot_widget.dart b/lib/views/widgets/tarot_widget.dart index 6b12f288..98026f1e 100644 --- a/lib/views/widgets/tarot_widget.dart +++ b/lib/views/widgets/tarot_widget.dart @@ -108,10 +108,10 @@ class _ButtonRowWidget extends StatelessWidget { if (!tarotGame.isEnded) ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all(Colors.black), + backgroundColor: WidgetStateProperty.all(Colors.black), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(CustomProperties.borderRadius), @@ -142,11 +142,11 @@ class _ButtonRowWidget extends StatelessWidget { Container(), ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.error), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(CustomProperties.borderRadius), @@ -168,11 +168,11 @@ class _ButtonRowWidget extends StatelessWidget { if (!tarotGame.isEnded) ElevatedButton.icon( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(CustomProperties.borderRadius), @@ -197,11 +197,11 @@ class _ButtonRowWidget extends StatelessWidget { else ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).primaryColor), foregroundColor: - MaterialStateProperty.all(Theme.of(context).cardColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Theme.of(context).cardColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(CustomProperties.borderRadius), diff --git a/lib/views/widgets/team_stat_widget.dart b/lib/views/widgets/team_stat_widget.dart index 68ba6434..1952ce9e 100644 --- a/lib/views/widgets/team_stat_widget.dart +++ b/lib/views/widgets/team_stat_widget.dart @@ -34,15 +34,14 @@ class TeamStatWidget extends StatelessWidget { padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 15), child: ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.secondary), - foregroundColor: MaterialStateProperty.all(Colors.black), - shape: MaterialStateProperty.all( - RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(CustomProperties.borderRadius), - side: BorderSide.none)), - padding: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all(Colors.black), + shape: WidgetStateProperty.all(RoundedRectangleBorder( + borderRadius: + BorderRadius.circular(CustomProperties.borderRadius), + side: BorderSide.none)), + padding: WidgetStateProperty.all( const EdgeInsets.only( right: 0, left: 0, diff --git a/pubspec.lock b/pubspec.lock index 92b87667..6c858676 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,50 +5,50 @@ packages: dependency: transitive description: name: _discoveryapis_commons - sha256: f8bb1fdbd77f3d5c1d62b5b0eca75fbf1e41bf4f6c62628f880582e2182ae45d + sha256: "113c4100b90a5b70a983541782431b82168b3cae166ab130649c36eb3559d498" url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "1.0.7" _fe_analyzer_shared: dependency: transitive description: name: _fe_analyzer_shared - sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051 + sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" url: "https://pub.dev" source: hosted - version: "64.0.0" + version: "67.0.0" _flutterfire_internals: dependency: transitive description: name: _flutterfire_internals - sha256: f5628cd9c92ed11083f425fd1f8f1bc60ecdda458c81d73b143aeda036c35fe7 + sha256: b46f62516902afb04befa4b30eb6a12ac1f58ca8cb25fb9d632407259555dd3d url: "https://pub.dev" source: hosted - version: "1.3.16" + version: "1.3.39" analyzer: dependency: transitive description: name: analyzer - sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893" + sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.4.1" archive: dependency: transitive description: name: archive - sha256: "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b" + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d url: "https://pub.dev" source: hosted - version: "3.4.9" + version: "3.6.1" args: dependency: transitive description: name: args - sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.5.0" async: dependency: transitive description: @@ -85,10 +85,10 @@ packages: dependency: transitive description: name: build_daemon - sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.2" build_resolvers: dependency: transitive description: @@ -101,18 +101,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "67d591d602906ef9201caf93452495ad1812bea2074f04e25dbd7c133785821b" + sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" url: "https://pub.dev" source: hosted - version: "2.4.7" + version: "2.4.11" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185 + sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe url: "https://pub.dev" source: hosted - version: "7.2.11" + version: "7.3.1" built_collection: dependency: transitive description: @@ -125,10 +125,10 @@ packages: dependency: transitive description: name: built_value - sha256: c9aabae0718ec394e5bc3c7272e6bb0dc0b32201a08fe185ec1d8401d3e39309 + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb url: "https://pub.dev" source: hosted - version: "8.8.1" + version: "8.9.2" characters: dependency: transitive description: @@ -165,34 +165,34 @@ packages: dependency: "direct main" description: name: cloud_firestore - sha256: cb978c7512624144f24f3d06e4312b2f4ac00b016f2fed62dc8f6d56b8585d78 + sha256: "240c1c3598e62ad58ee665b6df9c65172d2fbe4742770c21ed060e013cb8e037" url: "https://pub.dev" source: hosted - version: "4.13.6" + version: "5.1.0" cloud_firestore_platform_interface: dependency: transitive description: name: cloud_firestore_platform_interface - sha256: fa177fa85f7665c76e1ebec252a5b280b4b47612b4d70fe286944814fff1d4f2 + sha256: "5b5a9c2b5a85bf995f12e7447c4197d7ad659533d642d3d904ccbb509f83d62a" url: "https://pub.dev" source: hosted - version: "6.0.10" + version: "6.2.9" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web - sha256: d0ebbf0927e627c0d7d2f3177d3b6f0050e5d811c08c2b646b0c746a2b502cb7 + sha256: "898e9f65548df65ca7b2cff9f32cf233424ceccff1d870b8819ea2b8050d5b39" url: "https://pub.dev" source: hosted - version: "3.8.10" + version: "4.0.3" code_builder: dependency: transitive description: name: code_builder - sha256: feee43a5c05e7b3199bb375a86430b8ada1b04104f2923d0e03cc01ca87b6d84 + sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 url: "https://pub.dev" source: hosted - version: "4.9.0" + version: "4.10.0" collection: dependency: "direct main" description: @@ -201,6 +201,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" + color: + dependency: transitive + description: + name: color + sha256: ddcdf1b3badd7008233f5acffaf20ca9f5dc2cd0172b75f68f24526a5f5725cb + url: "https://pub.dev" + source: hosted + version: "3.0.0" convert: dependency: transitive description: @@ -221,18 +229,26 @@ packages: dependency: "direct main" description: name: cupertino_icons - sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "1.0.8" dart_style: dependency: transitive description: name: dart_style - sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368" + sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" url: "https://pub.dev" source: hosted - version: "2.3.4" + version: "2.3.6" + dartx: + dependency: transitive + description: + name: dartx + sha256: "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244" + url: "https://pub.dev" + source: hosted + version: "1.2.0" enum_to_string: dependency: "direct main" description: @@ -253,10 +269,10 @@ packages: dependency: transitive description: name: ffi - sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" file: dependency: transitive description: @@ -269,106 +285,106 @@ packages: dependency: "direct main" description: name: firebase_app_check - sha256: "0a4758407ef89adca086236b35b102eedbb4f272efeaf6741e76ed9f1d2b99d6" + sha256: "92a72c3a557455eadf39b2d7c2ef7d1b4fc4dd79c6b1edbaae1bc1c4a62309ed" url: "https://pub.dev" source: hosted - version: "0.2.1+8" + version: "0.3.0+3" firebase_app_check_platform_interface: dependency: transitive description: name: firebase_app_check_platform_interface - sha256: "7067fbde5e416ea4e127d24b3d8ef40f82a0e9472c8448ac07152f8c776e69bb" + sha256: "703017a0378d00127b94c7eef239fc18c0d04b66310634534e02df9ee5785691" url: "https://pub.dev" source: hosted - version: "0.1.0+10" + version: "0.1.0+33" firebase_app_check_web: dependency: transitive description: name: firebase_app_check_web - sha256: "998d640cd37422816cce9efa2adbf9f06822913943f386c08ca4032229410022" + sha256: a737957345510f55e08e3356c19bd0a80d77c72510bda5a6f67387a0b4c78c10 url: "https://pub.dev" source: hosted - version: "0.1.0+10" + version: "0.1.2+11" firebase_auth: dependency: "direct main" description: name: firebase_auth - sha256: "88f88d541a2c1903c023355e13d077835573a200bbf57e12a6a2c24bf99665a1" + sha256: a41b56878fa6aef3ea52962329b47eee333672d4b0ecc406e071b9fc729f242c url: "https://pub.dev" source: hosted - version: "4.15.3" + version: "5.1.2" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - sha256: "3c9cfaccb7549492edf5b0c67c6dd1c6727c7830891aa6727f2fb225f0226626" + sha256: d1c68097588f3b75ef79a22102ff96c311735c254353bccf6824d19f1a7e86b9 url: "https://pub.dev" source: hosted - version: "7.0.9" + version: "7.4.2" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - sha256: c09515414c07c11bb133aec4baae9a74c6ff1f62bf05ace54564db82b8c87852 + sha256: e66ec0ae5697ee39ccd4865d6887cb0df220dd4ea0b21404910c68ca4c1a731a url: "https://pub.dev" source: hosted - version: "5.8.12" + version: "5.12.4" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "96607c0e829a581c2a483c658f04e8b159964c3bae2730f73297070bc85d40bb" + sha256: "5159984ce9b70727473eb388394650677c02c925aaa6c9439905e1f30966a4d5" url: "https://pub.dev" source: hosted - version: "2.24.2" + version: "3.2.0" firebase_core_platform_interface: dependency: "direct main" description: name: firebase_core_platform_interface - sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63 + sha256: "1003a5a03a61fc9a22ef49f37cbcb9e46c86313a7b2e7029b9390cf8c6fc32cb" url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.1.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: d585bdf3c656c3f7821ba1bd44da5f13365d22fcecaf5eb75c4295246aaa83c0 + sha256: "23509cb3cddfb3c910c143279ac3f07f06d3120f7d835e4a5d4b42558e978712" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.17.3" firebase_crashlytics: dependency: "direct main" description: name: firebase_crashlytics - sha256: "5ccdf05de039f9544d0ba41c5ae2052ca2425985d32229911b09f69981164518" + sha256: da32da3b441d1bee73ca990085a3ae174b9fb3585229f02a278a2ea42454d784 url: "https://pub.dev" source: hosted - version: "3.4.8" + version: "4.0.3" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: "359197344def001589c84f8d1d57c05f6e2e773f559205610ce58c25e2045a57" + sha256: b7567106ed57bbadaa0610774cc17a10b82ed04a1aba99790f303385ac4ba78f url: "https://pub.dev" source: hosted - version: "3.6.16" + version: "3.6.39" firebase_dynamic_links: dependency: "direct main" description: name: firebase_dynamic_links - sha256: b0522806658428803aeb5e7be0b22a29acb8f8697a8909c36965feaeb1f655bd + sha256: beed25d57e0240728952c0ff540dde214b11b323ca09cb1ae5f71f30e5efc3b3 url: "https://pub.dev" source: hosted - version: "5.4.8" + version: "6.0.3" firebase_dynamic_links_platform_interface: dependency: transitive description: name: firebase_dynamic_links_platform_interface - sha256: "8b90384d8f85c7211f2b5e2d9d5ae98bd08091f116ef2bd1a74b33574efacc61" + sha256: bb949552fcf65e8ed810b69327eb0dcb174b7d69e2b71f8856d27af50c89ddc7 url: "https://pub.dev" source: hosted - version: "0.2.6+16" + version: "0.2.6+39" fixnum: dependency: transitive description: @@ -382,6 +398,22 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_gen_core: + dependency: transitive + description: + name: flutter_gen_core + sha256: d8e828ad015a8511624491b78ad8e3f86edb7993528b1613aefbb4ad95947795 + url: "https://pub.dev" + source: hosted + version: "5.6.0" + flutter_gen_runner: + dependency: "direct dev" + description: + name: flutter_gen_runner + sha256: "931b03f77c164df0a4815aac0efc619a6ac8ec4cada55025119fca4894dada90" + url: "https://pub.dev" + source: hosted + version: "5.6.0" flutter_launcher_icons: dependency: "direct dev" description: @@ -394,10 +426,10 @@ packages: dependency: "direct main" description: name: flutter_libphonenumber - sha256: f5a0e7c6292b2ae19a5dc07d79c100bced46cba64e4ae725a669c2b8368157b7 + sha256: "72d73e4d7beae20454ff2fa5d146d38ebfeec363bd98907263379984a723df4a" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" flutter_libphonenumber_android: dependency: transitive description: @@ -410,10 +442,10 @@ packages: dependency: transitive description: name: flutter_libphonenumber_ios - sha256: "6600bc6858134781fbd09338016d72c809671b3e7d465440c9f199afa8a06681" + sha256: "5b786a9e5edcc500c3197ac387e94e7deb0e5cd9a69194152c9a2bd150cdb4df" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" flutter_libphonenumber_platform_interface: dependency: transitive description: @@ -434,10 +466,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "4.0.0" flutter_localizations: dependency: "direct main" description: flutter @@ -447,66 +479,66 @@ packages: dependency: "direct main" description: name: flutter_markdown - sha256: "35108526a233cc0755664d445f8a6b4b61e6f8fe993b3658b80b4a26827fc196" + sha256: "2e8a801b1ded5ea001a4529c97b1f213dcb11c6b20668e081cafb23468593514" url: "https://pub.dev" source: hosted - version: "0.6.18+2" + version: "0.7.3" flutter_secure_storage: dependency: "direct main" description: name: flutter_secure_storage - sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685 + sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0" url: "https://pub.dev" source: hosted - version: "9.0.0" + version: "9.2.2" flutter_secure_storage_linux: dependency: transitive description: name: flutter_secure_storage_linux - sha256: "3d5032e314774ee0e1a7d0a9f5e2793486f0dff2dd9ef5a23f4e3fb2a0ae6a9e" + sha256: "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" flutter_secure_storage_macos: dependency: transitive description: name: flutter_secure_storage_macos - sha256: bd33935b4b628abd0b86c8ca20655c5b36275c3a3f5194769a7b3f37c905369c + sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.2" flutter_secure_storage_platform_interface: dependency: transitive description: name: flutter_secure_storage_platform_interface - sha256: "0d4d3a5dd4db28c96ae414d7ba3b8422fd735a8255642774803b2532c9a61d7e" + sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8 url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.2" flutter_secure_storage_web: dependency: transitive description: name: flutter_secure_storage_web - sha256: "30f84f102df9dcdaa2241866a958c2ec976902ebdaa8883fbfe525f1f2f3cf20" + sha256: f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9 url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.2.1" flutter_secure_storage_windows: dependency: transitive description: name: flutter_secure_storage_windows - sha256: "5809c66f9dd3b4b93b0a6e2e8561539405322ee767ac2f64d084e2ab5429d108" + sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.2" flutter_spinkit: dependency: "direct main" description: name: flutter_spinkit - sha256: b39c753e909d4796906c5696a14daf33639a76e017136c8d82bf3e620ce5bb8e + sha256: d2696eed13732831414595b98863260e33e8882fc069ee80ec35d4ac9ddb0472 url: "https://pub.dev" source: hosted - version: "5.2.0" + version: "5.2.1" flutter_staggered_grid_view: dependency: transitive description: @@ -519,10 +551,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c + sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.0.10+1" flutter_test: dependency: "direct dev" description: flutter @@ -537,18 +569,18 @@ packages: dependency: "direct main" description: name: font_awesome_flutter - sha256: "52671aea66da73b58d42ec6d0912b727a42248dd9a7c76d6c20f275783c48c08" + sha256: "275ff26905134bcb59417cf60ad979136f1f8257f2f449914b2c3e05bbb4cd6f" url: "https://pub.dev" source: hosted - version: "10.6.0" + version: "10.7.0" frontend_server_client: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" glob: dependency: transitive description: @@ -561,26 +593,26 @@ packages: dependency: "direct main" description: name: google_fonts - sha256: f0b8d115a13ecf827013ec9fc883390ccc0e87a96ed5347a3114cac177ef18e8 + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.2.1" google_identity_services_web: dependency: transitive description: name: google_identity_services_web - sha256: "0c56c2c5d60d6dfaf9725f5ad4699f04749fb196ee5a70487a46ef184837ccf6" + sha256: "9482364c9f8b7bd36902572ebc3a7c2b5c8ee57a9c93e6eb5099c1a9ec5265d8" url: "https://pub.dev" source: hosted - version: "0.3.0+2" + version: "0.3.1+1" google_mobile_ads: dependency: "direct main" description: name: google_mobile_ads - sha256: d2ef5ec1e1f31137fc241bdeab3037c31062d387dd221fd884fb1160444c788b + sha256: e2d18992d30b2be77cb6976b931112fc3c4612feffb5eb7a8b036bd7a64934da url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.1.0" google_sign_in: dependency: "direct main" description: @@ -593,50 +625,50 @@ packages: dependency: transitive description: name: google_sign_in_android - sha256: "6031f59074a337fdd81be821aba84cee3a41338c6e958499a5cd34d3e1db80ef" + sha256: d30fb34b659679ea74397e9748b4ab5d720720d57dcc79538f1b3c4a68654cb3 url: "https://pub.dev" source: hosted - version: "6.1.20" + version: "6.1.27" google_sign_in_ios: dependency: transitive description: name: google_sign_in_ios - sha256: "0822b0abc94ff6d705d7a321ef58818ffed864787f23f5ac3451e3e6afbcf90d" + sha256: a058c9880be456f21e2e8571c1126eaacd570bdc5b6c6d9d15aea4bdf22ca9fe url: "https://pub.dev" source: hosted - version: "5.7.1" + version: "5.7.6" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface - sha256: e10eaaa30a0cb03af12dd324fb2e630ac7e9d854d0530f7a87a4d825031f9a4a + sha256: "1f6e5787d7a120cc0359ddf315c92309069171306242e181c09472d1b00a2971" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.5" google_sign_in_web: dependency: transitive description: name: google_sign_in_web - sha256: "38e6ec2a7d65ec34bb7ae2db64a1d042b021330433b999e87330d45c688ff549" + sha256: d606264c7a1a526a3aa79d938b85a601d8589731a478bd4a3dcbdeb14a572228 url: "https://pub.dev" source: hosted - version: "0.12.3+1" + version: "0.12.4+1" googleapis: dependency: "direct main" description: name: googleapis - sha256: "8a8c311723162af077ca73f94b823b97ff68770d966e29614d20baca9fdb490a" + sha256: "864f222aed3f2ff00b816c675edf00a39e2aaf373d728d8abec30b37bee1a81c" url: "https://pub.dev" source: hosted - version: "12.0.0" + version: "13.2.0" googleapis_auth: dependency: "direct main" description: name: googleapis_auth - sha256: af7c3a3edf9d0de2e1e0a77e994fae0a581c525fa7012af4fa0d4a52ed9484da + sha256: befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938 url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.6.0" graphs: dependency: transitive description: @@ -645,14 +677,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.1" + hashcodes: + dependency: transitive + description: + name: hashcodes + sha256: "80f9410a5b3c8e110c4b7604546034749259f5d6dcca63e0d3c17c9258f1a651" + url: "https://pub.dev" + source: hosted + version: "2.0.0" http: dependency: "direct main" description: name: http - sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.2.2" http_multi_server: dependency: transitive description: @@ -673,42 +713,50 @@ packages: dependency: transitive description: name: image - sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271" + sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" url: "https://pub.dev" source: hosted - version: "4.1.3" + version: "4.2.0" + image_size_getter: + dependency: transitive + description: + name: image_size_getter + sha256: f98c4246144e9b968899d2dfde69091e22a539bb64bc9b0bea51505fbb490e57 + url: "https://pub.dev" + source: hosted + version: "2.1.3" in_app_purchase: dependency: "direct main" description: name: in_app_purchase - sha256: bdda02b5b11b56d5e29c7f0c57c433db3452b0c8ce1c37cbfcf1de52946efd9f + sha256: "960f26a08d9351fb8f89f08901f8a829d41b04d45a694b8f776121d9e41dcad6" url: "https://pub.dev" source: hosted - version: "3.1.11" + version: "3.2.0" in_app_purchase_android: dependency: transitive description: name: in_app_purchase_android - sha256: c4b84caa4e2c7ffebda444c5033fd8423cc3a45a6e1066929bbbcd4daf665db5 + sha256: b18871cffd4ec8911171864bfc0060c983be96215080a0847c29ef9147f439ef url: "https://pub.dev" source: hosted - version: "0.3.0+15" + version: "0.3.6+1" in_app_purchase_platform_interface: dependency: transitive description: name: in_app_purchase_platform_interface - sha256: "5168afbc54f406f741252b66d41872c1193a0066a6edcb587176290b92e2d537" + sha256: "1d353d38251da5b9fea6635c0ebfc6bb17a2d28d0e86ea5e083bf64244f1fb4c" url: "https://pub.dev" source: hosted - version: "1.3.6" + version: "1.4.0" in_app_purchase_storekit: dependency: transitive description: name: in_app_purchase_storekit - sha256: "29526f5ce85bd908b4cacdadb2e8ef299bccbb516b90d2881805343f868502ab" + sha256: "9a087c3c051266642468f031737c5a09f6fd90ff2b21d953e130563f3fd4cb34" url: "https://pub.dev" source: hosted - version: "0.3.7" + version: "0.3.17" infinite_scroll_pagination: dependency: "direct main" description: @@ -721,10 +769,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" io: dependency: transitive description: @@ -745,18 +793,42 @@ packages: dependency: transitive description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.0.0" logging: dependency: transitive description: @@ -769,42 +841,42 @@ packages: dependency: "direct main" description: name: markdown - sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 url: "https://pub.dev" source: hosted - version: "7.1.1" + version: "7.2.2" matcher: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" mime: dependency: transitive description: name: mime - sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" mockito: dependency: "direct dev" description: @@ -841,26 +913,26 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" + sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0 url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "8.0.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_parsing: dependency: transitive description: @@ -873,26 +945,26 @@ packages: dependency: transitive description: name: path_provider - sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa + sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.3" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" + sha256: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.7" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" + sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.0" path_provider_linux: dependency: transitive description: @@ -905,18 +977,18 @@ packages: dependency: transitive description: name: path_provider_platform_interface - sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" petitparser: dependency: transitive description: @@ -937,26 +1009,18 @@ packages: dependency: transitive description: name: platform - sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.5" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8 - url: "https://pub.dev" - source: hosted - version: "2.1.7" - pointycastle: - dependency: transitive - description: - name: pointycastle - sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" url: "https://pub.dev" source: hosted - version: "3.7.3" + version: "2.1.8" pool: dependency: transitive description: @@ -969,10 +1033,10 @@ packages: dependency: "direct main" description: name: provider - sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.2" pub_semver: dependency: transitive description: @@ -985,10 +1049,10 @@ packages: dependency: transitive description: name: pubspec_parse - sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.3.0" shelf: dependency: transitive description: @@ -1001,10 +1065,10 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.0" sky_engine: dependency: transitive description: flutter @@ -1070,26 +1134,26 @@ packages: dependency: "direct main" description: name: syncfusion_flutter_charts - sha256: d720751869540bc0b18e063414e9c8d41c924cca01e3aad3538d404c31d00e2d + sha256: c26cd2bb40fbe5e786a2bfeacedba9fafda21eb3b6ca473f0439f9dbe44730c8 url: "https://pub.dev" source: hosted - version: "24.1.43+1" + version: "26.1.42" syncfusion_flutter_core: dependency: transitive description: name: syncfusion_flutter_core - sha256: "1b40729aa10a727150a6cc56e532c770f4baded83846fca8700efd908d0f4d0a" + sha256: "76c0efa89c79108f043602b0170512f88fcb83156cca7f5ca6dfe17e840bc63d" url: "https://pub.dev" source: hosted - version: "24.1.43" + version: "26.1.42" syncfusion_flutter_gauges: dependency: "direct main" description: name: syncfusion_flutter_gauges - sha256: fc837dbcd215d100cf56ffd0cf3eeb0e8ebbb4d009839fa997531822b6a97625 + sha256: "2f7c9b845505daef1ac96685e01124da719dcb2dcb3167f42e120061b02696e1" url: "https://pub.dev" source: hosted - version: "24.1.43" + version: "26.1.42" term_glyph: dependency: transitive description: @@ -1102,10 +1166,18 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + url: "https://pub.dev" + source: hosted + version: "0.7.0" + time: + dependency: transitive + description: + name: time + sha256: ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221 url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "2.1.4" timing: dependency: transitive description: @@ -1126,26 +1198,26 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86 + sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" url: "https://pub.dev" source: hosted - version: "6.2.2" + version: "6.3.0" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def" + sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.3.3" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3 + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e url: "https://pub.dev" source: hosted - version: "6.2.1" + version: "6.3.1" url_launcher_linux: dependency: transitive description: @@ -1158,26 +1230,26 @@ packages: dependency: transitive description: name: url_launcher_macos - sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 + sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.0" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50" + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" + sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.1" url_launcher_windows: dependency: transitive description: @@ -1190,26 +1262,26 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "0f0c746dd2d6254a0057218ff980fc7f5670fd0fcf5e4db38a490d31eed4ad43" + sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" url: "https://pub.dev" source: hosted - version: "1.1.9+1" + version: "1.1.11+1" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: "0edf6d630d1bfd5589114138ed8fada3234deacc37966bec033d3047c29248b7" + sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da url: "https://pub.dev" source: hosted - version: "1.1.9+1" + version: "1.1.11+1" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: d24333727332d9bd20990f1483af4e09abdb9b1fc7c3db940b56ab5c42790c26 + sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" url: "https://pub.dev" source: hosted - version: "1.1.9+1" + version: "1.1.11+1" vector_math: dependency: transitive description: @@ -1218,6 +1290,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" watcher: dependency: transitive description: @@ -1230,66 +1310,74 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + url: "https://pub.dev" + source: hosted + version: "0.5.1" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.6" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "3.0.1" webview_flutter: dependency: transitive description: name: webview_flutter - sha256: "42393b4492e629aa3a88618530a4a00de8bb46e50e7b3993fedbfdc5352f0dbf" + sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522" url: "https://pub.dev" source: hosted - version: "4.4.2" + version: "4.8.0" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: b54c89fe14a6d26a2a46e24880da0441cdd2bf1f6d01a5b3e1d39558feb1de0b + sha256: f42447ca49523f11d8f70abea55ea211b3cafe172dd7a0e7ac007bb35dd356dc url: "https://pub.dev" source: hosted - version: "3.13.1" + version: "3.16.4" webview_flutter_platform_interface: dependency: transitive description: name: webview_flutter_platform_interface - sha256: dbe745ee459a16b6fec296f7565a8ef430d0d681001d8ae521898b9361854943 + sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.10.0" webview_flutter_wkwebview: dependency: transitive description: name: webview_flutter_wkwebview - sha256: eebfabfa8a115b535b52031b8b26f7a4b58ceceab378bc9db8762b0fb46f7b5d + sha256: "9c62cc46fa4f2d41e10ab81014c1de470a6c6f26051a2de32111b2ee55287feb" url: "https://pub.dev" source: hosted - version: "3.10.0" + version: "3.14.0" win32: dependency: transitive description: name: win32 - sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574 + sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "5.5.1" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" xml: dependency: transitive description: @@ -1307,5 +1395,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.16.5" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.22.2" diff --git a/pubspec.yaml b/pubspec.yaml index 31c87c57..034451c2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,22 +5,22 @@ publish_to: none version: 1.9.0 environment: - sdk: '>=2.17.0 <3.0.0' - flutter: '3.16.5' + sdk: '>=3.0.0 <4.0.0' + flutter: '3.22.2' dependencies: - cloud_firestore: ^4.0.0 + cloud_firestore: ^5.1.0 firebase_core_platform_interface: ^5.0.0 - firebase_crashlytics: ^3.0.0 - firebase_core: ^2.0.0 - firebase_auth: ^4.0.0 - firebase_dynamic_links: ^5.0.0 - firebase_app_check: ^0.2.0 + firebase_crashlytics: ^4.0.3 + firebase_core: ^3.2.0 + firebase_auth: ^5.1.2 + firebase_dynamic_links: ^6.0.3 + firebase_app_check: ^0.3.0+3 google_sign_in: ^6.0.0 - google_mobile_ads: ^4.0.0 + google_mobile_ads: ^5.1.0 cupertino_icons: ^1.0.2 enum_to_string: ^2.0.1 - flutter_markdown: ^0.6.0 + flutter_markdown: ^0.7.0 flutter_spinkit: ^5.0.0 flutter_svg: ^2.0.9 flutter_secure_storage: ^9.0.0 @@ -28,13 +28,13 @@ dependencies: font_awesome_flutter: ^10.0.0 google_fonts: ^6.0.0 http: ^1.1.2 - intl: ^0.18.1 + intl: ^0.19.0 in_app_purchase: ^3.0.7 - package_info_plus : ^5.0.1 + package_info_plus : ^8.0.0 provider: ^6.0.0 url_launcher: ^6.0.2 - syncfusion_flutter_charts: ^24.1.43+1 - syncfusion_flutter_gauges: ^24.1.43 + syncfusion_flutter_charts: ^26.1.42 + syncfusion_flutter_gauges: ^26.1.42 infinite_scroll_pagination: ^4.0.0 flutter: sdk: flutter @@ -44,7 +44,7 @@ dependencies: collection: ^1.15.0 crypto: ^3.0.2 markdown: ^7.0.0 - googleapis: ^12.0.0 + googleapis: ^13.1.0 googleapis_auth: ^1.3.1 @@ -55,7 +55,8 @@ dev_dependencies: mockito: ^5.0.0 network_image_mock: ^2.0.1 build_runner: ^2.1.2 - flutter_lints: ^3.0.1 + flutter_lints: ^4.0.0 + flutter_gen_runner: ^5.6.0 flutter: diff --git a/test/units/repositories/base_repository_test.mocks.dart b/test/units/repositories/base_repository_test.mocks.dart index 726a71e4..b8402854 100644 --- a/test/units/repositories/base_repository_test.mocks.dart +++ b/test/units/repositories/base_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/units/repositories/game/coinche/coinche_belote_game_repository_test.mocks.dart b/test/units/repositories/game/coinche/coinche_belote_game_repository_test.mocks.dart index a5fd62c2..2e720706 100644 --- a/test/units/repositories/game/coinche/coinche_belote_game_repository_test.mocks.dart +++ b/test/units/repositories/game/coinche/coinche_belote_game_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/units/repositories/game/contree/contree_belote_game_repository_test.mocks.dart b/test/units/repositories/game/contree/contree_belote_game_repository_test.mocks.dart index c62b5992..e9241da5 100644 --- a/test/units/repositories/game/contree/contree_belote_game_repository_test.mocks.dart +++ b/test/units/repositories/game/contree/contree_belote_game_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/units/repositories/game/french_belote/french_belote_game_repository_test.mocks.dart b/test/units/repositories/game/french_belote/french_belote_game_repository_test.mocks.dart index 030c4613..d8e2f29e 100644 --- a/test/units/repositories/game/french_belote/french_belote_game_repository_test.mocks.dart +++ b/test/units/repositories/game/french_belote/french_belote_game_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/units/repositories/game/tarot/tarot_game_repository_test.mocks.dart b/test/units/repositories/game/tarot/tarot_game_repository_test.mocks.dart index 01c4bae5..fcbbf553 100644 --- a/test/units/repositories/game/tarot/tarot_game_repository_test.mocks.dart +++ b/test/units/repositories/game/tarot/tarot_game_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/units/repositories/iap_repository_test.mocks.dart b/test/units/repositories/iap_repository_test.mocks.dart index cb2067de..744a1e8c 100644 --- a/test/units/repositories/iap_repository_test.mocks.dart +++ b/test/units/repositories/iap_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/units/repositories/player/player_repository_test.mocks.dart b/test/units/repositories/player/player_repository_test.mocks.dart index 16b1e872..35c99416 100644 --- a/test/units/repositories/player/player_repository_test.mocks.dart +++ b/test/units/repositories/player/player_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/units/repositories/score/coinche_belote/coinche_belote_score_repository_test.mocks.dart b/test/units/repositories/score/coinche_belote/coinche_belote_score_repository_test.mocks.dart index 888f6f66..5c2c6de6 100644 --- a/test/units/repositories/score/coinche_belote/coinche_belote_score_repository_test.mocks.dart +++ b/test/units/repositories/score/coinche_belote/coinche_belote_score_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/units/repositories/score/contree_belote/contree_belote_score_repository_test.mocks.dart b/test/units/repositories/score/contree_belote/contree_belote_score_repository_test.mocks.dart index 0fd67e08..1f91c534 100644 --- a/test/units/repositories/score/contree_belote/contree_belote_score_repository_test.mocks.dart +++ b/test/units/repositories/score/contree_belote/contree_belote_score_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/units/repositories/score/french_belote/french_belote_score_repository_test.mocks.dart b/test/units/repositories/score/french_belote/french_belote_score_repository_test.mocks.dart index 532ed2f8..9d72543a 100644 --- a/test/units/repositories/score/french_belote/french_belote_score_repository_test.mocks.dart +++ b/test/units/repositories/score/french_belote/french_belote_score_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/units/repositories/score/tarot/tarot_score_repository_test.mocks.dart b/test/units/repositories/score/tarot/tarot_score_repository_test.mocks.dart index d4fd7a3d..66ea32c6 100644 --- a/test/units/repositories/score/tarot/tarot_score_repository_test.mocks.dart +++ b/test/units/repositories/score/tarot/tarot_score_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/units/repositories/team/team_repository_test.mocks.dart b/test/units/repositories/team/team_repository_test.mocks.dart index 8708a0fc..3f8d0ddc 100644 --- a/test/units/repositories/team/team_repository_test.mocks.dart +++ b/test/units/repositories/team/team_repository_test.mocks.dart @@ -211,6 +211,24 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { returnValueForMissingStub: null, ); + @override + String get databaseId => (super.noSuchMethod( + Invocation.getter(#databaseId), + returnValue: _i6.dummyValue( + this, + Invocation.getter(#databaseId), + ), + ) as String); + + @override + set databaseId(String? _databaseId) => super.noSuchMethod( + Invocation.setter( + #databaseId, + _databaseId, + ), + returnValueForMissingStub: null, + ); + @override set settings(_i3.Settings? settings) => super.noSuchMethod( Invocation.setter( @@ -309,6 +327,7 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { String? host, int? port, { bool? sslEnabled = false, + bool? automaticHostMapping = true, }) => super.noSuchMethod( Invocation.method( @@ -317,7 +336,10 @@ class MockFirebaseFirestore extends _i1.Mock implements _i4.FirebaseFirestore { host, port, ], - {#sslEnabled: sslEnabled}, + { + #sslEnabled: sslEnabled, + #automaticHostMapping: automaticHostMapping, + }, ), returnValueForMissingStub: null, ); @@ -741,13 +763,18 @@ class MockCollectionReference extends _i1.Mock ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -906,6 +933,115 @@ class MockCollectionReference extends _i1.Mock ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [DocumentReference]. @@ -1009,13 +1145,18 @@ class MockDocumentReference extends _i1.Mock ) as _i5.Future<_i4.DocumentSnapshot>); @override - _i5.Stream<_i4.DocumentSnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.DocumentSnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.DocumentSnapshot>.empty(), ) as _i5.Stream<_i4.DocumentSnapshot>); @@ -1292,13 +1433,18 @@ class MockQuery extends _i1.Mock implements _i4.Query { ) as _i4.Query); @override - _i5.Stream<_i4.QuerySnapshot> snapshots( - {bool? includeMetadataChanges = false}) => + _i5.Stream<_i4.QuerySnapshot> snapshots({ + bool? includeMetadataChanges = false, + _i3.ListenSource? source = _i3.ListenSource.defaultSource, + }) => (super.noSuchMethod( Invocation.method( #snapshots, [], - {#includeMetadataChanges: includeMetadataChanges}, + { + #includeMetadataChanges: includeMetadataChanges, + #source: source, + }, ), returnValue: _i5.Stream<_i4.QuerySnapshot>.empty(), ) as _i5.Stream<_i4.QuerySnapshot>); @@ -1484,6 +1630,115 @@ class MockQuery extends _i1.Mock implements _i4.Query { ), ), ) as _i4.AggregateQuery); + + @override + _i4.AggregateQuery aggregate( + _i3.AggregateField? aggregateField1, [ + _i3.AggregateField? aggregateField2, + _i3.AggregateField? aggregateField3, + _i3.AggregateField? aggregateField4, + _i3.AggregateField? aggregateField5, + _i3.AggregateField? aggregateField6, + _i3.AggregateField? aggregateField7, + _i3.AggregateField? aggregateField8, + _i3.AggregateField? aggregateField9, + _i3.AggregateField? aggregateField10, + _i3.AggregateField? aggregateField11, + _i3.AggregateField? aggregateField12, + _i3.AggregateField? aggregateField13, + _i3.AggregateField? aggregateField14, + _i3.AggregateField? aggregateField15, + _i3.AggregateField? aggregateField16, + _i3.AggregateField? aggregateField17, + _i3.AggregateField? aggregateField18, + _i3.AggregateField? aggregateField19, + _i3.AggregateField? aggregateField20, + _i3.AggregateField? aggregateField21, + _i3.AggregateField? aggregateField22, + _i3.AggregateField? aggregateField23, + _i3.AggregateField? aggregateField24, + _i3.AggregateField? aggregateField25, + _i3.AggregateField? aggregateField26, + _i3.AggregateField? aggregateField27, + _i3.AggregateField? aggregateField28, + _i3.AggregateField? aggregateField29, + _i3.AggregateField? aggregateField30, + ]) => + (super.noSuchMethod( + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + returnValue: _FakeAggregateQuery_10( + this, + Invocation.method( + #aggregate, + [ + aggregateField1, + aggregateField2, + aggregateField3, + aggregateField4, + aggregateField5, + aggregateField6, + aggregateField7, + aggregateField8, + aggregateField9, + aggregateField10, + aggregateField11, + aggregateField12, + aggregateField13, + aggregateField14, + aggregateField15, + aggregateField16, + aggregateField17, + aggregateField18, + aggregateField19, + aggregateField20, + aggregateField21, + aggregateField22, + aggregateField23, + aggregateField24, + aggregateField25, + aggregateField26, + aggregateField27, + aggregateField28, + aggregateField29, + aggregateField30, + ], + ), + ), + ) as _i4.AggregateQuery); } /// A class which mocks [QueryDocumentSnapshot]. diff --git a/test/widgets/player_list_screen_test.mocks.dart b/test/widgets/player_list_screen_test.mocks.dart index 153b03d0..5a543c58 100644 --- a/test/widgets/player_list_screen_test.mocks.dart +++ b/test/widgets/player_list_screen_test.mocks.dart @@ -572,16 +572,6 @@ class MockTextEditingController extends _i1.Mock returnValueForMissingStub: null, ); - @override - bool isSelectionWithinTextBounds(_i8.TextSelection? selection) => - (super.noSuchMethod( - Invocation.method( - #isSelectionWithinTextBounds, - [selection], - ), - returnValue: false, - ) as bool); - @override void addListener(_i16.VoidCallback? listener) => super.noSuchMethod( Invocation.method( diff --git a/test/widgets/register_screen_test.dart b/test/widgets/register_screen_test.dart index 6af060f0..ef3f67c1 100644 --- a/test/widgets/register_screen_test.dart +++ b/test/widgets/register_screen_test.dart @@ -64,7 +64,7 @@ void main() { .style! .backgroundColor .toString(), - MaterialStateProperty.all(Theme.of(context).primaryColor) + WidgetStateProperty.all(Theme.of(context).primaryColor) .toString()); expect( @@ -73,7 +73,7 @@ void main() { .style! .backgroundColor .toString(), - MaterialStateProperty.all(Theme.of(context).cardColor) + WidgetStateProperty.all(Theme.of(context).cardColor) .toString()); expect( @@ -83,7 +83,7 @@ void main() { .style! .backgroundColor .toString(), - MaterialStateProperty.all(Theme.of(context).cardColor) + WidgetStateProperty.all(Theme.of(context).cardColor) .toString()); }); @@ -112,7 +112,7 @@ void main() { .style! .backgroundColor .toString(), - MaterialStateProperty.all(Theme.of(context).cardColor) + WidgetStateProperty.all(Theme.of(context).cardColor) .toString()); expect( @@ -121,7 +121,7 @@ void main() { .style! .backgroundColor .toString(), - MaterialStateProperty.all(Theme.of(context).primaryColor) + WidgetStateProperty.all(Theme.of(context).primaryColor) .toString()); expect( @@ -131,7 +131,7 @@ void main() { .style! .backgroundColor .toString(), - MaterialStateProperty.all(Theme.of(context).cardColor) + WidgetStateProperty.all(Theme.of(context).cardColor) .toString()); }); });