From f0301d814e6ab72cc0bcb5d0071f7dded053f7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cu=CC=9Bo=CC=9Bng=20Nguye=CC=82=CC=83n?= Date: Tue, 28 Dec 2021 23:07:45 +0700 Subject: [PATCH] Upgrade to Flutter 2.8.1 --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- android/build.gradle | 6 +- ios/Podfile.lock | 112 ++++---- lib/app.dart | 1 - lib/game/center_text_paint.dart | 8 +- lib/game/game_reward.freezed.dart | 11 +- lib/game/game_state.freezed.dart | 18 +- lib/game/note/note.freezed.dart | 10 +- lib/game/ripple_effect.dart | 1 - lib/game/tile/tile_chunk.freezed.dart | 11 +- lib/game/tile/tile_drawer.dart | 1 - .../game_config_state.freezed.dart | 11 +- lib/home/home_page.dart | 1 - lib/instrument/instrument.freezed.dart | 12 +- lib/router/router.gr.dart | 56 ++-- lib/setting/settings_page.dart | 4 +- lib/songs/song.freezed.dart | 26 +- lib/user/user.freezed.dart | 41 +-- pubspec.lock | 264 +++++++++++++----- pubspec.yaml | 6 +- 21 files changed, 378 insertions(+), 226 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4be12e03..00294c6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ name: Build branches: - master env: - flutter_version: 2.5.3 + flutter_version: 2.8.1 jobs: build: name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 279056a6..557e19a2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ name: Release tags: - '*' env: - flutter_version: 2.5.3 + flutter_version: 2.8.1 jobs: build: name: Build diff --git a/android/build.gradle b/android/build.gradle index bcbddca5..3e74f005 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,15 +1,15 @@ buildscript { - ext.kotlin_version = '1.5.31' + ext.kotlin_version = '1.6.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:7.0.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.10' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' } } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 3a6db71f..cf889ec7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -349,24 +349,24 @@ PODS: - BoringSSL-GRPC/Implementation (0.0.7): - BoringSSL-GRPC/Interface (= 0.0.7) - BoringSSL-GRPC/Interface (0.0.7) - - cloud_firestore (3.1.0): + - cloud_firestore (3.1.5): - Firebase/Firestore (= 8.9.0) - firebase_core - Flutter - - cloud_functions (3.1.0): + - cloud_functions (3.2.4): - Firebase/Functions (= 8.9.0) - firebase_core - Flutter - - device_info (0.0.1): + - device_info_plus (0.0.1): - Flutter - - FBAEMKit (12.0.2): - - FBSDKCoreKit_Basics (= 12.0.2) - - FBSDKCoreKit (12.0.2): - - FBAEMKit (= 12.0.2) - - FBSDKCoreKit_Basics (= 12.0.2) - - FBSDKCoreKit_Basics (12.0.2) - - FBSDKLoginKit (12.0.2): - - FBSDKCoreKit (= 12.0.2) + - FBAEMKit (12.1.0): + - FBSDKCoreKit_Basics (= 12.1.0) + - FBSDKCoreKit (12.1.0): + - FBAEMKit (= 12.1.0) + - FBSDKCoreKit_Basics (= 12.1.0) + - FBSDKCoreKit_Basics (12.1.0) + - FBSDKLoginKit (12.1.0): + - FBSDKCoreKit (= 12.1.0) - Firebase/Auth (8.9.0): - Firebase/CoreOnly - FirebaseAuth (~> 8.9.0) @@ -384,18 +384,18 @@ PODS: - Firebase/Storage (8.9.0): - Firebase/CoreOnly - FirebaseStorage (~> 8.9.0) - - firebase_auth (3.2.0): + - firebase_auth (3.3.4): - Firebase/Auth (= 8.9.0) - firebase_core - Flutter - - firebase_core (1.10.0): + - firebase_core (1.10.6): - Firebase/CoreOnly (= 8.9.0) - Flutter - - firebase_crashlytics (2.3.0): + - firebase_crashlytics (2.4.4): - Firebase/Crashlytics (= 8.9.0) - firebase_core - Flutter - - firebase_storage (10.1.0): + - firebase_storage (10.2.4): - Firebase/Storage (= 8.9.0) - firebase_core - Flutter @@ -408,7 +408,7 @@ PODS: - FirebaseCoreDiagnostics (~> 8.0) - GoogleUtilities/Environment (~> 7.6) - GoogleUtilities/Logger (~> 7.6) - - FirebaseCoreDiagnostics (8.9.0): + - FirebaseCoreDiagnostics (8.10.0): - GoogleDataTransport (~> 9.1) - GoogleUtilities/Environment (~> 7.6) - GoogleUtilities/Logger (~> 7.6) @@ -436,7 +436,7 @@ PODS: - FirebaseFunctions (8.9.0): - FirebaseCore (~> 8.0) - GTMSessionFetcher/Core (~> 1.5) - - FirebaseInstallations (8.9.0): + - FirebaseInstallations (8.10.0): - FirebaseCore (~> 8.0) - GoogleUtilities/Environment (~> 7.6) - GoogleUtilities/UserDefaults (~> 7.6) @@ -448,8 +448,8 @@ PODS: - flutter_email_sender (0.0.1): - Flutter - flutter_facebook_auth (3.5.3): - - FBSDKCoreKit (~> 12.0.2) - - FBSDKLoginKit (~> 12.0.2) + - FBSDKCoreKit (~> 12.1.0) + - FBSDKLoginKit (~> 12.1.0) - Flutter - FMDB (2.7.5): - FMDB/standard (= 2.7.5) @@ -518,23 +518,23 @@ PODS: - nanopb/encode (= 2.30908.0) - nanopb/decode (2.30908.0) - nanopb/encode (2.30908.0) - - package_info (0.0.1): + - package_info_plus (0.4.5): - Flutter - - path_provider (0.0.1): + - path_provider_ios (0.0.1): - Flutter - PromisesObjC (2.0.0) - - shared_preferences (0.0.1): + - shared_preferences_ios (0.0.1): - Flutter - sqflite (0.0.2): - Flutter - FMDB (>= 2.7.5) - - url_launcher (0.0.1): + - url_launcher_ios (0.0.1): - Flutter DEPENDENCIES: - cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`) - cloud_functions (from `.symlinks/plugins/cloud_functions/ios`) - - device_info (from `.symlinks/plugins/device_info/ios`) + - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`) @@ -544,11 +544,11 @@ DEPENDENCIES: - flutter_facebook_auth (from `.symlinks/plugins/flutter_facebook_auth/ios`) - google_sign_in (from `.symlinks/plugins/google_sign_in/ios`) - in_app_review (from `.symlinks/plugins/in_app_review/ios`) - - package_info (from `.symlinks/plugins/package_info/ios`) - - path_provider (from `.symlinks/plugins/path_provider/ios`) - - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) + - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) + - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - - url_launcher (from `.symlinks/plugins/url_launcher/ios`) + - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) SPEC REPOS: trunk: @@ -585,8 +585,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/cloud_firestore/ios" cloud_functions: :path: ".symlinks/plugins/cloud_functions/ios" - device_info: - :path: ".symlinks/plugins/device_info/ios" + device_info_plus: + :path: ".symlinks/plugins/device_info_plus/ios" firebase_auth: :path: ".symlinks/plugins/firebase_auth/ios" firebase_core: @@ -605,44 +605,44 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/google_sign_in/ios" in_app_review: :path: ".symlinks/plugins/in_app_review/ios" - package_info: - :path: ".symlinks/plugins/package_info/ios" - path_provider: - :path: ".symlinks/plugins/path_provider/ios" - shared_preferences: - :path: ".symlinks/plugins/shared_preferences/ios" + package_info_plus: + :path: ".symlinks/plugins/package_info_plus/ios" + path_provider_ios: + :path: ".symlinks/plugins/path_provider_ios/ios" + shared_preferences_ios: + :path: ".symlinks/plugins/shared_preferences_ios/ios" sqflite: :path: ".symlinks/plugins/sqflite/ios" - url_launcher: - :path: ".symlinks/plugins/url_launcher/ios" + url_launcher_ios: + :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7 BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879 - cloud_firestore: 2cff0618e560f435fc05da5c94c2d213eb7ba640 - cloud_functions: e7c23b62967917c4eb47911b90f798c4415ad0d4 - device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 - FBAEMKit: c6b8ddf8371640fcd1a3b844d0f8884c8f334cea - FBSDKCoreKit: 506c0fd1c09a3075f62be8fa36bdd921c563daa9 - FBSDKCoreKit_Basics: c0701d1634c944d60dd3c6361d66dbd0e707a456 - FBSDKLoginKit: d7c9f6ddff20d7b04c94d1f1f065dc7a441d44a0 + cloud_firestore: 338122a6149c14ca376ad363626b5bf3037a5056 + cloud_functions: d06612b3b0f30419e8305620f1382df43bdf4003 + device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed + FBAEMKit: 56c0bb9b42e3747cd82b67934f0c2b19325382ea + FBSDKCoreKit: 75368765d9c2303073145a7925dfaa9d60bcd77b + FBSDKCoreKit_Basics: 39865aff97e5f6951a78fb3e89dc4460e35e1895 + FBSDKLoginKit: e993f97c7cc794c5da4056d8aec3c3d66033a727 Firebase: 13d8d96499e2635428d5bf0ec675df21f95d9a95 - firebase_auth: 0d56cc4d105ff70d1547a7fcb10ee574ad05adf5 - firebase_core: f770e033e790657b3505f04be4cb24c482912f11 - firebase_crashlytics: ed8c1d66dc407d617cbed798f05a5d9115da7494 - firebase_storage: a3bbe618ef41930ae31da8f4691d37e4ed84f14d + firebase_auth: e875a50b81aefb20f305dfede425647e9675c19e + firebase_core: c263d7daf1dc92fcd9895e6abdc04872b0ee07ff + firebase_crashlytics: 9cbd5d9e8560b218f02fce3c7359567ac822d05f + firebase_storage: 2ed331c6bd5bfa6d64f1a6c57f01151f4f146c16 FirebaseAuth: 2b78b2a32c07b3ecfa4970bdf1d3632b8304099b FirebaseCore: 599ee609343eaf4941bd188f85e3aa077ffe325b - FirebaseCoreDiagnostics: 5daa63f1c1409d981a2d5007daa100b36eac6a34 + FirebaseCoreDiagnostics: 56fb7216d87e0e6ec2feddefa9d8a392fe8b2c18 FirebaseCrashlytics: 40efbd81157dae307ec95612fa1328347284d2c2 FirebaseFirestore: 15ae9648476436efed698a909e44c4737498f9b4 FirebaseFunctions: c78ec2f93cd453f25fb5e4c694c830f7a31ab349 - FirebaseInstallations: caa7c8e0d3e2345b8829d2fa9ca1b4dfbf2fcc85 + FirebaseInstallations: 830327b45345ffc859eaa9c17bcd5ae893fd5425 FirebaseStorage: 452c98c31ccb40b819764bf3039426c4388d9939 Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b - flutter_facebook_auth: 5638a1a8cc23016ec6f72945ba879f4482870c69 + flutter_facebook_auth: dfd6b2563406c538098e2127512d385c9ffd70ad FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a google_sign_in: c5cecea71f3be43282263550556e311c4cc03582 GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 @@ -655,12 +655,12 @@ SPEC CHECKSUMS: in_app_review: 4a97249f7a2f539a0f294c2d9196b7fe35e49541 leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729 nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 - package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 - path_provider: d1e9807085df1f9cc9318206cd649dc0b76be3de + package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e + path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5 PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 - shared_preferences: 5033afbb22d372e15aff8ff766df9021b845f273 + shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32 sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 - url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649 + url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af PODFILE CHECKSUM: 52850884bc4fe89b720ca304751837c651c6cba9 diff --git a/lib/app.dart b/lib/app.dart index ac6ccec2..ae457235 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -1,5 +1,4 @@ import 'package:auto_route/auto_route.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; // ignore: depend_on_referenced_packages import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/game/center_text_paint.dart b/lib/game/center_text_paint.dart index d0316474..227d84b7 100644 --- a/lib/game/center_text_paint.dart +++ b/lib/game/center_text_paint.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:flame/components.dart'; import 'package:flutter/material.dart'; @@ -8,15 +6,11 @@ class CenterTextPaint extends TextPaint { double fontSize = 24.0, Color color = Colors.black, String fontFamily = 'Arial', - TextDirection textDirection = TextDirection.ltr, - double? lineHeight, }) : super( - config: TextPaintConfig( + style: TextStyle( fontSize: fontSize, color: color, fontFamily: fontFamily, - textDirection: textDirection, - lineHeight: lineHeight, ), ); diff --git a/lib/game/game_reward.freezed.dart b/lib/game/game_reward.freezed.dart index 81485895..a542b824 100644 --- a/lib/game/game_reward.freezed.dart +++ b/lib/game/game_reward.freezed.dart @@ -141,13 +141,16 @@ class _$_GameReward implements _GameReward { return identical(this, other) || (other.runtimeType == runtimeType && other is _GameReward && - (identical(other.stars, stars) || other.stars == stars) && - (identical(other.playedNotes, playedNotes) || - other.playedNotes == playedNotes)); + const DeepCollectionEquality().equals(other.stars, stars) && + const DeepCollectionEquality() + .equals(other.playedNotes, playedNotes)); } @override - int get hashCode => Object.hash(runtimeType, stars, playedNotes); + int get hashCode => Object.hash( + runtimeType, + const DeepCollectionEquality().hash(stars), + const DeepCollectionEquality().hash(playedNotes)); @JsonKey(ignore: true) @override diff --git a/lib/game/game_state.freezed.dart b/lib/game/game_state.freezed.dart index 577c4766..c5657590 100644 --- a/lib/game/game_state.freezed.dart +++ b/lib/game/game_state.freezed.dart @@ -283,14 +283,15 @@ class _$GameStatePlaying implements GameStatePlaying { return identical(this, other) || (other.runtimeType == runtimeType && other is GameStatePlaying && - (identical(other.duration, duration) || - other.duration == duration) && - (identical(other.songName, songName) || - other.songName == songName)); + const DeepCollectionEquality().equals(other.duration, duration) && + const DeepCollectionEquality().equals(other.songName, songName)); } @override - int get hashCode => Object.hash(runtimeType, duration, songName); + int get hashCode => Object.hash( + runtimeType, + const DeepCollectionEquality().hash(duration), + const DeepCollectionEquality().hash(songName)); @JsonKey(ignore: true) @override @@ -558,12 +559,13 @@ class _$GameStateCompleted implements GameStateCompleted { return identical(this, other) || (other.runtimeType == runtimeType && other is GameStateCompleted && - (identical(other.gameReward, gameReward) || - other.gameReward == gameReward)); + const DeepCollectionEquality() + .equals(other.gameReward, gameReward)); } @override - int get hashCode => Object.hash(runtimeType, gameReward); + int get hashCode => + Object.hash(runtimeType, const DeepCollectionEquality().hash(gameReward)); @JsonKey(ignore: true) @override diff --git a/lib/game/note/note.freezed.dart b/lib/game/note/note.freezed.dart index 0e91958e..360b8354 100644 --- a/lib/game/note/note.freezed.dart +++ b/lib/game/note/note.freezed.dart @@ -125,13 +125,15 @@ class _$_Note implements _Note { return identical(this, other) || (other.runtimeType == runtimeType && other is _Note && - (identical(other.note, note) || other.note == note) && - (identical(other.startTick, startTick) || - other.startTick == startTick)); + const DeepCollectionEquality().equals(other.note, note) && + const DeepCollectionEquality().equals(other.startTick, startTick)); } @override - int get hashCode => Object.hash(runtimeType, note, startTick); + int get hashCode => Object.hash( + runtimeType, + const DeepCollectionEquality().hash(note), + const DeepCollectionEquality().hash(startTick)); @JsonKey(ignore: true) @override diff --git a/lib/game/ripple_effect.dart b/lib/game/ripple_effect.dart index 990c5014..da0a5cf5 100644 --- a/lib/game/ripple_effect.dart +++ b/lib/game/ripple_effect.dart @@ -2,7 +2,6 @@ import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame/flame.dart'; -import 'package:flame/sprite.dart'; import 'colors.dart'; import 'effect.dart'; diff --git a/lib/game/tile/tile_chunk.freezed.dart b/lib/game/tile/tile_chunk.freezed.dart index a180d112..674e3d86 100644 --- a/lib/game/tile/tile_chunk.freezed.dart +++ b/lib/game/tile/tile_chunk.freezed.dart @@ -148,18 +148,17 @@ class _$_TileChunk implements _TileChunk { (other.runtimeType == runtimeType && other is _TileChunk && const DeepCollectionEquality().equals(other.notes, notes) && - (identical(other.durationToPrevious, durationToPrevious) || - other.durationToPrevious == durationToPrevious) && - (identical(other.startTick, startTick) || - other.startTick == startTick)); + const DeepCollectionEquality() + .equals(other.durationToPrevious, durationToPrevious) && + const DeepCollectionEquality().equals(other.startTick, startTick)); } @override int get hashCode => Object.hash( runtimeType, const DeepCollectionEquality().hash(notes), - durationToPrevious, - startTick); + const DeepCollectionEquality().hash(durationToPrevious), + const DeepCollectionEquality().hash(startTick)); @JsonKey(ignore: true) @override diff --git a/lib/game/tile/tile_drawer.dart b/lib/game/tile/tile_drawer.dart index a9c5496a..edb60aa6 100644 --- a/lib/game/tile/tile_drawer.dart +++ b/lib/game/tile/tile_drawer.dart @@ -1,6 +1,5 @@ import 'package:flame/components.dart'; import 'package:flame/flame.dart'; -import 'package:flame/sprite.dart'; import 'package:flutter/material.dart'; import '../colors.dart'; diff --git a/lib/game_config/game_config_state.freezed.dart b/lib/game_config/game_config_state.freezed.dart index bcc67d6f..064b9ed0 100644 --- a/lib/game_config/game_config_state.freezed.dart +++ b/lib/game_config/game_config_state.freezed.dart @@ -132,13 +132,16 @@ class _$_GameConfigState implements _GameConfigState { return identical(this, other) || (other.runtimeType == runtimeType && other is _GameConfigState && - (identical(other.difficulty, difficulty) || - other.difficulty == difficulty) && - (identical(other.speed, speed) || other.speed == speed)); + const DeepCollectionEquality() + .equals(other.difficulty, difficulty) && + const DeepCollectionEquality().equals(other.speed, speed)); } @override - int get hashCode => Object.hash(runtimeType, difficulty, speed); + int get hashCode => Object.hash( + runtimeType, + const DeepCollectionEquality().hash(difficulty), + const DeepCollectionEquality().hash(speed)); @JsonKey(ignore: true) @override diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index eaba0b0d..cabbb855 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; // ignore: depend_on_referenced_packages import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import '../midi/midi_controller.dart'; diff --git a/lib/instrument/instrument.freezed.dart b/lib/instrument/instrument.freezed.dart index aaa01437..2a96a8c1 100644 --- a/lib/instrument/instrument.freezed.dart +++ b/lib/instrument/instrument.freezed.dart @@ -203,22 +203,22 @@ class _$_Instrument implements _Instrument { return identical(this, other) || (other.runtimeType == runtimeType && other is _Instrument && - (identical(other.id, id) || other.id == id) && + const DeepCollectionEquality().equals(other.id, id) && const DeepCollectionEquality() .equals(other.soundPaths, soundPaths) && const DeepCollectionEquality().equals(other.baseNotes, baseNotes) && - (identical(other.minNote, minNote) || other.minNote == minNote) && - (identical(other.maxNote, maxNote) || other.maxNote == maxNote)); + const DeepCollectionEquality().equals(other.minNote, minNote) && + const DeepCollectionEquality().equals(other.maxNote, maxNote)); } @override int get hashCode => Object.hash( runtimeType, - id, + const DeepCollectionEquality().hash(id), const DeepCollectionEquality().hash(soundPaths), const DeepCollectionEquality().hash(baseNotes), - minNote, - maxNote); + const DeepCollectionEquality().hash(minNote), + const DeepCollectionEquality().hash(maxNote)); @JsonKey(ignore: true) @override diff --git a/lib/router/router.gr.dart b/lib/router/router.gr.dart index 41c99319..17cefc06 100644 --- a/lib/router/router.gr.dart +++ b/lib/router/router.gr.dart @@ -84,24 +84,27 @@ class RootRouter extends _i10.RootStackRouter { ]; } -/// generated route for [_i1.SplashPage] +/// generated route for +/// [_i1.SplashPage] class SplashRoute extends _i10.PageRouteInfo { - const SplashRoute() : super(name, path: '/'); + const SplashRoute() : super(SplashRoute.name, path: '/'); static const String name = 'SplashRoute'; } -/// generated route for [_i2.HomePage] +/// generated route for +/// [_i2.HomePage] class HomeRoute extends _i10.PageRouteInfo { - const HomeRoute() : super(name, path: '/home-page'); + const HomeRoute() : super(HomeRoute.name, path: '/home-page'); static const String name = 'HomeRoute'; } -/// generated route for [_i3.GameConfigPage] +/// generated route for +/// [_i3.GameConfigPage] class GameConfigRoute extends _i10.PageRouteInfo { GameConfigRoute({required _i12.Song song, _i11.Key? key}) - : super(name, + : super(GameConfigRoute.name, path: '/game-config-page', args: GameConfigRouteArgs(song: song, key: key)); @@ -114,12 +117,18 @@ class GameConfigRouteArgs { final _i12.Song song; final _i11.Key? key; + + @override + String toString() { + return 'GameConfigRouteArgs{song: $song, key: $key}'; + } } -/// generated route for [_i4.GamePage] +/// generated route for +/// [_i4.GamePage] class GameRoute extends _i10.PageRouteInfo { GameRoute({required Map arguments, _i11.Key? key}) - : super(name, + : super(GameRoute.name, path: '/game-page', args: GameRouteArgs(arguments: arguments, key: key)); @@ -132,39 +141,50 @@ class GameRouteArgs { final Map arguments; final _i11.Key? key; + + @override + String toString() { + return 'GameRouteArgs{arguments: $arguments, key: $key}'; + } } -/// generated route for [_i5.UserPage] +/// generated route for +/// [_i5.UserPage] class UserRoute extends _i10.PageRouteInfo { - const UserRoute() : super(name, path: '/user-page'); + const UserRoute() : super(UserRoute.name, path: '/user-page'); static const String name = 'UserRoute'; } -/// generated route for [_i6.LocalePage] +/// generated route for +/// [_i6.LocalePage] class LocaleRoute extends _i10.PageRouteInfo { - const LocaleRoute() : super(name, path: '/locale-page'); + const LocaleRoute() : super(LocaleRoute.name, path: '/locale-page'); static const String name = 'LocaleRoute'; } -/// generated route for [_i7.ThemePage] +/// generated route for +/// [_i7.ThemePage] class ThemeRoute extends _i10.PageRouteInfo { - const ThemeRoute() : super(name, path: '/theme-page'); + const ThemeRoute() : super(ThemeRoute.name, path: '/theme-page'); static const String name = 'ThemeRoute'; } -/// generated route for [_i8.InstrumentsPage] +/// generated route for +/// [_i8.InstrumentsPage] class InstrumentsRoute extends _i10.PageRouteInfo { - const InstrumentsRoute() : super(name, path: '/instruments-page'); + const InstrumentsRoute() + : super(InstrumentsRoute.name, path: '/instruments-page'); static const String name = 'InstrumentsRoute'; } -/// generated route for [_i9.SettingsPage] +/// generated route for +/// [_i9.SettingsPage] class SettingsRoute extends _i10.PageRouteInfo { - const SettingsRoute() : super(name, path: '/settings-page'); + const SettingsRoute() : super(SettingsRoute.name, path: '/settings-page'); static const String name = 'SettingsRoute'; } diff --git a/lib/setting/settings_page.dart b/lib/setting/settings_page.dart index dccbacd4..9b865e0a 100644 --- a/lib/setting/settings_page.dart +++ b/lib/setting/settings_page.dart @@ -1,14 +1,14 @@ import 'dart:io'; import 'package:auto_route/auto_route.dart'; -import 'package:device_info/device_info.dart'; +import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/material.dart'; import 'package:flutter_email_sender/flutter_email_sender.dart'; // ignore: depend_on_referenced_packages import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:in_app_review/in_app_review.dart'; -import 'package:package_info/package_info.dart'; +import 'package:package_info_plus/package_info_plus.dart'; import '../locale/locale_page.dart'; import '../router/router.dart'; diff --git a/lib/songs/song.freezed.dart b/lib/songs/song.freezed.dart index 7a417ff9..2065151b 100644 --- a/lib/songs/song.freezed.dart +++ b/lib/songs/song.freezed.dart @@ -270,13 +270,13 @@ class _$_Song implements _Song { return identical(this, other) || (other.runtimeType == runtimeType && other is _Song && - (identical(other.id, id) || other.id == id) && - (identical(other.title, title) || other.title == title) && - (identical(other.artist, artist) || other.artist == artist) && - (identical(other.url, url) || other.url == url) && - (identical(other.bpm, bpm) || other.bpm == bpm) && - (identical(other.unitDuration, unitDuration) || - other.unitDuration == unitDuration) && + const DeepCollectionEquality().equals(other.id, id) && + const DeepCollectionEquality().equals(other.title, title) && + const DeepCollectionEquality().equals(other.artist, artist) && + const DeepCollectionEquality().equals(other.url, url) && + const DeepCollectionEquality().equals(other.bpm, bpm) && + const DeepCollectionEquality() + .equals(other.unitDuration, unitDuration) && const DeepCollectionEquality() .equals(other.tilesCount, tilesCount) && const DeepCollectionEquality().equals(other.duration, duration) && @@ -286,12 +286,12 @@ class _$_Song implements _Song { @override int get hashCode => Object.hash( runtimeType, - id, - title, - artist, - url, - bpm, - unitDuration, + const DeepCollectionEquality().hash(id), + const DeepCollectionEquality().hash(title), + const DeepCollectionEquality().hash(artist), + const DeepCollectionEquality().hash(url), + const DeepCollectionEquality().hash(bpm), + const DeepCollectionEquality().hash(unitDuration), const DeepCollectionEquality().hash(tilesCount), const DeepCollectionEquality().hash(duration), const DeepCollectionEquality().hash(tags)); diff --git a/lib/user/user.freezed.dart b/lib/user/user.freezed.dart index 932e1d40..c5979857 100644 --- a/lib/user/user.freezed.dart +++ b/lib/user/user.freezed.dart @@ -272,26 +272,33 @@ class _$_User implements _User { return identical(this, other) || (other.runtimeType == runtimeType && other is _User && - (identical(other.id, id) || other.id == id) && - (identical(other.playedNotes, playedNotes) || - other.playedNotes == playedNotes) && - (identical(other.stars, stars) || other.stars == stars) && - (identical(other.playedTime, playedTime) || - other.playedTime == playedTime) && - (identical(other.instrumentId, instrumentId) || - other.instrumentId == instrumentId) && - (identical(other.name, name) || other.name == name) && - (identical(other.photoUrl, photoUrl) || - other.photoUrl == photoUrl) && - (identical(other.anonymous, anonymous) || - other.anonymous == anonymous) && - (identical(other.creationTime, creationTime) || - other.creationTime == creationTime)); + const DeepCollectionEquality().equals(other.id, id) && + const DeepCollectionEquality() + .equals(other.playedNotes, playedNotes) && + const DeepCollectionEquality().equals(other.stars, stars) && + const DeepCollectionEquality() + .equals(other.playedTime, playedTime) && + const DeepCollectionEquality() + .equals(other.instrumentId, instrumentId) && + const DeepCollectionEquality().equals(other.name, name) && + const DeepCollectionEquality().equals(other.photoUrl, photoUrl) && + const DeepCollectionEquality().equals(other.anonymous, anonymous) && + const DeepCollectionEquality() + .equals(other.creationTime, creationTime)); } @override - int get hashCode => Object.hash(runtimeType, id, playedNotes, stars, - playedTime, instrumentId, name, photoUrl, anonymous, creationTime); + int get hashCode => Object.hash( + runtimeType, + const DeepCollectionEquality().hash(id), + const DeepCollectionEquality().hash(playedNotes), + const DeepCollectionEquality().hash(stars), + const DeepCollectionEquality().hash(playedTime), + const DeepCollectionEquality().hash(instrumentId), + const DeepCollectionEquality().hash(name), + const DeepCollectionEquality().hash(photoUrl), + const DeepCollectionEquality().hash(anonymous), + const DeepCollectionEquality().hash(creationTime)); @JsonKey(ignore: true) @override diff --git a/pubspec.lock b/pubspec.lock index 364a05f6..4c0c4309 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "30.0.0" + version: "31.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "2.7.0" + version: "2.8.0" archive: dependency: transitive description: @@ -42,21 +42,21 @@ packages: name: auto_route url: "https://pub.dartlang.org" source: hosted - version: "3.0.4" + version: "3.2.0" auto_route_generator: dependency: "direct dev" description: name: auto_route_generator url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.2.0" build: dependency: transitive description: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.2.1" build_config: dependency: transitive description: @@ -77,21 +77,21 @@ packages: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.6" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "2.1.7" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "7.2.2" + version: "7.2.3" built_collection: dependency: transitive description: @@ -112,7 +112,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -147,42 +147,42 @@ packages: name: cloud_firestore url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.1.5" cloud_firestore_platform_interface: dependency: transitive description: name: cloud_firestore_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "5.4.5" + version: "5.4.10" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.6.5" cloud_functions: dependency: "direct main" description: name: cloud_functions url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.2.4" cloud_functions_platform_interface: dependency: transitive description: name: cloud_functions_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "5.0.14" + version: "5.0.19" cloud_functions_web: dependency: transitive description: name: cloud_functions_web url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.2.5" code_builder: dependency: transitive description: @@ -211,6 +211,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.0.1" + csslib: + dependency: transitive + description: + name: csslib + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.1" dart_midi: dependency: "direct main" description: @@ -226,21 +233,49 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" - device_info: + version: "2.2.1" + device_info_plus: dependency: "direct main" description: - name: device_info + name: device_info_plus url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" - device_info_platform_interface: + version: "3.2.0" + device_info_plus_linux: dependency: transitive description: - name: device_info_platform_interface + name: device_info_plus_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.1.0" + device_info_plus_macos: + dependency: transitive + description: + name: device_info_plus_macos + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.0" + device_info_plus_platform_interface: + dependency: transitive + description: + name: device_info_plus_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.0" + device_info_plus_web: + dependency: transitive + description: + name: device_info_plus_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + device_info_plus_windows: + dependency: transitive + description: + name: device_info_plus_windows + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" ffi: dependency: transitive description: @@ -261,77 +296,77 @@ packages: name: firebase_auth url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "3.3.4" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "6.1.4" + version: "6.1.9" firebase_auth_web: dependency: transitive description: name: firebase_auth_web url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "3.3.5" firebase_core: dependency: "direct main" description: name: firebase_core url: "https://pub.dartlang.org" source: hosted - version: "1.10.0" + version: "1.10.6" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.2.3" firebase_core_web: dependency: transitive description: name: firebase_core_web url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.5.3" firebase_crashlytics: dependency: "direct main" description: name: firebase_crashlytics url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.4.4" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "3.1.6" + version: "3.1.11" firebase_storage: dependency: "direct main" description: name: firebase_storage url: "https://pub.dartlang.org" source: hosted - version: "10.1.0" + version: "10.2.4" firebase_storage_platform_interface: dependency: transitive description: name: firebase_storage_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.0.6" + version: "4.0.11" firebase_storage_web: dependency: transitive description: name: firebase_storage_web url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.2.5" fixnum: dependency: transitive description: @@ -345,7 +380,7 @@ packages: name: flame url: "https://pub.dartlang.org" source: hosted - version: "1.0.0-releasecandidate.16" + version: "1.0.0" flutter: dependency: "direct main" description: flutter @@ -357,7 +392,7 @@ packages: name: flutter_cache_manager url: "https://pub.dartlang.org" source: hosted - version: "3.1.3" + version: "3.3.0" flutter_email_sender: dependency: "direct main" description: @@ -371,14 +406,14 @@ packages: name: flutter_facebook_auth url: "https://pub.dartlang.org" source: hosted - version: "3.5.6" + version: "3.5.7" flutter_facebook_auth_platform_interface: dependency: transitive description: name: flutter_facebook_auth_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.7.0" + version: "2.7.1" flutter_facebook_auth_web: dependency: transitive description: @@ -392,7 +427,7 @@ packages: name: flutter_hooks url: "https://pub.dartlang.org" source: hosted - version: "0.18.0" + version: "0.18.1" flutter_launcher_icons: dependency: "direct dev" description: @@ -411,14 +446,14 @@ packages: name: flutter_native_splash url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.3.2" flutter_riverpod: dependency: "direct main" description: name: flutter_riverpod url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.3" flutter_web_plugins: dependency: transitive description: flutter @@ -430,14 +465,14 @@ packages: name: freezed url: "https://pub.dartlang.org" source: hosted - version: "0.15.0+1" + version: "1.1.0" freezed_annotation: dependency: "direct main" description: name: freezed_annotation url: "https://pub.dartlang.org" source: hosted - version: "0.15.0" + version: "1.1.0" frontend_server_client: dependency: transitive description: @@ -486,7 +521,14 @@ packages: name: hooks_riverpod url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.3" + html: + dependency: transitive + description: + name: html + url: "https://pub.dartlang.org" + source: hosted + version: "0.15.0" http: dependency: transitive description: @@ -514,7 +556,7 @@ packages: name: image url: "https://pub.dartlang.org" source: hosted - version: "3.0.8" + version: "3.1.0" in_app_review: dependency: "direct main" description: @@ -556,14 +598,14 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "4.4.0" json_serializable: dependency: "direct dev" description: name: json_serializable url: "https://pub.dartlang.org" source: hosted - version: "6.0.1" + version: "6.1.3" logging: dependency: "direct main" description: @@ -598,7 +640,7 @@ packages: name: ordered_set url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "5.0.0" package_config: dependency: transitive description: @@ -606,13 +648,48 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.2" - package_info: + package_info_plus: dependency: "direct main" description: - name: package_info + name: package_info_plus url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "1.3.0" + package_info_plus_linux: + dependency: transitive + description: + name: package_info_plus_linux + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + package_info_plus_macos: + dependency: transitive + description: + name: package_info_plus_macos + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" + package_info_plus_platform_interface: + dependency: transitive + description: + name: package_info_plus_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" + package_info_plus_web: + dependency: transitive + description: + name: package_info_plus_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + package_info_plus_windows: + dependency: transitive + description: + name: package_info_plus_windows + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" path: dependency: transitive description: @@ -626,21 +703,35 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.0.8" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.11" + path_provider_ios: + dependency: transitive + description: + name: path_provider_ios + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.7" path_provider_linux: dependency: transitive description: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.4" path_provider_macos: dependency: transitive description: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.4" path_provider_platform_interface: dependency: transitive description: @@ -654,7 +745,7 @@ packages: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" pedantic: dependency: transitive description: @@ -675,7 +766,7 @@ packages: name: platform url: "https://pub.dartlang.org" source: hosted - version: "3.0.2" + version: "3.1.0" plugin_platform_interface: dependency: transitive description: @@ -710,7 +801,7 @@ packages: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" quiver: dependency: transitive description: @@ -724,20 +815,34 @@ packages: name: riverpod url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.3" rxdart: dependency: transitive description: name: rxdart url: "https://pub.dartlang.org" source: hosted - version: "0.27.2" + version: "0.27.3" shared_preferences: dependency: "direct main" description: name: shared_preferences url: "https://pub.dartlang.org" source: hosted + version: "2.0.11" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.9" + shared_preferences_ios: + dependency: transitive + description: + name: shared_preferences_ios + url: "https://pub.dartlang.org" + source: hosted version: "2.0.8" shared_preferences_linux: dependency: transitive @@ -745,7 +850,7 @@ packages: name: shared_preferences_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" shared_preferences_macos: dependency: transitive description: @@ -773,7 +878,7 @@ packages: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" shelf: dependency: transitive description: @@ -799,14 +904,14 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.2.1" source_helper: dependency: transitive description: name: source_helper url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" source_span: dependency: transitive description: @@ -827,14 +932,14 @@ packages: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "2.0.0+4" + version: "2.0.1" sqflite_common: dependency: transitive description: name: sqflite_common url: "https://pub.dartlang.org" source: hosted - version: "2.0.1+1" + version: "2.1.0" stack_trace: dependency: transitive description: @@ -898,6 +1003,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.3.0" + universal_html: + dependency: transitive + description: + name: universal_html + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.8" universal_io: dependency: transitive description: @@ -911,7 +1023,21 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.12" + version: "6.0.17" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.13" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.13" url_launcher_linux: dependency: transitive description: @@ -939,7 +1065,7 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" url_launcher_windows: dependency: transitive description: @@ -960,7 +1086,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" watcher: dependency: transitive description: @@ -981,7 +1107,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.2.10" + version: "2.3.3" xdg_directories: dependency: transitive description: @@ -1004,5 +1130,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.15.0 <3.0.0" flutter: ">=2.5.0" diff --git a/pubspec.yaml b/pubspec.yaml index 13399cf7..30dff0c7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: dart_midi: git: url: 'https://github.com/feelfreelinux/dart_midi' - device_info: any + device_info_plus: any firebase_auth: any firebase_core: any firebase_crashlytics: any @@ -31,9 +31,9 @@ dependencies: hooks_riverpod: any in_app_review: any intl: any - json_annotation: ^4.3.0 + json_annotation: any logging: any - package_info: any + package_info_plus: any path_provider: any shared_preferences: any sprintf: any