diff --git a/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java b/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java index 0990102d5b6c7aba5dafc57cd374defc2018a483..3381f2153e237cba99fad56adbcfee43ce4cfb16 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java +++ b/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java @@ -40,10 +40,7 @@ public class MampfMobil { isInitialized = true; } - /*if(!isInitialized) { - customers = new Vector<>(); - deliverers = new Vector<>(); - suppliers = new Vector<>(); + if(customers.size()<2) { //create Dummys!!! customers.add(new Customer("Fabio", "Heyming", "Weinbergstr 70, 55299 Nackenheim")); @@ -110,13 +107,7 @@ public class MampfMobil { temp3.addBestellungsteil(new BestellungsTeil(suppliers.get(1).shopItems.get(0).item, 14)); customers.get(1).addBestellung(temp3); - - customers.add(new Customer("", "", "")); - deliverers.add(new Deliverer("", "", "")); - suppliers.add(new Supplier("", "")); - isInitialized = true; - savePersistant(); - }*/ + } } public static boolean findCustomer(String vorname, String nachname){ diff --git a/app/src/main/res/layout/recyclerview_orders_partrows.xml b/app/src/main/res/layout/recyclerview_orders_partrows.xml index 51d8bd5be7a5e7dba6002fcbcbdeac37af1e9704..130769fe9b1d78b2a439c403f512f15febaf1cfe 100644 --- a/app/src/main/res/layout/recyclerview_orders_partrows.xml +++ b/app/src/main/res/layout/recyclerview_orders_partrows.xml @@ -26,7 +26,7 @@ <TextView android:id="@+id/textViewName" - android:layout_width="80dp" + android:layout_width="110dp" android:layout_height="19dp" android:layout_marginStart="10dp" android:textSize="14sp" diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 2827c7984055eb3b2d777dc11f657fe9c74cafcc..332ffe8916ebc1014f77253862b3a41436a9b464 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -32,7 +32,7 @@ <string name="restamount_dp">Restmenge: </string> <string name="restamount">Restmenge</string> <string name="supplier_dp">Lieferant: </string> - <string name="buyamount_dp">Kaufmenge:</string> + <string name="buyamount_dp">Menge:</string> <string name="price_dp">Preis: </string> <string name="state_dp">"Status: "</string> <string name="readyForTransport">Bereit für Transport</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index eb42c8ea49e99586fed79d6c69ff8fb2380f6ad5..90f7c42f832982eb9cebe1f5fe2a0c77262c35ed 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,7 +31,7 @@ <string name="restamount_dp">Restamount: </string> <string name="restamount">Restamount</string> <string name="supplier_dp">Supplier: </string> - <string name="buyamount_dp">Buyamount:</string> + <string name="buyamount_dp">Amount:</string> <string name="price_dp">Price: </string> <string name="state_dp">State: </string> <string name="readyForTransport">ready for transportation</string>