From e06e0fd3e808de7a0ca3727c74a31f648584a2d4 Mon Sep 17 00:00:00 2001
From: fheyming <fabio-andre.heyming@sva.de>
Date: Fri, 2 Jun 2023 14:26:00 +0200
Subject: [PATCH] Removed hc strings
---
.../com/example/mampfmobil/ui/Classes/Bestellung.java | 8 ++++++--
.../ui/Classes/Recyclerviewadapter_Supplier_Orders.java | 4 ++--
.../ui/customer/CustomerShoppingCartFragment.java | 6 +++---
.../mampfmobil/ui/supplier/SupplierAddItemFragment.java | 4 ++--
app/src/main/res/values-de-rDE/strings.xml | 2 ++
app/src/main/res/values/strings.xml | 4 +++-
6 files changed, 18 insertions(+), 10 deletions(-)
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 e02b969..90f742b 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 198667e..af7559c 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 3dd92a5..4b21325 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 71c57d8..e8bab5a 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 23a08f3..7a8edc2 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 e8f27cf..b9c186e 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
--
GitLab