diff --git a/.idea/misc.xml b/.idea/misc.xml
index 47d09e1ef30bd10e921f570ce1fc94c1989e2ae4..082568d876e7c3ebf113cc4188629a4f4a2de8ac 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,7 +6,12 @@
<entry key="..\:/Git/application-android-iut/app/src/main/res/layout-land/activity_main.xml" value="0.19635416666666666" />
<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="..\:/Git/application-android-iut/app/src/main/res/layout/fragment_frag_vertical_layout.xml" value="0.2" />
+ <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout-land/activity_main.xml" value="0.21516754850088182" />
+ <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout-land/fragment_frag_horizontal_layout.xml" value="0.1" />
+ <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout/activity_main.xml" value="0.11302083333333333" />
+ <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout/activity_num_table.xml" value="0.24547101449275363" />
+ <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout/fragment_frag_horizontal_layout.xml" value="0.1" />
+ <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout/fragment_frag_vertical_layout.xml" value="0.1" />
<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" />
</map>
diff --git a/app/src/main/java/com/slprojects/pizzeria/FragVerticalLayout.java b/app/src/main/java/com/slprojects/pizzeria/FragVerticalLayout.java
index 6b852c6cb90440d3c558bafd2f75a02e94284872..9ed9867f3f4f92312743ad83328656406aabd18a 100644
--- a/app/src/main/java/com/slprojects/pizzeria/FragVerticalLayout.java
+++ b/app/src/main/java/com/slprojects/pizzeria/FragVerticalLayout.java
@@ -4,16 +4,27 @@ import android.os.Bundle;
import android.app.Fragment;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.TextView;
public class FragVerticalLayout extends Fragment {
+ //TextView textView;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ View view = inflater.inflate(R.layout.fragment_frag_vertical_layout, container, false);
+ Log.i("onCreateView","Vue du fragment 'inflatée'");
// Inflate the layout for this fragment
- return inflater.inflate(R.layout.activity_main, container, false);
+ //textView = view.findViewById(R.id.textNumTable);
+ return view;
}
-
+ /*
+ public void setTableNum(Integer numTable){
+ String numTableText = textView.getText().toString() + numTable;
+ textView.setText(numTableText);
+ }
+ */
}
\ No newline at end of file
diff --git a/app/src/main/java/com/slprojects/pizzeria/MainActivity.java b/app/src/main/java/com/slprojects/pizzeria/MainActivity.java
index b47e98db9b842219722506fd83eba22aed5d8073..a871860d758d0582a19120267be45c502ffcd047 100644
--- a/app/src/main/java/com/slprojects/pizzeria/MainActivity.java
+++ b/app/src/main/java/com/slprojects/pizzeria/MainActivity.java
@@ -23,17 +23,21 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
private ArrayList<String> nomBoutons;
private int numTable;
private backTasks tacheDeFond;
+ private FragVerticalLayout frag;
+ private Bundle savedInstanceState;
@Override
protected void onCreate(Bundle savedInstanceState) {
- FragVerticalLayout frag = new FragVerticalLayout();
+ super.onCreate(savedInstanceState);
+ this.savedInstanceState = savedInstanceState;
+ setContentView(R.layout.activity_main);
+
+ frag = new FragVerticalLayout();
FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.add(R.id.fragment_vertical_layout, frag);
transaction.commit();
Log.i("onCreate", "MainActivity");
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
Intent intent = getIntent();
// On récupère le num de la table
@@ -44,20 +48,24 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
textView.setText(numTableText);
Log.i("Numéro de la table", String.valueOf(numTable));
// Fin avec le num de la table
+ }
+
+ protected void onStart() {
+ super.onStart();
boutons = new ArrayList<>();
idIndexes = new ArrayList<>();
numCommands = new ArrayList<>();
nomBoutons = new ArrayList<>();
- boutons.add(findViewById(R.id.napolitaine));
- boutons.add(findViewById(R.id.royale));
- boutons.add(findViewById(R.id.quatreFromages));
- boutons.add(findViewById(R.id.montagnarde));
- boutons.add(findViewById(R.id.raclette));
- boutons.add(findViewById(R.id.hawaii));
- boutons.add(findViewById(R.id.pannaCotta));
- boutons.add(findViewById(R.id.tiramisu));
+ boutons.add(frag.getView().findViewById(R.id.napolitaine));
+ boutons.add(frag.getView().findViewById(R.id.royale));
+ boutons.add(frag.getView().findViewById(R.id.quatreFromages));
+ boutons.add(frag.getView().findViewById(R.id.montagnarde));
+ boutons.add(frag.getView().findViewById(R.id.raclette));
+ boutons.add(frag.getView().findViewById(R.id.hawaii));
+ boutons.add(frag.getView().findViewById(R.id.pannaCotta));
+ boutons.add(frag.getView().findViewById(R.id.tiramisu));
// On ajoute un listener sur chaque bouton
boutons.forEach((btn) -> btn.setOnClickListener(this));
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 7ba2d2a3da647ea10db75f65f99ca11b6c8fac06..5e31379f11e10d345f0251dfb6696b70d765885d 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -11,95 +11,17 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Numéro de la table: "
- app:layout_constraintBottom_toTopOf="@+id/napolitaine"
+ app:layout_constraintBottom_toTopOf="@+id/fragment_vertical_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <Button
- android:id="@+id/napolitaine"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:text="NAPOLITAINE"
- app:layout_constraintBottom_toTopOf="@+id/quatreFromages"
- app:layout_constraintEnd_toStartOf="@+id/royale"
- app:layout_constraintHorizontal_weight="1"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/textNumTable" />
-
- <Button
- android:id="@+id/royale"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:text="ROYALE"
- app:layout_constraintBottom_toTopOf="@+id/montagnarde"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_weight="1"
- app:layout_constraintStart_toEndOf="@+id/napolitaine"
- app:layout_constraintTop_toBottomOf="@+id/textNumTable" />
-
- <Button
- android:id="@+id/quatreFromages"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:text="QUATRE FROMAGES"
- app:layout_constraintBottom_toTopOf="@+id/raclette"
- app:layout_constraintEnd_toStartOf="@+id/montagnarde"
- app:layout_constraintHorizontal_weight="1"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/napolitaine" />
-
- <Button
- android:id="@+id/montagnarde"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:text="MONTAGNARDE"
- app:layout_constraintStart_toEndOf="@+id/quatreFromages"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/royale"
- app:layout_constraintBottom_toTopOf="@+id/hawaii"
- app:layout_constraintHorizontal_weight="1" />
-
- <Button
- android:id="@+id/raclette"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:text="RACLETTE"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/hawaii"
- app:layout_constraintTop_toBottomOf="@+id/quatreFromages"
- app:layout_constraintBottom_toTopOf="@+id/pannaCotta"
- app:layout_constraintHorizontal_weight="1" />
-
- <Button
- android:id="@+id/hawaii"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:text="HAWAII"
- app:layout_constraintBottom_toTopOf="@+id/tiramisu"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/raclette"
- app:layout_constraintTop_toBottomOf="@+id/montagnarde"
- app:layout_constraintHorizontal_weight="1" />
- <Button
- android:id="@+id/pannaCotta"
+ <FrameLayout
+ android:id="@+id/fragment_vertical_layout"
android:layout_width="0dp"
android:layout_height="0dp"
- android:text="PANNA COTTA"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/tiramisu"
- app:layout_constraintTop_toBottomOf="@+id/raclette"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintHorizontal_weight="1" />
-
- <Button
- android:id="@+id/tiramisu"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:text="TIRAMISU"
- app:layout_constraintStart_toEndOf="@+id/pannaCotta"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/hawaii"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintHorizontal_weight="1" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/textNumTable" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_frag_horizontal_layout.xml b/app/src/main/res/layout-land/fragment_frag_horizontal_layout.xml
new file mode 100644
index 0000000000000000000000000000000000000000..15abfc6c6d49e06479f564611772b0ebdf685fd7
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_frag_horizontal_layout.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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"
+ tools:context=".FragVerticalLayout">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <Button
+ android:id="@+id/napolitaine"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="NAPOLITAINE"
+ app:layout_constraintBottom_toTopOf="@+id/quatreFromages"
+ app:layout_constraintEnd_toStartOf="@+id/royale"
+ app:layout_constraintHorizontal_weight="1"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <Button
+ android:id="@+id/royale"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="ROYALE"
+ app:layout_constraintBottom_toTopOf="@+id/montagnarde"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_weight="1"
+ app:layout_constraintStart_toEndOf="@+id/napolitaine"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <Button
+ android:id="@+id/quatreFromages"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="QUATRE FROMAGES"
+ app:layout_constraintBottom_toTopOf="@+id/raclette"
+ app:layout_constraintEnd_toStartOf="@+id/montagnarde"
+ app:layout_constraintHorizontal_weight="1"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/napolitaine" />
+
+ <Button
+ android:id="@+id/montagnarde"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="MONTAGNARDE"
+ app:layout_constraintStart_toEndOf="@+id/quatreFromages"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/royale"
+ app:layout_constraintBottom_toTopOf="@+id/hawaii"
+ app:layout_constraintHorizontal_weight="1" />
+
+ <Button
+ android:id="@+id/raclette"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="RACLETTE"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/hawaii"
+ app:layout_constraintTop_toBottomOf="@+id/quatreFromages"
+ app:layout_constraintBottom_toTopOf="@+id/pannaCotta"
+ app:layout_constraintHorizontal_weight="1" />
+
+ <Button
+ android:id="@+id/hawaii"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="HAWAII"
+ app:layout_constraintBottom_toTopOf="@+id/tiramisu"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/raclette"
+ app:layout_constraintTop_toBottomOf="@+id/montagnarde"
+ app:layout_constraintHorizontal_weight="1" />
+
+ <Button
+ android:id="@+id/pannaCotta"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="PANNA COTTA"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/tiramisu"
+ app:layout_constraintTop_toBottomOf="@+id/raclette"
+ app:layout_constraintBottom_toTopOf="@+id/pizzaperso"
+ app:layout_constraintHorizontal_weight="1" />
+
+ <Button
+ android:id="@+id/tiramisu"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="TIRAMISU"
+ app:layout_constraintStart_toEndOf="@+id/pannaCotta"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/hawaii"
+ app:layout_constraintBottom_toTopOf="@+id/pizzaperso"
+ app:layout_constraintHorizontal_weight="1" />
+
+ <Button
+ android:id="@+id/pizzaperso"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:backgroundTint="#F44336"
+ android:text="Pizza Personnalisé"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/tiramisu" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bc58cfc772e5b84c8ccb283abe215b7ae9d06674..c03fe7fb57e26cdd2fc22118ac678725f31dd402 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,5 +6,25 @@
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/fragment_vertical_layout"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <FrameLayout
+ android:id="@+id/fragment_vertical_layout"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/textNumTable" />
+
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_frag_vertical_layout.xml b/app/src/main/res/layout/fragment_frag_vertical_layout.xml
index 98715dadaa6814c23659d501dbf8e0cde575935d..1a5168a05aa4b3bbfa255cb61da8c8ae0288fbe6 100644
--- a/app/src/main/res/layout/fragment_frag_vertical_layout.xml
+++ b/app/src/main/res/layout/fragment_frag_vertical_layout.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fragment_vertical_layout"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@@ -11,16 +10,6 @@
android:layout_width="match_parent"
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"
@@ -29,7 +18,7 @@
app:layout_constraintBottom_toTopOf="@+id/royale"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/textNumTable" />
+ app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/royale"
@@ -86,7 +75,7 @@
android:layout_width="424dp"
android:layout_height="0dp"
android:orientation="horizontal"
- app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintBottom_toTopOf="@+id/pizzaperso"
app:layout_constraintTop_toBottomOf="@+id/hawaii"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -109,5 +98,16 @@
android:text="TIRAMISU" />
</LinearLayout>
+ <Button
+ android:id="@+id/pizzaperso"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:backgroundTint="#F44336"
+ android:text="Pizza Personnalisé"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/linearLayout2" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
\ No newline at end of file