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 3f0dadf3224e1d6dd08a98de9bf1bacd4718223b..6fbf14c852c2507be76c14c18d6fc4e6c4129647 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 @@ -26,6 +26,8 @@ public class Recyclerviewadapter_Shop extends RecyclerView.Adapter<Recyclerviewa Context context; ArrayList<ShopItem> shopItemList; + + public Recyclerviewadapter_Shop(Context context, ArrayList<ShopItem> shopItemList){ this.context = context; this.shopItemList = shopItemList; @@ -100,9 +102,11 @@ public class Recyclerviewadapter_Shop extends RecyclerView.Adapter<Recyclerviewa TextView tvName, tvSupName, tvAmountNr,tvPrice; ShopItem sI; + private Toast toast; public MyViewHolder(@NonNull View itemView) { super(itemView); + tvName = itemView.findViewById(R.id.textViewName); tvSupName = itemView.findViewById(R.id.textViewSupplierName); tvAmountNr = itemView.findViewById(R.id.textViewAmountNumber); @@ -114,7 +118,11 @@ public class Recyclerviewadapter_Shop extends RecyclerView.Adapter<Recyclerviewa @Override public void onClick(View v) { - + if (toast != null) { + toast.cancel(); // Vorhandene Toast-Nachricht abbrechen + } + toast = Toast.makeText(v.getContext(), R.string.added_to_shopping_cart, Toast.LENGTH_SHORT); + toast.show(); MampfMobil.currentCustomer.addToShoppingCart(new BestellungsTeil(sI.item,Integer.parseInt(inputAmount.getText().toString()))); } }); diff --git a/app/src/main/res/layout/recyclerview_deliverer_orderrow.xml b/app/src/main/res/layout/recyclerview_deliverer_orderrow.xml index b80f297675bc91f453d242a35a4cd16d27f2ee28..36b652a4ad608ed23a246b1ea93b6a2f98b3c834 100644 --- a/app/src/main/res/layout/recyclerview_deliverer_orderrow.xml +++ b/app/src/main/res/layout/recyclerview_deliverer_orderrow.xml @@ -12,7 +12,7 @@ android:layout_marginTop="5dp" android:layout_marginStart="5dp" android:layout_marginEnd="5dp" - + app:cardBackgroundColor="?attr/boxColor" app:cardCornerRadius="20dp" app:cardElevation="5dp" app:layout_constraintBottom_toBottomOf="parent" @@ -49,6 +49,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:text="Der aktuelle Status oder so" + android:textStyle="bold" app:layout_constraintStart_toEndOf="@+id/textView7" app:layout_constraintTop_toBottomOf="@+id/buttonReady" /> diff --git a/app/src/main/res/layout/recyclerview_edititemrow.xml b/app/src/main/res/layout/recyclerview_edititemrow.xml index 88737e1dd16be7f2017b442b260bcab40940d7f6..12a8112eea58d98d0e83a18e87c2fa5ceb3769ef 100644 --- a/app/src/main/res/layout/recyclerview_edititemrow.xml +++ b/app/src/main/res/layout/recyclerview_edititemrow.xml @@ -12,7 +12,7 @@ android:layout_marginTop="5dp" android:layout_marginStart="5dp" android:layout_marginEnd="5dp" - + app:cardBackgroundColor="?attr/boxColor" app:cardCornerRadius="20dp" app:cardElevation="5dp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/recyclerview_ordersrow.xml b/app/src/main/res/layout/recyclerview_ordersrow.xml index 2c861076f66504eea6019ae59b585dc122d6310c..6c4a6ca25c5afb1ad0793d247784f796c9470e33 100644 --- a/app/src/main/res/layout/recyclerview_ordersrow.xml +++ b/app/src/main/res/layout/recyclerview_ordersrow.xml @@ -12,7 +12,7 @@ android:layout_marginTop="5dp" android:layout_marginStart="5dp" android:layout_marginEnd="5dp" - + app:cardBackgroundColor="?attr/boxColor" app:cardCornerRadius="20dp" app:cardElevation="5dp" app:layout_constraintBottom_toBottomOf="parent" @@ -81,6 +81,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:text="Der aktuelle Status oder so" + android:textStyle="bold" app:layout_constraintStart_toEndOf="@+id/textView7" app:layout_constraintTop_toBottomOf="@+id/textViewID" /> diff --git a/app/src/main/res/layout/recyclerview_shoppingcartrow.xml b/app/src/main/res/layout/recyclerview_shoppingcartrow.xml index 9a7adf0541460111f9139c304c896c49a518b683..8db922711e47b3555b1e1d34dbf869c964686b8e 100644 --- a/app/src/main/res/layout/recyclerview_shoppingcartrow.xml +++ b/app/src/main/res/layout/recyclerview_shoppingcartrow.xml @@ -12,7 +12,7 @@ android:layout_marginTop="5dp" android:layout_marginStart="5dp" android:layout_marginEnd="5dp" - + app:cardBackgroundColor="?attr/boxColor" app:cardCornerRadius="20dp" app:cardElevation="5dp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/recyclerview_shoprow.xml b/app/src/main/res/layout/recyclerview_shoprow.xml index 46a035391f3a643087d77728b2a159b5d902e646..4af2d54c800e0415474831d3a2f5a95061766538 100644 --- a/app/src/main/res/layout/recyclerview_shoprow.xml +++ b/app/src/main/res/layout/recyclerview_shoprow.xml @@ -12,6 +12,7 @@ android:layout_marginTop="5dp" android:layout_marginStart="5dp" android:layout_marginEnd="5dp" + app:cardBackgroundColor="?attr/boxColor" app:cardCornerRadius="20dp" app:cardElevation="5dp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/recyclerview_supplierordersrow.xml b/app/src/main/res/layout/recyclerview_supplierordersrow.xml index bf5b5e7679b2ab4d44c6566b145ea906aa72a401..f5d077ee9116fea3bf3c7307346241bee631dcda 100644 --- a/app/src/main/res/layout/recyclerview_supplierordersrow.xml +++ b/app/src/main/res/layout/recyclerview_supplierordersrow.xml @@ -12,7 +12,7 @@ android:layout_marginTop="5dp" android:layout_marginStart="5dp" android:layout_marginEnd="5dp" - + app:cardBackgroundColor="?attr/boxColor" app:cardCornerRadius="20dp" app:cardElevation="5dp" app:layout_constraintBottom_toBottomOf="parent" @@ -63,6 +63,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:text="Der aktuelle Status oder so" + android:textStyle="bold" app:layout_constraintStart_toEndOf="@+id/textView7" app:layout_constraintTop_toBottomOf="@+id/textViewID" /> diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index aebafb7b558ad8ca255031fa3b2c34c2342c4de3..15325c0361c9d9c90d1dc39fb900c154d63b68f6 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -63,4 +63,5 @@ <string name="sold_units_dp">Verkaufte Items:</string> <string name="noemptyinput">Keine leere eingaben</string> <string name="item_already_exists">Item existiert bereits</string> + <string name="added_to_shopping_cart">Zum Einkaufswagen hinzugefügt</string> </resources> \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 8abf818a2f1a1c6507dc6c611b49b43ed3583fb9..1553a5c4b7728498c70c8a4b72b041cefe79e99d 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -12,5 +12,6 @@ <!-- Status bar color. --> <item name="android:statusBarColor">?attr/colorPrimaryVariant</item> <!-- Customize your theme here. --> + <item name="boxColor">@color/dark_purple</item> </style> </resources> \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml new file mode 100644 index 0000000000000000000000000000000000000000..ad204f89578800608bb2e382215b8b06e6130598 --- /dev/null +++ b/app/src/main/res/values/attrs.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <attr name="boxColor" format="color" /> +</resources> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b1361292d171b5a83123e0ff19fd74bf1b57e900..546bdcd7f839b2c426c8e464cf8d7dc3791fa46f 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,4 +8,7 @@ <color name="black">#FF000000</color> <color name="white">#FFFFFFFF</color> <color name="dark_grey">#5A5A5A</color> + <color name="light_grey">#D3D3D3</color> + <color name="light_purple">#D8BFD8</color> + <color name="dark_purple">#301934</color> </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 b9c186e742a8476c01a1aa08980e1df6cdc264e9..554da628067eebc0fa6d732563b94a67a402d031 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,5 +62,6 @@ <string name="ordered">ordered</string> <string name="noemptyinput">noEmptyInput</string> <string name="item_already_exists">Item already exists</string> + <string name="added_to_shopping_cart">Added to Shopping Cart</string> </resources> \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index b05bf7a9605ecc50030f4f398388c09d05b11b01..5cc402a11792bb9c4e291d87c8b024cfd76b5b8a 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -13,6 +13,7 @@ <!-- Status bar color. --> <item name="android:statusBarColor">?attr/colorPrimaryVariant</item> <!-- Customize your theme here. --> + <item name="boxColor">@color/light_grey</item> </style> </resources> \ No newline at end of file