Partie 4 terminée

.idea/misc.xml

@@ -4,7 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/Git/application-android-iut/app/src/main/res/layout-land/activity_main.xml" value="0.1" />
-        <entry key="..\:/Git/application-android-iut/app/src/main/res/layout/activity_main.xml" value="0.10960144927536232" />
+        <entry key="..\:/Git/application-android-iut/app/src/main/res/layout/activity_main.xml" value="0.176" />
         <entry key="..\:/Git/application-android-iut/app/src/main/res/layout/activity_num_table.xml" value="0.264" />
         <entry key="..\:/Z IUT Orsay/AndroidStudioProjects/Pizzeria/app/src/main/res/layout-land/activity_main.xml" value="0.1" />
         <entry key="..\:/Z IUT Orsay/AndroidStudioProjects/Pizzeria/app/src/main/res/layout/activity_main.xml" value="0.2" />

app/src/main/java/com/slprojects/pizzeria/MainActivity.java

@@ -3,10 +3,12 @@ package com.slprojects.pizzeria;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 
 import java.util.ArrayList;
 
@@ -19,8 +21,18 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Log.i("onCreate", "MainActivity");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        Intent intent = getIntent();
+
+        // On récupère le num de la table
+        int numTable = intent.getIntExtra(NumTable.numTable, 1);
+        TextView textView = findViewById(R.id.textNumTable);
+        String numTableText = textView.getText().toString() + numTable;
+        textView.setText(numTableText);
+        Log.i("Numéro de la table", String.valueOf(numTable));
+        // Fin avec le num de la table
 
         boutons = new ArrayList<>();
         idIndexes = new ArrayList<>();

app/src/main/java/com/slprojects/pizzeria/NumTable.java

 package com.slprojects.pizzeria;
 
 import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -9,11 +11,13 @@ import android.widget.EditText;
 
 public class NumTable extends AppCompatActivity implements View.OnClickListener {
 
+    public static String numTable = "numTable";
     private EditText input;
     private Button btn;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Log.i("onCreate", "NumTable");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_num_table);
         input = findViewById(R.id.tableNumInput);
@@ -25,6 +29,14 @@ public class NumTable extends AppCompatActivity implements View.OnClickListener
     public void onClick(View v){
         if(v.getId() == btn.getId()) {
             Log.i("Numéro de la table", input.getText().toString());
+            finish();
+        }
     }
+
+    @Override
+    public void finish() {
+        Intent intent = new Intent(this, MainActivity.class);
+        intent.putExtra("numTable", Integer.parseInt(input.getText().toString()));
+        startActivity(intent);
     }
 }
\ No newline at end of file

app/src/main/res/layout-land/activity_main.xml

@@ -6,6 +6,15 @@
     android:layout_height="match_parent">
 
 
+    <TextView
+        android:id="@+id/textNumTable"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="Numéro de la table: "
+        app:layout_constraintBottom_toTopOf="@+id/napolitaine"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
     <Button
         android:id="@+id/napolitaine"
         android:layout_width="0dp"
@@ -15,7 +24,7 @@
         app:layout_constraintEnd_toStartOf="@+id/royale"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/textNumTable" />
 
     <Button
         android:id="@+id/royale"
@@ -26,7 +35,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toEndOf="@+id/napolitaine"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/textNumTable" />
 
     <Button
         android:id="@+id/quatreFromages"

app/src/main/res/layout/activity_main.xml

@@ -6,6 +6,16 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <TextView
+        android:id="@+id/textNumTable"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="Numéro de la table: "
+        app:layout_constraintBottom_toTopOf="@+id/napolitaine"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <Button
         android:id="@+id/napolitaine"
         android:layout_width="0dp"
@@ -14,7 +24,7 @@
         app:layout_constraintBottom_toTopOf="@+id/royale"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/textNumTable" />
 
     <Button
         android:id="@+id/royale"
@@ -73,6 +83,8 @@
         android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/hawaii"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         tools:layout_editor_absoluteX="1dp">
 
         <Button