🔀 Merge pull request #23 from bhavesh100/nstring-branch

🐛 Prevent the insertion of empty food name
lorenzovngl · May 20, 2023 · cfb31d0 · cfb31d0
2 parents ad75ac9 + 02d24f2
commit cfb31d0
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 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
@@ -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(

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -11,6 +11,7 @@
  <string name="food_name">اسم الغذاء</string>
  <string name="expiration_date">تاريخ انتهاء الصلاحية</string>
  <string name="please_select_a_date">الرجاء تحديد تاريخ</string>
+ <string name="please_enter_a_food_name">الرجاء إدخال اسم طعام</string>
  <string name="insert">إدراج</string>
  <string name="update">تحديث</string>
  <string name="cancel">يلغي</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -11,6 +11,7 @@
  <string name="food_name">Lebensmittelname</string>
  <string name="expiration_date">Verfallsdatum</string>
  <string name="please_select_a_date">Bitte Datum auswählen</string>
+ <string name="please_enter_a_food_name">Bitte geben Sie einen Lebensmittelnamen</string>
  <string name="insert">Einfügen</string>
  <string name="update">Aktualisieren</string>
  <string name="cancel">Abbrechen</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -12,6 +12,7 @@
  <string name="food_name">Nombre del producto</string>
  <string name="expiration_date">Fecha de caducidad</string>
  <string name="please_select_a_date">Por favor, seleccione la fecha</string>
+ <string name="please_enter_a_food_name">Por favor ingrese un nombre del producto</string>
  <string name="insert">Insertar</string>
  <string name="update">Actualizar</string>
  <string name="cancel">Cancelar</string>

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
@@ -11,6 +11,7 @@
  <string name="food_name">खाद्य पदार्थ का नाम</string>
  <string name="expiration_date">समाप्ति तिथि</string>
  <string name="please_select_a_date">कृपया एक तिथि चुनें</string>
+ <string name="please_enter_a_food_name">कृपया खाद्य पदार्थ का नाम दर्ज करें</string>
  <string name="insert">डालें</string>
  <string name="update">अपडेट करें</string>
  <string name="cancel">रद्द करें</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -12,6 +12,7 @@
  <string name="food_name">Nome alimento</string>
  <string name="expiration_date">Data di scadenza</string>
  <string name="please_select_a_date">Per favore seleziona una data</string>
+ <string name="please_enter_a_food_name">Si prega di inserire un nome alimento</string>
  <string name="insert">Inserisci</string>
  <string name="update">Aggiorna</string>
  <string name="cancel">Cancella</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -11,6 +11,7 @@
  <string name="food_name">Food name</string>
  <string name="expiration_date">Expiration date</string>
  <string name="please_select_a_date">Please select a date</string>
+ <string name="please_enter_a_food_name">Please enter a food name</string>
  <string name="insert">Insert</string>
  <string name="update">Update</string>
  <string name="cancel">Cancel</string>