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

resolve conflict

Browse Source
main
Allan POINT 3 years ago
parent 7ff5e9207e 0915b470b6
commit e16ea0fbb8
8 changed files with 139 additions and 276 deletions
Show Stats Download Patch File Download Diff File

42
code/app/src/main/java/projet/iut/jeu_de_la_vie/model/FragmentPlateau.java
Unescape View File

@ -0,0 +1,42 @@
package projet.iut.jeu_de_la_vie.model;
import android.content.Context;
import android.os.Bundle;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import projet.iut.jeu_de_la_vie.R;
import projet.iut.jeu_de_la_vie.model.plateau.Plateau;
public class FragmentPlateau extends Fragment {
private Plateau plateau;
public Plateau getPlateau() {
return plateau;
}
public void setPlateau(Plateau plateau) {
this.plateau = plateau;
}
public FragmentPlateau(){
super(R.layout.vue_jeu_tmp); //<-- lui passer la future vue du jeu
}
@Override
public void onViewCreated (@NonNull View view, Bundle savedInstanceState){
Log.d("fragment",isAdded()+"");
}
@Override
public void onInflate(@NonNull Context context, @NonNull AttributeSet attrs, @Nullable Bundle savedInstanceState) {
super.onInflate(context, attrs, savedInstanceState);
}
}

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

@ -22,6 +22,7 @@ public class Manager implements ObserverBDJ {
private IBoucleDeJeu boucleDeJeu;
private ChangeurRegle changeurRegle;
private boolean jeuLance;
private FragmentPlateau fragmentPlateau;
public Manager(){
@ -52,6 +53,7 @@ public class Manager implements ObserverBDJ {
deleguerChangementCellule();
actualiseurTour.changerTour();
}
}
public ActualiseurTour getActualiseurTour(){
@ -125,4 +127,12 @@ public class Manager implements ObserverBDJ {
public void setCellsColor(int color){
Cellule.setLivingColor(color);
}
public FragmentPlateau getFragmentPlateau() {
return fragmentPlateau;
}
public void setFragmentPlateau(FragmentPlateau fragmentPlateau) {
this.fragmentPlateau = fragmentPlateau;
}
}

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

@ -62,7 +62,7 @@ public class CellulesVivantes extends ObservableCV implements ObserverCellule {
}
/**
* Comportement lors ce que le cellule notifit l'objet CellulesVivantes.
* Comportement lors ce que le cellule notifie l'objet CellulesVivantes.
* Ici on ajoute ou retire la cellule du dictionaire qui contient les cellules vivante en fonction de la cellule qui à notifiée.
* @param cellule Cellule qui à notifiée
*/

4
code/app/src/main/java/projet/iut/jeu_de_la_vie/model/plateau/PrototypePlateau.java
Unescape View File

@ -1,5 +1,7 @@
package projet.iut.jeu_de_la_vie.model.plateau;
import androidx.fragment.app.Fragment;
import java.io.Serializable;
/**
@ -7,6 +9,6 @@ import java.io.Serializable;
* @author Yohann Breuil
* @author Allan Point
*/
public interface PrototypePlateau{
public interface PrototypePlateau {
Plateau cloner();
}

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

@ -21,6 +21,7 @@ import java.awt.font.NumericShaper;
import java.util.List;
import projet.iut.jeu_de_la_vie.R;
import projet.iut.jeu_de_la_vie.model.FragmentPlateau;
import projet.iut.jeu_de_la_vie.model.Manager;
import projet.iut.jeu_de_la_vie.model.cellule.Cellule;
import projet.iut.jeu_de_la_vie.model.plateau.Plateau;
@ -40,7 +41,8 @@ public class LauncherActivity extends AppCompatActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
manager = new Manager();
setContentView(R.layout.menu_principal);
setContentView(R.layout.jeu_de_la_vie);
/*
//très moche à enlever plus tard
start = findViewById(R.id.startButton);
start.setOnClickListener(this::startGame);
@ -56,22 +58,34 @@ public class LauncherActivity extends AppCompatActivity {
Log.d("instances",cell.isAlive().toString());
}
}
//updateGame();
manager.lancerJeu();
manager.update();
});
findViewById(R.id.test).setOnClickListener(y -> {
manager.getActualiseurCellule().getArbitre().getPlateau().setColone(2);
manager.getActualiseurCellule().getArbitre().getPlateau().setLigne(2);
manager.getActualiseurCellule().getArbitre().getPlateau().getCell(1, 1).setAlive(true);
//manager.getActualiseurCellule().getArbitre().getPlateau().getCell(0, 0).setAlive(true);
manager.getActualiseurCellule().getArbitre().getPlateau().getCell(1, 0).setAlive(true);
manager.getActualiseurCellule().getArbitre().getPlateau().getCell(0, 1).setAlive(true);
});
*/
*/
getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainerView,FragmentPlateau.class,null).commit();
FragmentPlateau frag = new FragmentPlateau();
getSupportFragmentManager().putFragment(new Bundle(),"main",frag);
manager.setFragmentPlateau(frag);
}
public void updateGame (){
}
@Override
protected void onStart (){
super.onStart();
FragmentPlateau fragment = new FragmentPlateau();
fragment.setPlateau(manager.getActualiseurCellule().getArbitre().getPlateau());
}
@Override
protected void onStop() {
@ -119,7 +133,7 @@ public class LauncherActivity extends AppCompatActivity {
@Override
protected void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
outState.putSerializable("manager",manager);
outState.putSerializable("manager",manager); //c'est bourrin mais magique
}
@Override

264
code/app/src/main/res/layout/jeu_de_la_vie.xml
Unescape View File

@ -5,264 +5,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<CheckBox
android:id="@+id/checkBox35"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox31"
app:layout_constraintTop_toBottomOf="@+id/checkBox32" />
<CheckBox
android:id="@+id/checkBox36"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox35"
app:layout_constraintTop_toBottomOf="@+id/checkBox33" />
<CheckBox
android:id="@+id/checkBox37"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox36"
app:layout_constraintTop_toBottomOf="@+id/checkBox34" />
<CheckBox
android:id="@+id/checkBox5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox8"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/checkBox7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/checkBox4" />
<CheckBox
android:id="@+id/checkBox8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox3"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/checkBox9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox7"
app:layout_constraintTop_toBottomOf="@+id/checkBox" />
<CheckBox
android:id="@+id/checkBox10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox9"
app:layout_constraintTop_toBottomOf="@+id/checkBox2" />
<CheckBox
android:id="@+id/checkBox11"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox10"
app:layout_constraintTop_toBottomOf="@+id/checkBox3" />
<CheckBox
android:id="@+id/checkBox12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox11"
app:layout_constraintTop_toBottomOf="@+id/checkBox8" />
<CheckBox
android:id="@+id/checkBox13"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox12"
app:layout_constraintTop_toBottomOf="@+id/checkBox5" />
<CheckBox
android:id="@+id/checkBox14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/checkBox7" />
<CheckBox
android:id="@+id/checkBox15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox14"
app:layout_constraintTop_toBottomOf="@+id/checkBox9" />
<CheckBox
android:id="@+id/checkBox16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox15"
app:layout_constraintTop_toBottomOf="@+id/checkBox10" />
<CheckBox
android:id="@+id/checkBox17"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox16"
app:layout_constraintTop_toBottomOf="@+id/checkBox11" />
<CheckBox
android:id="@+id/checkBox18"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox17"
app:layout_constraintTop_toBottomOf="@+id/checkBox12" />
<CheckBox
android:id="@+id/checkBox19"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox18"
app:layout_constraintTop_toBottomOf="@+id/checkBox13" />
<CheckBox
android:id="@+id/checkBox20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/checkBox14" />
<CheckBox
android:id="@+id/checkBox21"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox20"
app:layout_constraintTop_toBottomOf="@+id/checkBox15" />
<CheckBox
android:id="@+id/checkBox22"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox21"
app:layout_constraintTop_toBottomOf="@+id/checkBox16" />
<CheckBox
android:id="@+id/checkBox23"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox22"
app:layout_constraintTop_toBottomOf="@+id/checkBox17" />
<CheckBox
android:id="@+id/checkBox24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox23"
app:layout_constraintTop_toBottomOf="@+id/checkBox18" />
<CheckBox
android:id="@+id/checkBox25"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox24"
app:layout_constraintTop_toBottomOf="@+id/checkBox19" />
<CheckBox
android:id="@+id/checkBox26"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/checkBox20" />
<CheckBox
android:id="@+id/checkBox27"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/checkBox26" />
<CheckBox
android:id="@+id/checkBox28"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox26"
app:layout_constraintTop_toBottomOf="@+id/checkBox21" />
<CheckBox
android:id="@+id/checkBox29"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox28"
app:layout_constraintTop_toBottomOf="@+id/checkBox22" />
<CheckBox
android:id="@+id/checkBox30"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox27"
app:layout_constraintTop_toBottomOf="@+id/checkBox28" />
<CheckBox
android:id="@+id/checkBox31"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox30"
app:layout_constraintTop_toBottomOf="@+id/checkBox29" />
<CheckBox
android:id="@+id/checkBox32"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox29"
app:layout_constraintTop_toBottomOf="@+id/checkBox23" />
<CheckBox
android:id="@+id/checkBox33"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox32"
app:layout_constraintTop_toBottomOf="@+id/checkBox24" />
<CheckBox
android:id="@+id/checkBox34"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox33"
app:layout_constraintTop_toBottomOf="@+id/checkBox25" />
<CheckBox
android:id="@+id/checkBox4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragmentContainerView"
android:name="projet.iut.jeu_de_la_vie.model.FragmentPlateau"
android:layout_width="297dp"
android:layout_height="572dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/checkBox3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox2"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/checkBox2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/checkBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox4"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="quitter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

23
code/app/src/main/res/layout/menu_principal.xml
Unescape View File

@ -66,37 +66,38 @@
<Button
android:id="@+id/couleur1"
android:layout_width="39dp"
android:layout_height="23dp"
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="42dp"
android:layout_height="20dp"
android:onClick="setCellsGreen"
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_constraintStart_toEndOf="@+id/couleur1"
app:layout_constraintTop_toTopOf="@+id/CouleurLabel" />
app:layout_constraintTop_toTopOf="@+id/couleur1" />
<Button
android:id="@+id/couleur3"
android:layout_width="37dp"
android:layout_height="16dp"
android:layout_width="40dp"
android:layout_height="25dp"
android:onClick="setCellsBlue"
android:text="Button"
app:layout_constraintEnd_toEndOf="parent"
app:backgroundTint="@android:color/holo_blue_dark"
app:layout_constraintStart_toEndOf="@+id/couleur1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/CouleurLabel" />
<Button

44
code/app/src/main/res/layout/vue_jeu_tmp.xml
Unescape View File

@ -0,0 +1,44 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent">
<CheckBox
android:id="@+id/checkBox33"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/checkBox37"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="@+id/checkBox39"
app:layout_constraintStart_toEndOf="@+id/checkBox38"
app:layout_constraintTop_toBottomOf="@+id/checkBox39" />
<CheckBox
android:id="@+id/checkBox38"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@+id/checkBox33"
app:layout_constraintTop_toBottomOf="@+id/checkBox33" />
<CheckBox
android:id="@+id/checkBox39"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/checkBox33"
app:layout_constraintTop_toTopOf="@+id/checkBox33" />
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="quitter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
Write Preview
Loading…
Cancel
Save