diff --git a/android/gradle.properties b/android/gradle.properties index 14eed3944b547f02179b1b42f4b601f91b7957c0..aa51064abebb79ba519e600afb7af23779154d4e 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 0000000000000000000000000000000000000000..8b03873cfea4fcffcd65ec9c0133ec0fe39820a3 --- /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 0000000000000000000000000000000000000000..0b46e4f89d48042f40111a1cb1678e65a7ce22f6 --- /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 4f571d83827915d74a6785aafe09250c0dd5b03a..a0ecdf2f7cb1bd8ee0772706dfbb25dc29944e2b 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 39df1a59b026458a737bfd817540a46c3913e2d6..7aeb55d9c30deed467c4dd60bb298c96c72fbe84 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);