From bf66821d3dbc32448b3ddf55e429e738118840b0 Mon Sep 17 00:00:00 2001
From: juduteyrat <juduteyrat@etu.uca.fr>
Date: Sat, 26 Mar 2022 13:08:27 +0100
Subject: [PATCH] =?UTF-8?q?stop=20r=C3=A9par=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iut/jeu_de_la_vie/model/Manager.java      |   2 +-
 .../jeu_de_la_vie/view/LauncherActivity.java  |   8 +-
 .../main/res/layout-land/menu_principal.xml   | 147 ++++++++++++++++++
 3 files changed, 154 insertions(+), 3 deletions(-)
 create mode 100644 code/app/src/main/res/layout-land/menu_principal.xml

diff --git a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/Manager.java b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/Manager.java
index 59f212c..479e8b1 100644
--- a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/Manager.java
+++ b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/Manager.java
@@ -109,7 +109,7 @@ public class Manager implements ObserverBDJ {
 	 */
 	public void stoperJeu(){
 		actualiseurTour.resetTour();
-		actualiseurCellule.getArbitre().getPlateau().getCellulesVivantes().reset();
+		//actualiseurCellule.getArbitre().getPlateau().getCellulesVivantes().reset();
 		jeuLance = false;
 	}
 
diff --git a/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java b/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java
index 496f874..9c93004 100644
--- a/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java
+++ b/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java
@@ -38,8 +38,12 @@ public class LauncherActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        manager = new Manager();
-        setContentView(R.layout.jeu_de_la_vie);
+        if (savedInstanceState != null){
+        }
+        else {
+            manager = new Manager();
+            setContentView(R.layout.jeu_de_la_vie);
+        }
         DisplayMetrics disp = new DisplayMetrics();
         getWindowManager().getDefaultDisplay().getMetrics(disp);
         width = disp.widthPixels;
diff --git a/code/app/src/main/res/layout-land/menu_principal.xml b/code/app/src/main/res/layout-land/menu_principal.xml
new file mode 100644
index 0000000..bdaecfc
--- /dev/null
+++ b/code/app/src/main/res/layout-land/menu_principal.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/menuView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/titre"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Jeu de la vie"
+        app:layout_constraintBottom_toTopOf="@+id/regleLabel"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.471"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <EditText
+        android:id="@+id/nbColone"
+        android:layout_width="84dp"
+        android:layout_height="50dp"
+        android:layout_marginTop="148dp"
+        android:ems="10"
+        android:inputType="number"
+        android:singleLine="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.069"
+        app:layout_constraintStart_toEndOf="@+id/nbColoneLabel"
+        app:layout_constraintTop_toBottomOf="@+id/regleLabel" />
+
+    <TextView
+        android:id="@+id/nbColoneLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="44dp"
+        android:layout_marginLeft="44dp"
+        android:layout_marginTop="156dp"
+        android:text="Nb de colonnes"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/regleLabel" />
+
+    <TextView
+        android:id="@+id/nbLigneLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="28dp"
+
+        android:layout_marginRight="28dp"
+        android:text="nb lignes"
+
+        app:layout_constraintBottom_toBottomOf="@+id/nbLignes"
+        app:layout_constraintEnd_toEndOf="@+id/nbColoneLabel"
+        app:layout_constraintTop_toBottomOf="@+id/nbColoneLabel"
+        app:layout_constraintVertical_bias="0.825" />
+
+    <EditText
+        android:id="@+id/nbLignes"
+        android:layout_width="84dp"
+        android:layout_height="50dp"
+        android:layout_marginTop="36dp"
+        android:ems="10"
+        android:inputType="number"
+        android:singleLine="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.129"
+        app:layout_constraintStart_toEndOf="@+id/nbLigneLabel"
+        app:layout_constraintTop_toBottomOf="@+id/nbColone" />
+
+    <TextView
+        android:id="@+id/CouleurLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="60dp"
+
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:text="Couleur"
+        app:layout_constraintEnd_toEndOf="@+id/nbLigneLabel"
+        app:layout_constraintTop_toBottomOf="@+id/nbLignes" />
+
+    <Button
+        android:id="@+id/couleur1"
+        android:layout_width="40dp"
+        android:layout_height="25dp"
+
+        android:onClick="setCellsRed"
+
+        app:backgroundTint="@android:color/holo_red_dark"
+        app:layout_constraintStart_toStartOf="@+id/nbLignes"
+        app:layout_constraintTop_toTopOf="@+id/CouleurLabel" />
+
+    <Button
+        android:id="@+id/couleur2"
+        android:layout_width="40dp"
+        android:layout_height="25dp"
+
+        android:onClick="setCellsGreen"
+        android:text="Button"
+        app:backgroundTint="@android:color/holo_green_dark"
+        app:layout_constraintEnd_toStartOf="@+id/couleur3"
+        app:layout_constraintHorizontal_bias="0.451"
+        app:layout_constraintStart_toEndOf="@+id/couleur1"
+        app:layout_constraintTop_toTopOf="@+id/couleur1" />
+
+    <Button
+        android:id="@+id/couleur3"
+        android:layout_width="40dp"
+        android:layout_height="25dp"
+        android:layout_marginEnd="328dp"
+
+        android:layout_marginRight="328dp"
+
+        android:onClick="setCellsBlue"
+
+        android:text="Button"
+        app:backgroundTint="@android:color/holo_blue_dark"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/CouleurLabel" />
+
+    <Button
+        android:id="@+id/startButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="START \\(o^u^o)/"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.944"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.545" />
+
+    <TextView
+        android:id="@+id/regleLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="432dp"
+        android:text=""
+
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/titre"
+        app:layout_constraintStart_toStartOf="@+id/nbColoneLabel"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file