diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 526b4c25c6813ef690dfffafcf9a523c789c94a7..a2d7c21338e98a66cd8af9e352f293e52324608b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,7 +13,6 @@
<option value="$PROJECT_DIR$/app" />
</set>
</option>
- <option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e8934839a2258cc852ccccc02c91f4ff9cddfcf4..47d09e1ef30bd10e921f570ce1fc94c1989e2ae4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,6 +6,7 @@
<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="..\:/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/build.gradle b/app/build.gradle
index b59c748075ecdb5bad659260c5b2190fa20f73f6..359d46e87f468f57ac6c7eaf24e6d58e1aa353e9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,6 +25,7 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
+ namespace 'com.slprojects.pizzeria'
}
dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 90169b13871b046b8eb6718ddca5dc73a5554a27..ac6e0164bfa3805e210b73d96406bfa08d524507 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.slprojects.pizzeria" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
diff --git a/app/src/main/java/com/slprojects/pizzeria/FragVerticalLayout.java b/app/src/main/java/com/slprojects/pizzeria/FragVerticalLayout.java
new file mode 100644
index 0000000000000000000000000000000000000000..6b852c6cb90440d3c558bafd2f75a02e94284872
--- /dev/null
+++ b/app/src/main/java/com/slprojects/pizzeria/FragVerticalLayout.java
@@ -0,0 +1,19 @@
+package com.slprojects.pizzeria;
+
+import android.os.Bundle;
+
+import android.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class FragVerticalLayout extends Fragment {
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.activity_main, container, false);
+ }
+
+
+}
\ 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 5138fe721f1a455e5f3b3e6a81fff6609d5ff516..b47e98db9b842219722506fd83eba22aed5d8073 100644
--- a/app/src/main/java/com/slprojects/pizzeria/MainActivity.java
+++ b/app/src/main/java/com/slprojects/pizzeria/MainActivity.java
@@ -5,6 +5,7 @@ import static com.slprojects.pizzeria.NumTable.numTable;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
+import android.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
@@ -25,6 +26,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
@Override
protected void onCreate(Bundle savedInstanceState) {
+ FragVerticalLayout 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);
@@ -32,6 +38,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
// On récupère le num de la table
numTable = intent.getIntExtra(NumTable.numTable, 1);
+
TextView textView = findViewById(R.id.textNumTable);
String numTableText = textView.getText().toString() + numTable;
textView.setText(numTableText);
diff --git a/app/src/main/java/com/slprojects/pizzeria/NumTable.java b/app/src/main/java/com/slprojects/pizzeria/NumTable.java
index eff9e764967050b1403bdc77e8a8b89c3d2d29f3..f585b18fb585f3c0bd48f04c1c3fdd7726c2f808 100644
--- a/app/src/main/java/com/slprojects/pizzeria/NumTable.java
+++ b/app/src/main/java/com/slprojects/pizzeria/NumTable.java
@@ -35,6 +35,7 @@ public class NumTable extends AppCompatActivity implements View.OnClickListener
@Override
public void finish() {
+ // On va créer l'intent pour passer numTable
Intent intent = new Intent(this, MainActivity.class);
intent.putExtra("numTable", Integer.parseInt(input.getText().toString()));
startActivity(intent);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7558bafad6ed5bfcfa2d9ad550781dc0f2571c00..bc58cfc772e5b84c8ccb283abe215b7ae9d06674 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,101 +6,5 @@
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"
- android:layout_height="0dp"
- android:text="NAPOLITAINE"
- app:layout_constraintBottom_toTopOf="@+id/royale"
- app:layout_constraintEnd_toEndOf="parent"
- 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/quatreFromages"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/napolitaine" />
-
- <Button
- android:id="@+id/quatreFromages"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:text="QUATRE FROMAGES"
- app:layout_constraintBottom_toTopOf="@+id/montagnarde"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/royale" />
-
- <Button
- android:id="@+id/montagnarde"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:text="MONTAGNARDE"
- app:layout_constraintBottom_toTopOf="@+id/raclette"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/quatreFromages" />
-
- <Button
- android:id="@+id/raclette"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:text="RACLETTE"
- app:layout_constraintBottom_toTopOf="@+id/hawaii"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/montagnarde" />
-
- <Button
- android:id="@+id/hawaii"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:text="HAWAII"
- app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/raclette" />
-
- <LinearLayout
- android:id="@+id/linearLayout2"
- android:layout_width="424dp"
- android:layout_height="0dp"
- 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
- android:id="@+id/pannaCotta"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:layout_marginEnd="5dp"
- android:text="PANNA COTTA" />
-
- <Button
- android:id="@+id/tiramisu"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:layout_marginEnd="5dp"
- android:text="TIRAMISU" />
- </LinearLayout>
</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
new file mode 100644
index 0000000000000000000000000000000000000000..98715dadaa6814c23659d501dbf8e0cde575935d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_frag_vertical_layout.xml
@@ -0,0 +1,113 @@
+<?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"
+ android:layout_height="match_parent"
+ tools:context=".FragVerticalLayout">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ 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"
+ android:layout_height="0dp"
+ android:text="NAPOLITAINE"
+ app:layout_constraintBottom_toTopOf="@+id/royale"
+ app:layout_constraintEnd_toEndOf="parent"
+ 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/quatreFromages"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/napolitaine" />
+
+ <Button
+ android:id="@+id/quatreFromages"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="QUATRE FROMAGES"
+ app:layout_constraintBottom_toTopOf="@+id/montagnarde"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/royale" />
+
+ <Button
+ android:id="@+id/montagnarde"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="MONTAGNARDE"
+ app:layout_constraintBottom_toTopOf="@+id/raclette"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/quatreFromages" />
+
+ <Button
+ android:id="@+id/raclette"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="RACLETTE"
+ app:layout_constraintBottom_toTopOf="@+id/hawaii"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/montagnarde" />
+
+ <Button
+ android:id="@+id/hawaii"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:text="HAWAII"
+ app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/raclette" />
+
+ <LinearLayout
+ android:id="@+id/linearLayout2"
+ android:layout_width="424dp"
+ android:layout_height="0dp"
+ 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
+ android:id="@+id/pannaCotta"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:layout_marginEnd="5dp"
+ android:text="PANNA COTTA" />
+
+ <Button
+ android:id="@+id/tiramisu"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:layout_marginEnd="5dp"
+ android:text="TIRAMISU" />
+ </LinearLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79d39790e0ba345852fb5a150cd187487f6b04cc..64839a184f043981629c9cf1628f6dbbf42bca8e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
<resources>
<string name="app_name">Pizzeria</string>
+ <!-- TODO: Remove or change this placeholder text -->
+ <string name="hello_blank_fragment">Hello blank fragment</string>
</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b0e1af8e72372b0c0493882c6336bea5472f961c..2fcc7ef7e3beeade20934538edbd9b579ad8c4a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id 'com.android.application' version '7.1.1' apply false
- id 'com.android.library' version '7.1.1' apply false
+ id 'com.android.application' version '7.1.2' apply false
+ id 'com.android.library' version '7.1.2' apply false
}
task clean(type: Delete) {