Skip to content
Snippets Groups Projects
Commit 0573d261 authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

Partie 6 tj pas finie mais fragments works

parent 77308d1d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 189 additions and 110 deletions
.idea/misc.xml
+ 6
− 1
View file @ 0573d261
...@@ -6,7 +6,12 @@ ...@@ -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-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_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/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-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" /> <entry key="..\:/Z IUT Orsay/AndroidStudioProjects/Pizzeria/app/src/main/res/layout/activity_main.xml" value="0.2" />
</map> </map>
......
app/src/main/java/com/slprojects/pizzeria/FragVerticalLayout.java
+ 13
− 2
View file @ 0573d261
...@@ -4,16 +4,27 @@ import android.os.Bundle; ...@@ -4,16 +4,27 @@ import android.os.Bundle;
import android.app.Fragment; import android.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
public class FragVerticalLayout extends Fragment { public class FragVerticalLayout extends Fragment {
//TextView textView;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { 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 // 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
app/src/main/java/com/slprojects/pizzeria/MainActivity.java
+ 19
− 11
View file @ 0573d261
...@@ -23,17 +23,21 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -23,17 +23,21 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
private ArrayList<String> nomBoutons; private ArrayList<String> nomBoutons;
private int numTable; private int numTable;
private backTasks tacheDeFond; private backTasks tacheDeFond;
private FragVerticalLayout frag;
private Bundle savedInstanceState;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { 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(); FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.add(R.id.fragment_vertical_layout, frag); transaction.add(R.id.fragment_vertical_layout, frag);
transaction.commit(); transaction.commit();
Log.i("onCreate", "MainActivity"); Log.i("onCreate", "MainActivity");
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
Intent intent = getIntent(); Intent intent = getIntent();
// On récupère le num de la table // On récupère le num de la table
...@@ -44,20 +48,24 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -44,20 +48,24 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
textView.setText(numTableText); textView.setText(numTableText);
Log.i("Numéro de la table", String.valueOf(numTable)); Log.i("Numéro de la table", String.valueOf(numTable));
// Fin avec le num de la table // Fin avec le num de la table
}
protected void onStart() {
super.onStart();
boutons = new ArrayList<>(); boutons = new ArrayList<>();
idIndexes = new ArrayList<>(); idIndexes = new ArrayList<>();
numCommands = new ArrayList<>(); numCommands = new ArrayList<>();
nomBoutons = new ArrayList<>(); nomBoutons = new ArrayList<>();
boutons.add(findViewById(R.id.napolitaine)); boutons.add(frag.getView().findViewById(R.id.napolitaine));
boutons.add(findViewById(R.id.royale)); boutons.add(frag.getView().findViewById(R.id.royale));
boutons.add(findViewById(R.id.quatreFromages)); boutons.add(frag.getView().findViewById(R.id.quatreFromages));
boutons.add(findViewById(R.id.montagnarde)); boutons.add(frag.getView().findViewById(R.id.montagnarde));
boutons.add(findViewById(R.id.raclette)); boutons.add(frag.getView().findViewById(R.id.raclette));
boutons.add(findViewById(R.id.hawaii)); boutons.add(frag.getView().findViewById(R.id.hawaii));
boutons.add(findViewById(R.id.pannaCotta)); boutons.add(frag.getView().findViewById(R.id.pannaCotta));
boutons.add(findViewById(R.id.tiramisu)); boutons.add(frag.getView().findViewById(R.id.tiramisu));
// On ajoute un listener sur chaque bouton // On ajoute un listener sur chaque bouton
boutons.forEach((btn) -> btn.setOnClickListener(this)); boutons.forEach((btn) -> btn.setOnClickListener(this));
......
app/src/main/res/layout-land/activity_main.xml
+ 5
− 83
View file @ 0573d261
...@@ -11,95 +11,17 @@ ...@@ -11,95 +11,17 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Numéro de la table: " 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_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="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 <FrameLayout
android:id="@+id/pannaCotta" android:id="@+id/fragment_vertical_layout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="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_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_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/hawaii" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@+id/textNumTable" />
app:layout_constraintHorizontal_weight="1" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout-land/fragment_frag_horizontal_layout.xml 0 → 100644
+ 113
− 0
View file @ 0573d261
<?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
app/src/main/res/layout/activity_main.xml
+ 20
− 0
View file @ 0573d261
...@@ -6,5 +6,25 @@ ...@@ -6,5 +6,25 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".MainActivity"> 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> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_frag_vertical_layout.xml
+ 13
− 13
View file @ 0573d261
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <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:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -11,16 +10,6 @@ ...@@ -11,16 +10,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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 <Button
android:id="@+id/napolitaine" android:id="@+id/napolitaine"
android:layout_width="0dp" android:layout_width="0dp"
...@@ -29,7 +18,7 @@ ...@@ -29,7 +18,7 @@
app:layout_constraintBottom_toTopOf="@+id/royale" app:layout_constraintBottom_toTopOf="@+id/royale"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textNumTable" /> app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/royale" android:id="@+id/royale"
...@@ -86,7 +75,7 @@ ...@@ -86,7 +75,7 @@
android:layout_width="424dp" android:layout_width="424dp"
android:layout_height="0dp" android:layout_height="0dp"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@+id/pizzaperso"
app:layout_constraintTop_toBottomOf="@+id/hawaii" app:layout_constraintTop_toBottomOf="@+id/hawaii"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -109,5 +98,16 @@ ...@@ -109,5 +98,16 @@
android:text="TIRAMISU" /> android:text="TIRAMISU" />
</LinearLayout> </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> </androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout> </FrameLayout>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment