From 99c1d1d21122e8988f55561aab8bf969ec3de1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Mon, 1 Aug 2022 14:24:18 +0200
Subject: [PATCH] Add a "moves count" indicator
---
android/gradle.properties | 4 ++--
fastlane/metadata/android/en-US/changelogs/48.txt | 1 +
fastlane/metadata/android/fr-FR/changelogs/48.txt | 1 +
lib/provider/data.dart | 15 ++++++++++++++-
lib/screens/game.dart | 11 ++++++++++-
5 files changed, 28 insertions(+), 4 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/48.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/48.txt
diff --git a/android/gradle.properties b/android/gradle.properties
index 2c9d43c..9afb4c6 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.47
-app.versionCode=47
+app.versionName=0.0.48
+app.versionCode=48
diff --git a/fastlane/metadata/android/en-US/changelogs/48.txt b/fastlane/metadata/android/en-US/changelogs/48.txt
new file mode 100644
index 0000000..de6b295
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/48.txt
@@ -0,0 +1 @@
+Add a moves counter
diff --git a/fastlane/metadata/android/fr-FR/changelogs/48.txt b/fastlane/metadata/android/fr-FR/changelogs/48.txt
new file mode 100644
index 0000000..0342663
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/48.txt
@@ -0,0 +1 @@
+Ajout d'un compteur de coups
diff --git a/lib/provider/data.dart b/lib/provider/data.dart
index d11f57f..62ea928 100644
--- a/lib/provider/data.dart
+++ b/lib/provider/data.dart
@@ -5,11 +5,12 @@ class Data extends ChangeNotifier {
// application configuration
int _tilesCount = 4;
- // application data
+ // Game data
List _availableImages = [];
String _selectedImage = '';
List<MovingTile> _tiles = [];
double _tileImageSize = 1.0;
+ int _movesCount = 0;
// application state
bool _isShufflingBoard = false;
@@ -19,6 +20,7 @@ class Data extends ChangeNotifier {
void updateSelectedImage(String value) {
_selectedImage = value;
+ _movesCount = 0;
notifyListeners();
}
@@ -47,6 +49,16 @@ class Data extends ChangeNotifier {
notifyListeners();
}
+ int get movesCount => _movesCount;
+ void updateMovesCount(int movesCount) {
+ _movesCount = movesCount;
+ notifyListeners();
+ }
+
+ void incrementMovesCount() {
+ updateMovesCount(movesCount + 1);
+ }
+
bool get isShufflingBoard => _isShufflingBoard;
void updateIsShufflingBoard(bool isShuffling) {
@@ -84,6 +96,7 @@ class Data extends ChangeNotifier {
_tiles[indexTile1].currentRow = _tiles[indexTile2].currentRow;
_tiles[indexTile2].currentRow = swapRow;
+ incrementMovesCount();
notifyListeners();
}
}
diff --git a/lib/screens/game.dart b/lib/screens/game.dart
index 4c63e59..38bc89a 100644
--- a/lib/screens/game.dart
+++ b/lib/screens/game.dart
@@ -144,7 +144,16 @@ class Game {
children: [
TableRow(
children: [
- Column(children: []),
+ Column(children: [
+ Text(
+ myProvider.movesCount.toString(),
+ style: TextStyle(
+ fontSize: 40,
+ fontWeight: FontWeight.w600,
+ color: Colors.black,
+ ),
+ ),
+ ]),
Column(children: []),
],
),
--
GitLab