From 865bb7f4cd7fd1b12412b1af7618a4d8cc8703c9 Mon Sep 17 00:00:00 2001
From: fheyming <fabio-andre.heyming@sva.de>
Date: Fri, 2 Jun 2023 13:06:10 +0200
Subject: [PATCH] Removed hc strings
---
.../Classes/Recyclerviewadapter_Supplier_Orders.java | 4 ++--
.../Recyclerviewadapter_deliverer_activeOrders.java | 2 +-
.../Recyclerviewadapter_deliverer_closedOrders.java | 2 +-
.../Recyclerviewadapter_deliverer_orders.java | 2 +-
app/src/main/res/values-de-rDE/strings.xml | 12 ++++++++++++
app/src/main/res/values/strings.xml | 2 ++
6 files changed, 19 insertions(+), 5 deletions(-)
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 4d67b2c..198667e 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
@@ -66,8 +66,8 @@ public class Recyclerviewadapter_Supplier_Orders extends RecyclerView.Adapter<Re
public void onBindViewHolder(@NonNull Recyclerviewadapter_Supplier_Orders.MyViewHolder holder, int position) {
holder.tvID.setText(String.valueOf("# " + bestellungen.get(position).id));
holder.tvState.setText(bestellungen.get(position).state);
- if(bestellungen.get(position).state.equals("ordered")){
- holder.readyButton.setText("ready");
+ if(bestellungen.get(position).state.equals(context.getString(R.string.ordered))){
+ holder.readyButton.setText(context.getString(R.string.ready));
}
else if(bestellungen.get(position).state.equals(context.getString(R.string.readyForPickup))){
holder.readyButton.setText(context.getString(R.string.picked));
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_activeOrders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_activeOrders.java
index f5752d3..7778df8 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_activeOrders.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_activeOrders.java
@@ -49,7 +49,7 @@ public class Recyclerviewadapter_deliverer_activeOrders extends RecyclerView.Ada
holder.readyButton.setText(context.getString(R.string.inTransportation));
}
else if(bestellungen.get(position).state.equals(context.getString(R.string.readyForTransport))){
- holder.readyButton.setText("reserve");
+ holder.readyButton.setText(context.getString(R.string.reserve));
}
else{
holder.readyButton.setVisibility(View.INVISIBLE);
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_closedOrders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_closedOrders.java
index 2a9f5df..99ac337 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_closedOrders.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_closedOrders.java
@@ -47,7 +47,7 @@ public class Recyclerviewadapter_deliverer_closedOrders extends RecyclerView.Ada
holder.readyButton.setText(context.getString(R.string.inTransportation));
}
else if(bestellungen.get(position).state.equals(context.getString(R.string.readyForTransport))){
- holder.readyButton.setText("reserve");
+ holder.readyButton.setText(context.getString(R.string.reserve));
}
else{
holder.readyButton.setVisibility(View.INVISIBLE);
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java
index acc2746..28d0f53 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java
@@ -49,7 +49,7 @@ public class Recyclerviewadapter_deliverer_orders extends RecyclerView.Adapter<R
holder.readyButton.setText(context.getString(R.string.inTransportation));
}
else if(bestellungen.get(position).state.equals(context.getString(R.string.readyForTransport))){
- holder.readyButton.setText("reserve");
+ holder.readyButton.setText(context.getString(R.string.reserve));
}
else{
holder.readyButton.setVisibility(View.INVISIBLE);
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 3c5de7a..23a08f3 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -49,4 +49,16 @@
<string name="amount">Amount</string>
<string name="ready">Ready</string>
<string name="sum_dp">Sum:</string>
+ <string name="reserve">reserve</string>
+ <string name="ordered">ordered</string>
+ <string name="price">Price</string>
+ <string name="itemname">Itemname:</string>
+ <string name="amount_dp">Amount:</string>
+ <string name="items_sold_dp">Items sold:</string>
+ <string name="sales_volume_dp">Sales volume:</string>
+ <string name="orders_dp">Orders:</string>
+ <string name="supplieraddress_dp">Supplieraddress:</string>
+ <string name="edit">EDIT</string>
+ <string name="total">Total</string>
+ <string name="sold_units_dp">Sold Units:</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 ae6f0e0..e8f27cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,5 +58,7 @@
<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="ordered">ordered</string>
</resources>
\ No newline at end of file
--
GitLab