From 4470f93482d025b24c7bc56e62fc12e0ee9257fe Mon Sep 17 00:00:00 2001
From: POKORSKI-CREBOUW <alexis.pokorski@u-psud.fr>
Date: Sat, 12 Mar 2016 15:29:24 +0100
Subject: [PATCH 1/8] Rien

---
 SimongGame/.idea/misc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SimongGame/.idea/misc.xml b/SimongGame/.idea/misc.xml
index 43580ac..1002b47 100644
--- a/SimongGame/.idea/misc.xml
+++ b/SimongGame/.idea/misc.xml
@@ -44,7 +44,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

From 67fdaa7ae184f24b0080a5a1aa3699369d1a0c06 Mon Sep 17 00:00:00 2001
From: POKORSKI Alexis <alexis.pokorski@u-psud.fr>
Date: Sat, 12 Mar 2016 16:15:49 +0100
Subject: [PATCH 2/8] Push Correction

---
 .../java/cyril/simonggame/controller/Menu_Controller.java     | 4 +++-
 .../app/src/main/java/cyril/simonggame/view/Game_View.java    | 3 +++
 SimongGame/app/src/main/res/drawable/bluecircle.xml           | 1 -
 SimongGame/app/src/main/res/layout/activity_game.xml          | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/SimongGame/app/src/main/java/cyril/simonggame/controller/Menu_Controller.java b/SimongGame/app/src/main/java/cyril/simonggame/controller/Menu_Controller.java
index 79c8d09..3f859df 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/controller/Menu_Controller.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/controller/Menu_Controller.java
@@ -25,16 +25,18 @@ public class Menu_Controller implements View.OnClickListener {
     public Menu_Controller(Menu_view view){
         this.menu_view = view;
     }
-    ActivityOptionsCompat compat = ActivityOptionsCompat.makeSceneTransitionAnimation((Activity) menu_view.getContext(), null);
+    ActivityOptionsCompat compat ;
     @Override
     public void onClick(View v) {
         switch (v.getId()){
             case R.id.btPlay :
+                compat = ActivityOptionsCompat.makeSceneTransitionAnimation((Activity) menu_view.getContext(), null);
                 Intent intent = new Intent(menu_view.getContext(), GameActivity.class);
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 menu_view.getContext().startActivity(intent,compat.toBundle());
                 break;
             case R.id.btSetting :
+                compat = ActivityOptionsCompat.makeSceneTransitionAnimation((Activity) menu_view.getContext(), null);
                 Intent intent2 = new Intent(menu_view.getContext(), Setting_Activity.class);
                 intent2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 menu_view.getContext().startActivity(intent2,compat.toBundle());
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java b/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
index 9380fb6..18a245d 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
@@ -1,6 +1,8 @@
 package cyril.simonggame.view;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -25,6 +27,7 @@ public class Game_View extends LinearLayout {
     private Animation animBounceButton;
     final Context context;
     private Handler mainHandler = new Handler();
+
     public Game_View(Context context) {
         super(context);
         this.context = context;
diff --git a/SimongGame/app/src/main/res/drawable/bluecircle.xml b/SimongGame/app/src/main/res/drawable/bluecircle.xml
index e1f730e..3313c38 100644
--- a/SimongGame/app/src/main/res/drawable/bluecircle.xml
+++ b/SimongGame/app/src/main/res/drawable/bluecircle.xml
@@ -4,7 +4,6 @@
         android:width="120dp"
         android:height="120dp">
         <shape android:shape="oval">
-
             <solid
                 android:color="#04a3bf"/>
             <size
diff --git a/SimongGame/app/src/main/res/layout/activity_game.xml b/SimongGame/app/src/main/res/layout/activity_game.xml
index 0f07c1b..bb9638d 100644
--- a/SimongGame/app/src/main/res/layout/activity_game.xml
+++ b/SimongGame/app/src/main/res/layout/activity_game.xml
@@ -33,7 +33,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/buttonRed"
-                    android:background="@drawable/redcircle"/>
+                    android:background="@drawable/redcircle" />
             </LinearLayout>
 
             <LinearLayout

From 91d1b48b985d1a7b618ee8f9da968e58974d25ab Mon Sep 17 00:00:00 2001
From: POKORSKI-CREBOUW <alexis.pokorski@u-psud.fr>
Date: Sat, 12 Mar 2016 18:22:11 +0100
Subject: [PATCH 3/8] Update design game

---
 .../controller/Game_Controller.java           |  8 ++--
 .../cyril/simonggame/model/SimonGame.java     | 14 ++++--
 .../java/cyril/simonggame/view/Game_View.java | 47 ++++++++++++++-----
 SimongGame/app/src/main/res/anim/alpha.xml    |  4 +-
 .../app/src/main/res/anim/littlebounce.xml    |  4 +-
 .../app/src/main/res/drawable/background.xml  | 14 ++++++
 .../app/src/main/res/drawable/bluecircle.xml  |  4 +-
 .../app/src/main/res/drawable/greencircle.xml |  3 +-
 .../app/src/main/res/drawable/pinkcircle.xml  |  3 +-
 .../app/src/main/res/drawable/redcircle.xml   |  3 +-
 .../app/src/main/res/layout/activity_game.xml | 46 ++++++++++++++----
 11 files changed, 114 insertions(+), 36 deletions(-)
 create mode 100644 SimongGame/app/src/main/res/drawable/background.xml

diff --git a/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java b/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java
index 0f5fade..1005d1e 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java
@@ -18,12 +18,10 @@ public Game_Controller(Game_View view){
     }
     public void onClick(View v) {
         Button currentButton = (Button)v;
-        game_View.doAnimationBounce(currentButton);
         System.out.println(simonGame.getgameStarted());
        if(simonGame.getgameStarted() && !simonGame.getInAnimation()){
-
+           game_View.doAnimationBounce(currentButton);
             if(currentButton == simonGame.getPattern().get(simonGame.getRound())){
-
                 simonGame.setRound(simonGame.getRound()+1);
             }else{
                 simonGame.setGameStarted(false);
@@ -31,7 +29,11 @@ public void onClick(View v) {
             }
 
             if(simonGame.getPattern().size() == simonGame.getRound()){
+                simonGame.scoreUp();
+                game_View.updateScore(simonGame.getRound());
+
                 System.out.println("GG");
+                simonGame.setInAnimation(true);
                 game_View.startGamePartternAnimation();
             }
         }
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java b/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java
index 8879b7f..5dccee7 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java
@@ -23,9 +23,8 @@ public class SimonGame {
     private Game_View game_View;
     private boolean gameStarted = false;
     private boolean inAnimation = false;
-    private Handler mainHandle;
+
     private Button buttons[];
-    private boolean canPlay = false;
     private int round;
     private int currentTurn;
     private ArrayList<Button> pattern = new ArrayList<Button>();
@@ -38,9 +37,14 @@ public void startGame(){
         gameStarted = true;
         round = 0;
         currentTurn = 0;
+        game_View.updateScore(0);
         game_View.startGamePartternAnimation();
     }
-
+    public void addColorToPattern(){
+        setRound(0);
+        int randnb = random(0,3);
+        pattern.add(buttons[randnb]);
+    }
     public Integer random(int min, int max){
         return min + (int)(Math.random() * ((max - min) + 1));
     }
@@ -73,4 +77,8 @@ public boolean getgameStarted(){
     public void setGameStarted(boolean gameStarted){
         this.gameStarted = gameStarted;
     }
+
+    public void scoreUp(){
+        round++;
+    }
 }
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java b/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
index 7838670..f8096b9 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
@@ -8,6 +8,7 @@
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import cyril.simonggame.R;
 import cyril.simonggame.controller.Game_Controller;
@@ -18,7 +19,10 @@
  */
 public class Game_View extends LinearLayout {
     public SimonGame simonGame;
+    private Game_View itSelf ;
     private Button buttons[] =  new Button[4];
+    private TextView textViewScore;
+    private LinearLayout layoutButtons;
     private Animation animFondu;
     private Animation animRotate;
     private Animation animStartGame;
@@ -27,6 +31,7 @@ public class Game_View extends LinearLayout {
     private Handler mainHandler = new Handler();
     public Game_View(Context context) {
         super(context);
+        itSelf = this;
         this.context = context;
 
         inflate();
@@ -34,7 +39,9 @@ public Game_View(Context context) {
         initAnimation();
 
         simonGame = new SimonGame(this,buttons);
-        simonGame.startGame();
+
+        StartGameAnimation startGameAnimation = new StartGameAnimation();
+        startGameAnimation.start();
         initListener();
     }
 
@@ -49,6 +56,8 @@ private void bindView(){
         buttons[1] = (Button)findViewById(R.id.buttonGreen);
         buttons[2] = (Button)findViewById(R.id.buttonPurple);
         buttons[3] = (Button)findViewById(R.id.buttonRed);
+        textViewScore = (TextView) findViewById(R.id.textViewScoreNb);
+        layoutButtons = (LinearLayout) findViewById(R.id.layoutButtons);
 
     }
     public  void initAnimation(){
@@ -61,34 +70,50 @@ public void initListener(){
             x.setOnClickListener(new Game_Controller(this));
         }
     }
+    public void doStartGameAnimation(){
+        layoutButtons.startAnimation(animStartGame);
+    }
     public void doAnimationFondu(final Button button) {
         button.startAnimation(animFondu);
     }
     public void doAnimationBounce(final Button button){
         button.startAnimation(animBounceButton);
     }
+
     public void startGamePartternAnimation(){
         GamePatternAnimation gamePatternAnimation = new GamePatternAnimation();
         gamePatternAnimation.start();
     }
-    public class GamePatternAnimation extends Thread{
-        public Integer random(int min, int max){
-            return min + (int)(Math.random() * ((max - min) + 1));
-        }
+    public void updateScore(int score){
+        textViewScore.setText(String.valueOf(score));
+    }
+
+    public class StartGameAnimation extends Thread{
         public void run(){
+            doStartGameAnimation();
             try{
                 sleep(2000);
-            }catch (InterruptedException e){
+            } catch (InterruptedException e){
             }
-            int randnb;
+            Runnable runAnimation = new Runnable() {
+                @Override
+                public void run() {
+                    simonGame.startGame();
+                }
+            };
+            mainHandler.post(runAnimation);
+        }
+
+    }
+    public class GamePatternAnimation extends Thread{
+        public void run(){
             simonGame.setInAnimation(true);
-            simonGame.setRound(0);
-            randnb = random(0,3);
-            simonGame.getPattern().add(simonGame.getButtonAt(randnb));
+            int randnb;
+            simonGame.addColorToPattern();
             for(final Button x: simonGame.getPattern()) {
                 doAnimInMainHandle(x);
                 try{
-                    sleep(400);
+                    sleep(700);
                 }catch (InterruptedException e){
                 }
             }
diff --git a/SimongGame/app/src/main/res/anim/alpha.xml b/SimongGame/app/src/main/res/anim/alpha.xml
index 4f48a2c..5ac91f6 100644
--- a/SimongGame/app/src/main/res/anim/alpha.xml
+++ b/SimongGame/app/src/main/res/anim/alpha.xml
@@ -3,8 +3,8 @@
     android:interpolator="@android:anim/linear_interpolator">
     <alpha
         android:fromAlpha="1.0"
-        android:toAlpha="0.5"
-        android:duration="100"
+        android:toAlpha="0.4"
+        android:duration="200"
         android:repeatCount="1"
         android:repeatMode="reverse" />
 </set>
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/anim/littlebounce.xml b/SimongGame/app/src/main/res/anim/littlebounce.xml
index 9d57d92..2fb4de5 100644
--- a/SimongGame/app/src/main/res/anim/littlebounce.xml
+++ b/SimongGame/app/src/main/res/anim/littlebounce.xml
@@ -3,9 +3,9 @@
     android:interpolator="@android:anim/anticipate_overshoot_interpolator">
     <scale
         android:fromXScale="1.0"
-        android:toXScale="0.7"
+        android:toXScale="0.9"
         android:fromYScale="1.0"
-        android:toYScale="0.7"
+        android:toYScale="0.9"
         android:pivotX="50%"
         android:pivotY="50%"
         android:duration="150"
diff --git a/SimongGame/app/src/main/res/drawable/background.xml b/SimongGame/app/src/main/res/drawable/background.xml
new file mode 100644
index 0000000..1b9ecf4
--- /dev/null
+++ b/SimongGame/app/src/main/res/drawable/background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+    <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+        <gradient
+            android:type="radial"
+            android:centerX="50%"
+            android:centerY="50%"
+            android:startColor="#FFFFFFFF"
+            android:endColor="#FF8AD4FF"
+            android:gradientRadius="90%"/>
+    </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/drawable/bluecircle.xml b/SimongGame/app/src/main/res/drawable/bluecircle.xml
index e1f730e..8acaab9 100644
--- a/SimongGame/app/src/main/res/drawable/bluecircle.xml
+++ b/SimongGame/app/src/main/res/drawable/bluecircle.xml
@@ -4,13 +4,13 @@
         android:width="120dp"
         android:height="120dp">
         <shape android:shape="oval">
-
             <solid
-                android:color="#04a3bf"/>
+                android:color="#9fb7ff"/>
             <size
                 android:width="120dp"
                 android:height="120dp"
                 android:paddingRight="50dp"/>
+            <stroke android:width="1px" android:color="#d2d2d2"/>
         </shape>
     </item>
 </selector>
diff --git a/SimongGame/app/src/main/res/drawable/greencircle.xml b/SimongGame/app/src/main/res/drawable/greencircle.xml
index 5536d90..68998f3 100644
--- a/SimongGame/app/src/main/res/drawable/greencircle.xml
+++ b/SimongGame/app/src/main/res/drawable/greencircle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#94ef16"/>
+    <solid android:color="#d5ff9c"/>
     <size android:width="120dp" android:height="120dp" />
+    <stroke android:width="1px" android:color="#d2d2d2"/>
 </shape>
diff --git a/SimongGame/app/src/main/res/drawable/pinkcircle.xml b/SimongGame/app/src/main/res/drawable/pinkcircle.xml
index a16e759..1f2bdb3 100644
--- a/SimongGame/app/src/main/res/drawable/pinkcircle.xml
+++ b/SimongGame/app/src/main/res/drawable/pinkcircle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#c515ec"/>
+    <solid android:color="#f2b7ff"/>
     <size android:width="120dp" android:height="120dp" />
+    <stroke android:width="1px" android:color="#d2d2d2"/>
 </shape>
diff --git a/SimongGame/app/src/main/res/drawable/redcircle.xml b/SimongGame/app/src/main/res/drawable/redcircle.xml
index 23492d0..ed834a6 100644
--- a/SimongGame/app/src/main/res/drawable/redcircle.xml
+++ b/SimongGame/app/src/main/res/drawable/redcircle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#d61117"/>
+    <solid android:color="#ffa5a8"/>
     <size android:width="120dp" android:height="120dp" />
+    <stroke android:width="1px" android:color="#d2d2d2"/>
 </shape>
diff --git a/SimongGame/app/src/main/res/layout/activity_game.xml b/SimongGame/app/src/main/res/layout/activity_game.xml
index 0f07c1b..970ebd1 100644
--- a/SimongGame/app/src/main/res/layout/activity_game.xml
+++ b/SimongGame/app/src/main/res/layout/activity_game.xml
@@ -2,21 +2,44 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000"
+    android:background="@drawable/background"
     android:weightSum="1">
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Score : "
+        android:id="@+id/textViewScore"
+        android:textColor="#ffffff"
+        android:textIsSelectable="true"
+        android:textSize="30dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:paddingLeft="5dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/textViewScoreNb"
+        android:layout_alignBottom="@+id/textViewScore"
+        android:layout_toEndOf="@+id/textViewScore"
+        android:textSize="30dp"
+        android:textColor="#ffffff" />
+
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignWithParentIfMissing="false"
         android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true">
+        android:layout_centerHorizontal="true"
+        android:text=" "
+        android:id="@+id/relativeLayout">
 
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true">
+            android:id="@+id/layoutButtons">
 
             <LinearLayout
                 android:orientation="horizontal"
@@ -27,13 +50,15 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/buttonPurple"
                     android:background="@drawable/pinkcircle"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp"/>
+                    android:layout_marginRight="50dp"
+                    android:layout_marginBottom="50dp"
+                    style="?android:attr/borderlessButtonStyle"/>
                 <Button
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/buttonRed"
-                    android:background="@drawable/redcircle"/>
+                    android:background="@drawable/redcircle"
+                    style="?android:attr/borderlessButtonStyle"/>
             </LinearLayout>
 
             <LinearLayout
@@ -46,17 +71,18 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/buttonGreen"
                     android:background="@drawable/greencircle"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp"/>
+                    android:layout_marginRight="50dp"
+                    style="?android:attr/borderlessButtonStyle"/>
 
                 <Button
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/buttonBlue"
-                    android:background="@drawable/bluecircle"/>
+                    android:background="@drawable/bluecircle"
+                    style="?android:attr/borderlessButtonStyle"/>
             </LinearLayout>
         </LinearLayout>
 
     </RelativeLayout>
 
-    </RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file

From ed74c682448eddc99f35ce09a98b8a4f0720d8f8 Mon Sep 17 00:00:00 2001
From: POKORSKI-CREBOUW <alexis.pokorski@u-psud.fr>
Date: Sat, 12 Mar 2016 22:18:09 +0100
Subject: [PATCH 4/8] Update Game

---
 SimongGame/.idea/misc.xml                     |   2 +-
 .../simonggame/activity/GameActivity.java     |   7 +-
 .../simonggame/activity/Menu_Activity.java    |   6 +
 .../simonggame/activity/Setting_Activity.java |   7 +
 .../controller/Game_Controller.java           |  21 +-
 .../cyril/simonggame/model/SimonGame.java     |  47 +++-
 .../java/cyril/simonggame/view/Game_View.java | 239 ++++++++++++++----
 .../app/src/main/res/anim/apparitionfondu.xml |   7 +
 .../src/main/res/anim/disparitionfondu.xml    |   7 +
 .../src/main/res/anim/scaletoinvisible.xml    |  12 +
 .../app/src/main/res/anim/startgame.xml       |   2 +-
 .../app/src/main/res/drawable/retrybutton.png | Bin 0 -> 10063 bytes
 .../app/src/main/res/layout/activity_game.xml | 187 +++++++++-----
 13 files changed, 403 insertions(+), 141 deletions(-)
 create mode 100644 SimongGame/app/src/main/res/anim/apparitionfondu.xml
 create mode 100644 SimongGame/app/src/main/res/anim/disparitionfondu.xml
 create mode 100644 SimongGame/app/src/main/res/anim/scaletoinvisible.xml
 create mode 100644 SimongGame/app/src/main/res/drawable/retrybutton.png

diff --git a/SimongGame/.idea/misc.xml b/SimongGame/.idea/misc.xml
index 1002b47..43580ac 100644
--- a/SimongGame/.idea/misc.xml
+++ b/SimongGame/.idea/misc.xml
@@ -44,7 +44,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/activity/GameActivity.java b/SimongGame/app/src/main/java/cyril/simonggame/activity/GameActivity.java
index 50c780e..6456075 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/activity/GameActivity.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/activity/GameActivity.java
@@ -4,6 +4,7 @@
 import android.os.Bundle;
 import android.app.Activity;
 import android.view.Window;
+import android.view.WindowManager;
 
 import cyril.simonggame.view.Game_View;
 
@@ -13,8 +14,12 @@ public class GameActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_NO_TITLE); //retire le titre (Toolbar)
+        setInfullScreen();
         game_View = new Game_View(this);
         setContentView(game_View);
     }
-
+    public void setInfullScreen(){
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    }
 }
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/activity/Menu_Activity.java b/SimongGame/app/src/main/java/cyril/simonggame/activity/Menu_Activity.java
index e99702f..69fd827 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/activity/Menu_Activity.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/activity/Menu_Activity.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.Window;
+import android.view.WindowManager;
 
 import cyril.simonggame.view.Menu_view;
 
@@ -15,8 +16,13 @@ public class Menu_Activity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_NO_TITLE); //retire le titre (Toolbar)
+        setInfullScreen();
         menu_view = new Menu_view(this);
         setContentView(menu_view);
     }
 
+    public void setInfullScreen(){
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    }
 }
\ No newline at end of file
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/activity/Setting_Activity.java b/SimongGame/app/src/main/java/cyril/simonggame/activity/Setting_Activity.java
index 827f7cb..5b80cee 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/activity/Setting_Activity.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/activity/Setting_Activity.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.Window;
+import android.view.WindowManager;
 
 import cyril.simonggame.view.Menu_view;
 import cyril.simonggame.view.Setting_View;
@@ -16,7 +17,13 @@ public class Setting_Activity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_NO_TITLE); //retire le titre (Toolbar)
+        setInfullScreen();
         setting_view = new Setting_View(this);
         setContentView(setting_view);
     }
+
+    public void setInfullScreen(){
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    }
 }
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java b/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java
index 1005d1e..e29dee4 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java
@@ -16,26 +16,9 @@ public Game_Controller(Game_View view){
         this.game_View = view;
         this.simonGame = game_View.simonGame;
     }
+
     public void onClick(View v) {
         Button currentButton = (Button)v;
-        System.out.println(simonGame.getgameStarted());
-       if(simonGame.getgameStarted() && !simonGame.getInAnimation()){
-           game_View.doAnimationBounce(currentButton);
-            if(currentButton == simonGame.getPattern().get(simonGame.getRound())){
-                simonGame.setRound(simonGame.getRound()+1);
-            }else{
-                simonGame.setGameStarted(false);
-                System.out.println("GameOver");
-            }
-
-            if(simonGame.getPattern().size() == simonGame.getRound()){
-                simonGame.scoreUp();
-                game_View.updateScore(simonGame.getRound());
-
-                System.out.println("GG");
-                simonGame.setInAnimation(true);
-                game_View.startGamePartternAnimation();
-            }
-        }
+        simonGame.userHadClick(currentButton);
     }
 }
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java b/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java
index 5dccee7..b59bcc6 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java
@@ -25,8 +25,8 @@ public class SimonGame {
     private boolean inAnimation = false;
 
     private Button buttons[];
-    private int round;
-    private int currentTurn;
+    private int score;
+    private int tour;
     private ArrayList<Button> pattern = new ArrayList<Button>();
     public SimonGame(Game_View game_View,Button buttons[]){
         this.buttons = buttons;
@@ -35,13 +35,13 @@ public SimonGame(Game_View game_View,Button buttons[]){
     public void startGame(){
         pattern.clear();
         gameStarted = true;
-        round = 0;
-        currentTurn = 0;
+        score = 0;
+        tour = 0;
         game_View.updateScore(0);
         game_View.startGamePartternAnimation();
     }
     public void addColorToPattern(){
-        setRound(0);
+        setTour(0);
         int randnb = random(0,3);
         pattern.add(buttons[randnb]);
     }
@@ -56,11 +56,11 @@ public Button getButtonAt(int index){
         return buttons[index];
     }
 
-    public void setRound(int round){
-        this.round = round;
+    public void setTour(int tour){
+        this.tour = tour;
     }
-    public int getRound(){
-        return round;
+    public int getTour(){
+        return tour;
     }
 
 
@@ -79,6 +79,33 @@ public void setGameStarted(boolean gameStarted){
     }
 
     public void scoreUp(){
-        round++;
+        score++;
+    }
+    public int getScore(){return score;}
+
+    public void userHadClick(Button currentButton){
+        if(gameStarted && !inAnimation){
+            game_View.doAnimationBounce(currentButton);
+            if(currentButton == pattern.get(tour)){
+                tour++;
+            }else{
+                gameOver();
+                System.out.println("GameOver");
+            }
+
+            if(pattern.size() == tour){
+                scoreUp();
+                game_View.updateScore(score);
+                System.out.println("GG");
+                inAnimation = true;
+                game_View.startGamePartternAnimation();
+            }
+        }
+    }
+    public void gameOver(){
+        gameStarted = false;
+        game_View.setTextViewFinalScore(score);
+        game_View.doGameOverAnimation();
+
     }
 }
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java b/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
index c213c01..74caf11 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
@@ -1,15 +1,15 @@
 package cyril.simonggame.view;
 
 import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
 import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import cyril.simonggame.R;
@@ -21,14 +21,21 @@
  */
 public class Game_View extends LinearLayout {
     public SimonGame simonGame;
-    private Game_View itSelf ;
-    private Button buttons[] =  new Button[4];
+    private Game_View itSelf;
+    private Button buttons[] = new Button[4];
+    private ImageView retrybutton;
     private TextView textViewScore;
+    private TextView textViewFinalScore;
     private LinearLayout layoutButtons;
     private Animation animFondu;
+    private Animation animApparitionFondu;
+    private Animation animDipparitionFondu;
     private Animation animRotate;
     private Animation animStartGame;
     private Animation animBounceButton;
+    private Animation animScaleToInvisible;
+    private RelativeLayout layoutGameOver;
+    private RelativeLayout layoutGameInProgress;
     final Context context;
     private Handler mainHandler = new Handler();
 
@@ -41,10 +48,9 @@ public Game_View(Context context) {
         bindView();
         initAnimation();
 
-        simonGame = new SimonGame(this,buttons);
+        simonGame = new SimonGame(this, buttons);
+        doStartGameAnimation();
 
-        StartGameAnimation startGameAnimation = new StartGameAnimation();
-        startGameAnimation.start();
         initListener();
     }
 
@@ -52,77 +58,188 @@ private void inflate() {
         LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         layoutInflater.inflate(R.layout.activity_game, this, true);
     }
-    private void bindView(){
+
+    private void bindView() {
         //BindButton
-        buttons[0] = (Button)findViewById(R.id.buttonBlue);
-        buttons[1] = (Button)findViewById(R.id.buttonGreen);
-        buttons[2] = (Button)findViewById(R.id.buttonPurple);
-        buttons[3] = (Button)findViewById(R.id.buttonRed);
+        buttons[0] = (Button) findViewById(R.id.buttonBlue);
+        buttons[1] = (Button) findViewById(R.id.buttonGreen);
+        buttons[2] = (Button) findViewById(R.id.buttonPurple);
+        buttons[3] = (Button) findViewById(R.id.buttonRed);
         textViewScore = (TextView) findViewById(R.id.textViewScoreNb);
+        textViewFinalScore = (TextView) findViewById(R.id.textViewFinalScore);
         layoutButtons = (LinearLayout) findViewById(R.id.layoutButtons);
-
+        layoutGameInProgress = (RelativeLayout) findViewById(R.id.layoutGameInProgress);
+        layoutGameOver = (RelativeLayout) findViewById(R.id.layoutGameOver);
+        retrybutton = (ImageView) findViewById(R.id.retrybutton);
     }
-    public  void initAnimation(){
+
+    public void initAnimation() {
         animFondu = AnimationUtils.loadAnimation(context, R.anim.alpha);
         animStartGame = AnimationUtils.loadAnimation(context, R.anim.startgame);
+        animStartGame.setAnimationListener(new Animation.AnimationListener() {
+           @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+           @Override
+           public void onAnimationEnd(Animation animation) {
+               layoutGameInProgress.setVisibility(View.VISIBLE);
+               layoutButtons.setVisibility(View.VISIBLE);
+           }
+
+           @Override
+           public void onAnimationRepeat(Animation animation) {
+
+           }
+        });
         animBounceButton = AnimationUtils.loadAnimation(context, R.anim.littlebounce);
+        animApparitionFondu = AnimationUtils.loadAnimation(context, R.anim.apparitionfondu);
+        animApparitionFondu.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                layoutGameOver.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
+        animDipparitionFondu = AnimationUtils.loadAnimation(context, R.anim.disparitionfondu);
+        animDipparitionFondu.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                layoutGameOver.setVisibility(View.INVISIBLE);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
+        animScaleToInvisible = AnimationUtils.loadAnimation(context, R.anim.scaletoinvisible);
+        animScaleToInvisible.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                layoutGameInProgress.setVisibility(View.INVISIBLE);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
     }
-    public void initListener(){
-        for(final Button x: buttons) {
+
+    public void initListener() {
+        for (final Button x : buttons) {
             x.setOnClickListener(new Game_Controller(this));
         }
+
+        retrybutton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                updateScore(0);
+                layoutGameOver.startAnimation(animDipparitionFondu);
+                doStartGameAnimation();
+            }
+        });
     }
-    public void doStartGameAnimation(){
-        layoutButtons.startAnimation(animStartGame);
-    }
+
+
+
     public void doAnimationFondu(final Button button) {
         button.startAnimation(animFondu);
     }
-    public void doAnimationBounce(final Button button){
+
+    public void doAnimationBounce(final Button button) {
         button.startAnimation(animBounceButton);
     }
 
-    public void startGamePartternAnimation(){
+    public void startGamePartternAnimation() {
         GamePatternAnimation gamePatternAnimation = new GamePatternAnimation();
         gamePatternAnimation.start();
     }
-    public void updateScore(int score){
+
+    public void updateScore(int score) {
         textViewScore.setText(String.valueOf(score));
     }
 
-    public class StartGameAnimation extends Thread{
-        public void run(){
-            doStartGameAnimation();
-            try{
-                sleep(2000);
-            } catch (InterruptedException e){
-            }
-            Runnable runAnimation = new Runnable() {
+
+    public void setTextViewFinalScore(int score){
+        textViewFinalScore.setText(String.valueOf(score));
+    }
+    public class StartGameAnimation extends Thread {
+        public void run() {
+            try {
+            Runnable runnable = new Runnable() {
+                @Override
+                public void run() {
+                    layoutGameInProgress.setVisibility(View.VISIBLE);
+                    layoutButtons.setVisibility(View.INVISIBLE);
+                }
+            };
+            mainHandler.post(runnable);
+
+            sleep(1000);
+
+            runnable = new Runnable() {
+                @Override
+                public void run() {
+                    layoutButtons.startAnimation(animStartGame);
+                }
+            };
+            mainHandler.post(runnable);
+
+            sleep(2000);
+
+            runnable = new Runnable() {
                 @Override
                 public void run() {
                     simonGame.startGame();
                 }
             };
-            mainHandler.post(runAnimation);
+            mainHandler.post(runnable);
+            } catch (InterruptedException e) {
+
+            }
         }
 
     }
-    public class GamePatternAnimation extends Thread{
-        public void run(){
-            simonGame.setInAnimation(true);
-            int randnb;
-            simonGame.addColorToPattern();
-            for(final Button x: simonGame.getPattern()) {
-                doAnimInMainHandle(x);
-                try{
+
+    public class GamePatternAnimation extends Thread {
+        public void run() {
+            try {
+                sleep(1000);
+                simonGame.setInAnimation(true);
+                int randnb;
+                simonGame.addColorToPattern();
+                for (final Button x : simonGame.getPattern()) {
+                    doAnimInMainHandle(x);
                     sleep(700);
-                }catch (InterruptedException e){
                 }
-            }
-            simonGame.setInAnimation(false);
+                simonGame.setInAnimation(false);
 
+            } catch (InterruptedException e) {
+            }
         }
-        public void doAnimInMainHandle(final Button button){
+
+        public void doAnimInMainHandle(final Button button) {
             Runnable runAnimation = new Runnable() {
                 @Override
                 public void run() {
@@ -132,4 +249,40 @@ public void run() {
             mainHandler.post(runAnimation);
         }
     }
+    public void doGameOverAnimation(){
+        (new GameOverAnimation()).start();
+    }
+    public void doHiddenbuttonAnimation() {
+        for (Button x : buttons) {
+            x.startAnimation(animScaleToInvisible);
+        }
+    }
+
+    public class GameOverAnimation extends Thread {
+        public void run() {
+            Runnable runAnimation = new Runnable() {
+                @Override
+                public void run() {
+                    doHiddenbuttonAnimation();
+                }
+            };
+            mainHandler.post(runAnimation);
+            try {
+                sleep(1000);
+            } catch (InterruptedException e) {
+            }
+            runAnimation = new Runnable() {
+                @Override
+                public void run() {
+                    layoutGameOver.startAnimation(animApparitionFondu);
+                }
+            };
+            mainHandler.post(runAnimation);
+        }
+    }
+
+    public void doStartGameAnimation(){
+        (new StartGameAnimation()).start();
+    }
+
 }
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/anim/apparitionfondu.xml b/SimongGame/app/src/main/res/anim/apparitionfondu.xml
new file mode 100644
index 0000000..9626fe1
--- /dev/null
+++ b/SimongGame/app/src/main/res/anim/apparitionfondu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"  android:interpolator="@android:interpolator/linear">
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:duration="1500" />
+</set>
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/anim/disparitionfondu.xml b/SimongGame/app/src/main/res/anim/disparitionfondu.xml
new file mode 100644
index 0000000..e896311
--- /dev/null
+++ b/SimongGame/app/src/main/res/anim/disparitionfondu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"  android:interpolator="@android:interpolator/linear">
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0"
+        android:duration="1500" />
+</set>
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/anim/scaletoinvisible.xml b/SimongGame/app/src/main/res/anim/scaletoinvisible.xml
new file mode 100644
index 0000000..1f201e8
--- /dev/null
+++ b/SimongGame/app/src/main/res/anim/scaletoinvisible.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/bounce_interpolator">
+    <scale
+        android:fromXScale="1.0"
+        android:toXScale="0"
+        android:fromYScale="1.0"
+        android:toYScale="0"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:duration="500"
+        android:repeatCount="0"/>
+</set>
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/anim/startgame.xml b/SimongGame/app/src/main/res/anim/startgame.xml
index b77d05c..787f183 100644
--- a/SimongGame/app/src/main/res/anim/startgame.xml
+++ b/SimongGame/app/src/main/res/anim/startgame.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/bounce_interpolator">
+    android:interpolator="@android:anim/accelerate_decelerate_interpolator">
     <alpha
         android:fromAlpha="0"
         android:toAlpha="1.0"
diff --git a/SimongGame/app/src/main/res/drawable/retrybutton.png b/SimongGame/app/src/main/res/drawable/retrybutton.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbcdb8ab11dd6a5616470036c03357c1d4388eb9
GIT binary patch
literal 10063
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
agMp+Fq45jP3fHG(I6y@~UA{^d68b+OoJG$7

literal 0
HcmV?d00001

diff --git a/SimongGame/app/src/main/res/layout/activity_game.xml b/SimongGame/app/src/main/res/layout/activity_game.xml
index 970ebd1..a57a698 100644
--- a/SimongGame/app/src/main/res/layout/activity_game.xml
+++ b/SimongGame/app/src/main/res/layout/activity_game.xml
@@ -4,84 +4,139 @@
     android:layout_height="match_parent"
     android:background="@drawable/background"
     android:weightSum="1">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Score : "
-        android:id="@+id/textViewScore"
-        android:textColor="#ffffff"
-        android:textIsSelectable="true"
-        android:textSize="30dp"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
-        android:paddingLeft="5dp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/textViewScoreNb"
-        android:layout_alignBottom="@+id/textViewScore"
-        android:layout_toEndOf="@+id/textViewScore"
-        android:textSize="30dp"
-        android:textColor="#ffffff" />
-
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignWithParentIfMissing="false"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
-        android:text=" "
-        android:id="@+id/relativeLayout">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/layoutGameInProgress"
+        >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Score : "
+            android:id="@+id/textViewScore"
+            android:textColor="#ffffff"
+            android:textIsSelectable="true"
+            android:textSize="30dp"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentStart="true"
+            android:paddingLeft="5dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/textViewScoreNb"
+            android:layout_alignBottom="@+id/textViewScore"
+            android:layout_toEndOf="@+id/textViewScore"
+            android:textSize="30dp"
+            android:textColor="#ffffff" />
 
-        <LinearLayout
-            android:orientation="vertical"
+        <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/layoutButtons">
+            android:layout_alignWithParentIfMissing="false"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true"
+            android:text=" "
+            android:id="@+id/relativeLayout">
 
             <LinearLayout
-                android:orientation="horizontal"
+                android:orientation="vertical"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/buttonPurple"
-                    android:background="@drawable/pinkcircle"
-                    android:layout_marginRight="50dp"
-                    android:layout_marginBottom="50dp"
-                    style="?android:attr/borderlessButtonStyle"/>
-                <Button
+                android:layout_height="wrap_content"
+                android:id="@+id/layoutButtons">
+
+                <LinearLayout
+                    android:orientation="horizontal"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/buttonRed"
-                    android:background="@drawable/redcircle"
-                    style="?android:attr/borderlessButtonStyle"/>
-            </LinearLayout>
+                    android:layout_height="wrap_content">
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/buttonPurple"
+                        android:background="@drawable/pinkcircle"
+                        android:layout_marginRight="50dp"
+                        android:layout_marginBottom="50dp"
+                        style="?android:attr/borderlessButtonStyle"/>
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/buttonRed"
+                        android:background="@drawable/redcircle"
+                        style="?android:attr/borderlessButtonStyle"/>
+                </LinearLayout>
 
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/buttonGreen"
-                    android:background="@drawable/greencircle"
-                    android:layout_marginRight="50dp"
-                    style="?android:attr/borderlessButtonStyle"/>
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/buttonGreen"
+                        android:background="@drawable/greencircle"
+                        android:layout_marginRight="50dp"
+                        style="?android:attr/borderlessButtonStyle"/>
 
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/buttonBlue"
-                    android:background="@drawable/bluecircle"
-                    style="?android:attr/borderlessButtonStyle"/>
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/buttonBlue"
+                        android:background="@drawable/bluecircle"
+                        style="?android:attr/borderlessButtonStyle"/>
+                </LinearLayout>
             </LinearLayout>
-        </LinearLayout>
+
+        </RelativeLayout>
+    </RelativeLayout>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/layoutGameOver"
+        android:visibility="invisible">
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="GAME OVER"
+            android:id="@+id/textView2"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true"
+            android:textSize="50dp"
+            android:typeface="monospace"
+            android:textStyle="bold|italic" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/retrybutton"
+            android:src="@drawable/retrybutton"
+            android:layout_below="@+id/textView2"
+            android:layout_centerHorizontal="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="SCORE"
+            android:id="@+id/textView3"
+            android:textColor="#000000"
+            android:textSize="40dp"
+            android:textStyle="bold|italic"
+            android:typeface="monospace"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="48dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            android:id="@+id/textViewFinalScore"
+            android:textSize="50dp"
+            android:layout_marginTop="44dp"
+            android:layout_below="@+id/textView3"
+            android:layout_centerHorizontal="true" />
 
     </RelativeLayout>
 

From 327046a94858bd462192ae657f16a6a29a31135e Mon Sep 17 00:00:00 2001
From: POKORSKI Alexis <alexis.pokorski@u-psud.fr>
Date: Sat, 12 Mar 2016 22:21:32 +0100
Subject: [PATCH 5/8] ta mere

---
 SimongGame/.idea/gradle.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SimongGame/.idea/gradle.xml b/SimongGame/.idea/gradle.xml
index cda1f3c..fc132b2 100644
--- a/SimongGame/.idea/gradle.xml
+++ b/SimongGame/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="D:\Program files\Android\Android Studio\gradle\gradle-2.8" />
+        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.8" />
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>

From 557aecf483160134c5ad8aabc4e1783d846e4662 Mon Sep 17 00:00:00 2001
From: POKORSKI Alexis <alexis.pokorski@u-psud.fr>
Date: Sat, 12 Mar 2016 22:21:41 +0100
Subject: [PATCH 6/8] WTF

---
 SimongGame/.idea/misc.xml | 2 +-
 SimongGame/.idea/vcs.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SimongGame/.idea/misc.xml b/SimongGame/.idea/misc.xml
index 43580ac..1002b47 100644
--- a/SimongGame/.idea/misc.xml
+++ b/SimongGame/.idea/misc.xml
@@ -44,7 +44,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/SimongGame/.idea/vcs.xml b/SimongGame/.idea/vcs.xml
index 075f87f..288b36b 100644
--- a/SimongGame/.idea/vcs.xml
+++ b/SimongGame/.idea/vcs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file

From b52cfaec3a746c1a22a259b0ffb6f6bc01f82c50 Mon Sep 17 00:00:00 2001
From: POKORSKI-CREBOUW <alexis.pokorski@u-psud.fr>
Date: Sat, 12 Mar 2016 22:30:25 +0100
Subject: [PATCH 7/8] Rien PUTAIN

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 5095ba7..86aa253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ Network Trash Folder
 Temporary Items
 .apdisk
 SimongGame/.idea/vcs.xml
+SimongGame/.idea/gradle.xml

From 0c98c27d5ce62272d7d0795419c814bab1aa9818 Mon Sep 17 00:00:00 2001
From: POKORSKI-CREBOUW <alexis.pokorski@u-psud.fr>
Date: Sat, 12 Mar 2016 22:30:51 +0100
Subject: [PATCH 8/8] RIENNEN

---
 SimongGame/.idea/gradle.xml | 2 +-
 SimongGame/.idea/vcs.xml    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/SimongGame/.idea/gradle.xml b/SimongGame/.idea/gradle.xml
index fc132b2..cda1f3c 100644
--- a/SimongGame/.idea/gradle.xml
+++ b/SimongGame/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.8" />
+        <option name="gradleHome" value="D:\Program files\Android\Android Studio\gradle\gradle-2.8" />
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
diff --git a/SimongGame/.idea/vcs.xml b/SimongGame/.idea/vcs.xml
index 288b36b..6c0b863 100644
--- a/SimongGame/.idea/vcs.xml
+++ b/SimongGame/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file