From f3b33d28121435fc83d5bad9e8d70e8aee113c36 Mon Sep 17 00:00:00 2001
From: Fabio Heyming <fabio.heyming@web.de>
Date: Thu, 22 Jun 2023 17:33:29 +0200
Subject: [PATCH] Bugfix capped Itemname and Dummygenerator
---
.../java/com/example/mampfmobil/ui/MampfMobil.java | 13 ++-----------
.../res/layout/recyclerview_orders_partrows.xml | 2 +-
app/src/main/res/values-de-rDE/strings.xml | 2 +-
app/src/main/res/values/strings.xml | 2 +-
4 files changed, 5 insertions(+), 14 deletions(-)
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 0990102..3381f21 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 51d8bd5..130769f 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 2827c79..332ffe8 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 eb42c8e..90f7c42 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>
--
GitLab