From c319758cdd37f76c691b25344ba1b163acde205d Mon Sep 17 00:00:00 2001 From: fheyming <fabio-andre.heyming@sva.de> Date: Fri, 26 May 2023 12:24:18 +0200 Subject: [PATCH] bugfixes in navigation --- .../com/example/mampfmobil/ui/CustomerActivity.java | 2 +- .../com/example/mampfmobil/ui/DecideFragment.java | 11 ++++++----- .../mampfmobil/ui/supplier/SupplierLogonFragment.java | 4 ++-- app/src/main/res/values-de-rDE/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java b/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java index 94e7784..407f75e 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java +++ b/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java @@ -25,7 +25,7 @@ private ActivityCustomerBinding binding; binding = ActivityCustomerBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); - Log.d("myTag", "This is my Deliverer"); + Log.d("myTag", "This is my Costumer"); // Fragment "fragment_decide" wird angezeigt diff --git a/app/src/main/java/com/example/mampfmobil/ui/DecideFragment.java b/app/src/main/java/com/example/mampfmobil/ui/DecideFragment.java index 9b9cb76..e190ceb 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/DecideFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/DecideFragment.java @@ -48,33 +48,34 @@ public class DecideFragment extends Fragment { } }); - Button button2 = rootView.findViewById(R.id.DelivererButton); + Button button2 = rootView.findViewById(R.id.SupplierButton); button2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { FragmentManager fragmentManager = requireActivity().getSupportFragmentManager(); FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); - fragmentTransaction.replace(R.id.container, new DelivererLogonFragment()); + fragmentTransaction.replace(R.id.container, new SupplierLogonFragment()); fragmentTransaction.addToBackStack(null); // Fügt den Fragment-Wechsel zur Back-Stack hinzu fragmentTransaction.commit(); } }); - Button button3 = rootView.findViewById(R.id.SupplierButton); + + Button button3 = rootView.findViewById(R.id.DelivererButton); button3.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { FragmentManager fragmentManager = requireActivity().getSupportFragmentManager(); FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); - fragmentTransaction.replace(R.id.container, new SupplierLogonFragment()); + fragmentTransaction.replace(R.id.container, new DelivererLogonFragment()); fragmentTransaction.addToBackStack(null); // Fügt den Fragment-Wechsel zur Back-Stack hinzu fragmentTransaction.commit(); } }); - return rootView; } + @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); diff --git a/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierLogonFragment.java b/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierLogonFragment.java index 57f9ddb..c775ae0 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierLogonFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierLogonFragment.java @@ -19,6 +19,7 @@ import android.widget.Button; import com.example.mampfmobil.R; import com.example.mampfmobil.ui.CustomerActivity; +import com.example.mampfmobil.ui.SupplierActivity; import com.example.mampfmobil.ui.deliverer.DelivererLogonFragment; public class SupplierLogonFragment extends Fragment { @@ -35,13 +36,12 @@ public class SupplierLogonFragment extends Fragment { View rootView = inflater.inflate(R.layout.fragment_supplier_logon, container, false); Button button = rootView.findViewById(R.id.buttonRegister); - Log.d("myTag", "This is my Click2"+button); button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { // Wechsel zum anderen Fragment Log.d("myTag", "This is my Click"); - Intent intent = new Intent(getActivity(), CustomerActivity.class); + Intent intent = new Intent(getActivity(), SupplierActivity.class); startActivity(intent); } }); diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 023f36f..06b1ded 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -13,7 +13,7 @@ <string name="shop">Laden</string> <string name="statistics">Statistiken</string> <string name="add_Item">Hinzufügen"</string> - <string name="edit_Item">Bearbeiten"</string> + <string name="edit_Item">Übersicht/Bearbeiten"</string> <string name="open_orders">offene Bestellungen</string> <string name="active_orders">aktive Bestellungen</string> <string name="closed_orders">Geschlossene Bestellungen</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a16ab6c..48a6523 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,7 +12,7 @@ <string name="shop">Shop</string> <string name="statistics">Statistics</string> <string name="add_Item">Add Item</string> - <string name="edit_Item">Edit Item</string> + <string name="edit_Item">Overview/Edit</string> <string name="open_orders">Open Orders</string> <string name="active_orders">Active Orders</string> <string name="closed_orders">Closed Orders</string> -- GitLab