From e551bef3bfd76d4d6c982b18e9b43cd7e93dc61b Mon Sep 17 00:00:00 2001
From: chaignea <mathis.chaigneau@etu.u-pec.fr>
Date: Sun, 9 Apr 2023 14:55:47 +0200
Subject: [PATCH] =?UTF-8?q?Transformation=20de=20la=20checkbox=20pour=20l'?=
 =?UTF-8?q?option=20de=20la=20case=20vide=20en=20pr=C3=A9f=C3=A9rence?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../7.5/executionHistory/executionHistory.bin | Bin 1389106 -> 1596283 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/7.5/fileHashes/fileHashes.bin         | Bin 74415 -> 75515 bytes
 .gradle/7.5/fileHashes/fileHashes.lock        | Bin 17 -> 17 bytes
 .../7.5/fileHashes/resourceHashesCache.bin    | Bin 21285 -> 22373 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .gradle/buildOutputCleanup/outputFiles.bin    | Bin 164687 -> 164903 bytes
 .gradle/file-system.probe                     | Bin 8 -> 8 bytes
 app/src/main/AndroidManifest.xml              |   2 +-
 .../mastermind/ConfigurationActivity.java     |  15 +++++++
 .../mastermind/MasterMindActivity.java        |   4 ++
 .../com/example/mastermind/MenuActivity.java  |  39 ++++++++++++++++--
 .../menu/ObservateurMenuDebutPartie.java      |  19 +++++----
 app/src/main/res/layout/activity_menu.xml     |  19 ---------
 app/src/main/res/menu/menu_configuration.xml  |  12 ++++++
 app/src/main/res/values/strings.xml           |   3 ++
 app/src/main/res/xml/configuration_screen.xml |  16 +++++++
 17 files changed, 97 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/java/com/example/mastermind/ConfigurationActivity.java
 create mode 100644 app/src/main/res/menu/menu_configuration.xml
 create mode 100644 app/src/main/res/xml/configuration_screen.xml

diff --git a/.gradle/7.5/executionHistory/executionHistory.bin b/.gradle/7.5/executionHistory/executionHistory.bin
index ab3f6dbaced56f537ef109d244295841c6eaa472..a269207c947fc03f1e94e376e28a50e325604b19 100644
GIT binary patch
delta 14191
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
Px$%ph+g*cmx()a*LjGvV

delta 3370
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
O+)SaBRhP$&%Ki(xeSX~l

diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock
index c9252d67637202cd11cfe5027dafb40f1d5ad062..f685be12044c8e392d9a565d00027d4fd8bed483 100644
GIT binary patch
literal 17
VcmZQxXdCxzS@nKj1~6d$3;;In1xWw^

literal 17
VcmZQxXdCxzS@nKj1~6c{2mm(91ttIh

diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin
index 2eba1ce184bc87fb57b6e599a5084efd65e86314..b1d3eeaa53c8fcaebb361cbbb3d3e9cf7d0ab28f 100644
GIT binary patch
delta 3679
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

delta 2401
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

diff --git a/.gradle/7.5/fileHashes/fileHashes.lock b/.gradle/7.5/fileHashes/fileHashes.lock
index 77686ea487cc538ef61f7ec5b7cc40ca445bf151..d8de74651b809c074f088d533b40d61efe1810ed 100644
GIT binary patch
literal 17
VcmZQBSfRUsf03Rh0~l~@001Xh1E~N2

literal 17
VcmZQBSfRUsf03Rh0~oOF001Xl1Frx8

diff --git a/.gradle/7.5/fileHashes/resourceHashesCache.bin b/.gradle/7.5/fileHashes/resourceHashesCache.bin
index aeccdab5e609582fd0151cec2989043fd2f11a3d..97c3fc5556e74fc1bca231ba2d0c81e8db4c112a 100644
GIT binary patch
delta 1803
zcmZY7c{m(r9Kdl)Rf1(=kzK4aiD@(_k|)kkEJ72vRmZYYx1>oE`)I{VD~DsTd7lVM
z4yk=Kf?Y?gE6zxQRYWw6Bavj?apXx#QmS-j9#1p#JoC?YKJV|HnddF$5ya&Lz8RTv
zDw!M~pB2%hDDmIr6}66DU_aRz;`DO{E{J{%Mjm?a2WQ9!Ay7P_(J09cM56B~C?>l@
zHwYY(Q5hAWW1PTivOCOcYhAx1GiHuNA3bb#$sU~)nu4<s9ZLfHDUopH7rhS01{(Qj
z{29YlKBRQ^YI_<wc?n#hXv4z2!}hG-+_t0m8HVc)d0jG`Q@)9G--fC(3QT|o53Bt0
zD>Fk29gz-1Y6qd=M<Mczisxb^`q_guwMclH`Qld6-QpQ^JvMfI#xjJ?d;2s2>E2Bs
zNZlQthx=q+D)rt*qK^pEZ#;UNmKNe0&`tow>U?-*tg(L4PsRv|US$~m(8U~>@+@6J
z`)=@+hP$o8LkjnSD-%X1L||A^e}b7&Bg#R$Bi5B8HO@ExS$zQMzCPfJMkGWHFbzF9
zXflZ6RPati8-nGBWWVcvW`@c<K&0lv))6By-()2QA<;Vl8*3+IF;q{yV4xEgKp|Bd
za+*Br?|j)p4aI(-hAL1jq%reHyls)@^*adC)P|0&WOL|NbbTcH>3}nu+Hg#HoXhh2
zoE{|lnqphU5#>e#Zp9m-odr0W?$F8jw#5X|%qb-Ll!C__@pO?-f!spTT~zJ>RILF?
z*;awh%1(hXomge({7RN-y782<aqrl?q2x(5(+9q@G=FV{t270TOB+%1|3Z(l^ODKr
zq?KTIySdKekj(@Ck!V>GsVrH^8Mb<~&=aLu^?>U_V&_d9pcQR55Pv<qYvlQLTl^}$
z82_~S1qarNK9-RcDJdE+3~2JVKh3Ti^#3W~@{@^tUA$<rG*!;OCccx(ZV!>HY{=Xa
zZ0rMHF_b(S$pverL8%u9iau-IBAAF|NGaMA6zVM<qf6*Av%`4dMqm|^jACcloy2~V
z?-|Q@A-hCL3vw4w!<}?fRP-|UNNnu?(O;6hSZi!{UwWZS)HZ!IJSz-8L~BJi-ILfC
z+MOTRX}{Rc!wVv{JUekYy}dPzx7XzwR}L@ebq!Nm8QsU(;~DhuxQdC*1Nza6*u4@g
z{gHU&?A5myu4`s@u<#;N^IhCr%6T;ld;R+oGg*>&q4hGv#6yCgIWGU2x~6(#8YkG0
z38VSIx3w}(0@h7_b!n*$jzIj_GIQ(N;3z466vg$>({#LW5N?}~DcEN@BF+u=_V{NG
zFRVRhQ-wAi$A^yeq?k|ZN@Ie(b;RkzYWZQxjSWN5GSZ`*&(|@sB}B0j_wKD$AM9In
z3N)^`z6~$91+gluX?UznNE$WCCD!3ZPx2$46hG0_wV}nOjK9y(6;B-bQc8j^c}M%>
z4Bjg)yxD~pPmb^gOTA@90S2A)(a~})Xmukch`oAx|CYB<r%-37M9t0kRiU$|Ye*eD
yD9<_5VmxJ7gcsuvmCx~w!&(kU&vk_->B-|oj)-IPiT;NlDpkdQm8=StH^sljDmOm>

delta 116
zcmaF5j&bQS#tkMCj6suqB|Ijtl`xq66-b9ldQ3hmnJ_t4N@DX;DFw#Kccl#`tI8xy
z-YVlUSyy(&WL7zk$y4PLCiBWmOtzJuF!?W#)>T+J`JICJWLZUt$*GDSlaB(is?sSY
U_JbQ0e~521h!EK9=<$RL0LkzwrT_o{

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index c2e1e5f98d4e183558fca7f53f7c595576c9f613..da8a90e72a5c10e73ae37971bc517aa71c784c15 100644
GIT binary patch
literal 17
VcmZP$F`c)6-~Z@+3}C=_4gfj%1)Kl?

literal 17
VcmZP$F`c)6-~Z@+3}C=J7XUfN1!@2Q

diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 4d552305d363e444a9b3dbf9eda47dd23aec6f85..57f49ca2a044dbdfe7a1911f65689999288f8a4c 100644
GIT binary patch
delta 420
zcmX@##<jeIYlDddqw8i<iG$Mo=Y(8Odi-Z(00E{J=E-l3E&16JngRm;J%orgpWQ5L
zlFh`}xp}9V%nnBH&DY*}GV}MU>$)D8p#oLXx>@X#B0v8!r}x{|w)sK@{kQ8eGAc6j
z>neyi*u?*Wica6|#=;oI$s{ki{S_}GV=H6K^f!|jC-MvHR{E}*uLV_=xV>aDBew$M
z#*K;z{L{HKndWYGh}^)qJs_OXg>n0bPR0$4lP_d<F)=!AKYD_3BQO8MX|68w)TANW
zTST|#USqt-#m^;au-Dnb1ZwEY?WPYIXR|UoZdAM=2r^WD`iCEkyo`a{|NUSrWa2;k
zFno!M94}P$?(J#68I@%jS8i0y5ZDe>ZNtjwHQim0=^+0h(fx;(pML^Xcz^qUJ*Hb6
ze2X`VehsmL3KnlaZ_Z@M!EdCpFXxd}BUJR`<cWu7ZlB=5l*z*+&$v-h0PGCj?Fn&A
Q?^UKd9A-Q?xgbm&06A%c9smFU

delta 240
zcmV<M01yAChzie!3a~U70YkGj7{MEp4m2>cRy1M)1z7+ARVSBJn*lhp#WoPQ0Z6mf
z?nwi)H}V({w`TzX7z4ML1OZVA0v^$qssRFRw+{{h+=KyJm+X=Ok++qT0RkWanXw^w
z50?rl0-du!S+D_@P+$SHlYr&?vmj5$0hc~50tf*>x5dZ-u??53MgiEjX4e7m3Ab+H
z0g?p)5uqUxmkKEYAD8g>0Sy6AxBmD6aRRr8`vDpq0g<sGfDpF|DFQqN0Y{fdE&{=~
qATI*Z2)7A10w)NQn!=E`*gyhl3<4gxu_0IymkKEY4Yy!k0`DZ|2vlzX

diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index 271ba9ffbccac81ea79bc90605e8ec605957561e..c0fa7ea0a23dba5da26dfcb9fc32bbd36ebaea2b 100644
GIT binary patch
literal 8
PcmZQzU~Era`a=!?2top>

literal 8
PcmZQzU~ErlzpxVk2p<CZ

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7ea4ffe..6da1e71 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
             android:name=".ChoixDuMotDePasse"
             android:exported="false" />
         <activity
-            android:name=".SettingActivity"
+            android:name=".ConfigurationActivity"
             android:exported="false" />
         <activity
             android:name=".MasterMindActivity"
diff --git a/app/src/main/java/com/example/mastermind/ConfigurationActivity.java b/app/src/main/java/com/example/mastermind/ConfigurationActivity.java
new file mode 100644
index 0000000..02bc9e2
--- /dev/null
+++ b/app/src/main/java/com/example/mastermind/ConfigurationActivity.java
@@ -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);
+	}
+}
diff --git a/app/src/main/java/com/example/mastermind/MasterMindActivity.java b/app/src/main/java/com/example/mastermind/MasterMindActivity.java
index d71f0f4..5fdf1ce 100644
--- a/app/src/main/java/com/example/mastermind/MasterMindActivity.java
+++ b/app/src/main/java/com/example/mastermind/MasterMindActivity.java
@@ -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;
diff --git a/app/src/main/java/com/example/mastermind/MenuActivity.java b/app/src/main/java/com/example/mastermind/MenuActivity.java
index c3d0a46..e6bdc0b 100644
--- a/app/src/main/java/com/example/mastermind/MenuActivity.java
+++ b/app/src/main/java/com/example/mastermind/MenuActivity.java
@@ -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);
+    }
+    
 }
diff --git a/app/src/main/java/com/example/mastermind/controller/menu/ObservateurMenuDebutPartie.java b/app/src/main/java/com/example/mastermind/controller/menu/ObservateurMenuDebutPartie.java
index d79bec4..6b4cea5 100644
--- a/app/src/main/java/com/example/mastermind/controller/menu/ObservateurMenuDebutPartie.java
+++ b/app/src/main/java/com/example/mastermind/controller/menu/ObservateurMenuDebutPartie.java
@@ -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);
         }
     }
diff --git a/app/src/main/res/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml
index 8c4f543..31d922d 100644
--- a/app/src/main/res/layout/activity_menu.xml
+++ b/app/src/main/res/layout/activity_menu.xml
@@ -53,23 +53,4 @@
         android:textSize="30dp"
         android:text="Deux Joueur"/>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="pièce vide"
-        android:layout_alignParentBottom="true"
-        android:textSize="30dp"
-        android:layout_toLeftOf="@+id/vide"
-        android:editable="false"
-        android:textColor="@color/white"
-        />
-
-    <CheckBox
-        android:id="@+id/vide"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true" />
-
-
 </RelativeLayout>
diff --git a/app/src/main/res/menu/menu_configuration.xml b/app/src/main/res/menu/menu_configuration.xml
new file mode 100644
index 0000000..5ddac57
--- /dev/null
+++ b/app/src/main/res/menu/menu_configuration.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+    <item
+        android:id="@+id/action_configuration"
+        android:title="@string/action_configuration"
+        android:orderInCategory="100"
+        app:showAsAction="never"
+        />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7fa6bf8..632b495 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">MasterMind</string>
+    <string name="action_configuration">Configuration</string>
+    <string name="pref_piece_vide_titre">Pièces vides</string>
+    <string name="pref_piece_vide_texte">Autoriser les pièces vides</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/configuration_screen.xml b/app/src/main/res/xml/configuration_screen.xml
new file mode 100644
index 0000000..7a7ac93
--- /dev/null
+++ b/app/src/main/res/xml/configuration_screen.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <PreferenceCategory
+        android:title="Général"
+        android:key="general"
+        >
+        <CheckBoxPreference
+            android:key="pref_piece_vide"
+            android:title="@string/pref_piece_vide_titre"
+            android:summary="@string/pref_piece_vide_texte"
+            android:defaultValue="false"
+            />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file