Ajout d'un controleur

This commit is contained in:
Sehl Aylane
2026-03-11 15:52:10 +01:00
parent 648172d51a
commit 34412d84cd
14 changed files with 1219 additions and 1136 deletions
+35 -35
View File
@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="sae.chuzzle">
<application
android:allowBackup="true"
android:label="Chuzzle"
android:theme="@android:style/Theme.Light.NoTitleBar">
<!-- Point d'entrée : le menu principal -->
<activity android:name=".MenuActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- Partie avec graine : retour arrière = MenuActivity -->
<activity
android:name=".SeedActivity"
android:parentActivityName=".MenuActivity"/>
<!-- Options : retour arrière = MenuActivity -->
<activity
android:name=".OptionsActivity"
android:parentActivityName=".MenuActivity"/>
<!-- Jeu : retour arrière = MenuActivity -->
<activity
android:name=".MainActivity"
android:parentActivityName=".MenuActivity"/>
</application>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="sae.chuzzle">
<application
android:allowBackup="true"
android:label="Chuzzle"
android:theme="@android:style/Theme.Light.NoTitleBar">
<!-- Point d'entrée : le menu principal -->
<activity android:name=".MenuActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- Partie avec graine : retour arrière = MenuActivity -->
<activity
android:name=".SeedActivity"
android:parentActivityName=".MenuActivity"/>
<!-- Options : retour arrière = MenuActivity -->
<activity
android:name=".OptionsActivity"
android:parentActivityName=".MenuActivity"/>
<!-- Jeu : retour arrière = MenuActivity -->
<activity
android:name=".MainActivity"
android:parentActivityName=".MenuActivity"/>
</application>
</manifest>
+109
View File
@@ -0,0 +1,109 @@
package sae.chuzzle;
import android.app.Activity;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.RadioButton;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
public class Controleur {
private final Activity activite;
private final EtatJeu etatJeu;
private final VueGrille vueGrille;
private final TextView tvScore;
private final TextView tvCoups;
private final RadioButton rbLigne;
private final RadioButton rbDroite;
private final Spinner spinnerIndex;
private final Button btnJouer;
// -
// CONSTRUCTEUR
public Controleur(Activity activite, EtatJeu etatJeu, VueGrille vueGrille,
TextView tvScore, TextView tvCoups,
RadioButton rbLigne, RadioButton rbDroite,
Spinner spinnerIndex, Button btnJouer) {
this.activite = activite;
this.etatJeu = etatJeu;
this.vueGrille = vueGrille;
this.tvScore = tvScore;
this.tvCoups = tvCoups;
this.rbLigne = rbLigne;
this.rbDroite = rbDroite;
this.spinnerIndex = spinnerIndex;
this.btnJouer = btnJouer;
initialiserSpinner();
rafraichirAffichage();
}
// -
// INITIALISATION
private void initialiserSpinner() {
String[] indices = {"0", "1", "2", "3", "4", "5"};
ArrayAdapter<String> adaptateur = new ArrayAdapter<>(
activite,
android.R.layout.simple_spinner_item,
indices
);
adaptateur.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinnerIndex.setAdapter(adaptateur);
}
// -
// GESTION DU COUP
public void gererCoupJoueur() {
boolean estLigne = rbLigne.isChecked();
int index = spinnerIndex.getSelectedItemPosition();
int sens;
if (rbDroite.isChecked()) {
sens = +1;
} else {
sens = -1;
}
boolean accepte = etatJeu.appliquerCoup(estLigne, index, sens);
if (!accepte) {
Toast.makeText(activite, "Coup invalide !", Toast.LENGTH_SHORT).show();
}
if(accepte){
Toast.makeText(activite, "Coup valide !", Toast.LENGTH_SHORT).show();
}
rafraichirAffichage();
if (etatJeu.estTerminee()) {
Toast.makeText(
activite,
"Partie terminee ! Score : " + etatJeu.obtenirScore(),
Toast.LENGTH_LONG
).show();
btnJouer.setEnabled(false);
}
}
// -
// MISE A JOUR DE LA VUE
public void rafraichirAffichage() {
tvScore.setText("Score : " + etatJeu.obtenirScore());
tvCoups.setText("Coups : " + etatJeu.obtenirNbCoups());
vueGrille.definirGrille(etatJeu.obtenirGrille());
vueGrille.definirVerrous(etatJeu.obtenirVerrous());
}
}
File diff suppressed because it is too large Load Diff
+56 -123
View File
@@ -1,124 +1,57 @@
package sae.chuzzle;
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.RadioButton;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
import sae.chuzzle.EtatJeu;
import sae.chuzzle.VueGrille;
public class MainActivity extends Activity implements View.OnClickListener {
private EtatJeu etatJeu;
private VueGrille vueGrille;
private TextView tvScore;
private TextView tvCoups;
private RadioButton rbLigne;
private RadioButton rbDroite;
private Spinner spinnerIndex;
private Button btnJouer;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
// - Lire la graine et les options
long graine = getIntent().getLongExtra("graine", System.currentTimeMillis());
boolean daltonien = getSharedPreferences("chuzzle_prefs", MODE_PRIVATE)
.getBoolean("daltonien", false);
boolean hardMode = getSharedPreferences("chuzzle_prefs", MODE_PRIVATE)
.getBoolean("hard_mode", false);
// - Modèle
etatJeu = new EtatJeu(graine, hardMode);
// - Récupérer les vues depuis le XML
tvScore = findViewById(R.id.tvScore);
tvCoups = findViewById(R.id.tvCoups);
vueGrille = findViewById(R.id.vueGrille);
rbLigne = findViewById(R.id.rbLigne);
rbDroite = findViewById(R.id.rbDroite);
spinnerIndex = findViewById(R.id.spinnerIndex);
btnJouer = findViewById(R.id.btnJouer);
// - Configurer la vue
vueGrille.definirGrille(etatJeu.obtenirGrille());
vueGrille.definirVerrous(etatJeu.obtenirVerrous());
vueGrille.definirModeDaltonien(daltonien);
// - Configurer le spinner
String[] indices = {"0", "1", "2", "3", "4", "5"};
ArrayAdapter<String> adaptateur = new ArrayAdapter<>(
this,
android.R.layout.simple_spinner_item,
indices
);
adaptateur.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinnerIndex.setAdapter(adaptateur);
// --- Bouton jouer ---
btnJouer.setOnClickListener(this);
}
// GESTION DES CLICS
@Override
public void onClick(View v) {
if (v == btnJouer) {
gererCoupJoueur();
}
}
// COORDINATION
private void gererCoupJoueur() {
boolean estLigne = rbLigne.isChecked();
int index = spinnerIndex.getSelectedItemPosition();
int sens;
if (rbDroite.isChecked()) {
sens = +1;
} else {
sens = -1;
}
boolean accepte = etatJeu.appliquerCoup(estLigne, index, sens);
if (!accepte) {
Toast.makeText(
this,
"Coup invalide : aucune serie creee !",
Toast.LENGTH_SHORT
).show();
}
rafraichirAffichage();
if (etatJeu.estTerminee()) {
Toast.makeText(
this,
"Partie terminee ! Score final : " + etatJeu.obtenirScore(),
Toast.LENGTH_LONG
).show();
btnJouer.setEnabled(false);
}
}
private void rafraichirAffichage() {
tvScore.setText("Score : " + etatJeu.obtenirScore());
tvCoups.setText("Coups : " + etatJeu.obtenirNbCoups());
vueGrille.definirGrille(etatJeu.obtenirGrille());
vueGrille.definirVerrous(etatJeu.obtenirVerrous());
}
package sae.chuzzle;
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.RadioButton;
import android.widget.Spinner;
import android.widget.TextView;
public class MainActivity extends Activity implements View.OnClickListener {
private Controleur controleur;
private Button btnJouer;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
// --- Modèle ---
long graine = getIntent().getLongExtra("graine", System.currentTimeMillis());
boolean hardMode = getSharedPreferences("chuzzle_prefs", MODE_PRIVATE)
.getBoolean("hard_mode", false);
boolean daltonien = getSharedPreferences("chuzzle_prefs", MODE_PRIVATE)
.getBoolean("daltonien", false);
EtatJeu etatJeu = new EtatJeu(graine, hardMode);
// --- Vue ---
VueGrille vueGrille = findViewById(R.id.vueGrille);
vueGrille.definirModeDaltonien(daltonien);
// --- Controleur ---
btnJouer = findViewById(R.id.btnJouer);
btnJouer.setOnClickListener(this);
controleur = new Controleur(
this,
etatJeu,
vueGrille,
(TextView) findViewById(R.id.tvScore),
(TextView) findViewById(R.id.tvCoups),
(RadioButton) findViewById(R.id.rbLigne),
(RadioButton) findViewById(R.id.rbDroite),
(Spinner) findViewById(R.id.spinnerIndex),
btnJouer
);
}
@Override
public void onClick(View v) {
if (v == btnJouer) {
controleur.gererCoupJoueur();
}
}
}
+43 -43
View File
@@ -1,44 +1,44 @@
package sae.chuzzle;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
public class MenuActivity extends Activity implements View.OnClickListener {
private Button btnNouvellePartie;
private Button btnPartieGraine;
private Button btnOptions;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_menu);
btnNouvellePartie = findViewById(R.id.btnNouvellePartie);
btnPartieGraine = findViewById(R.id.btnPartieGraine);
btnOptions = findViewById(R.id.btnOptions);
btnNouvellePartie.setOnClickListener(this);
btnPartieGraine.setOnClickListener(this);
btnOptions.setOnClickListener(this);
}
@Override
public void onClick(View v) {
if (v == btnNouvellePartie) {
long graine = System.currentTimeMillis();
Intent intent = new Intent(this, MainActivity.class);
intent.putExtra("graine", graine);
startActivity(intent);
} else if (v == btnPartieGraine) {
Intent intent = new Intent(this, SeedActivity.class);
startActivity(intent);
} else if (v == btnOptions) {
Intent intent = new Intent(this, OptionsActivity.class);
startActivity(intent);
}
}
package sae.chuzzle;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
public class MenuActivity extends Activity implements View.OnClickListener {
private Button btnNouvellePartie;
private Button btnPartieGraine;
private Button btnOptions;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_menu);
btnNouvellePartie = findViewById(R.id.btnNouvellePartie);
btnPartieGraine = findViewById(R.id.btnPartieGraine);
btnOptions = findViewById(R.id.btnOptions);
btnNouvellePartie.setOnClickListener(this);
btnPartieGraine.setOnClickListener(this);
btnOptions.setOnClickListener(this);
}
@Override
public void onClick(View v) {
if (v == btnNouvellePartie) {
long graine = System.currentTimeMillis();
Intent intent = new Intent(this, MainActivity.class);
intent.putExtra("graine", graine);
startActivity(intent);
} else if (v == btnPartieGraine) {
Intent intent = new Intent(this, SeedActivity.class);
startActivity(intent);
} else if (v == btnOptions) {
Intent intent = new Intent(this, OptionsActivity.class);
startActivity(intent);
}
}
}
+40 -40
View File
@@ -1,41 +1,41 @@
package sae.chuzzle;
import android.app.Activity;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.widget.CompoundButton;
import android.widget.Switch;
public class OptionsActivity extends Activity
implements CompoundButton.OnCheckedChangeListener {
private SharedPreferences prefs;
private Switch switchDaltonien;
private Switch switchHard;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_options);
prefs = getSharedPreferences("chuzzle_prefs", MODE_PRIVATE);
switchDaltonien = findViewById(R.id.switchDaltonien);
switchHard = findViewById(R.id.switchHard);
switchDaltonien.setChecked(prefs.getBoolean("daltonien", false));
switchHard.setChecked(prefs.getBoolean("hard_mode", false));
switchDaltonien.setOnCheckedChangeListener(this);
switchHard.setOnCheckedChangeListener(this);
}
@Override
public void onCheckedChanged(CompoundButton bouton, boolean estCoche) {
if (bouton == switchDaltonien) {
prefs.edit().putBoolean("daltonien", estCoche).apply();
} else if (bouton == switchHard) {
prefs.edit().putBoolean("hard_mode", estCoche).apply();
}
}
package sae.chuzzle;
import android.app.Activity;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.widget.CheckBox;
import android.widget.CompoundButton;
public class OptionsActivity extends Activity
implements CompoundButton.OnCheckedChangeListener {
private SharedPreferences prefs;
private CheckBox checkDaltonien;
private CheckBox checkHard;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_options);
prefs = getSharedPreferences("chuzzle_prefs", MODE_PRIVATE);
checkDaltonien = findViewById(R.id.switchDaltonien);
checkHard = findViewById(R.id.switchHard);
checkDaltonien.setChecked(prefs.getBoolean("daltonien", false));
checkHard.setChecked(prefs.getBoolean("hard_mode", false));
checkDaltonien.setOnCheckedChangeListener(this);
checkHard.setOnCheckedChangeListener(this);
}
@Override
public void onCheckedChanged(CompoundButton bouton, boolean estCoche) {
if (bouton == checkDaltonien) {
prefs.edit().putBoolean("daltonien", estCoche).apply();
} else if (bouton == checkHard) {
prefs.edit().putBoolean("hard_mode", estCoche).apply();
}
}
}
+57 -58
View File
@@ -1,59 +1,58 @@
package sae.chuzzle;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
public class SeedActivity extends Activity implements View.OnClickListener {
private EditText etGraine;
private Button btnJouer;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_seed);
etGraine = findViewById(R.id.etGraine);
btnJouer = findViewById(R.id.btnJouer);
btnJouer.setOnClickListener(this);
}
@Override
public void onClick(View v) {
if (v == btnJouer) {
lancerPartieAvecGraine();
}
}
private void lancerPartieAvecGraine() {
String texte = etGraine.getText().toString().trim();
if (texte.isEmpty()) {
Toast.makeText(
this,
"Veuillez entrer une graine.",
Toast.LENGTH_SHORT
).show();
return;
}
long graine;
try {
graine = Long.parseLong(texte);
} catch (NumberFormatException e) {
graine = texte.hashCode();
}
Intent intent = new Intent(this, MainActivity.class);
intent.putExtra("graine", graine);
startActivity(intent);
}
package sae.chuzzle;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
public class SeedActivity extends Activity implements View.OnClickListener {
private EditText etGraine;
private Button btnJouer;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_seed);
etGraine = findViewById(R.id.etGraine);
btnJouer = findViewById(R.id.btnJouer);
btnJouer.setOnClickListener(this);
}
@Override
public void onClick(View v) {
if (v == btnJouer) {
lancerPartieAvecGraine();
}
}
private void lancerPartieAvecGraine() {
String texte = etGraine.getText().toString().trim();
if (texte.isEmpty()) {
Toast.makeText(
this,
"Veuillez entrer une graine.",
Toast.LENGTH_SHORT
).show();
return;
}
long graine;
try {
graine = Long.parseLong(texte);
} catch (NumberFormatException e) {
graine = texte.hashCode();
}
Intent intent = new Intent(this, MainActivity.class);
intent.putExtra("graine", graine);
startActivity(intent);
}
}
+157 -145
View File
@@ -1,146 +1,158 @@
package sae.chuzzle;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.view.View;
import androidx.annotation.NonNull;
public class VueGrille extends View {
private boolean[][] verrous = new boolean[NB_LIGNES][NB_COLONNES];
private static final int NB_LIGNES = 6;
private static final int NB_COLONNES = 6;
private static final int NB_TYPES = 7;
// Symboles pour le mode daltonien, un par type
private static final String[] SYMBOLES = {"", "", "", "", "", "", ""};
// La VueGrille ne reçoit qu'un tableau int[][] brut, pas un EtatJeu
private int[][] grille = new int[NB_LIGNES][NB_COLONNES];
private boolean modeDaltonien = false;
private final Paint pinceauCase = new Paint();
private final Paint pinceauSymbole = new Paint();
// =========================================================
// CONSTRUCTEUR
// =========================================================
public VueGrille(Context contexte) {
super(contexte);
pinceauCase.setAntiAlias(true);
pinceauCase.setStyle(Paint.Style.FILL);
pinceauSymbole.setAntiAlias(true);
pinceauSymbole.setColor(0xFF000000);
pinceauSymbole.setTextAlign(Paint.Align.CENTER);
}
// =========================================================
// API PUBLIQUE (appelée par MainActivity uniquement)
// =========================================================
/**
* Reçoit une copie de la grille depuis MainActivity.
* VueGrille ne sait pas d'où viennent ces données,
* elle sait juste les dessiner.
*/
public void definirGrille(int[][] nouvelleGrille) {
for (int l = 0; l < NB_LIGNES; l++) {
System.arraycopy(nouvelleGrille[l], 0, grille[l], 0, NB_COLONNES);
}
invalidate();
}
public void definirModeDaltonien(boolean actif) {
this.modeDaltonien = actif;
invalidate();
}
// =========================================================
// DESSIN
// =========================================================
@Override
protected void onDraw(@NonNull Canvas canvas) {
super.onDraw(canvas);
int largeur = getWidth();
int hauteur = getHeight();
float tailleCase = Math.min(
largeur / (float) NB_COLONNES,
hauteur / (float) NB_LIGNES
);
float margeGauche = (largeur - tailleCase * NB_COLONNES) / 2f;
float margeHaut = (hauteur - tailleCase * NB_LIGNES) / 2f;
pinceauSymbole.setTextSize(tailleCase * 0.4f);
for (int ligne = 0; ligne < NB_LIGNES; ligne++) {
for (int colonne = 0; colonne < NB_COLONNES; colonne++) {
int type = grille[ligne][colonne];
float x1 = margeGauche + colonne * tailleCase + 6;
float y1 = margeHaut + ligne * tailleCase + 6;
float x2 = margeGauche + (colonne + 1) * tailleCase - 6;
float y2 = margeHaut + (ligne + 1) * tailleCase - 6;
// Dessiner la case colorée
// Dessiner la case colorée
definirCouleur(type);
canvas.drawRoundRect(x1, y1, x2, y2, 20, 20, pinceauCase);
// Assombrir la case si elle est verrouillée
if (verrous[ligne][colonne]) {
pinceauCase.setARGB(120, 0, 0, 0);
canvas.drawRoundRect(x1, y1, x2, y2, 20, 20, pinceauCase);
}
// Dessiner le symbole daltonien
if (modeDaltonien) {
float cx = (x1 + x2) / 2f;
float cy = (y1 + y2) / 2f
- (pinceauSymbole.descent() + pinceauSymbole.ascent()) / 2f;
canvas.drawText(SYMBOLES[type % NB_TYPES], cx, cy, pinceauSymbole);
}
// Dessiner le cadenas par-dessus si verrouillée
if (verrous[ligne][colonne]) {
float cx = (x1 + x2) / 2f;
float cy = (y1 + y2) / 2f
- (pinceauSymbole.descent() + pinceauSymbole.ascent()) / 2f;
canvas.drawText("🔒", cx, cy, pinceauSymbole);
}
}
}
}
// =========================================================
// UTILITAIRE PRIVE
// =========================================================
private void definirCouleur(int type) {
switch (type % NB_TYPES) {
case 0: pinceauCase.setARGB(255, 200, 200, 200); break;
case 1: pinceauCase.setARGB(255, 255, 105, 180); break;
case 2: pinceauCase.setARGB(255, 90, 230, 200); break;
case 3: pinceauCase.setARGB(255, 100, 170, 255); break;
case 4: pinceauCase.setARGB(255, 255, 220, 90); break;
case 5: pinceauCase.setARGB(255, 255, 140, 90); break;
case 6: pinceauCase.setARGB(255, 255, 90, 90); break;
}
}
public void definirVerrous(boolean[][] nouveauxVerrous) {
for (int l = 0; l < NB_LIGNES; l++) {
System.arraycopy(nouveauxVerrous[l], 0, verrous[l], 0, NB_COLONNES);
}
invalidate();
}
package sae.chuzzle;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.util.AttributeSet;
import android.view.View;
import androidx.annotation.NonNull;
public class VueGrille extends View {
private boolean[][] verrous = new boolean[NB_LIGNES][NB_COLONNES];
private static final int NB_LIGNES = 6;
private static final int NB_COLONNES = 6;
private static final int NB_TYPES = 7;
// Symboles pour le mode daltonien, un par type
private static final String[] SYMBOLES = {"", "", "", "", "", "", ""};
// La VueGrille ne reçoit qu'un tableau int[][] brut, pas un EtatJeu
private int[][] grille = new int[NB_LIGNES][NB_COLONNES];
private boolean modeDaltonien = false;
private final Paint pinceauCase = new Paint();
private final Paint pinceauSymbole = new Paint();
// =========================================================
// CONSTRUCTEUR
// =========================================================
public VueGrille(Context contexte) {
super(contexte);
pinceauCase.setAntiAlias(true);
pinceauCase.setStyle(Paint.Style.FILL);
pinceauSymbole.setAntiAlias(true);
pinceauSymbole.setColor(0xFF000000);
pinceauSymbole.setTextAlign(Paint.Align.CENTER);
}
public VueGrille(Context context, AttributeSet attrs) {
super(context, attrs);
pinceauCase.setAntiAlias(true);
pinceauCase.setStyle(Paint.Style.FILL);
pinceauSymbole.setAntiAlias(true);
pinceauSymbole.setColor(0xFF000000);
pinceauSymbole.setTextAlign(Paint.Align.CENTER);
}
// API PUBLIQUE (appelée par MainActivity uniquement)
/**
* Reçoit une copie de la grille depuis MainActivity.
* VueGrille ne sait pas d'où viennent ces données,
* elle sait juste les dessiner.
*/
public void definirGrille(int[][] nouvelleGrille) {
for (int l = 0; l < NB_LIGNES; l++) {
System.arraycopy(nouvelleGrille[l], 0, grille[l], 0, NB_COLONNES);
}
invalidate();
}
public void definirModeDaltonien(boolean actif) {
this.modeDaltonien = actif;
invalidate();
}
// -
// DESSIN
@Override
protected void onDraw(@NonNull Canvas canvas) {
super.onDraw(canvas);
int largeur = getWidth();
int hauteur = getHeight();
float tailleCase = Math.min(
largeur / (float) NB_COLONNES,
hauteur / (float) NB_LIGNES
);
float margeGauche = (largeur - tailleCase * NB_COLONNES) / 2f;
float margeHaut = (hauteur - tailleCase * NB_LIGNES) / 2f;
pinceauSymbole.setTextSize(tailleCase * 0.4f);
for (int ligne = 0; ligne < NB_LIGNES; ligne++) {
for (int colonne = 0; colonne < NB_COLONNES; colonne++) {
int type = grille[ligne][colonne];
float x1 = margeGauche + colonne * tailleCase + 6;
float y1 = margeHaut + ligne * tailleCase + 6;
float x2 = margeGauche + (colonne + 1) * tailleCase - 6;
float y2 = margeHaut + (ligne + 1) * tailleCase - 6;
// Dessiner la case colorée
// Dessiner la case colorée
definirCouleur(type);
canvas.drawRoundRect(x1, y1, x2, y2, 20, 20, pinceauCase);
// Assombrir la case si elle est verrouillée
if (verrous[ligne][colonne]) {
pinceauCase.setARGB(120, 0, 0, 0);
canvas.drawRoundRect(x1, y1, x2, y2, 20, 20, pinceauCase);
}
// Dessiner le symbole daltonien
if (modeDaltonien) {
float cx = (x1 + x2) / 2f;
float cy = (y1 + y2) / 2f
- (pinceauSymbole.descent() + pinceauSymbole.ascent()) / 2f;
canvas.drawText(SYMBOLES[type % NB_TYPES], cx, cy, pinceauSymbole);
}
// Dessiner le cadenas par-dessus si verrouillée
if (verrous[ligne][colonne]) {
float cx = (x1 + x2) / 2f;
float cy = (y1 + y2) / 2f
- (pinceauSymbole.descent() + pinceauSymbole.ascent()) / 2f;
canvas.drawText("🔒", cx, cy, pinceauSymbole);
}
}
}
}
// -
// UTILITAIRE PRIVE
private void definirCouleur(int type) {
switch (type % NB_TYPES) {
case 0: pinceauCase.setARGB(255, 200, 200, 200); break;
case 1: pinceauCase.setARGB(255, 255, 105, 180); break;
case 2: pinceauCase.setARGB(255, 90, 230, 200); break;
case 3: pinceauCase.setARGB(255, 100, 170, 255); break;
case 4: pinceauCase.setARGB(255, 255, 220, 90); break;
case 5: pinceauCase.setARGB(255, 255, 140, 90); break;
case 6: pinceauCase.setARGB(255, 255, 90, 90); break;
}
}
public void definirVerrous(boolean[][] nouveauxVerrous) {
for (int l = 0; l < NB_LIGNES; l++) {
System.arraycopy(nouveauxVerrous[l], 0, verrous[l], 0, NB_COLONNES);
}
invalidate();
}
}
@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
+85 -85
View File
@@ -1,86 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:id="@+id/tvScore"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Score : 0"
android:textSize="18sp"
android:textStyle="bold"/>
<TextView
android:id="@+id/tvCoups"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Coups : 0"
android:textSize="18sp"/>
<sae.chuzzle.VueGrille
android:id="@+id/vueGrille"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<RadioGroup
android:id="@+id/rgChoix"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rbLigne"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Ligne"
android:checked="true"/>
<RadioButton
android:id="@+id/rbColonne"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Colonne"/>
</RadioGroup>
<Spinner
android:id="@+id/spinnerIndex"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<RadioGroup
android:id="@+id/rgSens"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rbDroite"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Droite / Bas (+1)"
android:checked="true"/>
<RadioButton
android:id="@+id/rbGauche"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Gauche / Haut (-1)"/>
</RadioGroup>
<Button
android:id="@+id/btnJouer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Jouer"/>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:id="@+id/tvScore"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Score : 0"
android:textSize="18sp"
android:textStyle="bold"/>
<TextView
android:id="@+id/tvCoups"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Coups : 0"
android:textSize="18sp"/>
<sae.chuzzle.VueGrille
android:id="@+id/vueGrille"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<RadioGroup
android:id="@+id/rgChoix"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rbLigne"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Ligne"
android:checked="true"/>
<RadioButton
android:id="@+id/rbColonne"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Colonne"/>
</RadioGroup>
<Spinner
android:id="@+id/spinnerIndex"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<RadioGroup
android:id="@+id/rgSens"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rbDroite"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Droite / Bas (+1)"
android:checked="true"/>
<RadioButton
android:id="@+id/rbGauche"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Gauche / Haut (-1)"/>
</RadioGroup>
<Button
android:id="@+id/btnJouer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Jouer"/>
</LinearLayout>
+37 -37
View File
@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:padding="48dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Chuzzle"
android:textSize="48sp"
android:textStyle="bold"
android:gravity="center"
android:layout_marginBottom="64dp"/>
<Button
android:id="@+id/btnNouvellePartie"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Nouvelle Partie"
android:layout_marginBottom="16dp"/>
<Button
android:id="@+id/btnPartieGraine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Partie avec Graine"
android:layout_marginBottom="16dp"/>
<Button
android:id="@+id/btnOptions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Options"/>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:padding="48dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Chuzzle"
android:textSize="48sp"
android:textStyle="bold"
android:gravity="center"
android:layout_marginBottom="64dp"/>
<Button
android:id="@+id/btnNouvellePartie"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Nouvelle Partie"
android:layout_marginBottom="16dp"/>
<Button
android:id="@+id/btnPartieGraine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Partie avec Graine"
android:layout_marginBottom="16dp"/>
<Button
android:id="@+id/btnOptions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Options"/>
</LinearLayout>
+57 -57
View File
@@ -1,58 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="48dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Options"
android:textSize="32sp"
android:textStyle="bold"
android:gravity="center"
android:layout_marginBottom="64dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginBottom="32dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Mode daltonien (symboles)"
android:textSize="18sp"/>
<Switch
android:id="@+id/switchDaltonien"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Hard mode (verrous)"
android:textSize="18sp"/>
<Switch
android:id="@+id/switchHard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="48dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Options"
android:textSize="32sp"
android:textStyle="bold"
android:gravity="center"
android:layout_marginBottom="64dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginBottom="32dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Mode daltonien (symboles)"
android:textSize="18sp"/>
<Switch
android:id="@+id/switchDaltonien"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Hard mode (verrous)"
android:textSize="18sp"/>
<Switch
android:id="@+id/switchHard"
android:layout_width="50dp"
android:layout_height="50dp"/>
</LinearLayout>
</LinearLayout>
+30 -30
View File
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:padding="48dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Entrez une graine"
android:textSize="24sp"
android:gravity="center"
android:layout_marginBottom="32dp"/>
<EditText
android:id="@+id/etGraine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Ex : 12345"
android:inputType="number"
android:layout_marginBottom="32dp"/>
<Button
android:id="@+id/btnJouer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Jouer"/>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:padding="48dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Entrez une graine"
android:textSize="24sp"
android:gravity="center"
android:layout_marginBottom="32dp"/>
<EditText
android:id="@+id/etGraine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Ex : 12345"
android:inputType="number"
android:layout_marginBottom="32dp"/>
<Button
android:id="@+id/btnJouer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Jouer"/>
</LinearLayout>
+1 -1
View File
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Chuzzle</string>
<string name="app_name">RealChuzzle</string>
</resources>