MainActivity: allow amount for poo and pee events

An unspecified amount has also been added
to have the same semantics as before.

During these actions, the strings for title
and description of dialogs have been cleaned up.

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "it.danieleverducci.lunatracker"
         minSdk = 21
         targetSdk = 34
-        versionCode = 6
+        versionCode = 7
-        versionName = "0.8"
+        versionName = "0.9"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt

@@ -6,7 +6,6 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
-import android.text.Editable
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -22,7 +21,6 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.core.widget.doOnTextChanged
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.progressindicator.LinearProgressIndicator
@@ -31,7 +29,6 @@ import com.thegrizzlylabs.sardineandroid.impl.SardineException
 import it.danieleverducci.lunatracker.adapters.LunaEventRecyclerAdapter
 import it.danieleverducci.lunatracker.entities.Logbook
 import it.danieleverducci.lunatracker.entities.LunaEvent
-import it.danieleverducci.lunatracker.entities.LunaEvent.Companion.TYPE_BABY_BOTTLE
 import it.danieleverducci.lunatracker.repository.FileLogbookRepository
 import it.danieleverducci.lunatracker.repository.LocalSettingsRepository
 import it.danieleverducci.lunatracker.repository.LogbookListObtainedListener
@@ -84,34 +81,30 @@ class MainActivity : AppCompatActivity() {
         recyclerView.setLayoutManager(LinearLayoutManager(applicationContext))
 
         // Set listeners
-        findViewById<View>(R.id.logbooks_add_button).setOnClickListener { showAddLogbookDialog(true) }
+        findViewById<View>(R.id.logbooks_add_button).setOnClickListener {
-        findViewById<View>(R.id.button_bottle).setOnClickListener { askBabyBottleContent() }
+            showAddLogbookDialog(true)
-        findViewById<View>(R.id.button_food).setOnClickListener { askNotes(LunaEvent(LunaEvent.TYPE_FOOD)) }
+        }
-        findViewById<View>(R.id.button_nipple_left).setOnClickListener { logEvent(
+        findViewById<View>(R.id.button_bottle).setOnClickListener {
-            LunaEvent(
+            addBabyBottleEvent()
-                LunaEvent.TYPE_BREASTFEEDING_LEFT_NIPPLE
+        }
-            )
+        findViewById<View>(R.id.button_food).setOnClickListener {
-        ) }
+            addNoteEvent(LunaEvent(LunaEvent.TYPE_FOOD))
-        findViewById<View>(R.id.button_nipple_both).setOnClickListener { logEvent(
+        }
-            LunaEvent(
+        findViewById<View>(R.id.button_nipple_left).setOnClickListener {
-                LunaEvent.TYPE_BREASTFEEDING_BOTH_NIPPLE
+            addPlainEvent(LunaEvent(LunaEvent.TYPE_BREASTFEEDING_LEFT_NIPPLE))
-            )
+        }
-        ) }
+        findViewById<View>(R.id.button_nipple_both).setOnClickListener {
-        findViewById<View>(R.id.button_nipple_right).setOnClickListener { logEvent(
+            addPlainEvent(LunaEvent(LunaEvent.TYPE_BREASTFEEDING_BOTH_NIPPLE))
-            LunaEvent(
+        }
-                LunaEvent.TYPE_BREASTFEEDING_RIGHT_NIPPLE
+        findViewById<View>(R.id.button_nipple_right).setOnClickListener {
-            )
+            addPlainEvent(LunaEvent(LunaEvent.TYPE_BREASTFEEDING_RIGHT_NIPPLE))
-        ) }
+        }
-        findViewById<View>(R.id.button_change_poo).setOnClickListener { logEvent(
+        findViewById<View>(R.id.button_change_poo).setOnClickListener {
-            LunaEvent(
+            addAmountEvent(LunaEvent(LunaEvent.TYPE_DIAPERCHANGE_POO))
-                LunaEvent.TYPE_DIAPERCHANGE_POO
+        }
-            )
+        findViewById<View>(R.id.button_change_pee).setOnClickListener {
-        ) }
+            addAmountEvent(LunaEvent(LunaEvent.TYPE_DIAPERCHANGE_PEE))
-        findViewById<View>(R.id.button_change_pee).setOnClickListener { logEvent(
+        }
-            LunaEvent(
-                LunaEvent.TYPE_DIAPERCHANGE_PEE
-            )
-        ) }
         val moreButton = findViewById<View>(R.id.button_more)
         moreButton.setOnClickListener {
             showOverflowPopupWindow(moreButton)
@@ -202,19 +195,18 @@ class MainActivity : AppCompatActivity() {
         return logbook?.logs ?: arrayListOf()
     }
 
-    fun askBabyBottleContent(existingEvent: LunaEvent? = null, onEnd: (() -> Unit)? = null) {
+    fun addBabyBottleEvent() {
-        val isNewEvent = (existingEvent != null)
+        val event = LunaEvent(LunaEvent.TYPE_BABY_BOTTLE)
-        val event = if (existingEvent == null) {
+        askBabyBottleContent(event, true) {
-            LunaEvent(TYPE_BABY_BOTTLE)
+            saveEvent(event)
-        } else {
+        }
-            existingEvent
     }
 
-        val previous = getPreviousSameEvent(event, getAllEvents())
+    fun askBabyBottleContent(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
         val d = AlertDialog.Builder(this)
-        val dialogView = layoutInflater.inflate(R.layout.number_picker_dialog, null)
+        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_bottle, null)
-        d.setTitle(R.string.log_bottle_dialog_title)
+        d.setTitle(event.getTypeDescription(this))
-        d.setMessage(R.string.log_bottle_dialog_description)
+        d.setMessage(event.getDialogMessage(this))
         d.setView(dialogView)
 
         val numberPicker = dialogView.findViewById<NumberPicker>(R.id.dialog_number_picker)
@@ -222,232 +214,254 @@ class MainActivity : AppCompatActivity() {
         numberPicker.maxValue = 25 // "250
         numberPicker.displayedValues = ((10..250 step 10).map { it.toString() }.toTypedArray())
         numberPicker.wrapSelectorWheel = false
-        if (previous != null) {
+        numberPicker.value = event.quantity / 10
-            numberPicker.value = previous.quantity / 10
-        }
 
-        val dateTextView = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
+        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        dateTextView.text =
+        val pickedTime = datePickerHelper(event.time, dateTV)
-            String.format(getString(R.string.dialog_event_detail_datetime_icon), DateUtils.formatDateTime(event.time))
 
-        val pickedDateTime = Calendar.getInstance()
+        if (!showTime) {
-        val currentDateTime = Calendar.getInstance()
+            dateTV.visibility = View.GONE
-        currentDateTime.time = Date(event.time * 1000)
-        dateTextView.setOnClickListener {
-            // Show datetime picker
-            val startYear = currentDateTime.get(Calendar.YEAR)
-            val startMonth = currentDateTime.get(Calendar.MONTH)
-            val startDay = currentDateTime.get(Calendar.DAY_OF_MONTH)
-            val startHour = currentDateTime.get(Calendar.HOUR_OF_DAY)
-            val startMinute = currentDateTime.get(Calendar.MINUTE)
-
-            DatePickerDialog(this, { _, year, month, day ->
-                TimePickerDialog(this, { _, hour, minute ->
-                    pickedDateTime.set(year, month, day, hour, minute)
-                    val time = pickedDateTime.time.time / 1000
-                    dateTextView.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), DateUtils.formatDateTime(time))
-                }, startHour, startMinute, android.text.format.DateFormat.is24HourFormat(this@MainActivity)).show()
-            }, startYear, startMonth, startDay).show()
         }
 
         d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
+            event.time = pickedTime.time.time / 1000
             event.quantity = numberPicker.value * 10
-            event.time = pickedDateTime.time.time / 1000 // Seconds since epoch
+            onPositive()
-            if (isNewEvent) {
+            dialogInterface.dismiss()
-                logEvent(event)
-            }
-            logbook?.sort()
-            recyclerView.adapter?.notifyDataSetChanged()
-            saveLogbook()
-            onEnd?.invoke()
         }
 
         d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
             dialogInterface.dismiss()
-            onEnd?.invoke()
         }
 
         val alertDialog = d.create()
         alertDialog.show()
     }
 
-    fun askWeightValue() {
+    fun addWeightEvent(event: LunaEvent) {
+        askWeightValue(event, true) { saveEvent(event) }
+    }
+
+    fun askWeightValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
         // Show number picker dialog
         val d = AlertDialog.Builder(this)
-        val dialogView = layoutInflater.inflate(R.layout.number_edit_dialog, null)
+        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_weight, null)
-        d.setTitle(R.string.log_weight_dialog_title)
-        d.setMessage(R.string.log_weight_dialog_description)
-        d.setView(dialogView)
-        val weightET = dialogView.findViewById<EditText>(R.id.dialog_number_edittext)
-        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
-            val weight = weightET.text.toString().toIntOrNull()
-            if (weight != null)
-                logEvent(LunaEvent(LunaEvent.TYPE_WEIGHT, weight))
-            else
-                Toast.makeText(this, R.string.toast_integer_error, Toast.LENGTH_SHORT).show()
-        }
-        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i -> dialogInterface.dismiss() }
-        val alertDialog = d.create()
-        alertDialog.show()
-    }
-
-    fun askTemperatureValue() {
-        // Show number picker dialog
-        val d = AlertDialog.Builder(this)
-        val dialogView = layoutInflater.inflate(R.layout.temperature_dialog, null)
-        d.setTitle(R.string.log_temperature_dialog_title)
-        d.setMessage(R.string.log_temperature_dialog_description)
-        d.setView(dialogView)
-        val tempSlider = dialogView.findViewById<Slider>(R.id.dialog_temperature_value)
-        val range = NumericUtils(this).getValidEventQuantityRange(LunaEvent.TYPE_TEMPERATURE)!!
-        tempSlider.valueFrom = range.first.toFloat()
-        tempSlider.valueTo = range.second.toFloat()
-        tempSlider.value = range.third.toFloat()
-        val tempTextView = dialogView.findViewById<TextView>(R.id.dialog_temperature_display)
-        tempTextView.text = range.third.toString()
-        tempSlider.addOnChangeListener({s, v, b -> tempTextView.text = v.toString()})
-        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
-            val temperature = (tempSlider.value * 10).toInt()   // In tenth of a grade
-            logEvent(LunaEvent(LunaEvent.TYPE_TEMPERATURE, temperature))
-        }
-        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i -> dialogInterface.dismiss() }
-        val alertDialog = d.create()
-        alertDialog.show()
-    }
-
-    fun askPukeValue(existingEvent: LunaEvent? = null, onEnd: (() -> Unit)? = null) {
-        val isNewEvent = (existingEvent != null)
-        val event = if (existingEvent == null) {
-            LunaEvent(LunaEvent.TYPE_PUKE)
-        } else {
-            existingEvent
-        }
-
-        val d = AlertDialog.Builder(this)
-        val dialogView = layoutInflater.inflate(R.layout.puke_dialog, null)
-        d.setTitle(R.string.log_puke_dialog_title)
-        d.setMessage(R.string.log_puke_dialog_description)
-        d.setView(dialogView)
-
-        val spinner = dialogView.findViewById<Spinner>(R.id.dialog_puke_value)
-        spinner.adapter = ArrayAdapter.createFromResource(this, R.array.AmountLabels, android.R.layout.simple_spinner_dropdown_item)
-        spinner.setSelection(event.quantity)
-
-        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
-            event.quantity = spinner.selectedItemPosition
-            if (isNewEvent) {
-                logEvent(event)
-            }
-            onEnd?.invoke()
-        }
-        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
-            dialogInterface.dismiss()
-            onEnd?.invoke
-        }
-        val alertDialog = d.create()
-        alertDialog.show()
-    }
-
-    // Ask to edit events to be edited (only affects date)
-    fun askPlain(existingEvent: LunaEvent? = null, onEnd: (() -> Unit)? = null) {
-        val isNewEvent = (existingEvent != null)
-        val event = if (existingEvent == null) {
-            LunaEvent(LunaEvent.TYPE_NOTE)
-        } else {
-            existingEvent
-        }
-
-        val d = AlertDialog.Builder(this)
-        val dialogView = layoutInflater.inflate(R.layout.dialog_plain_event, null)
         d.setTitle(event.getTypeDescription(this))
         d.setMessage(event.getDialogMessage(this))
         d.setView(dialogView)
 
-        val dateET = dialogView.findViewById<TextView>(R.id.notes_date_picker)
+        val weightET = dialogView.findViewById<EditText>(R.id.dialog_number_edittext)
+        weightET.setText(event.quantity.toString())
 
-        val pickedDateTime = Calendar.getInstance()
+        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        val currentDateTime = Calendar.getInstance()
+        val pickedTime = datePickerHelper(event.time, dateTV)
-        currentDateTime.time = Date(event.time * 1000)
 
-        dateET.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), DateUtils.formatDateTime(event.time))
+        if (!showTime) {
-        dateET.setOnClickListener {
+            dateTV.visibility = View.GONE
-            // Show datetime picker
-            val startYear = currentDateTime.get(Calendar.YEAR)
-            val startMonth = currentDateTime.get(Calendar.MONTH)
-            val startDay = currentDateTime.get(Calendar.DAY_OF_MONTH)
-            val startHour = currentDateTime.get(Calendar.HOUR_OF_DAY)
-            val startMinute = currentDateTime.get(Calendar.MINUTE)
-
-            DatePickerDialog(this, { _, year, month, day ->
-                TimePickerDialog(this, { _, hour, minute ->
-                    pickedDateTime.set(year, month, day, hour, minute)
-                    val time = pickedDateTime.time.time / 1000
-                    dateET.setText(String.format(getString(R.string.dialog_event_detail_datetime_icon), DateUtils.formatDateTime(time)))
-                }, startHour, startMinute, android.text.format.DateFormat.is24HourFormat(this@MainActivity)).show()
-            }, startYear, startMonth, startDay).show()
         }
 
         d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
-            // Save event and move it to the right position in the logbook
+            val weight = weightET.text.toString().toIntOrNull()
-            event.time = pickedDateTime.time.time / 1000 // Seconds since epoch
+            if (weight != null) {
-            if (isNewEvent) {
+                event.time = pickedTime.time.time / 1000
-                logEvent(event)
+                event.quantity = weight
+                onPositive()
+            } else {
+                Toast.makeText(this, R.string.toast_integer_error, Toast.LENGTH_SHORT).show()
             }
 
-            logbook?.sort()
+            dialogInterface.dismiss()
-            recyclerView.adapter?.notifyDataSetChanged()
-            saveLogbook()
-
-            onEnd?.invoke()
         }
 
         d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
             dialogInterface.dismiss()
-            onEnd?.invoke()
         }
 
         val alertDialog = d.create()
         alertDialog.show()
     }
 
-    fun askNotes(existingEvent: LunaEvent? = null, onEnd: (() -> Unit)? = null) {
+    fun addTemperatureEvent(event: LunaEvent) {
-        val isNewEvent = (existingEvent != null)
+        askTemperatureValue(event, true) { saveEvent(event) }
-        val event = if (existingEvent == null) {
-            LunaEvent(LunaEvent.TYPE_NOTE)
-        } else {
-            existingEvent
     }
+
+    fun askTemperatureValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
+        // Show number picker dialog
+        val d = AlertDialog.Builder(this)
+        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_temperature, null)
+        d.setTitle(event.getTypeDescription(this))
+        d.setMessage(event.getDialogMessage(this))
+        d.setView(dialogView)
+
+        val tempSlider = dialogView.findViewById<Slider>(R.id.dialog_temperature_value)
+        val range = NumericUtils(this).getValidEventQuantityRange(LunaEvent.TYPE_TEMPERATURE)!!
+        tempSlider.valueFrom = range.first.toFloat()
+        tempSlider.valueTo = range.second.toFloat()
+        tempSlider.value = if (event.quantity == 0) {
+            range.third.toFloat() // default
+        } else {
+            event.quantity.toFloat() / 10
+        }
+
+        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
+        val pickedTime = datePickerHelper(event.time, dateTV)
+        if (!showTime) {
+            dateTV.visibility = View.GONE
+        }
+
+        val tempTextView = dialogView.findViewById<TextView>(R.id.dialog_temperature_display)
+        tempTextView.text = tempSlider.value.toString()
+        tempSlider.addOnChangeListener({ s, v, b -> tempTextView.text = v.toString() })
+
+        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
+            event.time = pickedTime.time.time / 1000
+            event.quantity = (tempSlider.value * 10).toInt()   // temperature in tenth of a grade
+            onPositive()
+            dialogInterface.dismiss()
+        }
+
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
+            dialogInterface.dismiss()
+        }
+
+        val alertDialog = d.create()
+        alertDialog.show()
+    }
+
+    fun datePickerHelper(time: Long, dateTextView: TextView): Calendar {
+        dateTextView.text = DateUtils.formatDateTime(time)
+
+        val dateTime = Calendar.getInstance()
+        dateTime.time = Date(time * 1000)
+        dateTextView.setOnClickListener {
+            // Show datetime picker
+            val startYear = dateTime.get(Calendar.YEAR)
+            val startMonth = dateTime.get(Calendar.MONTH)
+            val startDay = dateTime.get(Calendar.DAY_OF_MONTH)
+            val startHour = dateTime.get(Calendar.HOUR_OF_DAY)
+            val startMinute = dateTime.get(Calendar.MINUTE)
+
+            DatePickerDialog(this, { _, year, month, day ->
+                TimePickerDialog(
+                    this,
+                    { _, hour, minute ->
+                        dateTime.set(year, month, day, hour, minute)
+                        dateTextView.text = DateUtils.formatDateTime(dateTime.time.time / 1000)
+                    },
+                    startHour,
+                    startMinute,
+                    android.text.format.DateFormat.is24HourFormat(this@MainActivity)
+                ).show()
+            }, startYear, startMonth, startDay).show()
+        }
+
+        return dateTime
+    }
+
+    fun saveEvent(event: LunaEvent) {
+        if (!getAllEvents().contains(event)) {
+            // new event
+            logEvent(event)
+        }
+
+        logbook?.sort()
+        recyclerView.adapter?.notifyDataSetChanged()
+        saveLogbook()
+    }
+
+    fun addAmountEvent(event: LunaEvent) {
+        askAmountValue(event, true) { saveEvent(event) }
+    }
+
+    fun askAmountValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
+        val d = AlertDialog.Builder(this)
+        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_amount, null)
+        d.setTitle(event.getTypeDescription(this))
+        d.setMessage(event.getDialogMessage(this))
+        d.setView(dialogView)
+
+        val spinner = dialogView.findViewById<Spinner>(R.id.dialog_amount_value)
+        spinner.adapter = ArrayAdapter.createFromResource(
+            this,
+            R.array.AmountLabels,
+            android.R.layout.simple_spinner_dropdown_item
+        )
+        // set pre-selected item and ensure the quantity to index is in bounds
+        spinner.setSelection(event.quantity.coerceIn(0, spinner.count - 1))
+
+        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
+        val pickedTime = datePickerHelper(event.time, dateTV)
+        if (!showTime) {
+            dateTV.visibility = View.GONE
+        }
+
+        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
+            event.time = pickedTime.time.time / 1000
+            event.quantity = spinner.selectedItemPosition
+            onPositive()
+            dialogInterface.dismiss()
+        }
+
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
+            dialogInterface.dismiss()
+        }
+
+        val alertDialog = d.create()
+        alertDialog.show()
+    }
+
+    fun addPlainEvent(event: LunaEvent) {
+        askDateValue(event, true) { saveEvent(event) }
+    }
+
+    // Ask to edit events to be edited (only affects date)
+    fun askDateValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
+        val d = AlertDialog.Builder(this)
+        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_plain, null)
+        d.setTitle(event.getTypeDescription(this))
+        d.setMessage(event.getDialogMessage(this))
+        d.setView(dialogView)
+
+        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
+        val pickedDateTime = datePickerHelper(event.time, dateTV)
+        if (!showTime) {
+            dateTV.visibility = View.GONE
+        }
+
+        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
+            event.time = pickedDateTime.time.time / 1000
+            onPositive()
+            dialogInterface.dismiss()
+        }
+
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
+            dialogInterface.dismiss()
+        }
+
+        val alertDialog = d.create()
+        alertDialog.show()
+    }
+
+    fun addNoteEvent(event: LunaEvent) {
+        askNotes(event, true) { saveEvent(event) }
+    }
+
+    fun askNotes(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
         val useQuantity = (event.type != LunaEvent.TYPE_NOTE && event.type != LunaEvent.TYPE_CUSTOM)
 
         val d = AlertDialog.Builder(this)
-        val dialogView = layoutInflater.inflate(R.layout.dialog_notes, null)
+        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_notes, null)
         d.setTitle(event.getTypeDescription(this))
         d.setMessage(event.getDialogMessage(this))
         d.setView(dialogView)
         val notesET = dialogView.findViewById<EditText>(R.id.notes_edittext)
         val qtyET = dialogView.findViewById<EditText>(R.id.notes_qty_edittext)
-        val dateET = dialogView.findViewById<TextView>(R.id.notes_date_picker)
 
-        val pickedDateTime = Calendar.getInstance()
+        val dateTV = dialogView.findViewById<TextView>(R.id.notes_date_picker)
-        val currentDateTime = Calendar.getInstance()
+        val pickedTime = datePickerHelper(event.time, dateTV)
-        currentDateTime.time = Date(event.time * 1000)
 
-        dateET.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), DateUtils.formatDateTime(event.time))
+        if (!showTime) {
-        dateET.setOnClickListener {
+            dateTV.visibility = View.GONE
-            // Show datetime picker
-            val startYear = currentDateTime.get(Calendar.YEAR)
-            val startMonth = currentDateTime.get(Calendar.MONTH)
-            val startDay = currentDateTime.get(Calendar.DAY_OF_MONTH)
-            val startHour = currentDateTime.get(Calendar.HOUR_OF_DAY)
-            val startMinute = currentDateTime.get(Calendar.MINUTE)
-
-            DatePickerDialog(this, { _, year, month, day ->
-                TimePickerDialog(this, { _, hour, minute ->
-                    pickedDateTime.set(year, month, day, hour, minute)
-                    val time = pickedDateTime.time.time / 1000
-                    dateET.setText(String.format(getString(R.string.dialog_event_detail_datetime_icon), DateUtils.formatDateTime(time)))
-                }, startHour, startMinute, android.text.format.DateFormat.is24HourFormat(this@MainActivity)).show()
-            }, startYear, startMonth, startDay).show()
         }
 
         notesET.setText(event.notes)
@@ -459,32 +473,30 @@ class MainActivity : AppCompatActivity() {
         }
 
         d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
+            val notes = notesET.text.toString()
+
             if (useQuantity) {
-                val qty = qtyET.text.toString().toIntOrNull()
+                val quantity = qtyET.text.toString().toIntOrNull()
-                if (qty != null) {
+                if (quantity != null) {
-                    event.quantity = qty
+                    event.time = pickedTime.time.time / 1000
+                    event.notes = notes
+                    event.quantity = quantity
+                    onPositive()
                 } else {
-                    Toast.makeText(this, R.string.toast_integer_error, Toast.LENGTH_SHORT).show()
+                    Toast.makeText(applicationContext, R.string.toast_integer_error, Toast.LENGTH_SHORT).show()
-                    onEnd?.invoke()
-                    return@setPositiveButton
-                }
                 }
 
-            event.notes = notesET.text.toString()
+            } else {
-            event.time = pickedDateTime.time.time / 1000 // Seconds since epoch
+                event.time = pickedTime.time.time / 1000
-
+                event.notes = notes
-            if (isNewEvent) {
+                onPositive()
-                logEvent(event)
             }
-            logbook?.sort()
+
-            recyclerView.adapter?.notifyDataSetChanged()
+            dialogInterface.dismiss()
-            saveLogbook()
-            onEnd?.invoke()
         }
 
         d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
             dialogInterface.dismiss()
-            onEnd?.invoke()
         }
 
         val alertDialog = d.create()
@@ -539,53 +551,81 @@ class MainActivity : AppCompatActivity() {
         return nextEvent
     }
 
-    fun showEventDetailDialog(event: LunaEvent) {
+    fun showEventDetailDialog(originalEvent: LunaEvent) {
+        val event = LunaEvent(originalEvent)
+
         // Do not update list while the detail is shown, to avoid changing the object below while it is changed by the user
         pauseLogbookUpdate = true
+
         val d = AlertDialog.Builder(this)
         d.setTitle(R.string.dialog_event_detail_title)
-        val dialogView = layoutInflater.inflate(R.layout.dialog_event_detail, null)
+
+        val dialogView = layoutInflater.inflate(R.layout.dialog_event_details, null)
         val emojiTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_emoji)
         val descriptionTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_description)
+        val dateTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_date)
         val quantityTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_quantity)
         val notesTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_notes)
 
         emojiTextView.text = event.getTypeEmoji(this)
         descriptionTextView.text = event.getTypeDescription(this)
+
+        val pickedTime = datePickerHelper(event.time, dateTextView)
+        val updateValues = {
             quantityTextView.text = NumericUtils(this).formatEventQuantity(event)
             notesTextView.text = event.notes
+        }
+        updateValues()
 
-        val dateTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_date)
+        quantityTextView.setOnClickListener {
-        dateTextView.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), DateUtils.formatDateTime(event.time))
+            when (event.type) {
+                LunaEvent.TYPE_BABY_BOTTLE -> askBabyBottleContent(event, false, updateValues)
+                LunaEvent.TYPE_WEIGHT -> askWeightValue(event, false, updateValues)
+                LunaEvent.TYPE_DIAPERCHANGE_POO,
+                LunaEvent.TYPE_DIAPERCHANGE_PEE,
+                LunaEvent.TYPE_PUKE -> askAmountValue(event, false, updateValues)
+                LunaEvent.TYPE_TEMPERATURE -> askTemperatureValue(event, false, updateValues)
+                LunaEvent.TYPE_NOTE -> askNotes(event, false, updateValues)
+            }
+        }
+
+        notesTextView.setOnClickListener {
+            when (event.type) {
+                LunaEvent.TYPE_FOOD,
+                LunaEvent.TYPE_MEDICINE,
+                LunaEvent.TYPE_NOTE -> askNotes(event, false, updateValues)
+            }
+        }
 
         d.setView(dialogView)
-        d.setPositiveButton(R.string.dialog_event_detail_close_button) { dialogInterface, i -> dialogInterface.dismiss() }
+
-        d.setNeutralButton(R.string.dialog_event_detail_delete_button) { dialogInterface, i -> deleteEvent(event) }
+        d.setNeutralButton(R.string.dialog_event_detail_delete_button) { dialogInterface, i ->
-        d.setNegativeButton(R.string.dialog_event_detail_edit_button) { dialogInterface, i ->
+            deleteEvent(originalEvent)
-            Log.d("MainActivity", "negative button pressed: ${event.type}")
+            dialogInterface.dismiss()
-            when (event.type) {
-                TYPE_BABY_BOTTLE -> askBabyBottleContent(event, { showEventDetailDialog(event) })
-                LunaEvent.TYPE_WEIGHT -> {}
-                LunaEvent.TYPE_BREASTFEEDING_LEFT_NIPPLE,
-                LunaEvent.TYPE_BREASTFEEDING_BOTH_NIPPLE,
-                LunaEvent.TYPE_BREASTFEEDING_RIGHT_NIPPLE,
-                LunaEvent.TYPE_ENEMA,
-                LunaEvent.TYPE_BATH,
-                LunaEvent.TYPE_COLIC,
-                LunaEvent.TYPE_DIAPERCHANGE_POO,
-                LunaEvent.TYPE_DIAPERCHANGE_PEE -> { askPlain(event, { showEventDetailDialog(event) }) }
-                LunaEvent.TYPE_MEDICINE -> askNotes(event, { showEventDetailDialog(event) })
-                LunaEvent.TYPE_NOTE -> askNotes(event, { showEventDetailDialog(event) })
-                LunaEvent.TYPE_TEMPERATURE, //todo
-                LunaEvent.TYPE_FOOD -> askNotes(event, { showEventDetailDialog(event) })
-                LunaEvent.TYPE_PUKE -> askPukeValue(event, { showEventDetailDialog(event) })
-                LunaEvent.TYPE_CUSTOM -> {} // todo?
-                else -> {}
         }
+
+        d.setPositiveButton(R.string.dialog_event_detail_close_button) { dialogInterface, i ->
+            event.time = pickedTime.time.time / 1000
+
+            if (event.time != originalEvent.time
+                    || event.quantity != originalEvent.quantity
+                    || event.notes != originalEvent.notes) {
+                originalEvent.time = event.time
+                originalEvent.quantity = event.quantity
+                originalEvent.notes = event.notes
+                saveEvent(originalEvent)
             }
+
+            dialogInterface.dismiss()
+        }
+
         val alertDialog = d.create()
         alertDialog.show()
-        alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(ContextCompat.getColor(this, R.color.danger))
+
+        alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(
+            ContextCompat.getColor(this, R.color.danger)
+        )
+
         alertDialog.setOnDismissListener {
             // Resume logbook update
             pauseLogbookUpdate = false
@@ -598,14 +638,11 @@ class MainActivity : AppCompatActivity() {
             signatureTextEdit.visibility = View.VISIBLE
         }
 
-        // create next/previous links to events of the same type
-
-        val previousTextView = dialogView.findViewById<TextView>(R.id.dialog_event_previous)
-        val nextTextView = dialogView.findViewById<TextView>(R.id.dialog_event_next)
         val allEvents = getAllEvents()
-        val nextEvent = getNextSameEvent(event, allEvents)
-        val previousEvent = getPreviousSameEvent(event, allEvents)
 
+        // create link to prevent event of the same type
+        val previousTextView = dialogView.findViewById<TextView>(R.id.dialog_event_previous)
+        val previousEvent = getPreviousSameEvent(event, allEvents)
         if (previousEvent != null) {
             val emoji = previousEvent.getTypeEmoji(applicationContext)
             val time = DateUtils.formatTimeDuration(applicationContext, event.time - previousEvent.time)
@@ -618,6 +655,9 @@ class MainActivity : AppCompatActivity() {
             previousTextView.visibility = View.GONE
         }
 
+        // create link to next event of the same type
+        val nextTextView = dialogView.findViewById<TextView>(R.id.dialog_event_next)
+        val nextEvent = getNextSameEvent(event, allEvents)
         if (nextEvent != null) {
             val emoji = nextEvent.getTypeEmoji(applicationContext)
             val time = DateUtils.formatTimeDuration(applicationContext, nextEvent.time - event.time)
@@ -732,7 +772,7 @@ class MainActivity : AppCompatActivity() {
                 runOnUiThread({
                     setLoading(false)
                     loadLogbookList()
-                    Toast.makeText(this@MainActivity, getString(R.string.logbook_created) + logbookName, Toast.LENGTH_SHORT).show()
+                    Toast.makeText(applicationContext, getString(R.string.logbook_created) + logbookName, Toast.LENGTH_SHORT).show()
                 })
             }
 
@@ -889,7 +929,7 @@ class MainActivity : AppCompatActivity() {
                     setLoading(false)
 
                     Toast.makeText(
-                        this@MainActivity,
+                        applicationContext,
                         if (lastEventAdded != null)
                             R.string.toast_event_added
                         else
@@ -951,7 +991,7 @@ class MainActivity : AppCompatActivity() {
         runOnUiThread({
             setLoading(false)
 
-            Toast.makeText(this@MainActivity, R.string.toast_event_add_error, Toast.LENGTH_SHORT).show()
+            Toast.makeText(applicationContext, R.string.toast_event_add_error, Toast.LENGTH_SHORT).show()
             recyclerView.adapter?.notifyDataSetChanged()
             savingEvent(false)
         })
@@ -984,41 +1024,37 @@ class MainActivity : AppCompatActivity() {
             val inflater = LayoutInflater.from(anchor.context)
             contentView = inflater.inflate(R.layout.more_events_popup, null)
             contentView.findViewById<View>(R.id.button_medicine).setOnClickListener {
-                askNotes(LunaEvent(LunaEvent.TYPE_MEDICINE))
+                addNoteEvent(LunaEvent(LunaEvent.TYPE_MEDICINE))
                 dismiss()
             }
-            contentView.findViewById<View>(R.id.button_enema).setOnClickListener({
+            contentView.findViewById<View>(R.id.button_enema).setOnClickListener {
-                logEvent(LunaEvent(LunaEvent.TYPE_ENEMA))
+                addPlainEvent(LunaEvent(LunaEvent.TYPE_ENEMA))
                 dismiss()
-            })
+            }
-            contentView.findViewById<View>(R.id.button_note).setOnClickListener({
+            contentView.findViewById<View>(R.id.button_note).setOnClickListener {
-                askNotes(LunaEvent(LunaEvent.TYPE_NOTE))
+                addNoteEvent(LunaEvent(LunaEvent.TYPE_NOTE))
                 dismiss()
-            })
+            }
-            contentView.findViewById<View>(R.id.button_temperature).setOnClickListener({
+            contentView.findViewById<View>(R.id.button_temperature).setOnClickListener {
-                askTemperatureValue()
+                addTemperatureEvent(LunaEvent(LunaEvent.TYPE_TEMPERATURE))
                 dismiss()
-            })
+            }
-            contentView.findViewById<View>(R.id.button_puke).setOnClickListener({
+            contentView.findViewById<View>(R.id.button_puke).setOnClickListener {
-                askPukeValue()
+                addAmountEvent(LunaEvent(LunaEvent.TYPE_PUKE))
                 dismiss()
-            })
+            }
-            contentView.findViewById<View>(R.id.button_colic).setOnClickListener({
+            contentView.findViewById<View>(R.id.button_colic).setOnClickListener {
-                logEvent(
+                addPlainEvent(LunaEvent(LunaEvent.TYPE_COLIC))
-                    LunaEvent(LunaEvent.TYPE_COLIC)
-                )
                 dismiss()
-            })
+            }
-            contentView.findViewById<View>(R.id.button_scale).setOnClickListener({
+            contentView.findViewById<View>(R.id.button_scale).setOnClickListener {
-                askWeightValue()
+                addWeightEvent(LunaEvent(LunaEvent.TYPE_WEIGHT))
                 dismiss()
-            })
+            }
-            contentView.findViewById<View>(R.id.button_bath).setOnClickListener({
+            contentView.findViewById<View>(R.id.button_bath).setOnClickListener {
-                logEvent(
+                addPlainEvent(LunaEvent(LunaEvent.TYPE_BATH))
-                    LunaEvent(LunaEvent.TYPE_BATH)
-                )
                 dismiss()
-            })
+            }
         }.also { popupWindow ->
             popupWindow.setOnDismissListener({
                 Handler(mainLooper).postDelayed({

app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt

@@ -45,9 +45,9 @@ class LunaEvent: Comparable<LunaEvent> {
             jo.put("type", value)
         }
     var quantity: Int
-        get() = jo.optInt("quantity")
+        get() = jo.optInt("quantity", -1)
         set(value) {
-            if (value > 0)
+            if (value >= 0)
                 jo.put("quantity", value)
         }
     var notes: String
@@ -69,6 +69,15 @@ class LunaEvent: Comparable<LunaEvent> {
             throw IllegalArgumentException("JSONObject is not a LunaEvent")
     }
 
+    constructor(event: LunaEvent) {
+        this.jo = JSONObject()
+        this.type = event.type
+        this.time = event.time
+        this.quantity = event.quantity
+        this.notes = event.notes
+        this.signature = event.signature
+    }
+
     constructor(type: String) {
         this.jo = JSONObject()
         this.time = System.currentTimeMillis() / 1000
@@ -86,7 +95,7 @@ class LunaEvent: Comparable<LunaEvent> {
         return context.getString(
             when (type) {
                 TYPE_BABY_BOTTLE -> R.string.event_bottle_type
-                TYPE_WEIGHT -> R.string.event_scale_type
+                TYPE_WEIGHT -> R.string.event_weight_type
                 TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_type
                 TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_type
                 TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_type
@@ -109,7 +118,7 @@ class LunaEvent: Comparable<LunaEvent> {
         return context.getString(
             when (type) {
                 TYPE_BABY_BOTTLE -> R.string.event_bottle_desc
-                TYPE_WEIGHT -> R.string.event_scale_desc
+                TYPE_WEIGHT -> R.string.event_weight_desc
                 TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_desc
                 TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_desc
                 TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_desc
@@ -129,10 +138,18 @@ class LunaEvent: Comparable<LunaEvent> {
     }
 
     fun getDialogMessage(context: Context): String? {
-        return when(type) {
+        return context.getString(
-            TYPE_MEDICINE -> context.getString(R.string.log_medicine_dialog_description)
+            when(type) {
-            else -> null
+                TYPE_BABY_BOTTLE -> R.string.log_bottle_dialog_description
+                TYPE_MEDICINE -> R.string.log_medicine_dialog_description
+                TYPE_TEMPERATURE -> R.string.log_temperature_dialog_description
+                TYPE_DIAPERCHANGE_POO,
+                TYPE_DIAPERCHANGE_PEE,
+                TYPE_PUKE -> R.string.log_amount_dialog_description
+                TYPE_WEIGHT -> R.string.log_weight_dialog_description
+                else -> R.string.log_unknown_dialog_description
             }
+        )
     }
 
     fun toJson(): JSONObject {

app/src/main/java/utils/NumericUtils.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.icu.util.LocaleData
 import android.icu.util.ULocale
 import android.os.Build
+import android.util.Log
 import it.danieleverducci.lunatracker.R
 import it.danieleverducci.lunatracker.entities.LunaEvent
 import java.text.NumberFormat
@@ -60,21 +61,28 @@ class NumericUtils (val context: Context) {
         )
     }
 
-    fun formatEventQuantity(item: LunaEvent): String {
+    fun formatEventQuantity(event: LunaEvent): String {
         val formatted = StringBuilder()
-        if (item.quantity > 0) {
+        if (event.quantity >= 0) {
-            formatted.append(when (item.type) {
+            formatted.append(when (event.type) {
                 LunaEvent.TYPE_TEMPERATURE ->
-                    (item.quantity / 10.0f).toString()
+                    (event.quantity / 10.0f).toString()
-                LunaEvent.TYPE_PUKE ->
+                LunaEvent.TYPE_DIAPERCHANGE_POO,
-                    context.resources.getStringArray(R.array.AmountLabels)[item.quantity]
+                LunaEvent.TYPE_DIAPERCHANGE_PEE,
+                LunaEvent.TYPE_PUKE -> {
+                    val array = context.resources.getStringArray(R.array.AmountLabels)
+                    return array.getOrElse(event.quantity) {
+                        Log.e("NumericUtils", "Invalid index ${event.quantity}")
+                        return ""
+                    }
+                }
                 else ->
-                    item.quantity
+                    event.quantity
             })
 
             formatted.append(" ")
             formatted.append(
-                when (item.type) {
+                when (event.type) {
                     LunaEvent.TYPE_BABY_BOTTLE -> measurement_unit_liquid_base
                     LunaEvent.TYPE_WEIGHT -> measurement_unit_weight_base
                     LunaEvent.TYPE_MEDICINE -> measurement_unit_weight_tiny

app/src/main/res/layout/dialog_edit_plain.xml

@@ -3,15 +3,14 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_gravity="center"
-    android:gravity="center"
     android:orientation="vertical">
 
-    <Spinner
+    <TextView
-        android:id="@+id/dialog_puke_value"
+        android:id="@+id/dialog_date_picker"
-        android:layout_width="250dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="16dp"
+        android:layout_gravity="center"
-        android:paddingVertical="8dp"/>
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="20dp"/>
 
 </LinearLayout>

app/src/main/res/layout/dialog_edit_temperature.xml

@@ -23,4 +23,12 @@
         android:layout_height="wrap_content"
         android:textSize="30sp"
         android:textColor="@color/accent"/>
+
+    <TextView
+        android:id="@+id/dialog_date_picker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginEnd="20dp"/>
+
 </LinearLayout>

app/src/main/res/layout/dialog_edit_weight.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/dialog_number_edittext"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:inputType="number"
+            android:hint="0"
+            android:background="@drawable/textview_background"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:text="g"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/dialog_date_picker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="20dp"/>
+
+</LinearLayout>

app/src/main/res/layout/dialog_event_details.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -35,8 +36,7 @@
         android:drawablePadding="10dp"
         android:drawableTint="@color/accent"
         android:textSize="16sp"
-        android:textStyle="bold"
+        android:textStyle="bold"/>
-        android:text="@string/dialog_event_detail_datetime_icon" />
 
     <TextView
         android:id="@+id/dialog_event_detail_type_quantity"

app/src/main/res/layout/more_events_popup.xml

@@ -67,7 +67,7 @@
                 android:padding="10dp"
                 android:background="@drawable/dropdown_list_item_background"
                 style="@style/OverflowMenuText"
-                android:text="@string/overflow_event_scale"/>
+                android:text="@string/overflow_event_weight"/>
 
             <TextView
                 android:id="@+id/button_bath"

app/src/main/res/layout/number_edit_dialog.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center"
-    android:gravity="center">
-
-    <EditText
-        android:id="@+id/dialog_number_edittext"
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
-        android:inputType="number"
-        android:hint="0"
-        android:background="@drawable/textview_background"/>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:text="g"/>
-</LinearLayout>

app/src/main/res/values-de/strings.xml

@@ -3,18 +3,9 @@
     <string name="title">🌜 LunaTracker 🌛</string>
     <string name="logbook">Ereignisprotokoll</string>
 
-    <string name="log_bottle_dialog_title">Fläschchen</string>
-    <string name="log_bottle_dialog_description">Trinkmenge eingeben</string>
-
-    <string name="log_weight_dialog_title">Gewicht</string>
-    <string name="log_weight_dialog_description">Gewicht eingeben</string>
-
-    <string name="log_temperature_dialog_title">Temperatur</string>
-    <string name="log_temperature_dialog_description">Temperatur eingeben</string>
-
     <string name="event_bottle_desc">Fläschchen</string>
     <string name="event_food_desc">Essen</string>
-    <string name="event_scale_desc">Gewicht</string>
+    <string name="event_weight_desc">Gewicht</string>
     <string name="event_breastfeeding_left_desc">Stillen (links)</string>
     <string name="event_breastfeeding_both_desc">Stillen</string>
     <string name="event_breastfeeding_right_desc">Stillen (rechts)</string>
@@ -27,7 +18,7 @@
     <string name="event_colic_desc">Blähungskolik</string>
     <string name="event_unknown_desc"></string>
 
-    <string name="overflow_event_scale">⚖️ Gewicht</string>
+    <string name="overflow_event_weight">⚖️ Gewicht</string>
     <string name="overflow_event_medicine">💊 Medikament</string>
     <string name="overflow_event_enema">🪠 Einlauf</string>
     <string name="overflow_event_note">📝 Notiz</string>
@@ -77,10 +68,13 @@
     <string name="trim_logbook_dialog_button_ok">Jetzt bereinigen</string>
     <string name="trim_logbook_dialog_button_cancel">Später erinnern</string>
 
-    <string name="log_notes_dialog_description">Notizen:</string>
+    <string name="log_bottle_dialog_description">Trinkmenge eingeben</string>
     <string name="log_medicine_dialog_description">Medikamentenname, Menge, Art, Notizen, …:</string>
-    <string name="log_notes_dialog_qty_hint">Menge (optional)</string>
+    <string name="log_notes_dialog_description">Notizen:</string>
     <string name="log_notes_dialog_note_hint">Notiz eingeben</string>
+    <string name="log_notes_dialog_qty_hint">Menge (optional)</string>
+    <string name="log_temperature_dialog_description">Temperatur eingeben</string>
+    <string name="log_weight_dialog_description">Gewicht eingeben</string>
 
     <string name="dialog_event_detail_title">Ereignisdetails</string>
     <string name="dialog_event_detail_close_button">OK</string>

app/src/main/res/values-fr/strings.xml

@@ -3,18 +3,9 @@
     <string name="title">🌜 LunaTracker 🌛</string>
     <string name="logbook">Entrées enregistrées</string>
 
-    <string name="log_bottle_dialog_title">Biberon</string>
-    <string name="log_bottle_dialog_description">Renseignez la quantité contenue dans le biberon</string>
-
-    <string name="log_weight_dialog_title">Poids</string>
-    <string name="log_weight_dialog_description">Renseignez le poids</string>
-
-    <string name="log_temperature_dialog_title">Température</string>
-    <string name="log_temperature_dialog_description">Renseignez la Température</string>
-
     <string name="event_bottle_desc">Biberon</string>
     <string name="event_food_desc">Nourriture</string>
-    <string name="event_scale_desc">Poids</string>
+    <string name="event_weight_desc">Poids</string>
     <string name="event_breastfeeding_left_desc">Allaitement (sein gauche)</string>
     <string name="event_breastfeeding_both_desc">Allaitement</string>
     <string name="event_breastfeeding_right_desc">Allaitement (sein droit)</string>
@@ -27,7 +18,7 @@
     <string name="event_colic_desc">Colique gazeuse</string>
     <string name="event_unknown_desc"></string>
 
-    <string name="overflow_event_scale">⚖️ Poids</string>
+    <string name="overflow_event_weight">⚖️ Poids</string>
     <string name="overflow_event_medicine">💊 Médicament</string>
     <string name="overflow_event_enema">🪠 Lavement</string>
     <string name="overflow_event_note">📝 Note</string>
@@ -76,10 +67,13 @@
     <string name="trim_logbook_dialog_button_ok">Supprimer les vieilles entrées maintenant</string>
     <string name="trim_logbook_dialog_button_cancel">Me rappeller plus tard</string>
 
-    <string name="log_notes_dialog_description">Notes:</string>
+    <string name="log_bottle_dialog_description">Renseignez la quantité contenue dans le biberon</string>
     <string name="log_medicine_dialog_description">nom du médicament, quantité, type, notes …:</string>
-    <string name="log_notes_dialog_qty_hint">Quantité (ou vide)</string>
+    <string name="log_notes_dialog_description">Notes:</string>
     <string name="log_notes_dialog_note_hint">Notes ...</string>
+    <string name="log_notes_dialog_qty_hint">Quantité (ou vide)</string>
+    <string name="log_temperature_dialog_description">Renseignez la Température</string>
+    <string name="log_weight_dialog_description">Renseignez le poids</string>
 
     <string name="dialog_event_detail_title">Détails de l\'entrée</string>
     <string name="dialog_event_detail_close_button">OK</string>

app/src/main/res/values-it/strings.xml

@@ -3,16 +3,7 @@
     <string name="title">🌜 LunaTracker 🌛</string>
     <string name="logbook">Diario di bordo</string>
 
-    <string name="log_bottle_dialog_title">Biberon</string>
+    <string name="overflow_event_weight">⚖️ Peso</string>
-    <string name="log_bottle_dialog_description">Inserisci la quantità contenuta nel biberon</string>
-
-    <string name="log_weight_dialog_title">Pesata</string>
-    <string name="log_weight_dialog_description">Inserisci il peso rilevato</string>
-
-    <string name="log_temperature_dialog_title">Temperatura</string>
-    <string name="log_temperature_dialog_description">Inserisci la temperatura</string>
-
-    <string name="overflow_event_scale">⚖️ Peso</string>
     <string name="overflow_event_medicine">💊 Medicina</string>
     <string name="overflow_event_enema">🪠 Clistere</string>
     <string name="overflow_event_note">📝 Nota</string>
@@ -21,7 +12,7 @@
 
     <string name="event_bottle_desc">Biberon</string>
     <string name="event_food_desc">Cibo</string>
-    <string name="event_scale_desc">Pesata</string>
+    <string name="event_weight_desc">Pesata</string>
     <string name="event_breastfeeding_left_desc">Allatt. al seno (sx)</string>
     <string name="event_breastfeeding_both_desc">Allatt. al seno</string>
     <string name="event_breastfeeding_right_desc">Allatt. al seno (dx)</string>
@@ -76,10 +67,13 @@
     <string name="trim_logbook_dialog_button_ok">Cancella i più vecchi</string>
     <string name="trim_logbook_dialog_button_cancel">Ricordamelo dopo</string>
 
-    <string name="log_notes_dialog_description">Note:</string>
+    <string name="log_bottle_dialog_description">Inserisci la quantità contenuta nel biberon</string>
     <string name="log_medicine_dialog_description">Nome della medicina, quantità, formato, note…:</string>
-    <string name="log_notes_dialog_qty_hint">Quantità, o vuoto</string>
+    <string name="log_notes_dialog_description">Note:</string>
     <string name="log_notes_dialog_note_hint">Inserisci le note</string>
+    <string name="log_notes_dialog_qty_hint">Quantità, o vuoto</string>
+    <string name="log_temperature_dialog_description">Inserisci la temperatura</string>
+    <string name="log_weight_dialog_description">Inserisci il peso rilevato</string>
 
     <string name="dialog_event_detail_title">Dettaglio evento</string>
     <string name="dialog_event_detail_close_button">OK</string>

app/src/main/res/values/arrays.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="AmountLabels">
+        <item>@string/amount_unspecified</item>
         <item>@string/amount_little</item>
         <item>@string/amount_normal</item>
         <item>@string/amount_plenty</item>

app/src/main/res/values/strings.xml

@@ -3,23 +3,9 @@
     <string name="title">🌜 LunaTracker 🌛</string>
     <string name="logbook">Logged events</string>
 
-    <string name="log_bottle_dialog_title">Baby bottle</string>
-    <string name="log_bottle_dialog_description">Insert the quantity contained in the baby bottle</string>
-
-    <string name="log_weight_dialog_title">Weight</string>
-    <string name="log_weight_dialog_description">Insert the weight</string>
-
-    <string name="log_temperature_dialog_title">Temperature</string>
-    <string name="log_temperature_dialog_description">Insert the temperature</string>
-
-    <string name="log_puke_dialog_title">Puke</string>
-    <string name="log_puke_dialog_description">Select the amount</string>
-
-    <string name="dialog_event_detail_edit_button">Edit</string>
-
     <string name="event_bottle_type" translatable="false">🍼</string>
     <string name="event_food_type" translatable="false">🥣</string>
-    <string name="event_scale_type" translatable="false">⚖️</string>
+    <string name="event_weight_type" translatable="false">⚖️</string>
     <string name="event_breastfeeding_left_type" translatable="false">🤱 ←</string>
     <string name="event_breastfeeding_both_type" translatable="false">🤱 ↔</string>
     <string name="event_breastfeeding_right_type" translatable="false">🤱 →</string>
@@ -36,7 +22,7 @@
 
     <string name="event_bottle_desc">Baby bottle</string>
     <string name="event_food_desc">Food</string>
-    <string name="event_scale_desc">Weight</string>
+    <string name="event_weight_desc">Weight</string>
     <string name="event_breastfeeding_left_desc">Breastfeeding (left)</string>
     <string name="event_breastfeeding_both_desc">Breastfeeding</string>
     <string name="event_breastfeeding_right_desc">Breastfeeding (right)</string>
@@ -51,7 +37,7 @@
     <string name="event_bath_desc">Bath</string>
     <string name="event_unknown_desc"></string>
 
-    <string name="overflow_event_scale">⚖️ Weight</string>
+    <string name="overflow_event_weight">⚖️ Weight</string>
     <string name="overflow_event_medicine">💊 Medicine</string>
     <string name="overflow_event_enema">🪠 Enema</string>
     <string name="overflow_event_note">📝 Note</string>
@@ -77,6 +63,7 @@
     <string name="year_ago">year</string>
     <string name="years_ago">years</string>
 
+    <string name="amount_unspecified"></string>
     <string name="amount_little">Little</string>
     <string name="amount_normal">Normal</string>
     <string name="amount_plenty">Plenty</string>
@@ -116,10 +103,15 @@
     <string name="trim_logbook_dialog_button_ok">Trim it now</string>
     <string name="trim_logbook_dialog_button_cancel">Remind me later</string>
 
-    <string name="log_notes_dialog_description">Notes:</string>
+    <string name="log_amount_dialog_description">Select the amount:</string>
+    <string name="log_bottle_dialog_description">Insert the quantity contained in the baby bottle:</string>
     <string name="log_medicine_dialog_description">Medicine name, quantity, type, notes…:</string>
-    <string name="log_notes_dialog_qty_hint">Quantity (or empty)</string>
+    <string name="log_notes_dialog_description">Notes:</string>
     <string name="log_notes_dialog_note_hint">Write some notes</string>
+    <string name="log_notes_dialog_qty_hint">Quantity (or empty)</string>
+    <string name="log_temperature_dialog_description">Select the temperature:</string>
+    <string name="log_unknown_dialog_description"></string>
+    <string name="log_weight_dialog_description">Insert the weight:</string>
 
     <string name="measurement_unit_liquid_base_metric" translatable="false">ml</string>
     <string name="measurement_unit_weight_base_metric" translatable="false">g</string>
@@ -135,7 +127,6 @@
     <string name="row_luna_event_time">Time</string>
 
     <string name="dialog_event_detail_title">Event detail</string>
-    <string name="dialog_event_detail_datetime_icon" translatable="false">🕒 %s</string>
     <string name="dialog_event_detail_close_button">OK</string>
     <string name="dialog_event_detail_delete_button">Delete</string>
     <string name="dialog_event_detail_quantity">Quantity</string>