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

Modif responsif sur la hauteur

Browse Source
This commit is contained in:
Claire G 2023-04-06 10:28:24 +02:00
parent ef0b698a77
commit 405c41e2d3
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,6 @@ import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
import android.view.View; import android.view.View;
import android.widget.LinearLayout;
import android.widget.TableLayout;
import com.example.mastermind.R; import com.example.mastermind.R;
@ -18,12 +16,6 @@ public class GameView extends View {
private Collection<Integer> pionsAttaquant; private Collection<Integer> pionsAttaquant;
private Collection<Integer> pionsDefenseur; private Collection<Integer> pionsDefenseur;
private Collection<Integer> pionsPasPlaces; private Collection<Integer> pionsPasPlaces;
private TableLayout grilleView;
private TableLayout notation1View;
private TableLayout notation2View;
private LinearLayout buttonsView;
private LinearLayout choixView;
private LinearLayout selectionView;
private Saisie saisie; private Saisie saisie;
private Grille grille; private Grille grille;
private Paint circle; private Paint circle;
@ -53,7 +45,7 @@ public class GameView extends View {
for (int x=0;x<4;x++) { for (int x=0;x<4;x++) {
this.circle.setColor(grille.pop()); this.circle.setColor(grille.pop());
//TODO: coordonnées propres //TODO: coordonnées propres
canvas.drawCircle(( x*this.getWidth()/8+(this.getWidth()*21/68)),(y*this.getWidth()/8+this.getWidth()/10), this.getWidth()/17, this.circle); canvas.drawCircle(( x*this.getWidth()/8+(this.getWidth()*21/68)),(y*this.getHeight()/14+this.getHeight()/21), this.getWidth()/17, this.circle);
} }
} }
// affichage de la zone de saisie // affichage de la zone de saisie
@ -63,7 +55,7 @@ public class GameView extends View {
for (int i=0;i<this.saisie.getSelection().size();i++){ for (int i=0;i<this.saisie.getSelection().size();i++){
this.circle.setColor(saisie.pop()); this.circle.setColor(saisie.pop());
//TODO: coordonnées propres (encore) //TODO: coordonnées propres (encore)
canvas.drawCircle((i*this.getWidth()/5+this.getWidth()/5),this.getWidth()*58/40, this.getWidth()/12, this.circle); canvas.drawCircle((i*this.getWidth()/5+this.getWidth()/5),this.getHeight()-this.getHeight()*2/9, this.getWidth()/14, this.circle);
} }
// affichage des couleurs choisissables // affichage des couleurs choisissables
@ -74,13 +66,16 @@ public class GameView extends View {
for (int i=0;i<this.saisie.getChoix().size();i++){ for (int i=0;i<this.saisie.getChoix().size();i++){
this.circle.setColor(couleurs.pop()); this.circle.setColor(couleurs.pop());
//TODO: coordonnées propres (encore) //TODO: coordonnées propres (encore)
canvas.drawCircle((i*this.getWidth()*2/13+this.getWidth()/8),this.getWidth()*689/420, this.getWidth()/15, this.circle); canvas.drawCircle((i*this.getWidth()*2/13+this.getWidth()/8),this.getHeight()-this.getHeight()/7, this.getWidth()/16, this.circle);
} }
//TODO: ajout des colonnes de notation //TODO: ajout des colonnes de notation
//TODO: ajout des boutons //TODO: ajout des boutons
//Test de bouton valider //Test de bouton valider
this.circle.setColor(this.getResources().getColor(R.color.green)); this.circle.setColor(this.getResources().getColor(R.color.green));
canvas.drawCircle((this.getWidth()/2),this.getHeight()-this.getWidth()/9, this.getWidth()/10, this.circle); canvas.drawCircle((this.getWidth()/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);*/
} }
//Change l'état de soumission à notation après qu'une combinaision ai été soumise puis inversement //Change l'état de soumission à notation après qu'une combinaision ai été soumise puis inversement

2
app/src/main/java/com/example/mastermind/game/TouchListener.java
View File

@ -17,7 +17,7 @@ public class TouchListener implements View.OnTouchListener{
if (action==MotionEvent.ACTION_UP) if (action==MotionEvent.ACTION_UP)
{ {
//Surveille quel bouton de couleur est choisi //Surveille quel bouton de couleur est choisi
if (v.getWidth()*689/420-v.getWidth()/15<y && y<v.getWidth()*689/420+v.getWidth()/15){ 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){ if(v.getWidth()/8-v.getWidth()/15<x && x<v.getWidth()/8+v.getWidth()/15){
this.view.addChoix(0); this.view.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){ } else if(v.getWidth()*2/13+v.getWidth()/8-v.getWidth()/15<x && x<v.getWidth()*2/13+v.getWidth()/8+v.getWidth()/15){

3
app/src/main/res/layout/activity_main.xml
View File

@ -4,7 +4,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#333" android:background="#333"
tools:context=".MainActivity"> tools:context=".MainActivity"
>
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"