Transformation de la checkbox pour l'option de la case vide en préférence
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
package com.example.mastermind;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceActivity;
|
||||
|
||||
public class ConfigurationActivity extends PreferenceActivity {
|
||||
|
||||
public static String PREF_PIECE_VIDE = "pref_piece_vide";
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
this.addPreferencesFromResource(R.xml.configuration_screen);
|
||||
}
|
||||
}
|
@@ -1,7 +1,11 @@
|
||||
package com.example.mastermind;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
import android.widget.LinearLayout;
|
||||
|
@@ -1,7 +1,11 @@
|
||||
package com.example.mastermind;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.widget.CheckBox;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
@@ -10,14 +14,43 @@ import com.example.mastermind.controller.menu.ObservateurMenuDebutPartie;
|
||||
import com.example.mastermind.util.UtilTypePartie;
|
||||
|
||||
public class MenuActivity extends AppCompatActivity {
|
||||
|
||||
private SharedPreferences prefs;
|
||||
|
||||
@Override
|
||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
this.prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
|
||||
setContentView(R.layout.activity_menu);
|
||||
this.findViewById(R.id.unJoueur)
|
||||
.setOnClickListener(new ObservateurMenuDebutPartie(this, UtilTypePartie.UN_JOEUR, (CheckBox) this.findViewById(R.id.vide)));
|
||||
.setOnClickListener(new ObservateurMenuDebutPartie(this, UtilTypePartie.UN_JOEUR));
|
||||
this.findViewById(R.id.deuxJoueur)
|
||||
.setOnClickListener(new ObservateurMenuDebutPartie(this, UtilTypePartie.DEUX_JOEUR, (CheckBox) this.findViewById(R.id.vide)));
|
||||
.setOnClickListener(new ObservateurMenuDebutPartie(this, UtilTypePartie.DEUX_JOEUR));
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
this.getMenuInflater().inflate(R.menu.menu_configuration, menu);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
int id = item.getItemId();
|
||||
|
||||
if (id == R.id.action_configuration) {
|
||||
this.startActivity(new Intent(this, ConfigurationActivity.class));
|
||||
return true;
|
||||
}
|
||||
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
public boolean acceptPieceVide() {
|
||||
return this.prefs.getBoolean(ConfigurationActivity.PREF_PIECE_VIDE, false);
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -1,42 +1,43 @@
|
||||
package com.example.mastermind.controller.menu;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.view.View;
|
||||
import android.widget.CheckBox;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import com.example.mastermind.ChoixDuMotDePasse;
|
||||
import com.example.mastermind.ConfigurationActivity;
|
||||
import com.example.mastermind.MasterMindActivity;
|
||||
import com.example.mastermind.MenuActivity;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class ObservateurMenuDebutPartie implements View.OnClickListener {
|
||||
|
||||
private AppCompatActivity menu;
|
||||
private MenuActivity menu;
|
||||
|
||||
private int typePartie;
|
||||
|
||||
private CheckBox vide;
|
||||
|
||||
|
||||
public ObservateurMenuDebutPartie(AppCompatActivity menu, int type, CheckBox vide){
|
||||
public ObservateurMenuDebutPartie(MenuActivity menu, int type){
|
||||
this.menu=menu;
|
||||
this.typePartie=type;
|
||||
this.vide=vide;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
boolean vide = this.menu.acceptPieceVide();
|
||||
if(typePartie == 1){
|
||||
Intent mastermind = new Intent(menu, MasterMindActivity.class);
|
||||
mastermind.putExtra("vide", vide.isChecked());
|
||||
mastermind.putExtra("vide", vide);
|
||||
|
||||
Random r=new Random();
|
||||
int tab[]=new int[4];
|
||||
int max=6;
|
||||
if(vide.isChecked()){
|
||||
if(vide){
|
||||
max++;
|
||||
}
|
||||
tab[0]=r.nextInt(max);
|
||||
@@ -49,7 +50,7 @@ public class ObservateurMenuDebutPartie implements View.OnClickListener {
|
||||
}
|
||||
if(typePartie ==2){
|
||||
Intent choixCode = new Intent(menu, ChoixDuMotDePasse.class);
|
||||
choixCode.putExtra("vide", vide.isChecked());
|
||||
choixCode.putExtra("vide", vide);
|
||||
menu.startActivity(choixCode);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user