From f4ff89b4a8d3d67dfa811cc75326d49106232b2c Mon Sep 17 00:00:00 2001
From: fheyming <fabio-andre.heyming@sva.de>
Date: Fri, 2 Jun 2023 11:48:48 +0200
Subject: [PATCH] Removed hc strings
---
.../mampfmobil/ui/Classes/Bestellung.java | 2 +-
.../Classes/Recyclerviewadapter_Orders.java | 4 +--
.../Recyclerviewadapter_Supplier_Orders.java | 18 +++++-----
...lerviewadapter_deliverer_activeOrders.java | 24 +++++++-------
...lerviewadapter_deliverer_closedOrders.java | 33 +++++++------------
.../Recyclerviewadapter_deliverer_orders.java | 28 ++++++++--------
.../DelivererActiveOrdersFragment.java | 9 ++---
.../DelivererClosedOrdersFragment.java | 8 +++--
.../DelivererOpenOrdersFragment.java | 8 +++--
.../fragment_customer_shopping_cart.xml | 10 +++---
.../res/layout/fragment_supplier_add_item.xml | 8 ++---
.../layout/fragment_supplier_statistics.xml | 6 ++--
.../recyclerview_deliverer_orderrow.xml | 6 ++--
.../res/layout/recyclerview_edititemrow.xml | 2 +-
.../layout/recyclerview_orders_partrows.xml | 2 +-
.../res/layout/recyclerview_ordersrow.xml | 2 +-
.../layout/recyclerview_shoppingcartrow.xml | 2 +-
.../res/layout/recyclerview_statisticrow.xml | 4 +--
.../layout/recyclerview_supplierordersrow.xml | 4 +--
app/src/main/res/values-de-rDE/strings.xml | 15 +++++++++
app/src/main/res/values/strings.xml | 28 +++++++++++++++-
21 files changed, 128 insertions(+), 95 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 e48b41f..e02b969 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
@@ -18,7 +18,7 @@ public class Bestellung {
public Bestellung(Supplier supplier,Boolean delivery){
bestellungsTeile = new Vector<>();
this.supplier = supplier;
- state = "ordered";
+ state = "ordered" ;
this.delivery = delivery;
id = idCounter;
idCounter++;
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders.java
index 17c9a2d..75baf49 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders.java
@@ -46,10 +46,10 @@ public class Recyclerviewadapter_Orders extends RecyclerView.Adapter<Recyclervie
holder.tvTotalCost.setText(String.valueOf(temp));
if(bestellungen.get(position).delivery){
- holder.tvDelivery.setText("DELIVERY");
+ holder.tvDelivery.setText(context.getString(R.string.delivery));
}
else{
- holder.tvDelivery.setText("PICKUP");
+ holder.tvDelivery.setText(context.getString(R.string.pickup));
}
// Initialisiere und konfiguriere den Recyclerviewadapter_Orders_Parts
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 353c734..4d67b2c 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
@@ -40,7 +40,7 @@ public class Recyclerviewadapter_Supplier_Orders extends RecyclerView.Adapter<Re
}
for(Customer c:MampfMobil.customers){
for(Bestellung b:c.bestellungen){
- if(b.supplier==MampfMobil.currentSupplier&&b.state.equals("picked")){
+ if(b.supplier==MampfMobil.currentSupplier&&b.state.equals(context.getString(R.string.picked))){
bestellungen.add(b);
}
}
@@ -69,8 +69,8 @@ public class Recyclerviewadapter_Supplier_Orders extends RecyclerView.Adapter<Re
if(bestellungen.get(position).state.equals("ordered")){
holder.readyButton.setText("ready");
}
- else if(bestellungen.get(position).state.equals("ready for pickup")){
- holder.readyButton.setText("picked");
+ else if(bestellungen.get(position).state.equals(context.getString(R.string.readyForPickup))){
+ holder.readyButton.setText(context.getString(R.string.picked));
}
else{
holder.readyButton.setVisibility(View.INVISIBLE);
@@ -83,10 +83,10 @@ public class Recyclerviewadapter_Supplier_Orders extends RecyclerView.Adapter<Re
holder.tvTotalCost.setText(String.valueOf(temp));
if(bestellungen.get(position).delivery){
- holder.tvDelivery.setText("DELIVERY");
+ holder.tvDelivery.setText(context.getString(R.string.delivery));
}
else{
- holder.tvDelivery.setText("PICKUP");
+ holder.tvDelivery.setText(context.getString(R.string.pickup));
}
// Initialisiere und konfiguriere den Recyclerviewadapter_Orders_Parts
@@ -99,16 +99,16 @@ public class Recyclerviewadapter_Supplier_Orders extends RecyclerView.Adapter<Re
holder.readyButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- if (bestellungen.get(position).state.equals("ready for pickup")) {
- bestellungen.get(position).state = "picked";
+ if (bestellungen.get(position).state.equals(context.getString(R.string.readyForPickup))) {
+ bestellungen.get(position).state = context.getString(R.string.picked);
notifyItemRangeChanged(position, getItemCount());
}
if (bestellungen.get(position).state.equals("ordered")) {
if(bestellungen.get(position).delivery){
- bestellungen.get(position).state = "ready for transportation";
+ bestellungen.get(position).state = context.getString(R.string.readyForTransport);
}
else{
- bestellungen.get(position).state = "ready for pickup";
+ bestellungen.get(position).state = context.getString(R.string.readyForPickup);
}
notifyItemRangeChanged(position, getItemCount());
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 ec5f8ba..f5752d3 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
@@ -42,13 +42,13 @@ public class Recyclerviewadapter_deliverer_activeOrders extends RecyclerView.Ada
holder.tvID.setText(String.valueOf("# " + bestellungen.get(position).id));
holder.tvState.setText(bestellungen.get(position).state);
- if(bestellungen.get(position).state.equals("In transportation")){
- holder.readyButton.setText("delivered");
+ if(bestellungen.get(position).state.equals(context.getString(R.string.inTransportation))){
+ holder.readyButton.setText(context.getString(R.string.delivered));
}
- else if(bestellungen.get(position).state.equals("ready for transportation/deliverer found")){
- holder.readyButton.setText("In transportation");
+ else if(bestellungen.get(position).state.equals(context.getString(R.string.readyForTransportDelivererFound))){
+ holder.readyButton.setText(context.getString(R.string.inTransportation));
}
- else if(bestellungen.get(position).state.equals("ready for transportation")){
+ else if(bestellungen.get(position).state.equals(context.getString(R.string.readyForTransport))){
holder.readyButton.setText("reserve");
}
else{
@@ -61,23 +61,21 @@ public class Recyclerviewadapter_deliverer_activeOrders extends RecyclerView.Ada
@Override
public void onClick(View v) {
- if (bestellungen.get(position).state.equals("In transportation")) {
+ if (bestellungen.get(position).state.equals(context.getString(R.string.inTransportation))) {
- Log.d("myTag", "This is my DELETE");
- bestellungen.get(position).state = "delivered";
+ bestellungen.get(position).state = context.getString(R.string.delivered);
int adapterPosition = holder.getAdapterPosition();
if (adapterPosition != RecyclerView.NO_POSITION) {
removeItem(adapterPosition);
}
- DelivererActiveOrdersFragment.setVec();
+ DelivererActiveOrdersFragment.setVec(context);
notifyItemRangeChanged(position, getItemCount());
- Log.d("myTag", "This is my DELETE22");
return;
}
- if (bestellungen.get(position).state.equals("ready for transportation/deliverer found")) {
- bestellungen.get(position).state = "In transportation";
- DelivererActiveOrdersFragment.setVec();
+ if (bestellungen.get(position).state.equals(context.getString(R.string.readyForTransportDelivererFound))) {
+ bestellungen.get(position).state = context.getString(R.string.inTransportation);
+ DelivererActiveOrdersFragment.setVec(context);
notifyItemRangeChanged(position, getItemCount());
return;
}
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 96f8dfb..2a9f5df 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
@@ -40,13 +40,13 @@ public class Recyclerviewadapter_deliverer_closedOrders extends RecyclerView.Ada
holder.tvID.setText(String.valueOf("# " + bestellungen.get(position).id));
holder.tvState.setText(bestellungen.get(position).state);
- if(bestellungen.get(position).state.equals("In transportation")){
- holder.readyButton.setText("delivered");
+ if(bestellungen.get(position).state.equals(context.getString(R.string.inTransportation))){
+ holder.readyButton.setText(context.getString(R.string.delivered));
}
- else if(bestellungen.get(position).state.equals("ready for transportation/deliverer found")){
- holder.readyButton.setText("In transportation");
+ else if(bestellungen.get(position).state.equals(context.getString(R.string.readyForTransportDelivererFound))){
+ holder.readyButton.setText(context.getString(R.string.inTransportation));
}
- else if(bestellungen.get(position).state.equals("ready for transportation")){
+ else if(bestellungen.get(position).state.equals(context.getString(R.string.readyForTransport))){
holder.readyButton.setText("reserve");
}
else{
@@ -59,30 +59,19 @@ public class Recyclerviewadapter_deliverer_closedOrders extends RecyclerView.Ada
@Override
public void onClick(View v) {
- if (bestellungen.get(position).state.equals("In transportation")) {
+ if (bestellungen.get(position).state.equals(context.getString(R.string.inTransportation))) {
- bestellungen.get(position).state = "delivered";
+ bestellungen.get(position).state = context.getString(R.string.delivered);
int adapterPosition = holder.getAdapterPosition();
if (adapterPosition != RecyclerView.NO_POSITION) {
removeItem(adapterPosition);
}
- DelivererOpenOrdersFragment.setVec();
+ DelivererOpenOrdersFragment.setVec(context);
notifyItemRangeChanged(position, getItemCount());
}
- if (bestellungen.get(position).state.equals("ready for transportation/deliverer found")) {
- bestellungen.get(position).state = "In transportation";
- DelivererOpenOrdersFragment.setVec();
- notifyItemRangeChanged(position, getItemCount());
- return;
- }
- if (bestellungen.get(position).state.equals("ready for transportation")) {
- bestellungen.get(position).state = "ready for pickup/deliverer found";
- bestellungen.get(position).deliverer = MampfMobil.currentDeliverer;
- int adapterPosition = holder.getAdapterPosition();
- if (adapterPosition != RecyclerView.NO_POSITION) {
- removeItem(adapterPosition);
- }
- DelivererOpenOrdersFragment.setVec();
+ if (bestellungen.get(position).state.equals(context.getString(R.string.readyForTransportDelivererFound))) {
+ bestellungen.get(position).state = context.getString(R.string.inTransportation);
+ DelivererOpenOrdersFragment.setVec(context);
notifyItemRangeChanged(position, getItemCount());
return;
}
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 20ad005..acc2746 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
@@ -42,13 +42,13 @@ public class Recyclerviewadapter_deliverer_orders extends RecyclerView.Adapter<R
holder.tvID.setText(String.valueOf("# " + bestellungen.get(position).id));
holder.tvState.setText(bestellungen.get(position).state);
- if(bestellungen.get(position).state.equals("In transportation")){
- holder.readyButton.setText("delivered");
+ if(bestellungen.get(position).state.equals(context.getString(R.string.inTransportation))){
+ holder.readyButton.setText(context.getString(R.string.delivered));
}
- else if(bestellungen.get(position).state.equals("ready for transportation/deliverer found")){
- holder.readyButton.setText("In transportation");
+ else if(bestellungen.get(position).state.equals(context.getString(R.string.readyForTransportDelivererFound))){
+ holder.readyButton.setText(context.getString(R.string.inTransportation));
}
- else if(bestellungen.get(position).state.equals("ready for transportation")){
+ else if(bestellungen.get(position).state.equals(context.getString(R.string.readyForTransport))){
holder.readyButton.setText("reserve");
}
else{
@@ -61,30 +61,30 @@ public class Recyclerviewadapter_deliverer_orders extends RecyclerView.Adapter<R
@Override
public void onClick(View v) {
- if (bestellungen.get(position).state.equals("In transportation")) {
+ if (bestellungen.get(position).state.equals(context.getString(R.string.inTransportation))) {
- bestellungen.get(position).state = "delivered";
+ bestellungen.get(position).state = context.getString(R.string.delivered);
int adapterPosition = holder.getAdapterPosition();
if (adapterPosition != RecyclerView.NO_POSITION) {
removeItem(adapterPosition);
}
- DelivererOpenOrdersFragment.setVec();
+ DelivererOpenOrdersFragment.setVec(context);
notifyItemRangeChanged(position, getItemCount());
}
- if (bestellungen.get(position).state.equals("ready for transportation/deliverer found")) {
- bestellungen.get(position).state = "In transportation";
- DelivererOpenOrdersFragment.setVec();
+ if (bestellungen.get(position).state.equals(context.getString(R.string.readyForTransportDelivererFound))) {
+ bestellungen.get(position).state = context.getString(R.string.inTransportation);
+ DelivererOpenOrdersFragment.setVec(context);
notifyItemRangeChanged(position, getItemCount());
return;
}
- if (bestellungen.get(position).state.equals("ready for transportation")) {
- bestellungen.get(position).state = "ready for transportation/deliverer found";
+ if (bestellungen.get(position).state.equals(context.getString(R.string.readyForTransport))) {
+ bestellungen.get(position).state = context.getString(R.string.readyForTransportDelivererFound);
bestellungen.get(position).deliverer = MampfMobil.currentDeliverer;
int adapterPosition = holder.getAdapterPosition();
if (adapterPosition != RecyclerView.NO_POSITION) {
removeItem(adapterPosition);
}
- DelivererOpenOrdersFragment.setVec();
+ DelivererOpenOrdersFragment.setVec(context);
notifyItemRangeChanged(position, getItemCount());
return;
}
diff --git a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererActiveOrdersFragment.java b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererActiveOrdersFragment.java
index 7398ff4..dd09ca5 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererActiveOrdersFragment.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererActiveOrdersFragment.java
@@ -4,6 +4,7 @@ import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.ViewModelProvider;
+import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
@@ -47,21 +48,21 @@ public class DelivererActiveOrdersFragment extends Fragment {
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
}
-
LinearLayoutManager layoutManager = new LinearLayoutManager(requireActivity());
recyclerView.setLayoutManager(layoutManager);
- setVec();
+ Context context = rootView.getContext();
+ setVec(context);
Recyclerviewadapter_deliverer_activeOrders adapter = new Recyclerviewadapter_deliverer_activeOrders(requireContext(),activeOrders);
recyclerView.setAdapter(adapter);
adapter.notifyDataSetChanged();
return rootView;
}
- public static void setVec(){
+ public static void setVec(Context context){
activeOrders = new Vector<>();
for(Customer c: MampfMobil.customers){
for(Bestellung b:c.bestellungen){
- if((b.state.equals("ready for transportation/deliverer found") || b.state.equals("In transportation")) && b.delivery){
+ if((b.state.equals(context.getString(R.string.readyForTransportDelivererFound)) || b.state.equals(context.getString(R.string.inTransportation))) && b.delivery){
activeOrders.add(b);
}
}
diff --git a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererClosedOrdersFragment.java b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererClosedOrdersFragment.java
index 84a1c7f..9b9962c 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererClosedOrdersFragment.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererClosedOrdersFragment.java
@@ -4,6 +4,7 @@ import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.ViewModelProvider;
+import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
@@ -50,18 +51,19 @@ public class DelivererClosedOrdersFragment extends Fragment {
LinearLayoutManager layoutManager = new LinearLayoutManager(requireActivity());
recyclerView.setLayoutManager(layoutManager);
- setVec();
+ Context context = rootView.getContext();
+ setVec(context);
Recyclerviewadapter_deliverer_orders adapter = new Recyclerviewadapter_deliverer_orders(requireContext(),closedOrders);
recyclerView.setAdapter(adapter);
adapter.notifyDataSetChanged();
return rootView;
}
- public static void setVec(){
+ public static void setVec(Context context){
closedOrders = new Vector<>();
for(Customer c: MampfMobil.customers){
for(Bestellung b:c.bestellungen){
- if(b.state.equals("delivered") && b.deliverer == MampfMobil.currentDeliverer){
+ if(b.state.equals(context.getString(R.string.delivered)) && b.deliverer == MampfMobil.currentDeliverer){
closedOrders.add(b);
}
}
diff --git a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererOpenOrdersFragment.java b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererOpenOrdersFragment.java
index d272d65..99e9da6 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererOpenOrdersFragment.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererOpenOrdersFragment.java
@@ -4,6 +4,7 @@ import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.ViewModelProvider;
+import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
@@ -52,7 +53,8 @@ public class DelivererOpenOrdersFragment extends Fragment {
LinearLayoutManager layoutManager = new LinearLayoutManager(requireActivity());
recyclerView.setLayoutManager(layoutManager);
- setVec();
+ Context context = rootView.getContext();
+ setVec(context);
Recyclerviewadapter_deliverer_orders adapter = new Recyclerviewadapter_deliverer_orders(requireContext(),openOrders);
recyclerView.setAdapter(adapter);
adapter.notifyDataSetChanged();
@@ -66,11 +68,11 @@ public class DelivererOpenOrdersFragment extends Fragment {
// TODO: Use the ViewModel
}
- public static void setVec(){
+ public static void setVec(Context context){
openOrders = new Vector<>();
for(Customer c: MampfMobil.customers){
for(Bestellung b:c.bestellungen){
- if(b.state.equals("ready for transportation") && b.delivery){
+ if(b.state.equals(context.getString(R.string.readyForTransport)) && b.delivery){
openOrders.add(b);
}
}
diff --git a/app/src/main/res/layout/fragment_customer_shopping_cart.xml b/app/src/main/res/layout/fragment_customer_shopping_cart.xml
index 8ea1f35..e9dd5cd 100644
--- a/app/src/main/res/layout/fragment_customer_shopping_cart.xml
+++ b/app/src/main/res/layout/fragment_customer_shopping_cart.xml
@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:layout_marginBottom="24dp"
- android:text="buy"
+ android:text="@string/buy"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
@@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginBottom="44dp"
- android:text="Address: "
+ android:text="@string/address_dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
@@ -51,7 +51,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
- android:text="Delivery"
+ android:text="@string/delivery"
app:layout_constraintBottom_toTopOf="@+id/textView2"
app:layout_constraintStart_toStartOf="@+id/textView2" />
@@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
- android:text="StorePickup"
+ android:text="@string/storepickup"
app:layout_constraintBottom_toBottomOf="@+id/textView3"
app:layout_constraintStart_toEndOf="@+id/switchDelivery"
app:layout_constraintTop_toTopOf="@+id/textView3"
@@ -81,7 +81,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
- android:text="Price: "
+ android:text="@string/price_dp"
app:layout_constraintBottom_toBottomOf="@+id/textView4"
app:layout_constraintStart_toEndOf="@+id/textView4"
app:layout_constraintTop_toTopOf="@+id/textView4"
diff --git a/app/src/main/res/layout/fragment_supplier_add_item.xml b/app/src/main/res/layout/fragment_supplier_add_item.xml
index d0a4281..4eabf1f 100644
--- a/app/src/main/res/layout/fragment_supplier_add_item.xml
+++ b/app/src/main/res/layout/fragment_supplier_add_item.xml
@@ -25,7 +25,7 @@
android:layout_marginTop="30dp"
android:ems="10"
android:inputType="numberDecimal"
- android:hint="Price"
+ android:hint="@string/price"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
@@ -38,7 +38,7 @@
android:layout_marginTop="30dp"
android:ems="10"
android:inputType="number"
- android:hint="Amount"
+ android:hint="@string/amount"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView13" />
@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="64dp"
- android:text="Itemname:"
+ android:text="@string/itemname"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -68,7 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
- android:text="Amount:"
+ android:text="@string/amount_dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/editTextTextItemPrice" />
diff --git a/app/src/main/res/layout/fragment_supplier_statistics.xml b/app/src/main/res/layout/fragment_supplier_statistics.xml
index 4afd1ee..17bc1aa 100644
--- a/app/src/main/res/layout/fragment_supplier_statistics.xml
+++ b/app/src/main/res/layout/fragment_supplier_statistics.xml
@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
- android:text="Items sold:"
+ android:text="@string/items_sold_dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textViewSV" />
@@ -37,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
- android:text="Sales volume:"
+ android:text="@string/sales_volume_dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
- android:text="Orders:"
+ android:text="@string/orders_dp"
app:layout_constraintStart_toEndOf="@+id/textViewSalesVolume"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/recyclerview_deliverer_orderrow.xml b/app/src/main/res/layout/recyclerview_deliverer_orderrow.xml
index b67bb29..b2bdcfe 100644
--- a/app/src/main/res/layout/recyclerview_deliverer_orderrow.xml
+++ b/app/src/main/res/layout/recyclerview_deliverer_orderrow.xml
@@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:text="Ready"
+ android:text="@string/ready"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -74,7 +74,7 @@
android:id="@+id/textView15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Supplieraddress:"
+ android:text="@string/supplieraddress_dp"
app:layout_constraintStart_toStartOf="@+id/textView7"
app:layout_constraintTop_toBottomOf="@+id/textView7" />
@@ -82,7 +82,7 @@
android:id="@+id/textView16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Costumeraddress:"
+ android:text="@string/costumerAddress"
app:layout_constraintStart_toStartOf="@+id/textView15"
app:layout_constraintTop_toBottomOf="@+id/textView14" />
diff --git a/app/src/main/res/layout/recyclerview_edititemrow.xml b/app/src/main/res/layout/recyclerview_edititemrow.xml
index a0b07c1..207f87b 100644
--- a/app/src/main/res/layout/recyclerview_edititemrow.xml
+++ b/app/src/main/res/layout/recyclerview_edititemrow.xml
@@ -55,7 +55,7 @@
android:layout_width="93dp"
android:layout_height="41dp"
android:layout_marginEnd="16dp"
- android:text="EDIT"
+ android:text="@string/edit"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/deleteButton2"
diff --git a/app/src/main/res/layout/recyclerview_orders_partrows.xml b/app/src/main/res/layout/recyclerview_orders_partrows.xml
index 2e8f607..c7c9556 100644
--- a/app/src/main/res/layout/recyclerview_orders_partrows.xml
+++ b/app/src/main/res/layout/recyclerview_orders_partrows.xml
@@ -66,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
- android:text="Sum: "
+ android:text="@string/sum_dp"
app:layout_constraintStart_toEndOf="@+id/textViewPrice"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/recyclerview_ordersrow.xml b/app/src/main/res/layout/recyclerview_ordersrow.xml
index d2fa40b..52dd4f9 100644
--- a/app/src/main/res/layout/recyclerview_ordersrow.xml
+++ b/app/src/main/res/layout/recyclerview_ordersrow.xml
@@ -100,7 +100,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
- android:text="Total"
+ android:text="@string/total"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/textViewTotalCost" />
diff --git a/app/src/main/res/layout/recyclerview_shoppingcartrow.xml b/app/src/main/res/layout/recyclerview_shoppingcartrow.xml
index d8203f3..aae783f 100644
--- a/app/src/main/res/layout/recyclerview_shoppingcartrow.xml
+++ b/app/src/main/res/layout/recyclerview_shoppingcartrow.xml
@@ -116,7 +116,7 @@
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Sum: "
+ android:text="@string/sum_dp"
app:layout_constraintStart_toEndOf="@+id/editText"
app:layout_constraintTop_toBottomOf="@+id/textViewAmount" />
diff --git a/app/src/main/res/layout/recyclerview_statisticrow.xml b/app/src/main/res/layout/recyclerview_statisticrow.xml
index 96dbabe..34d5c04 100644
--- a/app/src/main/res/layout/recyclerview_statisticrow.xml
+++ b/app/src/main/res/layout/recyclerview_statisticrow.xml
@@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
- android:text="Sold Units: "
+ android:text="@string/sold_units_dp"
app:layout_constraintStart_toEndOf="@+id/textViewName"
app:layout_constraintTop_toTopOf="parent" />
@@ -66,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
- android:text="Sum: "
+ android:text="@string/sum_dp"
app:layout_constraintStart_toEndOf="@+id/textViewPrice"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/recyclerview_supplierordersrow.xml b/app/src/main/res/layout/recyclerview_supplierordersrow.xml
index d74ae32..c4f4018 100644
--- a/app/src/main/res/layout/recyclerview_supplierordersrow.xml
+++ b/app/src/main/res/layout/recyclerview_supplierordersrow.xml
@@ -82,7 +82,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
- android:text="Total"
+ android:text="@string/total"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/textViewTotalCost" />
@@ -91,7 +91,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:text="Ready"
+ android:text="@string/ready"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 53da538..3c5de7a 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -34,4 +34,19 @@
<string name="buyamount_dp">Kaufmenge:</string>
<string name="price_dp">Preis: </string>
<string name="state_dp">"Status: "</string>
+ <string name="readyForTransport">Bereit für Transport</string>
+ <string name="readyForTransportDelivererFound">Bereit für Transport/Zusteller gefunden</string>
+ <string name="delivered">Zugestellt</string>
+ <string name="inTransportation">Im Transport</string>
+ <string name="readyForPickup">Bereit zur Abholung</string>
+ <string name="delivery">Lieferung</string>
+ <string name="pickup">Abholung</string>
+ <string name="picked">Abgeholt</string>
+ <string name="costumerAddress">Kundenadresse:</string>
+ <string name="buy">buy</string>
+ <string name="address_dp">Address:</string>
+ <string name="storepickup">StorePickup</string>
+ <string name="amount">Amount</string>
+ <string name="ready">Ready</string>
+ <string name="sum_dp">Sum:</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 3ed5454..ae6f0e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,5 +32,31 @@
<string name="supplier_dp">Supplier: </string>
<string name="buyamount_dp">Buyamount:</string>
<string name="price_dp">Price: </string>
- <string name="state_dp">"State: "</string>
+ <string name="state_dp">State: </string>
+ <string name="readyForTransport">ready for transportation</string>
+ <string name="readyForTransportDelivererFound">ready for transportation/deliverer found</string>
+ <string name="delivered">delivered</string>
+ <string name="inTransportation">In transportation</string>
+ <string name="readyForPickup">ready for pickup</string>
+ <string name="delivery">delivery</string>
+ <string name="pickup">pickup</string>
+ <string name="picked">picked</string>
+ <string name="costumerAddress">Costumeraddress:</string>
+ <string name="buy">buy</string>
+ <string name="address_dp">Address:</string>
+ <string name="storepickup">StorePickup</string>
+ <string name="price">Price</string>
+ <string name="amount">Amount</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="ready">Ready</string>
+ <string name="supplieraddress_dp">Supplieraddress:</string>
+ <string name="edit">EDIT</string>
+ <string name="sum_dp">Sum:</string>
+ <string name="total">Total</string>
+ <string name="sold_units_dp">Sold Units:</string>
+
</resources>
\ No newline at end of file
--
GitLab