From 4e94a324f52bc5aac5cced9ff443929c1d0842ca Mon Sep 17 00:00:00 2001 From: Claire G Date: Thu, 6 Apr 2023 14:38:30 +0200 Subject: [PATCH] Ajout visuel boutons retour et annuler --- .../main/java/com/example/mastermind/game/GameView.java | 9 ++++++--- app/src/main/res/values/colors.xml | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/example/mastermind/game/GameView.java b/app/src/main/java/com/example/mastermind/game/GameView.java index 8a4ff1d..2dd5427 100644 --- a/app/src/main/java/com/example/mastermind/game/GameView.java +++ b/app/src/main/java/com/example/mastermind/game/GameView.java @@ -87,10 +87,13 @@ public class GameView extends View { //TODO: ajout des boutons //Test de bouton valider this.circle.setColor(this.getResources().getColor(R.color.green)); - canvas.drawCircle((this.getWidth()/2),this.getHeight()-this.getHeight()/16, this.getWidth()/13, this.circle); + canvas.drawCircle((this.getWidth()/2)+(getWidth()/11)*2,this.getHeight()-this.getHeight()/16, this.getWidth()/13, this.circle); // bouton retour - /*this.circle.setColor(this.getResources().getColor(R.color.blue)); - canvas.drawCircle((this.getWidth()/2), this.getHeight()-this.getHeight()/16, this.getWidth()/13, this.circle);*/ + this.circle.setColor(this.getResources().getColor(R.color.blue)); + canvas.drawCircle((this.getWidth()/2), this.getHeight()-this.getHeight()/16, this.getWidth()/13, this.circle); + // bouton annuler + this.circle.setColor(this.getResources().getColor(R.color.red)); + canvas.drawCircle((this.getWidth()/2)-(getWidth()/11)*2, this.getHeight()-this.getHeight()/16, this.getWidth()/13, this.circle); } //Change l'état de soumission à notation après qu'une combinaision ai été soumise puis inversement diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c99f351..3a50cf7 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,6 +14,5 @@ #FFFEC603 #FF333333 #FF999999 - - + #d32f2f \ No newline at end of file