diff --git a/app/src/main/java/sae/chuzzle/EtatJeu.java b/app/src/main/java/sae/chuzzle/EtatJeu.java index 619a6a5..e598950 100644 --- a/app/src/main/java/sae/chuzzle/EtatJeu.java +++ b/app/src/main/java/sae/chuzzle/EtatJeu.java @@ -27,7 +27,7 @@ public class EtatJeu { this.plateau = new Plateau(this.aleatoire); } - // --- Getters --- + // --- Getters public int obtenirScore() { return score; @@ -59,7 +59,7 @@ public class EtatJeu { return copie; } - // --- Actions --- + // --- Actions public boolean appliquerCoup(boolean estLigne, int index, int sens) { if (partieTerminee || plateau.estBloque(estLigne, index)) { @@ -259,9 +259,8 @@ public class EtatJeu { } public void restaurerEtat(Bundle b) { - if (!b.containsKey("grille")) { - return; - } + if (!b.containsKey("grille")) return; + int[] g = b.getIntArray("grille"); boolean[] v = b.getBooleanArray("verrous"); int[][] grid = plateau.getGrille(); diff --git a/app/src/main/java/sae/chuzzle/MainActivity.java b/app/src/main/java/sae/chuzzle/MainActivity.java index f09f304..1b44579 100644 --- a/app/src/main/java/sae/chuzzle/MainActivity.java +++ b/app/src/main/java/sae/chuzzle/MainActivity.java @@ -10,7 +10,6 @@ public class MainActivity extends Activity { private Controleur controleur; private boolean hardMode; private EtatJeu etatJeu; - private Button btnMenu; private VueGrille vueGrille; diff --git a/app/src/main/java/sae/chuzzle/VueGrille.java b/app/src/main/java/sae/chuzzle/VueGrille.java index 2da9f4f..cf2146a 100644 --- a/app/src/main/java/sae/chuzzle/VueGrille.java +++ b/app/src/main/java/sae/chuzzle/VueGrille.java @@ -24,7 +24,7 @@ public class VueGrille extends View { // Données nécessaires au dessin - private int[][] grille = new int[NB_LIGNES][NB_COLONNES]; + private int[][] grille = new int[NB_LIGNES][NB_COLONNES]; private boolean[][] verrous = new boolean[NB_LIGNES][NB_COLONNES]; private Boolean animEstLigne = null; @@ -205,8 +205,7 @@ public class VueGrille extends View { canvas.drawRoundRect(x1, y1, x2, y2, 20, 20, pinceauCase); if (animEstLigne != null) { - if ((animEstLigne && ligne == animIndex) - || (!animEstLigne && colonne == animIndex)) { + if ((animEstLigne && ligne == animIndex) || (!animEstLigne && colonne == animIndex)) { canvas.drawRoundRect(x1, y1, x2, y2, 20, 20, pinceauSelection); } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..efcd1e2 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + +