haissous/SAE41_2022
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "affichage de tous les composants"

Browse Source 
This reverts commit 6079ddb71f.
This commit is contained in:
Haïssous Kayyissa 2023-04-05 17:11:43 +02:00
parent e34c000f65
commit 75ac209aef
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/example/mastermind/game/GameView.java
View File

@ -43,9 +43,10 @@ public class GameView extends View {
protected void onDraw(Canvas canvas){ protected void onDraw(Canvas canvas){
super.onDraw(canvas); super.onDraw(canvas);
this.setBackgroundColor(this.getResources().getColor(R.color.grey)); this.setBackgroundColor(this.getResources().getColor(R.color.grey));
//affichage des anciennes soumissions
LinkedList<Integer> grille = new LinkedList<Integer>(); LinkedList<Integer> grille = new LinkedList<Integer>();
grille.addAll(this.grille.getSoumissions()); grille.addAll(this.grille.getSoumissions());
System.out.println(grille);
System.out.println(this.grille.getSoumissions());
for (int y=0; y<10;y++) { for (int y=0; y<10;y++) {
for (int x=0;x<4;x++) { for (int x=0;x<4;x++) {
this.circle.setColor(grille.pop()); this.circle.setColor(grille.pop());
@ -54,25 +55,6 @@ public class GameView extends View {
System.out.println("rond grille"); System.out.println("rond grille");
} }
} }
// affichage de la zone de saisie
LinkedList<Integer> saisie = new LinkedList<Integer>();
saisie.addAll(this.saisie.getChoix());
for (int i=0;i<4;i++){
this.circle.setColor(saisie.pop());
//TODO: coordonnées propres (encore)
canvas.drawCircle((i*200+250),1550, 80, this.circle);
System.out.println("rond saisie");
}
// affichage des couleurs choisissables
LinkedList<Integer> couleurs = new LinkedList<Integer>();
couleurs.addAll(this.saisie.getSelection());
for (int i=0;i<6;i++){
this.circle.setColor(couleurs.pop());
//TODO: coordonnées propres (encore)
canvas.drawCircle((i*160+150),1750, 70, this.circle);
System.out.println("rond saisie");
}
} }
public void redraw(){ public void redraw(){