diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Bestellung.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Bestellung.java index e02b969716834640129ebe34db0b389bdbaf9d2d..90f742b0c14a58c5d54239e346a161c48b487e52 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Bestellung.java +++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Bestellung.java @@ -1,5 +1,9 @@ package com.example.mampfmobil.ui.Classes; +import android.content.Context; + +import com.example.mampfmobil.R; + import java.util.Vector; public class Bestellung { @@ -15,10 +19,10 @@ public class Bestellung { public int id; - public Bestellung(Supplier supplier,Boolean delivery){ + public Bestellung(Supplier supplier, Boolean delivery, Context context){ bestellungsTeile = new Vector<>(); this.supplier = supplier; - state = "ordered" ; + state = context.getString(R.string.ordered) ; this.delivery = delivery; id = idCounter; idCounter++; diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java index 198667efaebe713fd19a9f47e67bc77abac242ad..af7559c19b64f657c3519f6021a3e6800b637ffe 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java +++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java @@ -26,14 +26,14 @@ public class Recyclerviewadapter_Supplier_Orders extends RecyclerView.Adapter<Re this.context =context; for(Customer c:MampfMobil.customers){ for(Bestellung b:c.bestellungen){ - if(b.supplier==MampfMobil.currentSupplier&&b.state.equals("ordered")){ + if(b.supplier==MampfMobil.currentSupplier&&b.state.equals(context.getString(R.string.ordered))){ bestellungen.add(b); } } } for(Customer c:MampfMobil.customers){ for(Bestellung b:c.bestellungen){ - if(b.supplier==MampfMobil.currentSupplier&&b.state.equals("ready")){ + if(b.supplier==MampfMobil.currentSupplier&&b.state.equals(context.getString(R.string.ready))){ bestellungen.add(b); } } diff --git a/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerShoppingCartFragment.java b/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerShoppingCartFragment.java index 3dd92a54a29c8eb69ee9aa5ec6a20113bf831fd5..4b213257a927b149cc99e520d44c137dd6cde8b2 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerShoppingCartFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerShoppingCartFragment.java @@ -67,16 +67,16 @@ public class CustomerShoppingCartFragment extends Fragment { for(BestellungsTeil bT: MampfMobil.currentCustomer.shoppingCart){ boolean exist = false; for(Bestellung b:MampfMobil.currentCustomer.bestellungen){ - if(b.supplier == bT.item.supplier && b.state.equals("ordered") && !switchDelivery.isChecked() == b.delivery){ + if(b.supplier == bT.item.supplier && b.state.equals(v.getContext().getString(R.string.ordered)) && !switchDelivery.isChecked() == b.delivery){ b.addBestellungsteil(bT); exist = true; Log.d("myTag", "Added "+ bT.item.name); } } if(!exist){ - MampfMobil.currentCustomer.addBestellung(new Bestellung(bT.item.supplier,!switchDelivery.isChecked())); + MampfMobil.currentCustomer.addBestellung(new Bestellung(bT.item.supplier,!switchDelivery.isChecked(), rootView.getContext())); for(Bestellung b:MampfMobil.currentCustomer.bestellungen){ - if(b.supplier == bT.item.supplier && b.state.equals("ordered")){ + if(b.supplier == bT.item.supplier && b.state.equals(v.getContext().getString(R.string.ordered))){ b.addBestellungsteil(bT); Log.d("myTag", "created "+ bT.item.name); diff --git a/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierAddItemFragment.java b/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierAddItemFragment.java index 71c57d836057fbde31791db6f28223a4eab7bf0c..e8bab5a64c13fcee5aae9893d4d4c6e847accf87 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierAddItemFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierAddItemFragment.java @@ -49,7 +49,7 @@ public class SupplierAddItemFragment extends Fragment { if (toast != null) { toast.cancel(); // Vorhandene Toast-Nachricht abbrechen } - toast = Toast.makeText(rootView.getContext(), "noEmptyInput", Toast.LENGTH_SHORT); + toast = Toast.makeText(rootView.getContext(), R.string.noemptyinput, Toast.LENGTH_SHORT); toast.show(); return; } @@ -64,7 +64,7 @@ public class SupplierAddItemFragment extends Fragment { if (toast != null) { toast.cancel(); // Vorhandene Toast-Nachricht abbrechen } - toast = Toast.makeText(rootView.getContext(), "Item already exists", Toast.LENGTH_SHORT); + toast = Toast.makeText(rootView.getContext(), R.string.item_already_exists, Toast.LENGTH_SHORT); toast.show(); } else{ diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 23a08f31620b7c4eac87026681db0f963225b736..7a8edc28f8baa5ae0c4b5fb5690bd5626e660b60 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -61,4 +61,6 @@ <string name="edit">EDIT</string> <string name="total">Total</string> <string name="sold_units_dp">Sold Units:</string> + <string name="noemptyinput">noEmptyInput</string> + <string name="item_already_exists">Item already exists</string> </resources> \ 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 e8f27cf1526a9b63267dfdf193a357c52b18a36e..b9c186e742a8476c01a1aa08980e1df6cdc264e9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -58,7 +58,9 @@ <string name="sum_dp">Sum:</string> <string name="total">Total</string> <string name="sold_units_dp">Sold Units:</string> - <string name="reserve">reserve2</string> + <string name="reserve">reserve</string> <string name="ordered">ordered</string> + <string name="noemptyinput">noEmptyInput</string> + <string name="item_already_exists">Item already exists</string> </resources> \ No newline at end of file