From 7615538a2d5de721da1e01035eaf836d2617666a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20M=C3=B6ller?= Date: Mon, 8 Jul 2024 23:15:06 +0300 Subject: [PATCH] peg flutter version to 3.19.6: animations didn't play properly on 3.22 --- .../lib/Layout/main_list.dart | 4 -- frosthaven_assistant/lib/main.dart | 6 +- frosthaven_assistant/pubspec.lock | 72 +++++++++---------- frosthaven_assistant/pubspec.yaml | 2 + 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/frosthaven_assistant/lib/Layout/main_list.dart b/frosthaven_assistant/lib/Layout/main_list.dart index cba91e2a..6bb5da56 100644 --- a/frosthaven_assistant/lib/Layout/main_list.dart +++ b/frosthaven_assistant/lib/Layout/main_list.dart @@ -176,18 +176,14 @@ class MainListState extends State { valueListenable: getIt().darkMode, builder: (context, value, child) { return Container( - //alignment: Alignment.center, - //width: MediaQuery.of(context).size.width, decoration: BoxDecoration( image: DecorationImage( fit: BoxFit.cover, - //repeat: ImageRepeat.repeat, image: AssetImage(getIt().darkMode.value ? 'assets/images/bg/bg.png' : 'assets/images/bg/frosthaven-bg.png')), ), child: ValueListenableBuilder>( - //TODO: show loading animation while waiting to load from disk. valueListenable: _gameData.modelData, builder: (context, value, child) { return ValueListenableBuilder( diff --git a/frosthaven_assistant/lib/main.dart b/frosthaven_assistant/lib/main.dart index 2257fcd5..ed541734 100644 --- a/frosthaven_assistant/lib/main.dart +++ b/frosthaven_assistant/lib/main.dart @@ -74,9 +74,11 @@ class MyApp extends StatelessWidget { getIt().init(); getIt().loadData("assets/data/") .then((value) => getIt().load()).then((value) => - getIt().init()).then((value) => loading.value = false); + getIt().init()).then((value) => { + loading.value = false + } + ); } catch (error) { - loading.value = false; } diff --git a/frosthaven_assistant/pubspec.lock b/frosthaven_assistant/pubspec.lock index b30f46fe..c8e147ed 100644 --- a/frosthaven_assistant/pubspec.lock +++ b/frosthaven_assistant/pubspec.lock @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: build_daemon - sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" + sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.0.1" build_resolvers: dependency: transitive description: @@ -109,18 +109,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.9" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe + sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799" url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "7.3.0" build_test: dependency: "direct dev" description: @@ -411,10 +411,10 @@ packages: dependency: "direct main" description: name: flutter_native_splash - sha256: aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840 + sha256: edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.0" flutter_test: dependency: "direct dev" description: flutter @@ -437,10 +437,10 @@ packages: dependency: transitive description: name: frontend_server_client - sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "3.2.0" get_it: dependency: "direct main" description: @@ -525,10 +525,10 @@ packages: dependency: transitive description: name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.6.7" json_annotation: dependency: transitive description: @@ -549,26 +549,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.0" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "2.0.1" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "2.0.1" lints: dependency: transitive description: @@ -605,10 +605,10 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.11.0" mime: dependency: transitive description: @@ -837,10 +837,10 @@ packages: dependency: transitive description: name: shared_preferences_android - sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577" + sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.2.2" shared_preferences_foundation: dependency: transitive description: @@ -994,26 +994,26 @@ packages: dependency: transitive description: name: test - sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" + sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f url: "https://pub.dev" source: hosted - version: "1.25.2" + version: "1.24.9" test_api: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.6.1" test_core: dependency: transitive description: name: test_core - sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" + sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.5.9" timing: dependency: transitive description: @@ -1050,10 +1050,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf + sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9" url: "https://pub.dev" source: hosted - version: "6.3.3" + version: "6.3.2" url_launcher_ios: dependency: transitive description: @@ -1114,10 +1114,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "13.0.0" wakelock_plus: dependency: "direct main" description: @@ -1170,10 +1170,10 @@ packages: dependency: transitive description: name: win32 - sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 + sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb" url: "https://pub.dev" source: hosted - version: "5.5.1" + version: "5.5.0" window_manager: dependency: "direct main" description: @@ -1216,5 +1216,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <3.6.0" - flutter: ">=3.22.0" + dart: ">=3.3.0 <3.6.0" + flutter: ">=3.19.6" diff --git a/frosthaven_assistant/pubspec.yaml b/frosthaven_assistant/pubspec.yaml index c7b2bc31..9374775a 100644 --- a/frosthaven_assistant/pubspec.yaml +++ b/frosthaven_assistant/pubspec.yaml @@ -19,6 +19,8 @@ version: 1.9.1+35 environment: sdk: ">=3.1.0 <3.6.0" + #for some reason main list animations do not play on flutter 3.22.x, so pegging flutter version. + flutter: '3.19.6' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions