From 393cc799d384110bf28998320d87c7202d6e09b4 Mon Sep 17 00:00:00 2001 From: chaignea Date: Sat, 8 Apr 2023 20:09:10 +0200 Subject: [PATCH] Modification de l'affichage de fin --- .../7.5/executionHistory/executionHistory.bin | Bin 1182076 -> 1389106 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/7.5/fileHashes/fileHashes.bin | Bin 73565 -> 74415 bytes .gradle/7.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../7.5/fileHashes/resourceHashesCache.bin | Bin 20911 -> 21285 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/outputFiles.bin | Bin 159827 -> 164687 bytes app/src/main/AndroidManifest.xml | 3 - .../mastermind/FinDePartieActivity.java | 48 --- .../mastermind/MasterMindActivity.java | 86 +++- app/src/main/res/drawable/rounded_corners.xml | 7 + .../layout/activity_choix_du_mot_de_passe.xml | 17 +- .../res/layout/activity_fin_de_partie.xml | 81 ---- .../main/res/layout/activity_master_mind.xml | 386 +++++++++++------- app/src/main/res/values/dimens.xml | 9 +- 15 files changed, 321 insertions(+), 316 deletions(-) delete mode 100644 app/src/main/java/com/example/mastermind/FinDePartieActivity.java create mode 100644 app/src/main/res/drawable/rounded_corners.xml delete mode 100644 app/src/main/res/layout/activity_fin_de_partie.xml diff --git a/.gradle/7.5/executionHistory/executionHistory.bin b/.gradle/7.5/executionHistory/executionHistory.bin index 2ec63321d98709cd7193ac559064d21a9c8d64af..ab3f6dbaced56f537ef109d244295841c6eaa472 100644 GIT binary patch delta 7036 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 E3ESQ&X8-^I delta 5818 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 SnX#EDQH+R!;jx(vB>i7VpuK$n diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock index e570b12ce09cb9fc7b9a07bd439fde4da86936bf..c9252d67637202cd11cfe5027dafb40f1d5ad062 100644 GIT binary patch literal 17 VcmZQxXdCxzS@nKj1~6c{2mm(91ttIh literal 17 VcmZQxXdCxzS@nKj1~6cJ4*)ji1w#M; diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin index 87427cf41d1f2959868a0fc3715e9268ee876a62..2eba1ce184bc87fb57b6e599a5084efd65e86314 100644 GIT binary patch delta 2572 zcmcIlX;c$e6wV7v0){3MB`gh@pyF1MMN!075YSNE5*1u35m7d^#|0HI$|{??V+o~t z00CJnvWygkx=@W9wty%^1!Pggav~ze9qgNVV|xzxqy5o$&di;2^L^i4-pzZ>7j%nM zy2VpW!E|D(X)24C?HDEasr+U#gIqv#5Lbzu#wMte9-c`XNBjCd(kr*fAx34aZA5;t zh|r2Mjkp1f+nqKUCdg^!MeLtc#pK2vZDXC;e4cjhB0Oy0=EqB60$9!B|BlUsVB&;!Nnn-~e20hT)IKbC<_=w4ex3?<) z>e-m<3s(g1yKN#*PNf-^@JF~-gu+w9#Q1SX!zR7Gxy8BdJf7FTC5QsD%GwYR z#1KjII6!9dICHq88^I2_2_F_!#g;uuMvt>^jB1}BYo8ZCPtfh-d7Ov(2Dt@uhN_Aipm!^+ivI5*!L zUAyu^i2Cbv0}DFI=~R-28^+;n3;0BnY?uK1IlP3M)a|!t#wGorpyp$Iy5^%4QimUe zSEcYpKI(`Hvl{<l2%QXoeYwGscyPihQ zM97h8c=QgwC`4I0-$n8J#sFq-$Dv%fYj7}F=hjgegU${m5CT5ovH>QycV2vLg;>^TJ9JH6?7?y^|2>_%tN@+?_1l6i*^Co9dl3T4jKi~;LYs)|0Z8t_RKkIb~zU1QW9LgZ)8 z0a)N?;T`P1;oK||-oe40vgTnv-cK7^O1_V&+BDRXKdcn*c`evH>- znMXc8EtTAu+fUdtUpERSD2!De5B3E3&vQeC!{_V>*^u6ABWpGHmSm}N}xA*yp^0CwiNF)q%%!hs)A zlmLUZS!p*C@I^(JCE2sNSs{Tr1`e+lN>G&NI}u1|hnFPsamPG9DRB^=pI3~%T{>Hl z@y;kLk6lGv%3q>GGcF*8e~a?4C9o#k@>_vOGH2bvBgJ|y{X6>c>Y&sI2-*uvA(uHZ z`_uwE;DjG;G93pb?@n{R+D@L_5QQaux=X~$^-FEu3G@1rJ!K*rMa5vRWvwC^#EbW6g$fFzj+>O#H#wQu@41o)XRuQh< zU4S>QCg)kd$~F;st;`6q<}BdJ1m`nX*$wz3FQ&oko~81Z-ow3;<6Cr*Q&dIx^{@?i ziX!`1;WBqA4fVnO-b9U#oU_~iI5S&~oZ_-iReiDyhA_B9oM&8qoCAUkv6L@7yWYF^ zl{b#sw?`e;q(%MuU{BE_;%o8V@A%5;0^k96V_=gqS^&&t@8j31TwOZj8r};cYsZIO zqB*xH4uf$H+Cj5uIladqBdYaT^;@f3Wf{)!5GAK~U?XDGiO5%|S01rZrrKB-jmSxpdV@g14q@V=A ztYt`Gz_$bm49G2zz<_)!B_R8CyT?|ql&O)*37I?4D8(|;>4 delta 1850 zcmcJPX;4#F6vy8UL0J+lB$^N+d0{Flie-~UEh;VqL>)t2gN6uI3RQ;HN>Nz`1zTI; zf`L|w7@Y!f0Uu)!)X`~atBzz4L`5mIvbeA+Q3A^JzIQYI5Zjr4>6v-&ym|NcKlhw- z&)f?Q?DlKyDsLh1q!tK^Cc|!t2epbU;!>~OYFX4T?t>Qaj`u~D_y%S8BNig13!Y_y1M-CZc%z@yTF`&p!&;UPDOS!+5$3FMd4ZZrg*<-|AH6dPT;8aXCvE<;(^8<96_Q3j>UpQ10Z z7LCQ#oUd6^hO6&Rz|~9CsCpMl8IuO&d-J%T_&0#v7I!X zah7`(zO3eLZJYB7AK+|Sar>=%>eNya@TjGq+X_g7d-SP;gKg20ar6z4F=+7n$_ZYjm_ zFK9(L|I4#jkvmE$v)dfV9jV{9}(>z<+(eo_H_tVywEPNX*)9_Pk5^87$&FC$>pT#wpag2A+ zPh0UQY%s~U&s~_+ySf+0nH!85hcM*Ls>q6}2njm6 z&-rhBs)okrxj=tSDCr-2vV(V3BWmbOk`7$-Wlm1T9d2T1&gymW45HDG-=SV3l8eK2 zZ~3mVU5%}aIv@0l{BakDmov0|=}zR$I+Q+?Ubp|1SI+6APj@_5IxoVCfqF*4epCSC zGkNPB1fFk?jIkvar<23RozqNF(O4p5y=Xvhv#5bd13rhx^|Sn&v$?^Ebtg@VWwd~> zl#EcNr_o$g*(!Qt_lI~+o90h8wa!A*h|avyZ6QMu&S})`GjhOIReBRp`s2?5=)(^$ zO^!$2Y|Ct7>#wVHxyk2`j4Jbswok&ryy;sNnW!38=kTCUIS)0D$5OqN(xEv@3|N;n|ehII6Z-P~b$@3<^;=+;JYfEV5@0N+Kahx#BW;i>%uU?pnJ zk{#*{0T9WH!yEQS_cdyTGrfe%oumenrVuAcTt?okUrD2$GtXUjYV+LnXGs2c4mTOa z6o8bpHM^+$1z-gkxBd1?vFrG3O~ss!SVf2g$6cagAbJ0|ZoLp3V9{s9)-{X3FtFv0 SJYyCKt2(BEI)fNQv;G1-Gf|5G diff --git a/.gradle/7.5/fileHashes/fileHashes.lock b/.gradle/7.5/fileHashes/fileHashes.lock index 30330fcd37e6df664a9cbc51ab07b40691fc36b8..77686ea487cc538ef61f7ec5b7cc40ca445bf151 100644 GIT binary patch literal 17 VcmZQBSfRUsf03Rh0~oOF001Xl1Frx8 literal 17 VcmZQBSfRUsf03Rh0~oNX0{|w<104VW diff --git a/.gradle/7.5/fileHashes/resourceHashesCache.bin b/.gradle/7.5/fileHashes/resourceHashesCache.bin index 1426bd16f0634607a27c651649e731b827628cf8..aeccdab5e609582fd0151cec2989043fd2f11a3d 100644 GIT binary patch delta 646 zcmZ3#m~rVc#tkMCj6s`CB^nq7c24!;`EzY+Ap;l$?ccms(tt_h^NY;8M;6wIKtzL? z|3ksoL{CNKd6#cNRX?13RXRX`-LKm7i)N2BRM32~tW1E0^qFOS&rTVyh6o0JhM6F9 zQ}bd(T-{x$V$sQ|G8O`Qi~gK3>Bta*3Pw(zDl?N`LsodLnW-aGZ0=-L*#Lp)n_qiA zTRN~pO}#idS2jZ+|AX%1bE{kVp@QotpOtM8sLFgM{q*a}YN+<=$*yvXnAi_)RQw^n z(I7%#v!h2IXT32{RuYH>L0Dkhht;Qd^VG0BcYh^R_2q*uP*4t4MQL$ibjzgX;uD-Y zTz<}dw=q>LSQnkR$joK+gC^dG7dQm=W2&&;V^}`1RNvg~Yg>I(eT_N`rjm*S?2E(7 zmYjWlRyI`jxnM1(3MG#PpJYyy84Y|`j<;v4r8jA zURLp7(n_7{Z6A{=RX6qB`;DpO`>{n5=?m}gjeLLSto%cz1(+&Wk9TxEPTllYu5pR$ ex6OIEm?}Q+JFB?nvCU4^n!^HB-zBDkQ~&_Sjl|#p delta 69 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 delta 1584 zcmZWpdr;I>6!zRj#J9)_KNRGVtP3%_zm;7edAK6NDn3@nM5jjJj|9zEGZjl?VpC&} zaRj}}AyOB7z)C3KO>U72lo%BPW+Ig#m0IICx<&?=LTCM>f7+S7b06P1_dDPDez$Yi zxGQ~Q>&yy73yX3>BmSP@1KdA2TkHw01Fu+*t~n zG5AApV?-G=v^dI|L6m4i7Ne#fcuIpqp}qr8}hR~Y$*iWZ)7B%3!L>EYE! zi}}i9Dla>x@Nekd*4RNdu#II-jP4F!5zGvbg_f?U5KhKMg^k?(@zZ_!B zLsFw?K;caTE>Sqx20Z^!GhhCXOH6)jWjuE{Tih7VgELvMhRNR<)B%3w1rC`x8rlHk z#y}6w_5oFH^?@#ind3o4=XkK;2n{lS0z`s$P~a#CcVO%=tU%{5DA+j+E-V@W_kmjG z!gql=0b zVfeNM_F{A_m3B53d_Z20gHn*YpMz~oY7=P(%}G!t`;%Y@(923?n5}f%b}LzB)qG;~ z(R^Z{O@R%bPPMc{1P-?oAng)CU%y1N^OuPHvJRS+bP&F^0~VpKlV~08qys}2;nsB# zckj!zS3-mQJ_Q2o5QTU55p*f1omTGQc56TJMoS5aAAyu_Gg5*lNY3@xSCV}Z#KYJ? z4O*Pkn>U>l#QhU&c&i*7yfQ(>a}}WQ?gRx#9|1Q%m1vXCAB8-SSC2tF@b2U+JXi?@ zykuSxo~?pFuCpp=ae<9*v8veWqTs_;2Oc^B`TVu{i|}|gH1lOCO}MItqP8qZ#}`k6 ziFYh;pyd=OA}zHPaA6%3@uV~p2G@fscBSnEd~zDzVnI+JHbsl$BH1BfU0Vmzo(ZWS z-S3mxc-PAxFwo1^HmG27$G0AiBx^iK5|Rw)QB9I+)SexeNd!_%k-G1wX{cQYF1h+D z41!#L4OET1_@l=NuV#>7_pX!9B|lTZ_9bMA+r6ats-@J)*gjhBUPehK{Q~6-FaAd8 zn|5kV@=a25*GSVbCfA2qpRx`?_aICJ0}c;DpfnD7JXQFJ*vYKNpl6aiKL}@P znH@Yfr^e-K=nK9!nesWk7_Dziq5NaKnFBL@$+iRD%*n9Vk9s~ZmbvAKma0aa!02cK zdymO$3JHKlUr)evGVJoHjO4AF0Y)@vSq@fdnHz5eQBCvwSpk*@gHew7Gtwx3CNU4n zsSm63lcaazXb8b{1N#BvjjR~^jLh9&B1Y0ahmlnD$k_gSU$QXQ!c6~vU$!#7_FM~Q z&t*2g_`E~LC(uQrtZ64;XfkW&U$m&wI*(}cJ6|?qc?xszKQB<)1x)2DTU&4_l{JaR zi%1owvmQRw7Kr6Grtqm>JEUz9JzuELAZ~wTFc*(%U%{pi)rTq5JZ_mNv)8eH-+uw% C>S*Nv diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5fd120f..7ea4ffe 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,9 +14,6 @@ - diff --git a/app/src/main/java/com/example/mastermind/FinDePartieActivity.java b/app/src/main/java/com/example/mastermind/FinDePartieActivity.java deleted file mode 100644 index 0610754..0000000 --- a/app/src/main/java/com/example/mastermind/FinDePartieActivity.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.example.mastermind; - -import android.content.Intent; -import android.os.Bundle; -import android.widget.TextView; - -import androidx.appcompat.app.AppCompatActivity; - -import com.example.mastermind.vue.mastermind.UnePiece; - -public class FinDePartieActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_fin_de_partie); - - boolean trouve = getIntent().getBooleanExtra("trouve", false); - int[] code = getIntent().getIntArrayExtra("code"); - int tours = getIntent().getIntExtra("tour", 0); - - if (trouve){ - ((TextView)findViewById(R.id.texte_gagnant)).setText("Victoire de l'attaquant"); - } else { - ((TextView)findViewById(R.id.texte_gagnant)).setText("Victoire du défenseur"); - } - - ((UnePiece)findViewById(R.id.reponse_code1)).setColor(code[0]); - ((UnePiece)findViewById(R.id.reponse_code2)).setColor(code[1]); - ((UnePiece)findViewById(R.id.reponse_code3)).setColor(code[2]); - ((UnePiece)findViewById(R.id.reponse_code4)).setColor(code[3]); - - if (trouve) { - if (tours == 0) { - ((TextView)findViewById(R.id.texte_nombre_coups)).setText("Le défenseur a trouvé le code en 1 tentative"); - } else { - ((TextView)findViewById(R.id.texte_nombre_coups)).setText("Le défenseur a trouvé le code en " + (tours+1) + " tentatives"); - } - } - } - - @Override - public void onBackPressed() { - Intent menu=new Intent(this, MenuActivity.class); - this.startActivity(menu); - this.finish(); - } -} diff --git a/app/src/main/java/com/example/mastermind/MasterMindActivity.java b/app/src/main/java/com/example/mastermind/MasterMindActivity.java index 3d5b051..d71f0f4 100644 --- a/app/src/main/java/com/example/mastermind/MasterMindActivity.java +++ b/app/src/main/java/com/example/mastermind/MasterMindActivity.java @@ -2,7 +2,10 @@ package com.example.mastermind; import android.content.Intent; import android.os.Bundle; +import android.view.MotionEvent; +import android.view.View; import android.widget.LinearLayout; +import android.widget.TextView; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; @@ -29,6 +32,9 @@ public class MasterMindActivity extends AppCompatActivity { private ArrayList> corrections; + // 0 pour personne, 1 pour attaquant, 2 pour défenseur + private int gagnant; + @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -50,6 +56,8 @@ public class MasterMindActivity extends AppCompatActivity { b.putInt("tour", 0); + b.putInt("gagnant", 0); + this.combinaisons = new ArrayList<>(); combinaisons.add(new ArrayList<>(0)); for (int i=0; i<4; i++) @@ -90,10 +98,10 @@ public class MasterMindActivity extends AppCompatActivity { if (nextable) { if (this.tour < 9) { //on affiche la correction - boolean gagne = this.afficherCorrection((LinearLayout) this.jeu.getChildAt(this.tour)); + this.afficherCorrection((LinearLayout) this.jeu.getChildAt(this.tour)); + //on supprime les listener et sauvegarde la combinaison LinearLayout anciennesPieces = (LinearLayout) this.jeu.getChildAt(this.tour); - ArrayList combinaison = new ArrayList<>(); for (int i = 0; i < anciennesPieces.getChildCount(); i++) { anciennesPieces.getChildAt(i).setOnTouchListener(null); @@ -101,7 +109,7 @@ public class MasterMindActivity extends AppCompatActivity { } this.combinaisons.add(combinaison); - if (gagne) { + if (this.gagnant == 1) { this.finDePartie(true); } else { //on incremente le tour @@ -117,21 +125,28 @@ public class MasterMindActivity extends AppCompatActivity { } else { //on affiche la correction - boolean gagne = this.afficherCorrection((LinearLayout) this.jeu.getChildAt(this.tour)); - //on supprime les listener - if (this.tour > 0) { - LinearLayout anciennesPieces = (LinearLayout) this.jeu.getChildAt(this.tour - 1); - - for (int i = 0; i < anciennesPieces.getChildCount(); i++) { - anciennesPieces.getChildAt(i).setOnTouchListener(null); - } + this.afficherCorrection((LinearLayout) this.jeu.getChildAt(this.tour)); + + //on supprime les listener et sauvegarde la combinaison + LinearLayout anciennesPieces = (LinearLayout) this.jeu.getChildAt(this.tour); + ArrayList combinaison = new ArrayList<>(); + for (int i = 0; i < anciennesPieces.getChildCount(); i++) { + anciennesPieces.getChildAt(i).setOnTouchListener(null); + combinaison.add(((UnePiece) anciennesPieces.getChildAt(i)).getColor()); + } + this.combinaisons.add(combinaison); + + if (this.gagnant == 1) { + this.finDePartie(true); + } else { + this.gagnant = 2; + this.finDePartie(false); } - this.finDePartie(gagne); } } } - public boolean afficherCorrection(LinearLayout pieces){ + public void afficherCorrection(LinearLayout pieces){ int[] colorpiece=new int[4]; for(int i=0; i<4; i++){ colorpiece[i]=((UnePiece)pieces.getChildAt(i)).getColor(); @@ -165,20 +180,45 @@ public class MasterMindActivity extends AppCompatActivity { } } this.corrections.add(correction); - return gagner; + if (gagner){ + this.gagnant=1; + } } public void finDePartie(boolean trouve){ - Intent fin=new Intent(this, FinDePartieActivity.class); - fin.putExtra("trouve", trouve); - fin.putExtra("tour", this.tour); - fin.putExtra("code", this.code); - this.startActivity(fin); - this.finish(); + if (trouve){ + if (this.tour == 0) { + ((TextView) findViewById(R.id.texte_gagnant)).setText("Victoire de l'attaquant en 1 tentative"); + }else + ((TextView) findViewById(R.id.texte_gagnant)).setText("Victoire de l'attaquant en " + (this.tour + 1) + " tentatives"); + } else { + ((TextView)findViewById(R.id.texte_gagnant)).setText("Victoire du défenseur"); + } + + ((UnePiece)findViewById(R.id.reponse_code1)).setColor(this.code[0]); + ((UnePiece)findViewById(R.id.reponse_code2)).setColor(this.code[1]); + ((UnePiece)findViewById(R.id.reponse_code3)).setColor(this.code[2]); + ((UnePiece)findViewById(R.id.reponse_code4)).setColor(this.code[3]); + + findViewById(R.id.cache_reponse).setVisibility(View.INVISIBLE); + + findViewById(R.id.tour).setVisibility(View.INVISIBLE); + findViewById(R.id.tour).setOnTouchListener(null); + + findViewById(R.id.mastermind).setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + Intent intent = new Intent(MasterMindActivity.this, MenuActivity.class); + MasterMindActivity.this.startActivity(intent); + MasterMindActivity.this.finish(); + return true; + } + }); } public void init(Bundle state){ this.tour= state.getInt("tour"); + this.gagnant= state.getInt("gagnant"); ArrayList> combinaisons = (ArrayList>) state.getSerializable("combinaisons"); ArrayList> corrections = (ArrayList>) state.getSerializable("corrections"); @@ -201,6 +241,11 @@ public class MasterMindActivity extends AppCompatActivity { corrections.remove(this.tour); this.combinaisons = combinaisons; this.corrections = corrections; + + if (this.gagnant==1){ + this.finDePartie(true); + }else if (this.gagnant==2) + this.finDePartie(false); } @Override @@ -210,6 +255,7 @@ public class MasterMindActivity extends AppCompatActivity { outState = new Bundle(); Bundle b = new Bundle(); b.putInt("tour", this.tour); + b.putInt("gagnant", this.gagnant); ArrayList combinaison = new ArrayList<>(); LinearLayout anciennesPieces =(LinearLayout) this.jeu.getChildAt(this.tour); diff --git a/app/src/main/res/drawable/rounded_corners.xml b/app/src/main/res/drawable/rounded_corners.xml new file mode 100644 index 0000000..88d52d1 --- /dev/null +++ b/app/src/main/res/drawable/rounded_corners.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_choix_du_mot_de_passe.xml b/app/src/main/res/layout/activity_choix_du_mot_de_passe.xml index 8595f8c..2d8d862 100644 --- a/app/src/main/res/layout/activity_choix_du_mot_de_passe.xml +++ b/app/src/main/res/layout/activity_choix_du_mot_de_passe.xml @@ -54,14 +54,17 @@ android:id="@+id/bouton_valider_code" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_margin="@dimen/margeM" - android:text="Valider" - android:textColor="@color/white" - android:textAlignment="center" - android:textSize="@dimen/margeM" - android:background="@color/black" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true"/> + android:layout_alignParentRight="true" + android:layout_marginStart="@dimen/margeM" + android:layout_marginTop="@dimen/margeM" + android:layout_marginEnd="@dimen/margeM" + android:layout_marginBottom="@dimen/margeM" + android:background="@color/black" + android:text="Valider" + android:textAlignment="center" + android:textColor="@color/white" + android:textSize="@dimen/texte" /> diff --git a/app/src/main/res/layout/activity_fin_de_partie.xml b/app/src/main/res/layout/activity_fin_de_partie.xml deleted file mode 100644 index 190787b..0000000 --- a/app/src/main/res/layout/activity_fin_de_partie.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_master_mind.xml b/app/src/main/res/layout/activity_master_mind.xml index c342b6b..a2cba02 100644 --- a/app/src/main/res/layout/activity_master_mind.xml +++ b/app/src/main/res/layout/activity_master_mind.xml @@ -6,187 +6,267 @@ android:layout_height="match_parent" android:background="@color/marron" android:gravity="center_vertical" + android:id="@+id/mastermind" > + + + + + + + + + + + + +