From ee1802c3d1aeb4513f155706d05a66953c85df65 Mon Sep 17 00:00:00 2001
From: Fabio Heyming <fabio.heyming@web.de>
Date: Sat, 10 Jun 2023 01:33:24 +0200
Subject: [PATCH] Added Euro Zeichen
---
.../mampfmobil/ui/Classes/Recyclerviewadapter_Orders.java | 2 +-
.../ui/Classes/Recyclerviewadapter_Orders_Parts.java | 2 +-
.../mampfmobil/ui/Classes/Recyclerviewadapter_Shop.java | 2 +-
.../ui/Classes/Recyclerviewadapter_ShoppingCart.java | 6 +++---
.../ui/Classes/Recyclerviewadapter_Supplier_Orders.java | 2 +-
.../mampfmobil/ui/Classes/Recyclerviewadapter_editItem.java | 2 +-
.../ui/Classes/Recyclerviewadapter_statistic.java | 2 +-
.../ui/customer/CustomerShoppingCartFragment.java | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
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 75baf49..12eb46c 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
@@ -43,7 +43,7 @@ public class Recyclerviewadapter_Orders extends RecyclerView.Adapter<Recyclervie
for(BestellungsTeil bt:bestellungen.get(position).bestellungsTeile){
temp = temp + bt.item.price * bt.quantity;
}
- holder.tvTotalCost.setText(String.valueOf(temp));
+ holder.tvTotalCost.setText(String.format("%.2f", temp) + " €");
if(bestellungen.get(position).delivery){
holder.tvDelivery.setText(context.getString(R.string.delivery));
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders_Parts.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders_Parts.java
index 993ba03..c09691b 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders_Parts.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders_Parts.java
@@ -37,7 +37,7 @@ public class Recyclerviewadapter_Orders_Parts extends RecyclerView.Adapter<Recyc
public void onBindViewHolder(@NonNull Recyclerviewadapter_Orders_Parts.MyViewHolder holder, int position) {
holder.tvName.setText(bestellungsTeile.get(position).item.name);
holder.tvAmountNr.setText(String.valueOf(bestellungsTeile.get(position).quantity));
- holder.tvPrice.setText(String.valueOf(bestellungsTeile.get(position).item.price));
+ holder.tvPrice.setText(String.format("%.2f", (bestellungsTeile.get(position).item.price)) + " €");
holder.tvSum.setText(String.valueOf(bestellungsTeile.get(position).item.price*bestellungsTeile.get(position).quantity));
}
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Shop.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Shop.java
index 02b7e65..6c23b77 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Shop.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Shop.java
@@ -50,7 +50,7 @@ public class Recyclerviewadapter_Shop extends RecyclerView.Adapter<Recyclerviewa
holder.tvName.setText(shopItemList.get(position).item.name);
holder.tvSupName.setText(shopItemList.get(position).item.supplier.name);
holder.tvAmountNr.setText(String.valueOf(shopItemList.get(position).quantity));
- holder.tvPrice.setText(String.valueOf(shopItemList.get(position).item.price));
+ holder.tvPrice.setText(String.format("%.2f", shopItemList.get(position).item.price) + " €");
holder.sI = shopItemList.get(position);
Vector<ShopItem> favs = new Vector<>();
favs = MampfMobil.currentCustomer.favoriten;
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_ShoppingCart.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_ShoppingCart.java
index d19a501..566768b 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_ShoppingCart.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_ShoppingCart.java
@@ -45,8 +45,8 @@ public class Recyclerviewadapter_ShoppingCart extends RecyclerView.Adapter<Recyc
holder.tvSupName.setText(shoppingCart.get(position).item.supplier.name);
holder.tvAmountNr.setText(String.valueOf(MampfMobil.getItemQuantity(shoppingCart.get(position).item)));
holder.inputAmount.setText(String.valueOf(shoppingCart.get(position).quantity));
- holder.tvPrice.setText(String.valueOf(shoppingCart.get(position).item.price));
- holder.tvSum.setText(String.valueOf(shoppingCart.get(position).item.price * shoppingCart.get(position).quantity));
+ holder.tvPrice.setText(String.format("%.2f", (shoppingCart.get(position).item.price)) + " €");
+ holder.tvSum.setText(String.format("%.2f", (shoppingCart.get(position).item.price * shoppingCart.get(position).quantity)) + " €");
holder.inputAmount.addTextChangedListener(new TextWatcher() {
@Override
@@ -64,7 +64,7 @@ public class Recyclerviewadapter_ShoppingCart extends RecyclerView.Adapter<Recyc
if(!holder.inputAmount.getText().toString().equals("")){
Log.d("myTag", "Habe bn bei"+ position);
shoppingCart.get(position).quantity = Integer.parseInt(holder.inputAmount.getText().toString());
- holder.tvSum.setText(String.valueOf(shoppingCart.get(position).item.price * shoppingCart.get(position).quantity));
+ holder.tvSum.setText(String.format("%.2f", (shoppingCart.get(position).item.price * shoppingCart.get(position).quantity)) + " €");
CustomerShoppingCartFragment.setSum();
}
//shoppingCart.get(position).quantity = Integer.parseInt(holder.inputAmount.getText().toString());
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 38a96ac..34f0acf 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
@@ -80,7 +80,7 @@ public class Recyclerviewadapter_Supplier_Orders extends RecyclerView.Adapter<Re
for(BestellungsTeil bt:bestellungen.get(position).bestellungsTeile){
temp = temp + bt.item.price * bt.quantity;
}
- holder.tvTotalCost.setText(String.valueOf(temp));
+ holder.tvTotalCost.setText(String.format("%.2f", temp) + " €");
if(bestellungen.get(position).delivery){
holder.tvDelivery.setText(context.getString(R.string.delivery));
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_editItem.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_editItem.java
index e0f29d0..54e0966 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_editItem.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_editItem.java
@@ -41,7 +41,7 @@ public class Recyclerviewadapter_editItem extends RecyclerView.Adapter<Recyclerv
@Override
public void onBindViewHolder(@NonNull Recyclerviewadapter_editItem.MyViewHolder holder, int position) {
holder.tvName.setText(shopItems.get(position).item.name);
- holder.etPrice.setText(String.valueOf(shopItems.get(position).item.price));
+ holder.etPrice.setText(String.format("%.2f", (shopItems.get(position).item.price)) + " €");
holder.etAmount.setText(String.valueOf(shopItems.get(position).quantity));
holder.buttonDeleteItem.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_statistic.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_statistic.java
index c291cea..90c5dc7 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_statistic.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_statistic.java
@@ -49,7 +49,7 @@ public class Recyclerviewadapter_statistic extends RecyclerView.Adapter<Recycler
public void onBindViewHolder(@NonNull Recyclerviewadapter_statistic.MyViewHolder holder, int position) {
holder.tvName.setText(shopItems.get(position).item.name);
holder.tvAmountNr.setText(String.valueOf(getItemsSold(position)));
- holder.tvPrice.setText(String.valueOf(shopItems.get(position).item.price));
+ holder.tvPrice.setText(String.format("%.2f", (shopItems.get(position).item.price)) + " €");
holder.tvSum.setText(getItemSum(position));
}
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 4b21325..c893a88 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
@@ -117,7 +117,7 @@ public class CustomerShoppingCartFragment extends Fragment {
for(BestellungsTeil bT: MampfMobil.currentCustomer.shoppingCart){
temp = temp + bT.item.price* bT.quantity;
}
- sum.setText(String.valueOf(temp));
+ sum.setText(String.format("%.2f", temp) + " €");
}
}
\ No newline at end of file
--
GitLab