From 25387490680efe07903929600406140cd17bd842 Mon Sep 17 00:00:00 2001
From: Claire G <claire.gobert2002@gmail.com>
Date: Sun, 9 Apr 2023 23:27:46 +0200
Subject: [PATCH] partie avec pion vide fonctionnelle

---
 .../com/example/mastermind/ChoiceCombi.java   |  4 ++
 .../com/example/mastermind/GameActivity.java  |  6 ++-
 .../example/mastermind/SaisieActivity.java    |  2 +
 .../com/example/mastermind/game/Saisie.java   |  4 ++
 .../mastermind/game/TouchListener.java        | 43 +++++++++++++------
 app/src/main/res/values/colors.xml            |  1 +
 6 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/example/mastermind/ChoiceCombi.java b/app/src/main/java/com/example/mastermind/ChoiceCombi.java
index fe4d2d1..733e33f 100644
--- a/app/src/main/java/com/example/mastermind/ChoiceCombi.java
+++ b/app/src/main/java/com/example/mastermind/ChoiceCombi.java
@@ -71,4 +71,8 @@ public class ChoiceCombi extends Activity  implements SaisieActivity {
         this.saisie.initSelection(this.getResources().getColor(R.color.pionVide));
         this.view.invalidate();
     }
+
+    public int getNbrPion() {
+        return this.saisie.getSizeChoix();
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mastermind/GameActivity.java b/app/src/main/java/com/example/mastermind/GameActivity.java
index e6be412..fd89df0 100644
--- a/app/src/main/java/com/example/mastermind/GameActivity.java
+++ b/app/src/main/java/com/example/mastermind/GameActivity.java
@@ -87,6 +87,10 @@ public class GameActivity extends Activity implements SaisieActivity  {
         }
     }
 
+    public int getNbrPion() {
+        return this.saisie.getSizeChoix();
+    }
+
     //Change l'état de soumission à notation après qu'une combinaision ai été soumise puis inversement
     public void changeState() {
         if(!this.bot) {
@@ -200,7 +204,7 @@ public class GameActivity extends Activity implements SaisieActivity  {
         this.pionsAttaquant[4]=this.getResources().getColor(R.color.yellow);
         this.pionsAttaquant[5]=this.getResources().getColor(R.color.white);
         if(emptyPion) {
-            this.pionsAttaquant[6]=this.getResources().getColor(R.color.pionVide);
+            this.pionsAttaquant[6]=this.getResources().getColor(R.color.vide);
         }
 
         // on inisialise la saisie
diff --git a/app/src/main/java/com/example/mastermind/SaisieActivity.java b/app/src/main/java/com/example/mastermind/SaisieActivity.java
index 9b0ad94..a33a1f2 100644
--- a/app/src/main/java/com/example/mastermind/SaisieActivity.java
+++ b/app/src/main/java/com/example/mastermind/SaisieActivity.java
@@ -8,5 +8,7 @@ public interface SaisieActivity {
     void removePion();
 
     void clearChoix();
+
+    int getNbrPion();
 }
     
diff --git a/app/src/main/java/com/example/mastermind/game/Saisie.java b/app/src/main/java/com/example/mastermind/game/Saisie.java
index f9d2834..6d865c8 100644
--- a/app/src/main/java/com/example/mastermind/game/Saisie.java
+++ b/app/src/main/java/com/example/mastermind/game/Saisie.java
@@ -79,6 +79,10 @@ public class Saisie {
         }
     }
 
+    public int getSizeChoix() {
+        return this.choix.size();
+    }
+
     public Integer[] getSelection(){
         Integer[] selectiontab=new Integer[4];
         for (int i=0;i<this.selection.size();i++){
diff --git a/app/src/main/java/com/example/mastermind/game/TouchListener.java b/app/src/main/java/com/example/mastermind/game/TouchListener.java
index 29e0089..721a143 100644
--- a/app/src/main/java/com/example/mastermind/game/TouchListener.java
+++ b/app/src/main/java/com/example/mastermind/game/TouchListener.java
@@ -21,19 +21,38 @@ public class TouchListener implements View.OnTouchListener{
         {
             //Surveille quel bouton de couleur est choisi
             if (v.getHeight()-v.getHeight()/7-v.getWidth()/16<y && y<v.getHeight()-v.getHeight()/7+v.getWidth()/16){
-                if(v.getWidth()/8-v.getWidth()/15<x && x<v.getWidth()/8+v.getWidth()/15){
-                    this.context.addChoix(0);
-                } else if(v.getWidth()*2/13+v.getWidth()/8-v.getWidth()/15<x && x<v.getWidth()*2/13+v.getWidth()/8+v.getWidth()/15){
-                    this.context.addChoix(1);
-                } else if(2*v.getWidth()*2/13+v.getWidth()/8-v.getWidth()/15<x && x<2*v.getWidth()*2/13+v.getWidth()/8+v.getWidth()/15) {
-                    this.context.addChoix(2);
-                } else if(3*v.getWidth()*2/13+v.getWidth()/8-v.getWidth()/15<x && x<3*v.getWidth()*2/13+v.getWidth()/8+v.getWidth()/15){
-                    this.context.addChoix(3);
-                } else if(4*v.getWidth()*2/13+v.getWidth()/8-v.getWidth()/15<x && x<4*v.getWidth()*2/13+v.getWidth()/8+v.getWidth()/15) {
-                    this.context.addChoix(4);
-                } else if(5*v.getWidth()*2/13+v.getWidth()/8-v.getWidth()/15<x && x<5*v.getWidth()*2/13+v.getWidth()/8+v.getWidth()/15){
-                    this.context.addChoix(5);
+                if(this.context.getNbrPion() == 6 || this.context.getNbrPion() == 2) {
+                    if (v.getWidth() / 8 - v.getWidth() / 15 < x && x < v.getWidth() / 8 + v.getWidth() / 15) {
+                        this.context.addChoix(0);
+                    } else if (v.getWidth() * 2 / 13 + v.getWidth() / 8 - v.getWidth() / 15 < x && x < v.getWidth() * 2 / 13 + v.getWidth() / 8 + v.getWidth() / 15) {
+                        this.context.addChoix(1);
+                    } else if (2 * v.getWidth() * 2 / 13 + v.getWidth() / 8 - v.getWidth() / 15 < x && x < 2 * v.getWidth() * 2 / 13 + v.getWidth() / 8 + v.getWidth() / 15) {
+                        this.context.addChoix(2);
+                    } else if (3 * v.getWidth() * 2 / 13 + v.getWidth() / 8 - v.getWidth() / 15 < x && x < 3 * v.getWidth() * 2 / 13 + v.getWidth() / 8 + v.getWidth() / 15) {
+                        this.context.addChoix(3);
+                    } else if (4 * v.getWidth() * 2 / 13 + v.getWidth() / 8 - v.getWidth() / 15 < x && x < 4 * v.getWidth() * 2 / 13 + v.getWidth() / 8 + v.getWidth() / 15) {
+                        this.context.addChoix(4);
+                    } else if (5 * v.getWidth() * 2 / 13 + v.getWidth() / 8 - v.getWidth() / 15 < x && x < 5 * v.getWidth() * 2 / 13 + v.getWidth() / 8 + v.getWidth() / 15) {
+                        this.context.addChoix(5);
+                    }
+                } else if(this.context.getNbrPion() == 7) {
+                    if (v.getWidth() / 8 - v.getWidth() / 15 < x && x < v.getWidth() / 8 + v.getWidth() / 15) {
+                        this.context.addChoix(0);
+                    } else if (v.getWidth() * 2 / 14 + v.getWidth() / 14 - v.getWidth() / 18 < x && x < v.getWidth() * 2 / 14 + v.getWidth() / 14 + v.getWidth() / 18) {
+                        this.context.addChoix(1);
+                    } else if (2 * v.getWidth() * 2 / 14 + v.getWidth() / 14 - v.getWidth() / 18 < x && x < 2 * v.getWidth() * 2 / 14 + v.getWidth() / 14 + v.getWidth() / 18) {
+                        this.context.addChoix(2);
+                    } else if (3 * v.getWidth() * 2 / 14 + v.getWidth() / 14 - v.getWidth() / 18 < x && x < 3 * v.getWidth() * 2 / 14 + v.getWidth() / 14 + v.getWidth() / 18) {
+                        this.context.addChoix(3);
+                    } else if (4 * v.getWidth() * 2 / 14 + v.getWidth() / 14 - v.getWidth() / 18 < x && x < 4 * v.getWidth() * 2 / 14 + v.getWidth() / 14 + v.getWidth() / 18) {
+                        this.context.addChoix(4);
+                    } else if (5 * v.getWidth() * 2 / 14 + v.getWidth() / 14 - v.getWidth() / 18 < x && x < 5 * v.getWidth() * 2 / 14 + v.getWidth() / 14 + v.getWidth() / 18) {
+                        this.context.addChoix(5);
+                    } else if(6 * v.getWidth() * 2 / 14 + v.getWidth() / 14 - v.getWidth() / 18 < x && x < 6 * v.getWidth() * 2 / 14 + v.getWidth() / 14 + v.getWidth() / 18) {
+                        this.context.addChoix(6);
+                    }
                 }
+
             // surveille si un bouton de controle est cliqué
             } else if (v.getHeight()-v.getWidth()/16-v.getWidth()/13<y && y<v.getHeight()-v.getHeight()/16+v.getWidth()/13){
                 if(v.getWidth()/2+(v.getWidth()/11)*2-v.getWidth()/13<x && x<v.getWidth()/2+(v.getWidth()/11)*2+v.getWidth()/13) { // soumettre
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3a50cf7..b712429 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,5 +14,6 @@
     <color name="yellow">#FFFEC603</color>
     <color name="grey">#FF333333</color>
     <color name="pionVide">#FF999999</color>
+    <color name="vide">#FF889998</color>
     <color name="red">#d32f2f</color>
 </resources>
\ No newline at end of file