From dc216535330b5ad60c08753d0fd2a0553a8cd155 Mon Sep 17 00:00:00 2001 From: NonoL3Robot Date: Wed, 16 Mar 2022 11:43:07 +0100 Subject: [PATCH] =?UTF-8?q?switch=20de=20fen=C3=AAtre=20(spoiler=20:=20?= =?UTF-8?q?=C3=A7a=20marche=20pas)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outilcuisson/AfficherFragment.java | 24 ++++++++++++++++--- .../example/outilcuisson/AjouterFragment.java | 14 +++++++---- .../example/outilcuisson/MainActivity.java | 8 ++++++- app/src/main/res/layout/ajouter_fragment.xml | 3 ++- app/src/main/res/menu/menu_contextuel.xml | 9 ++++--- app/src/main/res/values/strings.xml | 3 ++- 6 files changed, 47 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/example/outilcuisson/AfficherFragment.java b/app/src/main/java/com/example/outilcuisson/AfficherFragment.java index f833492..3130be9 100644 --- a/app/src/main/java/com/example/outilcuisson/AfficherFragment.java +++ b/app/src/main/java/com/example/outilcuisson/AfficherFragment.java @@ -20,8 +20,12 @@ import android.widget.ListView; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import com.google.android.material.navigation.NavigationView; + import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; @@ -109,14 +113,18 @@ public class AfficherFragment extends Fragment { = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo(); switch (item.getItemId()) { + case R.id.thermosContext: + afficherThermos(cuissonAffichees.get(information.position)); + break; + case R.id.modifierContext: +// modifierCuisson(); + break; case R.id.supprContext: cuissonAffichees.remove(information.position); adapterCuissons.notifyDataSetChanged(); listeCuissons.requestLayout(); break; - case R.id.thermosContext: - afficherThermos(cuissonAffichees.get(information.position)); - break; + case R.id.cancelContext: break; } @@ -135,4 +143,14 @@ public class AfficherFragment extends Fragment { null) .show(); } + + public void modifierCuisson() { +// ((MainActivity)getActivity()).changeFragment(1); + Fragment fragment = new AjouterFragment(); + FragmentManager fragmentManager = fragment.getChildFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction.replace(R.id.ajouter_fragment, fragment, fragment.toString()); + fragmentTransaction.addToBackStack(fragment.toString()); + fragmentTransaction.commit(); + } } diff --git a/app/src/main/java/com/example/outilcuisson/AjouterFragment.java b/app/src/main/java/com/example/outilcuisson/AjouterFragment.java index f577d70..418adb4 100644 --- a/app/src/main/java/com/example/outilcuisson/AjouterFragment.java +++ b/app/src/main/java/com/example/outilcuisson/AjouterFragment.java @@ -106,6 +106,7 @@ public class AjouterFragment extends Fragment { Cuisson cuisson = new Cuisson(txtPlat, hDuree, mDuree, temperature); activiteQuiMEcoute.recevoirCuisson(cuisson); + viderChamps(); String content = getString(R.string.toast_ajout_ok, cuisson.getPlat()); Toast.makeText(getContext(), content, Toast.LENGTH_SHORT) @@ -127,13 +128,16 @@ public class AjouterFragment extends Fragment { * Efface le contenu des champs de textes et met le TimePicker à 0h40 */ btnEffacer.setOnClickListener(view2 -> { - - inputPlat.setText(""); - inputDuree.setHour(0); - inputDuree.setMinute(40); - inputTemperature.setText(""); + viderChamps(); }); return view; } + + private void viderChamps() { + inputPlat.setText(""); + inputDuree.setHour(0); + inputDuree.setMinute(40); + inputTemperature.setText(""); + } } diff --git a/app/src/main/java/com/example/outilcuisson/MainActivity.java b/app/src/main/java/com/example/outilcuisson/MainActivity.java index 11acf0b..23a4979 100644 --- a/app/src/main/java/com/example/outilcuisson/MainActivity.java +++ b/app/src/main/java/com/example/outilcuisson/MainActivity.java @@ -53,12 +53,14 @@ public class MainActivity extends AppCompatActivity implements AjouterFragment.E */ private static final String TAG = "Cuisson"; + private ViewPager2 gestionnairePagination; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - ViewPager2 gestionnairePagination = findViewById( + gestionnairePagination = findViewById( R.id.activity_main_viewpager); TabLayout gestionnaireOnglet = findViewById(R.id.tab_layout); @@ -193,4 +195,8 @@ public class MainActivity extends AppCompatActivity implements AjouterFragment.E fragmentAModifier.addCuisson(cuisson); } } + + public void changeFragment(int pos) { + gestionnairePagination.setCurrentItem(pos); + } } \ No newline at end of file diff --git a/app/src/main/res/layout/ajouter_fragment.xml b/app/src/main/res/layout/ajouter_fragment.xml index 6572fe8..64b2e53 100644 --- a/app/src/main/res/layout/ajouter_fragment.xml +++ b/app/src/main/res/layout/ajouter_fragment.xml @@ -2,7 +2,8 @@ + android:stretchColumns="1" + android:id="@+id/ajouter_fragment"> - + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4f40e7f..5e65061 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,8 +16,9 @@ apparaître un menu contextuel possédant plusieurs options. - "Supprimer" "Voir thermostat" + "Modifier" + "Supprimer" "Annuler"