From a3389aa674f605f9fafa238b0f250ce82245a773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Mon, 10 Jul 2023 12:07:11 +0200
Subject: [PATCH] Improve some display, update dependencies
---
android/app/build.gradle | 2 +-
android/gradle.properties | 4 +-
.../metadata/android/en-US/changelogs/30.txt | 1 +
.../metadata/android/fr-FR/changelogs/30.txt | 1 +
lib/layout/game.dart | 37 ++--
lib/layout/parameters.dart | 11 +-
lib/provider/data.dart | 34 +++-
pubspec.lock | 183 ++++++++++--------
8 files changed, 165 insertions(+), 108 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/30.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/30.txt
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8f9c32b..3295fd7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -39,7 +39,7 @@ if (keystorePropertiesFile.exists()) {
}
android {
- compileSdkVersion 31
+ compileSdkVersion 33
defaultConfig {
applicationId "org.benoitharrault.colors"
diff --git a/android/gradle.properties b/android/gradle.properties
index d965699..cc4e56e 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.0.29
-app.versionCode=29
+app.versionName=0.0.30
+app.versionCode=30
diff --git a/fastlane/metadata/android/en-US/changelogs/30.txt b/fastlane/metadata/android/en-US/changelogs/30.txt
new file mode 100644
index 0000000..e19eafa
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/30.txt
@@ -0,0 +1 @@
+Fix some display issues, update dependencies
diff --git a/fastlane/metadata/android/fr-FR/changelogs/30.txt b/fastlane/metadata/android/fr-FR/changelogs/30.txt
new file mode 100644
index 0000000..1a703bc
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/30.txt
@@ -0,0 +1 @@
+Améliorations d'affichage, mise à jour de dépendances
diff --git a/lib/layout/game.dart b/lib/layout/game.dart
index 81fb64d..81b93d3 100644
--- a/lib/layout/game.dart
+++ b/lib/layout/game.dart
@@ -52,11 +52,15 @@ class Game {
Text(
myProvider.movesCount.toString(),
style: TextStyle(
- fontSize: 40,
+ fontSize: 35,
fontWeight: FontWeight.w600,
color: Colors.black,
),
),
+ ],
+ ),
+ Column(
+ children: [
Text(
'(max: ' + myProvider.maxMovesCount.toString() + ')',
style: TextStyle(
@@ -65,14 +69,10 @@ class Game {
color: maxMovesCountColor,
),
),
- ],
- ),
- Column(
- children: [
Text(
progressIndicator,
style: TextStyle(
- fontSize: 20,
+ fontSize: 15,
fontWeight: FontWeight.w600,
color: Colors.green,
),
@@ -111,11 +111,12 @@ class Game {
static TextButton buildRestartGameButton(Data myProvider) {
return TextButton(
- child: Container(
- child: Image(
- image: AssetImage('assets/icons/button_back.png'),
- fit: BoxFit.fill,
- ),
+ style: ButtonStyle(
+ padding: MaterialStateProperty.all<EdgeInsets>(EdgeInsets.all(0)),
+ ),
+ child: Image(
+ image: AssetImage('assets/icons/button_back.png'),
+ fit: BoxFit.fill,
),
onPressed: () => GameUtils.resetGame(myProvider),
);
@@ -142,15 +143,11 @@ class Game {
children: [
TableRow(
children: [
- Column(
- children: [decorationImage],
- ),
- Column(
- children: [buildRestartGameButton(myProvider)],
- ),
- Column(
- children: [decorationImage],
- ),
+ Column(children: [decorationImage]),
+ Column(children: [decorationImage]),
+ Column(children: [buildRestartGameButton(myProvider)]),
+ Column(children: [decorationImage]),
+ Column(children: [decorationImage]),
],
),
],
diff --git a/lib/layout/parameters.dart b/lib/layout/parameters.dart
index d1bbd6c..f3fcc67 100644
--- a/lib/layout/parameters.dart
+++ b/lib/layout/parameters.dart
@@ -67,11 +67,12 @@ class Parameters {
Column(
children: [
TextButton(
- child: Container(
- child: Image(
- image: AssetImage('assets/icons/button_start.png'),
- fit: BoxFit.fill,
- ),
+ style: ButtonStyle(
+ padding: MaterialStateProperty.all<EdgeInsets>(EdgeInsets.all(0)),
+ ),
+ child: Image(
+ image: AssetImage('assets/icons/button_start.png'),
+ fit: BoxFit.fill,
),
onPressed: () => GameUtils.startGame(myProvider),
),
diff --git a/lib/provider/data.dart b/lib/provider/data.dart
index 1df7fb5..8bd370f 100644
--- a/lib/provider/data.dart
+++ b/lib/provider/data.dart
@@ -47,25 +47,51 @@ class Data extends ChangeNotifier {
int _progressTotal = 0;
int _progressDelta = 0;
+ bool isParameterValueAllowed(String parameterValue, List parametersAllowedValues) {
+ bool found = false;
+ parametersAllowedValues.forEach((item) {
+ if (item.contains(parameterValue)) {
+ found = true;
+ }
+ });
+ return found;
+ }
+
void updateParameterLevel(String parameterLevel) {
- _parameterLevel = parameterLevel;
+ if (isParameterValueAllowed(parameterLevel, _availableLevelValues)) {
+ _parameterLevel = parameterLevel;
+ } else {
+ _parameterLevel = _parameterLevelDefault;
+ }
notifyListeners();
}
void updateParameterSize(String parameterSize) {
- _parameterSize = parameterSize;
+ if (isParameterValueAllowed(parameterSize, _availableSizeValues)) {
+ _parameterSize = parameterSize;
+ } else {
+ _parameterSize = _parameterSizeDefault;
+ }
updateBoardSize(getBoardSizeFromParameter(parameterSize));
notifyListeners();
}
void updateParameterColors(String parameterColors) {
- _parameterColors = parameterColors;
+ if (isParameterValueAllowed(parameterColors, _availableColorsValues)) {
+ _parameterColors = parameterColors;
+ } else {
+ _parameterColors = _parameterColorsDefault;
+ }
updateColorsCount(getColorsCountFromParameter(parameterColors));
notifyListeners();
}
void updateParameterSkin(String parameterSkin) {
- _parameterSkin = parameterSkin;
+ if (isParameterValueAllowed(parameterSkin, _availableSkinValues)) {
+ _parameterSkin = parameterSkin;
+ } else {
+ _parameterSkin = _parameterSkinDefault;
+ }
notifyListeners();
}
diff --git a/pubspec.lock b/pubspec.lock
index c6a8d1d..0a5815c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,56 +5,64 @@ packages:
dependency: transitive
description:
name: async
- url: "https://pub.dartlang.org"
+ sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+ url: "https://pub.dev"
source: hosted
- version: "2.9.0"
+ version: "2.10.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
- url: "https://pub.dartlang.org"
+ sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+ url: "https://pub.dev"
source: hosted
- version: "2.1.0"
+ version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
- url: "https://pub.dartlang.org"
+ sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+ url: "https://pub.dev"
source: hosted
version: "1.2.1"
clock:
dependency: transitive
description:
name: clock
- url: "https://pub.dartlang.org"
+ sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+ url: "https://pub.dev"
source: hosted
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
- url: "https://pub.dartlang.org"
+ sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+ url: "https://pub.dev"
source: hosted
- version: "1.16.0"
+ version: "1.17.0"
fake_async:
dependency: transitive
description:
name: fake_async
- url: "https://pub.dartlang.org"
+ sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+ url: "https://pub.dev"
source: hosted
version: "1.3.1"
ffi:
dependency: transitive
description:
name: ffi
- url: "https://pub.dartlang.org"
+ sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
+ url: "https://pub.dev"
source: hosted
- version: "2.0.1"
+ version: "2.0.2"
file:
dependency: transitive
description:
name: file
- url: "https://pub.dartlang.org"
+ sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+ url: "https://pub.dev"
source: hosted
version: "6.1.4"
flutter:
@@ -76,156 +84,170 @@ packages:
dependency: transitive
description:
name: js
- url: "https://pub.dartlang.org"
+ sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+ url: "https://pub.dev"
source: hosted
- version: "0.6.4"
+ version: "0.6.5"
matcher:
dependency: transitive
description:
name: matcher
- url: "https://pub.dartlang.org"
+ sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+ url: "https://pub.dev"
source: hosted
- version: "0.12.12"
+ version: "0.12.13"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
- url: "https://pub.dartlang.org"
+ sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+ url: "https://pub.dev"
source: hosted
- version: "0.1.5"
+ version: "0.2.0"
meta:
dependency: transitive
description:
name: meta
- url: "https://pub.dartlang.org"
+ sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+ url: "https://pub.dev"
source: hosted
version: "1.8.0"
nested:
dependency: transitive
description:
name: nested
- url: "https://pub.dartlang.org"
+ sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
+ url: "https://pub.dev"
source: hosted
version: "1.0.0"
overlay_support:
dependency: "direct main"
description:
name: overlay_support
- url: "https://pub.dartlang.org"
+ sha256: fc39389bfd94e6985e1e13b2a88a125fc4027608485d2d4e2847afe1b2bb339c
+ url: "https://pub.dev"
source: hosted
- version: "2.0.1"
+ version: "2.1.0"
path:
dependency: transitive
description:
name: path
- url: "https://pub.dartlang.org"
+ sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+ url: "https://pub.dev"
source: hosted
version: "1.8.2"
path_provider_linux:
dependency: transitive
description:
name: path_provider_linux
- url: "https://pub.dartlang.org"
+ sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57
+ url: "https://pub.dev"
source: hosted
- version: "2.1.7"
+ version: "2.1.11"
path_provider_platform_interface:
dependency: transitive
description:
name: path_provider_platform_interface
- url: "https://pub.dartlang.org"
+ sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
+ url: "https://pub.dev"
source: hosted
- version: "2.0.4"
+ version: "2.0.6"
path_provider_windows:
dependency: transitive
description:
name: path_provider_windows
- url: "https://pub.dartlang.org"
+ sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96"
+ url: "https://pub.dev"
source: hosted
- version: "2.1.3"
+ version: "2.1.7"
platform:
dependency: transitive
description:
name: platform
- url: "https://pub.dartlang.org"
+ sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+ url: "https://pub.dev"
source: hosted
version: "3.1.0"
plugin_platform_interface:
dependency: transitive
description:
name: plugin_platform_interface
- url: "https://pub.dartlang.org"
+ sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+ url: "https://pub.dev"
source: hosted
version: "2.1.3"
process:
dependency: transitive
description:
name: process
- url: "https://pub.dartlang.org"
+ sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
+ url: "https://pub.dev"
source: hosted
version: "4.2.4"
provider:
dependency: "direct main"
description:
name: provider
- url: "https://pub.dartlang.org"
+ sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
+ url: "https://pub.dev"
source: hosted
- version: "6.0.3"
+ version: "6.0.5"
shared_preferences:
dependency: "direct main"
description:
name: shared_preferences
- url: "https://pub.dartlang.org"
+ sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1"
+ url: "https://pub.dev"
source: hosted
- version: "2.0.15"
+ version: "2.2.0"
shared_preferences_android:
dependency: transitive
description:
name: shared_preferences_android
- url: "https://pub.dartlang.org"
+ sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076
+ url: "https://pub.dev"
source: hosted
- version: "2.0.13"
- shared_preferences_ios:
+ version: "2.2.0"
+ shared_preferences_foundation:
dependency: transitive
description:
- name: shared_preferences_ios
- url: "https://pub.dartlang.org"
+ name: shared_preferences_foundation
+ sha256: b046999bf0ff58f04c364491bb803dcfa8f42e47b19c75478f53d323684a8cc1
+ url: "https://pub.dev"
source: hosted
- version: "2.1.1"
+ version: "2.3.1"
shared_preferences_linux:
dependency: transitive
description:
name: shared_preferences_linux
- url: "https://pub.dartlang.org"
+ sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1"
+ url: "https://pub.dev"
source: hosted
- version: "2.1.1"
- shared_preferences_macos:
- dependency: transitive
- description:
- name: shared_preferences_macos
- url: "https://pub.dartlang.org"
- source: hosted
- version: "2.0.4"
+ version: "2.3.0"
shared_preferences_platform_interface:
dependency: transitive
description:
name: shared_preferences_platform_interface
- url: "https://pub.dartlang.org"
+ sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1"
+ url: "https://pub.dev"
source: hosted
- version: "2.1.0"
+ version: "2.3.0"
shared_preferences_web:
dependency: transitive
description:
name: shared_preferences_web
- url: "https://pub.dartlang.org"
+ sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a"
+ url: "https://pub.dev"
source: hosted
- version: "2.0.4"
+ version: "2.2.0"
shared_preferences_windows:
dependency: transitive
description:
name: shared_preferences_windows
- url: "https://pub.dartlang.org"
+ sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d
+ url: "https://pub.dev"
source: hosted
- version: "2.1.1"
+ version: "2.3.0"
sky_engine:
dependency: transitive
description: flutter
@@ -235,65 +257,74 @@ packages:
dependency: transitive
description:
name: source_span
- url: "https://pub.dartlang.org"
+ sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+ url: "https://pub.dev"
source: hosted
- version: "1.9.0"
+ version: "1.9.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
- url: "https://pub.dartlang.org"
+ sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+ url: "https://pub.dev"
source: hosted
- version: "1.10.0"
+ version: "1.11.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
- url: "https://pub.dartlang.org"
+ sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+ url: "https://pub.dev"
source: hosted
- version: "2.1.0"
+ version: "2.1.1"
string_scanner:
dependency: transitive
description:
name: string_scanner
- url: "https://pub.dartlang.org"
+ sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+ url: "https://pub.dev"
source: hosted
- version: "1.1.1"
+ version: "1.2.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
- url: "https://pub.dartlang.org"
+ sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+ url: "https://pub.dev"
source: hosted
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
- url: "https://pub.dartlang.org"
+ sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+ url: "https://pub.dev"
source: hosted
- version: "0.4.12"
+ version: "0.4.16"
vector_math:
dependency: transitive
description:
name: vector_math
- url: "https://pub.dartlang.org"
+ sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+ url: "https://pub.dev"
source: hosted
- version: "2.1.2"
+ version: "2.1.4"
win32:
dependency: transitive
description:
name: win32
- url: "https://pub.dartlang.org"
+ sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
+ url: "https://pub.dev"
source: hosted
- version: "3.0.0"
+ version: "4.1.4"
xdg_directories:
dependency: transitive
description:
name: xdg_directories
- url: "https://pub.dartlang.org"
+ sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
+ url: "https://pub.dev"
source: hosted
- version: "0.2.0+2"
+ version: "1.0.0"
sdks:
- dart: ">=2.17.0 <3.0.0"
- flutter: ">=3.0.0"
+ dart: ">=2.18.0 <3.0.0"
+ flutter: ">=3.3.0"
--
GitLab