Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 45-improve-app-metadata
  • master
  • Release_0.0.10_10
  • Release_0.0.11_11
  • Release_0.0.12_12
  • Release_0.0.13_13
  • Release_0.0.14_14
  • Release_0.0.15_15
  • Release_0.0.16_16
  • Release_0.0.17_17
  • Release_0.0.18_18
  • Release_0.0.19_19
  • Release_0.0.1_1
  • Release_0.0.20_20
  • Release_0.0.21_21
  • Release_0.0.22_22
  • Release_0.0.23_23
  • Release_0.0.24_24
  • Release_0.0.25_25
  • Release_0.0.26_26
  • Release_0.0.27_27
  • Release_0.0.28_28
  • Release_0.0.29_29
  • Release_0.0.2_2
  • Release_0.0.30_30
  • Release_0.0.31_31
  • Release_0.0.32_32
  • Release_0.0.33_33
  • Release_0.0.34_34
  • Release_0.0.35_35
  • Release_0.0.36_36
  • Release_0.0.37_37
  • Release_0.0.38_38
  • Release_0.0.39_39
  • Release_0.0.3_3
  • Release_0.0.4_4
  • Release_0.0.5_5
  • Release_0.0.6_6
  • Release_0.0.7_7
  • Release_0.0.8_8
  • Release_0.0.9_9
  • Release_0.1.0_40
  • Release_0.1.1_41
  • Release_0.1.2_42
  • Release_0.2.0_43
  • Release_0.2.1_44
  • Release_0.2.2_45
  • Release_0.3.0_46
  • Release_0.3.1_47
  • Release_0.4.0_48
  • Release_0.4.1_49
  • Release_0.4.2_50
  • Release_0.5.0_51
  • Release_0.6.0_52
  • Release_0.7.0_53
  • Release_0.8.0_54
  • Release_0.8.1_55
  • Release_0.8.2_56
  • Release_0.9.0_57
  • Release_0.9.1_58
60 results

Target

Select target project
  • android/org.benoitharrault.colors
1 result
Select Git revision
  • 45-improve-app-metadata
  • master
  • Release_0.0.10_10
  • Release_0.0.11_11
  • Release_0.0.12_12
  • Release_0.0.13_13
  • Release_0.0.14_14
  • Release_0.0.15_15
  • Release_0.0.16_16
  • Release_0.0.17_17
  • Release_0.0.18_18
  • Release_0.0.19_19
  • Release_0.0.1_1
  • Release_0.0.20_20
  • Release_0.0.21_21
  • Release_0.0.22_22
  • Release_0.0.23_23
  • Release_0.0.24_24
  • Release_0.0.25_25
  • Release_0.0.26_26
  • Release_0.0.27_27
  • Release_0.0.28_28
  • Release_0.0.29_29
  • Release_0.0.2_2
  • Release_0.0.30_30
  • Release_0.0.31_31
  • Release_0.0.32_32
  • Release_0.0.33_33
  • Release_0.0.34_34
  • Release_0.0.35_35
  • Release_0.0.36_36
  • Release_0.0.37_37
  • Release_0.0.38_38
  • Release_0.0.39_39
  • Release_0.0.3_3
  • Release_0.0.4_4
  • Release_0.0.5_5
  • Release_0.0.6_6
  • Release_0.0.7_7
  • Release_0.0.8_8
  • Release_0.0.9_9
  • Release_0.1.0_40
  • Release_0.1.1_41
  • Release_0.1.2_42
  • Release_0.2.0_43
  • Release_0.2.1_44
  • Release_0.2.2_45
  • Release_0.3.0_46
  • Release_0.3.1_47
  • Release_0.4.0_48
  • Release_0.4.1_49
  • Release_0.4.2_50
  • Release_0.5.0_51
  • Release_0.6.0_52
  • Release_0.7.0_53
  • Release_0.8.0_54
  • Release_0.8.1_55
  • Release_0.8.2_56
  • Release_0.9.0_57
  • Release_0.9.1_58
60 results
Show changes

Commits on Source 4

org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=0.0.5 app.versionName=0.0.7
app.versionCode=5 app.versionCode=7
...@@ -55,6 +55,14 @@ class Game { ...@@ -55,6 +55,14 @@ class Game {
color: Colors.black, color: Colors.black,
), ),
), ),
Text(
'(max: ' + myProvider.maxMovesCount.toString() + ')',
style: TextStyle(
fontSize: 15,
fontWeight: FontWeight.w600,
color: Colors.grey,
),
),
] ]
), ),
Column( Column(
......
...@@ -22,6 +22,7 @@ class Data extends ChangeNotifier { ...@@ -22,6 +22,7 @@ class Data extends ChangeNotifier {
int _boardSize = 0; int _boardSize = 0;
int _colorsCount = 0; int _colorsCount = 0;
int _movesCount = 0; int _movesCount = 0;
int _maxMovesCount = 0;
List _cells = []; List _cells = [];
int _progress = 0; int _progress = 0;
...@@ -96,7 +97,7 @@ class Data extends ChangeNotifier { ...@@ -96,7 +97,7 @@ class Data extends ChangeNotifier {
switch(level) { switch(level) {
case 'easy': { return 6; } case 'easy': { return 6; }
break; break;
case 'normal': { return 10; } case 'medium': { return 10; }
break; break;
case 'hard': { return 14; } case 'hard': { return 14; }
break; break;
...@@ -110,7 +111,7 @@ class Data extends ChangeNotifier { ...@@ -110,7 +111,7 @@ class Data extends ChangeNotifier {
switch(level) { switch(level) {
case 'easy': { return 4; } case 'easy': { return 4; }
break; break;
case 'normal': { return 5; } case 'medium': { return 5; }
break; break;
case 'hard': { return 6; } case 'hard': { return 6; }
break; break;
...@@ -140,6 +141,11 @@ class Data extends ChangeNotifier { ...@@ -140,6 +141,11 @@ class Data extends ChangeNotifier {
updateMovesCount(movesCount + 1); updateMovesCount(movesCount + 1);
} }
int get maxMovesCount => _maxMovesCount;
void updateMaxMovesCount(int maxMovesCount) {
_maxMovesCount = maxMovesCount;
}
int get progress => _progress; int get progress => _progress;
int get progressTotal => _progressTotal; int get progressTotal => _progressTotal;
int get progressDelta => _progressDelta; int get progressDelta => _progressDelta;
...@@ -176,6 +182,7 @@ class Data extends ChangeNotifier { ...@@ -176,6 +182,7 @@ class Data extends ChangeNotifier {
_gameIsRunning = false; _gameIsRunning = false;
_gameWon = false; _gameWon = false;
_movesCount = 0; _movesCount = 0;
_maxMovesCount = 0;
_progress = 0; _progress = 0;
notifyListeners(); notifyListeners();
} }
......
...@@ -39,11 +39,19 @@ class BoardUtils { ...@@ -39,11 +39,19 @@ class BoardUtils {
myProvider.resetGame(); myProvider.resetGame();
myProvider.updateCells(grid); myProvider.updateCells(grid);
myProvider.updateMaxMovesCount(computeMaxMovesCountLimit(myProvider));
int initProgress = BoardUtils.getSiblingFillableCells(myProvider, 0, 0, [[0, 0]]).length; int initProgress = BoardUtils.getSiblingFillableCells(myProvider, 0, 0, [[0, 0]]).length;
myProvider.updateProgress(initProgress); myProvider.updateProgress(initProgress);
} }
static int computeMaxMovesCountLimit(myProvider) {
int boardSize = myProvider.boardSize;
int colorsCount = myProvider.colorsCount;
return (30 * (boardSize * colorsCount) / (17 * 6)).round();
}
static fillBoardFromFirstCell(Data myProvider, int value) { static fillBoardFromFirstCell(Data myProvider, int value) {
List cellsToFill = BoardUtils.getSiblingFillableCells(myProvider, 0, 0, [[0, 0]]); List cellsToFill = BoardUtils.getSiblingFillableCells(myProvider, 0, 0, [[0, 0]]);
int progressBeforeMove = cellsToFill.length; int progressBeforeMove = cellsToFill.length;
......