From 47938544ef8119d0c26160e77ccfbda3b230ed45 Mon Sep 17 00:00:00 2001 From: Reimar Date: Fri, 16 May 2025 11:15:42 +0200 Subject: [PATCH] Fix errors when amount is null --- .../mercantec/easyeat/ui/shopping_list/ShoppingItemAdapter.kt | 2 +- .../mercantec/easyeat/ui/shopping_list/ShoppingListFragment.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingItemAdapter.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingItemAdapter.kt index d758bf7..3a99292 100644 --- a/app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingItemAdapter.kt +++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingItemAdapter.kt @@ -28,7 +28,7 @@ class ShoppingItemAdapter(context: Context, items: ArrayList) val nameView = view.findViewById(R.id.name) val textViews = listOf(amountView, unitView, nameView) - amountView.text = DecimalFormat("#.##").format(item.amount) + amountView.text = if (item.amount != null) DecimalFormat("#.##").format(item.amount) else "" unitView.text = item.unit nameView.text = item.name diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingListFragment.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingListFragment.kt index 1ece23e..de0b6c1 100644 --- a/app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingListFragment.kt +++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingListFragment.kt @@ -192,7 +192,8 @@ class ShoppingListFragment : Fragment() { .setPositiveButton(R.string.add_label) { dialog, id -> val dialog = dialog as AlertDialog - val amount = view.findViewById(R.id.amount).text.toString().toDouble() + val amountStr = view.findViewById(R.id.amount).text.toString() + val amount = if (amountStr.isEmpty()) null else amountStr.toDouble() val unit = view.findViewById(R.id.unit_selector).selectedItem.toString() .ifEmpty { null } val name = view.findViewById(R.id.name).text.toString()