From 02d24f2a8eac6e2ddab2e115d05c94aa38fc8492 Mon Sep 17 00:00:00 2001 From: Bhavesh Kumawat Date: Fri, 19 May 2023 20:47:37 +0530 Subject: [PATCH] Created an if statement to check foodName is not empty --- .../view/InsertActivity.kt | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/InsertActivity.kt b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/InsertActivity.kt index c46bbc2..eb11ddc 100644 --- a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/InsertActivity.kt +++ b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/InsertActivity.kt @@ -220,26 +220,30 @@ class InsertActivity : ComponentActivity() { ), onClick = { try { - if (datePickerState.selectedDateMillis != null) { - var id = 0 - if (itemToEdit != null) { - id = itemId ?: 0 + if(foodName.isNotEmpty()) { + if (datePickerState.selectedDateMillis != null) { + var id = 0 + if (itemToEdit != null) { + id = itemId ?: 0 + } + val entry = ExpirationDate( + id = id, + foodName = foodName, + expirationDate = datePickerState.selectedDateMillis!! + ) + if (addExpirationDate != null) { + addExpirationDate(entry) + } + activity?.finish() + } else { + Toast.makeText( + activity, + R.string.please_select_a_date, + Toast.LENGTH_SHORT + ).show() } - val entry = ExpirationDate( - id = id, - foodName = foodName, - expirationDate = datePickerState.selectedDateMillis!! - ) - if (addExpirationDate != null) { - addExpirationDate(entry) - } - activity?.finish() } else { - Toast.makeText( - activity, - R.string.please_select_a_date, - Toast.LENGTH_SHORT - ).show() + Toast.makeText(activity,R.string.please_enter_a_food_name,Toast.LENGTH_SHORT).show() } } catch (e: Exception) { Toast.makeText(