From a4266b1230c1299c35d6aa1192c85fc5889cfdd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Sat, 24 Jul 2021 19:35:36 +0200
Subject: [PATCH] Remove flag on cell when explored
---
android/gradle.properties | 4 +--
.../metadata/android/en-US/changelogs/5.txt | 1 +
.../metadata/android/fr-FR/changelogs/5.txt | 1 +
lib/provider/data.dart | 1 +
lib/utils/board_utils.dart | 35 +++++++++++++++----
5 files changed, 34 insertions(+), 8 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/5.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/5.txt
diff --git a/android/gradle.properties b/android/gradle.properties
index 14eed39..aa51064 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.4
-app.versionCode=4
+app.versionName=0.0.5
+app.versionCode=5
diff --git a/fastlane/metadata/android/en-US/changelogs/5.txt b/fastlane/metadata/android/en-US/changelogs/5.txt
new file mode 100644
index 0000000..8b03873
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/5.txt
@@ -0,0 +1 @@
+Remove flag on cell when explored.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/5.txt b/fastlane/metadata/android/fr-FR/changelogs/5.txt
new file mode 100644
index 0000000..0b46e4f
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/5.txt
@@ -0,0 +1 @@
+Enlève le marquage sur les cellules parcourues.
diff --git a/lib/provider/data.dart b/lib/provider/data.dart
index 4f571d8..a0ecdf2 100644
--- a/lib/provider/data.dart
+++ b/lib/provider/data.dart
@@ -80,6 +80,7 @@ class Data extends ChangeNotifier {
void setCellAsExplored(int row, int col) {
_cells[row][col].isExplored = true;
+ _cells[row][col].isMarked = false;
if (_cells[row][col].isMined) {
_cells[row][col].isExploded = true;
};
diff --git a/lib/utils/board_utils.dart b/lib/utils/board_utils.dart
index 39df1a5..7aeb55d 100644
--- a/lib/utils/board_utils.dart
+++ b/lib/utils/board_utils.dart
@@ -4,21 +4,42 @@ import '../provider/data.dart';
class BoardUtils {
static printGrid(List cells) {
+ final String IS_MINED = 'X';
+ final String IS_SAFE = '.';
+
+ final String MINE_FOUND = '#';
+ final String WRONG_MARKED_CELL = '0';
+ final String EXPLORED_SAFE_CELL = '.';
+ final String UNKNOWN_STATE = ' ';
+
print('');
String line = '--';
for (var i = 0; i < cells[0].length; i++) {
line += '-';
}
- print(line);
+ print(line + ' ' + line);
for (var rowIndex = 0; rowIndex < cells.length; rowIndex++) {
- String row = '|';
+ String currentLine = '';
+ String solvedLine = '';
for (var colIndex = 0; colIndex < cells[rowIndex].length; colIndex++) {
- row += cells[rowIndex][colIndex].isMined ? 'X' : '.';
+ solvedLine += cells[rowIndex][colIndex].isMined ? IS_MINED : IS_SAFE;
+
+ String cellString = UNKNOWN_STATE;
+ if (cells[rowIndex][colIndex].isExplored) {
+ cellString = EXPLORED_SAFE_CELL;
+ }
+ if (cells[rowIndex][colIndex].isMarked) {
+ if (cells[rowIndex][colIndex].isMined) {
+ cellString = MINE_FOUND;
+ } else {
+ cellString = WRONG_MARKED_CELL;
+ }
+ }
+ currentLine += cellString;
}
- row += '|';
- print(row);
+ print('|' + currentLine + '| |' + solvedLine + '|');
}
- print(line);
+ print(line + ' ' + line);
print('');
}
@@ -169,6 +190,8 @@ class BoardUtils {
int sizeHorizontal = cells.length;
int sizeVertical = cells[0].length;
+ printGrid(cells);
+
myProvider.updateGameWin(false);
myProvider.updateGameFail(false);
--
GitLab