From b0ce03a6937faeed4808ac817ce531b3263e22da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr> Date: Mon, 26 Sep 2022 17:05:44 +0200 Subject: [PATCH] Update framework and dependencies, clean some code --- android/gradle.properties | 4 +-- .../metadata/android/en-US/changelogs/53.txt | 1 + .../metadata/android/fr-FR/changelogs/53.txt | 1 + lib/screens/game_pick_image.dart | 8 ++--- lib/screens/game_pick_word.dart | 8 ++--- lib/screens/home.dart | 1 - lib/utils/random_pick_data.dart | 3 +- pubspec.lock | 33 ++++++++----------- 8 files changed, 26 insertions(+), 33 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/53.txt create mode 100644 fastlane/metadata/android/fr-FR/changelogs/53.txt diff --git a/android/gradle.properties b/android/gradle.properties index 260fd64..f428ddc 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -app.versionName=0.1.28 -app.versionCode=52 +app.versionName=0.1.29 +app.versionCode=53 diff --git a/fastlane/metadata/android/en-US/changelogs/53.txt b/fastlane/metadata/android/en-US/changelogs/53.txt new file mode 100644 index 0000000..2bbe4a9 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/53.txt @@ -0,0 +1 @@ +Upgrade Flutter framework and dependencies, clean some code diff --git a/fastlane/metadata/android/fr-FR/changelogs/53.txt b/fastlane/metadata/android/fr-FR/changelogs/53.txt new file mode 100644 index 0000000..864ad0a --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/53.txt @@ -0,0 +1 @@ +Mise à jour du framework Flutter et de ses dépendances, nettoyage de code diff --git a/lib/screens/game_pick_image.dart b/lib/screens/game_pick_image.dart index c7d7d3d..e7fb047 100644 --- a/lib/screens/game_pick_image.dart +++ b/lib/screens/game_pick_image.dart @@ -238,8 +238,8 @@ class GamePickImagePage extends StatelessWidget { Container( child: ElevatedButton( style: ElevatedButton.styleFrom( - onPrimary: Colors.teal, - primary: Colors.teal, + foregroundColor: Colors.teal, + backgroundColor: Colors.teal, padding: EdgeInsets.all(35), ), child: Text( @@ -256,8 +256,8 @@ class GamePickImagePage extends StatelessWidget { Container( child: ElevatedButton( style: ElevatedButton.styleFrom( - onPrimary: Colors.teal, - primary: Colors.teal, + foregroundColor: Colors.teal, + backgroundColor: Colors.teal, padding: EdgeInsets.all(35), ), child: Text( diff --git a/lib/screens/game_pick_word.dart b/lib/screens/game_pick_word.dart index df675f8..610dde9 100644 --- a/lib/screens/game_pick_word.dart +++ b/lib/screens/game_pick_word.dart @@ -263,8 +263,8 @@ class GamePickWordPage extends StatelessWidget { Container( child: ElevatedButton( style: ElevatedButton.styleFrom( - onPrimary: Colors.teal, - primary: Colors.teal, + foregroundColor: Colors.teal, + backgroundColor: Colors.teal, padding: EdgeInsets.all(35), ), child: Text( @@ -281,8 +281,8 @@ class GamePickWordPage extends StatelessWidget { Container( child: ElevatedButton( style: ElevatedButton.styleFrom( - onPrimary: Colors.teal, - primary: Colors.teal, + foregroundColor: Colors.teal, + backgroundColor: Colors.teal, padding: EdgeInsets.all(35), ), child: Text( diff --git a/lib/screens/home.dart b/lib/screens/home.dart index 76cc8ad..b4a7355 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -37,7 +37,6 @@ class Home extends StatelessWidget { child: TextButton( style: TextButton.styleFrom( padding: EdgeInsets.all(15), - primary: color, backgroundColor: color, ), child: Image( diff --git a/lib/utils/random_pick_data.dart b/lib/utils/random_pick_data.dart index 3875f18..da9b7fa 100644 --- a/lib/utils/random_pick_data.dart +++ b/lib/utils/random_pick_data.dart @@ -13,8 +13,7 @@ class RandomPickData { await getWordsAndImages(lang, wordsCount, imagesPerWordCount); } - Future<void> getWordsAndImages( - String lang, int wordsCount, int imagesPerWordCount) async { + Future<void> getWordsAndImages(String lang, int wordsCount, int imagesPerWordCount) async { RandomPickWord randomPickWord; RandomPickImage randomPickImage; diff --git a/pubspec.lock b/pubspec.lock index 5a0caee..f0dec00 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -21,21 +21,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.2.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: @@ -49,7 +42,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -66,7 +59,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.4" + version: "0.13.5" http_parser: dependency: transitive description: @@ -80,21 +73,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" nested: dependency: transitive description: @@ -108,7 +101,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" provider: dependency: "direct main" description: @@ -127,7 +120,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -148,21 +141,21 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" typed_data: dependency: transitive description: -- GitLab