cycle de vie commencé il faudrait faire une vue du jeu pour que je puisse continuer

main
juduteyrat 3 years ago
parent 17fc525236
commit f8c99ea655

@ -6,12 +6,15 @@
<entry key="../../../../../../../../etud/alpoint/cours/2A/android/projet/projet-android/code/app/src/main/res/layout-port/menu_principal.xml" value="0.296195652173913" />
<entry key="../../../../../../../../etud/alpoint/cours/2A/android/projet/projet-android/code/app/src/main/res/layout/menu_principal.xml" value="0.296195652173913" />
<entry key="../../../../../../../etud/alpoint/cours/2A/android/projet/projet-android/app/src/main/res/layout-port/menu_principal.xml" value="0.29030797101449274" />
<entry key="../../../../../etud/juduteyrat/Documents/android/code/app/src/main/res/layout-port/menu_principal.xml" value="0.19739583333333333" />
<entry key="../../../../../etud/juduteyrat/Documents/android/code/app/src/main/res/layout/menu_principal.xml" value="0.33" />
<entry key="app/src/main/res/layout-port/menu_principal.xml" value="0.296195652173913" />
<entry key="app/src/main/res/layout-port/text_item.xml" value="0.21197916666666666" />
<entry key="app/src/main/res/layout-port/vue_jeu.xml" value="0.21197916666666666" />
</map>
</option>
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>

@ -1,13 +1,20 @@
package projet.iut.jeu_de_la_vie.launcher;
import android.graphics.Color;
import android.os.Bundle;
import android.text.Editable;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import java.util.List;
import projet.iut.jeu_de_la_vie.R;
import projet.iut.jeu_de_la_vie.model.Manager;
import projet.iut.jeu_de_la_vie.model.cellule.Cellule;
@ -15,19 +22,52 @@ import projet.iut.jeu_de_la_vie.model.cellule.Cellule;
public class Launcher extends AppCompatActivity {
private Manager manager;
private Button start;
@Override
protected void onResume(){
super.onResume();
}
@Override
protected void onStart() {
super.onStart();
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
manager = new Manager();
setContentView(R.layout.menu_principal);
manager.lancerJeu();
//très moche à enlever plus tard
start = findViewById(R.id.startButton);
start.setOnClickListener(l -> {
EditText colones = findViewById(R.id.nbColone);
manager.getActualiseurCellule().getArbitre().getPlateau().setColone(Integer.parseInt(colones.getText().toString()));
EditText lignes = findViewById(R.id.nbLignes);
manager.getActualiseurCellule().getArbitre().getPlateau().setLigne(Integer.parseInt(lignes.getText().toString()));
for (List<Cellule> list : manager.getActualiseurCellule().getArbitre().getPlateau().getGrille()) {
for (Cellule cell : list) {
Log.d("instances",cell.isAlive().toString());
}
}
});
}
@Override
protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
manager.getActualiseurCellule().getArbitre().getPlateau().setColone(savedInstanceState.getInt("colonnes"));
manager.getActualiseurCellule().getArbitre().getPlateau().setLigne(savedInstanceState.getInt("lignes"));
}
@Override
protected void onStop() {
super.onStop();
}
private void setNbColumns(){
EditText editText = findViewById(R.id.nbColone);
Editable text = editText.getText();
manager.setNumberOfColumns(Integer.parseInt(text.toString()));
//EditText editText = findViewById(R.id.nbColone);
//Editable text = editText.getText();
//manager.setNumberOfColumns(Integer.parseInt(text.toString()));
}
private void setNbLignes(){
EditText editText = findViewById(R.id.nbLignes);
@ -58,5 +98,12 @@ public class Launcher extends AppCompatActivity {
setCellsColor(blue);
}
@Override
protected void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
int colonnes = manager.getActualiseurCellule().getArbitre().getPlateau().getColone();
outState.putInt("colonnes",colonnes);
int lignes = manager.getActualiseurCellule().getArbitre().getPlateau().getLigne();
outState.putInt("lignes",lignes);
}
}

@ -23,7 +23,6 @@ public class Manager implements ObserverBDJ {
private boolean jeuLance;
public Manager(){
boucleDeJeu = new BoucleDeJeu5FPS();
((ObservableBDJ)boucleDeJeu).attacher(this);

@ -2,6 +2,7 @@
<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/layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -77,10 +78,10 @@
android:id="@+id/couleur2"
android:layout_width="42dp"
android:layout_height="20dp"
android:text="Button"
android:onClick="setCellsGreen"
android:text="Button"
app:layout_constraintEnd_toStartOf="@+id/couleur3"
app:layout_constraintStart_toEndOf="@+id/couleur1"
app:layout_constraintTop_toTopOf="@+id/CouleurLabel" />
@ -89,10 +90,10 @@
android:id="@+id/couleur3"
android:layout_width="37dp"
android:layout_height="16dp"
android:text="Button"
android:onClick="setCellsBlue"
android:text="Button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/couleur1"
@ -102,11 +103,11 @@
android:id="@+id/startButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="startGame"
android:text="START \\(o^u^o)/"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:onClick="startGame"/>
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/regleLabel"
Loading…
Cancel
Save