allan.point
/
projet-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stop réparé

Browse Source
main
juduteyrat 3 years ago
parent 634c72bb97
commit bf66821d3d
3 changed files with 154 additions and 3 deletions
Show Stats Download Patch File Download Diff File

2
code/app/src/main/java/projet/iut/jeu_de_la_vie/model/Manager.java
Unescape View File

@ -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;
}

8
code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java
Unescape View File

@ -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;

147
code/app/src/main/res/layout-land/menu_principal.xml
Unescape View File

@ -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>
Write Preview
Loading…
Cancel
Save