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 4d67b2c975e73f2883450e454e9b8cfa880738a7..198667efaebe713fd19a9f47e67bc77abac242ad 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 f5752d38240516010f7ef7d2e4615969322ab03f..7778df8c5a6e25f0588bbd1c84c916d54ffdc874 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 2a9f5df9d033c5a8d75e88c51d2181e07ba09636..99ac3378c4c83b71228ee8bb52562ebae5b3e002 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 acc2746a0799605913aae264e9480867a0565f09..28d0f53512a453214ac773aa37a9536dc0e704d4 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 3c5de7a0b843b11e4484c49d74f70800d4bf4fd3..23a08f31620b7c4eac87026681db0f963225b736 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 ae6f0e09192ad944f65643a348d8764f1ccfdcb8..e8f27cf1526a9b63267dfdf193a357c52b18a36e 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