Updated readme with contribution instructions

README.md

@@ -13,7 +13,24 @@ Dedicated to my daughter Luna.
 
 ![Screenshot](fastlane/metadata/android/en-US/images/phoneScreenshots/1.png)
 
-## Thanks for the valuable contributions to:
+## Contributions
+
+### Why isn't this hosted on GitHub?
+
+I'm using a private git server just because I'm worried for the vast majority of open source code being hosted in a server property of Microsoft and being used to train theirs AI.
+I didn't find a better option, BTW the Gitea project is working on implementing federation, so soon it will be possible to contribute using any other gitea server, selfhosted or not.
+
+### How to contribute
+
+The project is open to contribution, but with some limits:
+
+- I'm sorry I can't accept AI-generated contributions. Reviewing a contribution requires time and effort from my side, while generating code with AI requires very little time and produces non reliable code that must be reviewed in detail. This is effectively shifting the work on my side, and in a forced way. If you feel you need a feature but you're not able to implement it by yourself, I prefer you to create an issue in the repository so I can implement it when I can, in a more mantainable way.
+- I prefer to make project-wide changes (i.e. updating Android target, app name and icon, release number...) by myself.
+
+To contribute, you'll have to create an account on this git instance. Unfortunately, I had to disable registration to avoid huge waves of fake accounts created by bots.
+You can request an account writing to daniele.verducci@ichibi.eu
+
+### Thanks for the valuable contributions to:
 
 - Chepycou (French translation)
 - Daniel Neubauer (German translation)

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

@@ -12,7 +12,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
-import android.widget.Button
 import android.widget.EditText
 import android.widget.NumberPicker
 import android.widget.PopupWindow
@@ -63,7 +62,7 @@ class MainActivity : AppCompatActivity() {
     val updateListRunnable: Runnable = Runnable {
         if (logbook != null && !pauseLogbookUpdate)
             loadLogbook(logbook!!.name)
-        handler.postDelayed(updateListRunnable, 1000 * 60)
+        handler.postDelayed(updateListRunnable, 1000*60)
     }
     var logbookRepo: LogbookRepository? = null
     var showingOverflowPopupWindow = false
@@ -82,30 +81,34 @@ class MainActivity : AppCompatActivity() {
         recyclerView.setLayoutManager(LinearLayoutManager(applicationContext))
 
         // Set listeners
-        findViewById<View>(R.id.logbooks_add_button).setOnClickListener {
-            showAddLogbookDialog(true)
-        }
-        findViewById<View>(R.id.button_bottle).setOnClickListener {
-            addBabyBottleEvent(LunaEvent(LunaEvent.TYPE_BABY_BOTTLE))
-        }
-        findViewById<View>(R.id.button_food).setOnClickListener {
-            addNoteEvent(LunaEvent(LunaEvent.TYPE_FOOD))
-        }
-        findViewById<View>(R.id.button_nipple_left).setOnClickListener {
-            addPlainEvent(LunaEvent(LunaEvent.TYPE_BREASTFEEDING_LEFT_NIPPLE))
-        }
-        findViewById<View>(R.id.button_nipple_both).setOnClickListener {
-            addPlainEvent(LunaEvent(LunaEvent.TYPE_BREASTFEEDING_BOTH_NIPPLE))
-        }
-        findViewById<View>(R.id.button_nipple_right).setOnClickListener {
-            addPlainEvent(LunaEvent(LunaEvent.TYPE_BREASTFEEDING_RIGHT_NIPPLE))
-        }
-        findViewById<View>(R.id.button_change_poo).setOnClickListener {
-            addAmountEvent(LunaEvent(LunaEvent.TYPE_DIAPERCHANGE_POO))
-        }
-        findViewById<View>(R.id.button_change_pee).setOnClickListener {
-            addAmountEvent(LunaEvent(LunaEvent.TYPE_DIAPERCHANGE_PEE))
-        }
+        findViewById<View>(R.id.logbooks_add_button).setOnClickListener { showAddLogbookDialog(true) }
+        findViewById<View>(R.id.button_bottle).setOnClickListener { askBabyBottleContent() }
+        findViewById<View>(R.id.button_food).setOnClickListener { askNotes(LunaEvent(LunaEvent.TYPE_FOOD)) }
+        findViewById<View>(R.id.button_nipple_left).setOnClickListener { logEvent(
+            LunaEvent(
+                LunaEvent.TYPE_BREASTFEEDING_LEFT_NIPPLE
+            )
+        ) }
+        findViewById<View>(R.id.button_nipple_both).setOnClickListener { logEvent(
+            LunaEvent(
+                LunaEvent.TYPE_BREASTFEEDING_BOTH_NIPPLE
+            )
+        ) }
+        findViewById<View>(R.id.button_nipple_right).setOnClickListener { logEvent(
+            LunaEvent(
+                LunaEvent.TYPE_BREASTFEEDING_RIGHT_NIPPLE
+            )
+        ) }
+        findViewById<View>(R.id.button_change_poo).setOnClickListener { logEvent(
+            LunaEvent(
+                LunaEvent.TYPE_DIAPERCHANGE_POO
+            )
+        ) }
+        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)
@@ -127,9 +130,9 @@ class MainActivity : AppCompatActivity() {
 
     private fun setListAdapter(items: ArrayList<LunaEvent>) {
         val adapter = LunaEventRecyclerAdapter(this, items)
-        adapter.onItemClickListener = object : LunaEventRecyclerAdapter.OnItemClickListener {
+        adapter.onItemClickListener = object: LunaEventRecyclerAdapter.OnItemClickListener {
             override fun onItemClick(event: LunaEvent) {
-                showEventDetailDialog(event)
+                showEventDetailDialog(event, items)
             }
         }
         recyclerView.adapter = adapter
@@ -192,456 +195,118 @@ class MainActivity : AppCompatActivity() {
         super.onStop()
     }
 
-    fun getAllEvents(): ArrayList<LunaEvent> {
-        return logbook?.logs ?: arrayListOf()
-    }
-
-    fun addBabyBottleEvent(event: LunaEvent) {
-        setToPreviousQuantity(event)
-        askBabyBottleContent(event, true) {
-            saveEvent(event)
-        }
-    }
-
-    fun askBabyBottleContent(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
+    fun askBabyBottleContent() {
+        // Show number picker dialog
+        val localSettings = LocalSettingsRepository(this)
         val d = AlertDialog.Builder(this)
-        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_bottle, null)
-        d.setTitle(event.getTypeDescription(this))
-        d.setMessage(event.getDialogMessage(this))
+        val dialogView = layoutInflater.inflate(R.layout.number_picker_dialog, null)
+        d.setTitle(R.string.log_bottle_dialog_title)
+        d.setMessage(R.string.log_bottle_dialog_description)
         d.setView(dialogView)
-
         val numberPicker = dialogView.findViewById<NumberPicker>(R.id.dialog_number_picker)
         numberPicker.minValue = 1 // "10"
         numberPicker.maxValue = 25 // "250
         numberPicker.displayedValues = ((10..250 step 10).map { it.toString() }.toTypedArray())
         numberPicker.wrapSelectorWheel = false
-        numberPicker.value = event.quantity / 10
-
-        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        val pickedTime = datePickerHelper(event.time, dateTV)
-
-        if (!showTime) {
-            dateTV.visibility = View.GONE
-        }
-
+        numberPicker.value = localSettings.loadBabyBottleContent()
         d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
-            event.time = pickedTime.time.time / 1000
-            event.quantity = numberPicker.value * 10
-            onPositive()
-            dialogInterface.dismiss()
+            logEvent(LunaEvent(LunaEvent.TYPE_BABY_BOTTLE, numberPicker.value * 10))
+            localSettings.saveBabyBottleContent(numberPicker.value)
         }
-
-        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
-            dialogInterface.dismiss()
-        }
-
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i -> dialogInterface.dismiss() }
         val alertDialog = d.create()
         alertDialog.show()
     }
 
-    fun addWeightEvent(event: LunaEvent) {
-        setToPreviousQuantity(event)
-        askWeightValue(event, true) { saveEvent(event) }
-    }
-
-    fun askWeightValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
+    fun askWeightValue() {
         // Show number picker dialog
         val d = AlertDialog.Builder(this)
-        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_weight, null)
-        d.setTitle(event.getTypeDescription(this))
-        d.setMessage(event.getDialogMessage(this))
+        val dialogView = layoutInflater.inflate(R.layout.number_edit_dialog, 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)
-        weightET.setText(event.quantity.toString())
-
-        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 ->
             val weight = weightET.text.toString().toIntOrNull()
-            if (weight != null) {
-                event.time = pickedTime.time.time / 1000
-                event.quantity = weight
-                onPositive()
-            } else {
+            if (weight != null)
+                logEvent(LunaEvent(LunaEvent.TYPE_WEIGHT, weight))
+            else
                 Toast.makeText(this, R.string.toast_integer_error, Toast.LENGTH_SHORT).show()
-            }
-
-            dialogInterface.dismiss()
         }
-
-        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
-            dialogInterface.dismiss()
-        }
-
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i -> dialogInterface.dismiss() }
         val alertDialog = d.create()
         alertDialog.show()
     }
 
-    fun addTemperatureEvent(event: LunaEvent) {
-        setToPreviousQuantity(event)
-        askTemperatureValue(event, true) { saveEvent(event) }
-    }
-
-    fun askTemperatureValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
+    fun askTemperatureValue() {
         // 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))
+        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 = 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
-        }
-
+        tempSlider.value = range.third.toFloat()
         val tempTextView = dialogView.findViewById<TextView>(R.id.dialog_temperature_display)
-        tempTextView.text = tempSlider.value.toString()
-        tempSlider.addOnChangeListener({ s, v, b -> tempTextView.text = v.toString() })
-
+        tempTextView.text = range.third.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()
+            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()
-        }
-
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i -> dialogInterface.dismiss() }
         val alertDialog = d.create()
         alertDialog.show()
     }
 
-    fun datePickerHelper(time: Long, dateTextView: TextView, onChange: (Long) -> Unit = {}): 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)
-                        onChange.invoke(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 addSleepEvent(event: LunaEvent) {
-        askSleepValue(event) { saveEvent(event) }
-    }
-
-    fun askSleepValue(event: LunaEvent, onPositive: () -> Unit) {
+    fun askPukeValue() {
         val d = AlertDialog.Builder(this)
-        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_duration, null)
-        d.setTitle(event.getTypeDescription(this))
-        d.setMessage(event.getDialogMessage(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 durationTextView = dialogView.findViewById<TextView>(R.id.dialog_date_duration)
-        val durationNowButton = dialogView.findViewById<Button>(R.id.dialog_date_duration_now)
-        val datePicker = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        val durationMinus15Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_minus15)
-        val durationMinus5Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_minus5)
-        val durationPlus15Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_plus15)
-        val durationPlus5Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_plus5)
-
-        val currentDurationTextColor = durationTextView.currentTextColor
-        val invalidDurationTextColor = ContextCompat.getColor(this, R.color.danger)
-
-        var duration = event.quantity
-
-        fun isValidTime(timeSeconds: Long, durationSeconds: Int): Boolean {
-            val now = Calendar.getInstance().time.time / 1000
-            return (timeSeconds + durationSeconds) <= now && durationSeconds < (12 * 60 * 60)
-        }
-
-        val onDateChange = { time: Long ->
-            durationTextView.setTextColor(currentDurationTextColor)
-
-            if (duration == 0) {
-                // baby is sleeping
-                durationTextView.text = "💤"
-            } else {
-                durationTextView.text = DateUtils.formatTimeDuration(applicationContext, duration.toLong())
-                if (!isValidTime(time, duration)) {
-                    durationTextView.setTextColor(invalidDurationTextColor)
-                }
-            }
-        }
-
-        val pickedDateTime = datePickerHelper(event.time, datePicker, onDateChange)
-
-        onDateChange(pickedDateTime.time.time / 1000)
-
-        fun adjust(minutes: Int) {
-            duration += minutes * 60
-            if (duration < 0) {
-                duration = 0
-            }
-            onDateChange(pickedDateTime.time.time / 1000)
-        }
-
-        durationMinus15Button.setOnClickListener { adjust(-15) }
-        durationMinus5Button.setOnClickListener { adjust(-5) }
-        durationPlus5Button.setOnClickListener { adjust(5) }
-        durationPlus15Button.setOnClickListener { adjust(15) }
-
-        durationNowButton.setOnClickListener {
-            val now = Calendar.getInstance().time.time / 1000
-            val start = pickedDateTime.time.time / 1000
-            if (now > start) {
-                duration = (now - start).toInt()
-                duration -= duration % 60 // prevent printing of seconds
-                onDateChange(pickedDateTime.time.time / 1000)
-            }
-        }
+        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(1)
 
         d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
-            val time = pickedDateTime.time.time / 1000
-
-            if (isValidTime(time, duration)) {
-                event.time = time
-                event.quantity = duration
-                onPositive()
-            } else {
-                Toast.makeText(this, R.string.toast_date_error, Toast.LENGTH_SHORT).show()
-            }
-            dialogInterface.dismiss()
+            val pos = spinner.selectedItemPosition
+            logEvent(LunaEvent(LunaEvent.TYPE_PUKE, pos + 1))
         }
-
-        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
-            dialogInterface.dismiss()
-        }
-
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i -> dialogInterface.dismiss() }
         val alertDialog = d.create()
         alertDialog.show()
     }
 
-    fun addAmountEvent(event: LunaEvent) {
-        askAmountValue(event, true) { saveEvent(event) }
-    }
-
-    fun askAmountValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
+    fun askNotes(lunaEvent: LunaEvent) {
         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_edit_notes, null)
-        d.setTitle(event.getTypeDescription(this))
-        d.setMessage(event.getDialogMessage(this))
+        val dialogView = layoutInflater.inflate(R.layout.dialog_notes, null)
+        d.setTitle(lunaEvent.getTypeDescription(this))
+        d.setMessage(lunaEvent.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 dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        val pickedTime = datePickerHelper(event.time, dateTV)
-
-        if (!showTime) {
-            dateTV.visibility = View.GONE
-        }
-
-        val nextTextView = dialogView.findViewById<TextView>(R.id.notes_template_next)
-        val prevTextView = dialogView.findViewById<TextView>(R.id.notes_template_prev)
-        val templates = getAllEvents().filter { it.type == event.type }.distinctBy { it.notes.trim() }.sortedBy { it.time }
-
-        fun updateContent(current: LunaEvent) {
-            val prevEvent = getPreviousSameEvent(current, templates)
-            var nextEvent = getNextSameEvent(current, templates)
-
-            notesET.setText(current.notes)
-            if (useQuantity) {
-                qtyET.setText(current.quantity.toString())
-            }
-
-            if (nextEvent == null && current != event) {
-                nextEvent = event
-            }
-
-            if (nextEvent != null) {
-                nextTextView.setOnClickListener {
-                    notesET.setText(nextEvent.notes)
-                    if (useQuantity) {
-                        qtyET.setText(nextEvent.quantity.toString())
-                    }
-                    updateContent(nextEvent)
-                }
-                nextTextView.alpha = 1.0f
-            } else {
-                nextTextView.setOnClickListener {}
-                nextTextView.alpha = 0.5f
-            }
-
-            if (prevEvent != null) {
-                prevTextView.setOnClickListener {
-                    notesET.setText(prevEvent.notes)
-                    if (useQuantity) {
-                        qtyET.setText(prevEvent.quantity.toString())
-                    }
-                    updateContent(prevEvent)
-                }
-                prevTextView.alpha = 1.0f
-            } else {
-                prevTextView.setOnClickListener {}
-                prevTextView.alpha = 0.5f
-            }
-        }
-
-        notesET.setText(event.notes)
-
-        if (useQuantity) {
-            qtyET.setText(event.quantity.toString())
-        } else {
+        if (lunaEvent.type == LunaEvent.TYPE_NOTE || lunaEvent.type == LunaEvent.TYPE_CUSTOM)
             qtyET.visibility = View.GONE
-        }
-
-        updateContent(event)
-
         d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
-            val notes = notesET.text.toString()
-
-            if (useQuantity) {
-                val quantity = qtyET.text.toString().toIntOrNull()
-                if (quantity != null) {
-                    event.time = pickedTime.time.time / 1000
-                    event.notes = notes
-                    event.quantity = quantity
-                    onPositive()
-                } else {
+            val qtyStr = qtyET.text.toString()
+            if (qtyStr.isNotEmpty()) {
+                val qty = qtyStr.toIntOrNull()
+                if (qty == null) {
                     Toast.makeText(this, R.string.toast_integer_error, Toast.LENGTH_SHORT).show()
+                    return@setPositiveButton
                 }
-
-            } else {
-                event.time = pickedTime.time.time / 1000
-                event.notes = notes
-                onPositive()
+                lunaEvent.quantity = qty
             }
-
-            dialogInterface.dismiss()
+            val notes = notesET.text.toString()
+            lunaEvent.notes = notes
+            logEvent(lunaEvent)
         }
-
-        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
-            dialogInterface.dismiss()
-        }
-
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i -> dialogInterface.dismiss() }
         val alertDialog = d.create()
         alertDialog.show()
     }
@@ -666,14 +331,7 @@ class MainActivity : AppCompatActivity() {
         alertDialog.show()
     }
 
-    fun setToPreviousQuantity(event: LunaEvent) {
-        val prev = getPreviousSameEvent(event, getAllEvents())
-        if (prev != null) {
-            event.quantity = prev.quantity
-        }
-    }
-
-    fun getPreviousSameEvent(event: LunaEvent, items: List<LunaEvent>): LunaEvent? {
+    fun getPreviousSameEvent(event: LunaEvent, items: ArrayList<LunaEvent>): LunaEvent? {
         var previousEvent: LunaEvent? = null
         for (item in items) {
             if (item.type == event.type && item.time < event.time) {
@@ -687,7 +345,7 @@ class MainActivity : AppCompatActivity() {
         return previousEvent
     }
 
-    fun getNextSameEvent(event: LunaEvent, items: List<LunaEvent>): LunaEvent? {
+    fun getNextSameEvent(event: LunaEvent, items: ArrayList<LunaEvent>): LunaEvent? {
         var nextEvent: LunaEvent? = null
         for (item in items) {
             if (item.type == event.type && item.time > event.time) {
@@ -701,86 +359,55 @@ class MainActivity : AppCompatActivity() {
         return nextEvent
     }
 
-    fun showEventDetailDialog(originalEvent: LunaEvent) {
-        val event = LunaEvent(originalEvent)
-
+    fun showEventDetailDialog(event: LunaEvent, items: ArrayList<LunaEvent>) {
         // 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)
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_emoji).text = event.getTypeEmoji(this)
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_description).text = event.getTypeDescription(this)
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_quantity).text =
+            NumericUtils(this).formatEventQuantity(event)
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_notes).text = event.notes
+
+        val currentDateTime = Calendar.getInstance()
+        currentDateTime.time = Date(event.time * 1000)
 
-        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)
+        dateTextView.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), DateUtils.formatDateTime(event.time))
+        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)
 
-        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()
-
-        quantityTextView.setOnClickListener {
-            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)
-                LunaEvent.TYPE_SLEEP -> askSleepValue(event, updateValues)
-            }
-        }
-
-        notesTextView.setOnClickListener {
-            when (event.type) {
-                LunaEvent.TYPE_FOOD,
-                LunaEvent.TYPE_MEDICINE,
-                LunaEvent.TYPE_NOTE -> askNotes(event, false, updateValues)
-            }
+            DatePickerDialog(this, { _, year, month, day ->
+                TimePickerDialog(this, { _, hour, minute ->
+                    val pickedDateTime = Calendar.getInstance()
+                    pickedDateTime.set(year, month, day, hour, minute)
+                    // Save event and move it to the right position in the logbook
+                    event.time = pickedDateTime.time.time / 1000 // Seconds since epoch
+                    dateTextView.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), DateUtils.formatDateTime(event.time))
+                    logbook?.sort()
+                    recyclerView.adapter?.notifyDataSetChanged()
+                    saveLogbook()
+                }, startHour, startMinute, android.text.format.DateFormat.is24HourFormat(this@MainActivity)).show()
+            }, startYear, startMonth, startDay).show()
         }
 
         d.setView(dialogView)
-
-        d.setNeutralButton(R.string.dialog_event_detail_delete_button) { dialogInterface, i ->
-            deleteEvent(originalEvent)
-            dialogInterface.dismiss()
-        }
-
-        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()
-        }
-
+        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) }
         val alertDialog = d.create()
         alertDialog.show()
-
-        alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(
-            ContextCompat.getColor(this, R.color.danger)
-        )
-
-        alertDialog.setOnDismissListener {
+        alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(ContextCompat.getColor(this, R.color.danger))
+        alertDialog.setOnDismissListener({
             // Resume logbook update
             pauseLogbookUpdate = false
-        }
+        })
 
         // show optional signature
         if (event.signature.isNotEmpty()) {
@@ -789,33 +416,32 @@ class MainActivity : AppCompatActivity() {
             signatureTextEdit.visibility = View.VISIBLE
         }
 
-        val allEvents = getAllEvents()
+        // create next/previous links to events of the same type
 
-        // create link to prevent event of the same type
         val previousTextView = dialogView.findViewById<TextView>(R.id.dialog_event_previous)
-        val previousEvent = getPreviousSameEvent(event, allEvents)
+        val nextTextView = dialogView.findViewById<TextView>(R.id.dialog_event_next)
+        val nextEvent = getNextSameEvent(event, items)
+        val previousEvent = getPreviousSameEvent(event, items)
+
         if (previousEvent != null) {
             val emoji = previousEvent.getTypeEmoji(applicationContext)
             val time = DateUtils.formatTimeDuration(applicationContext, event.time - previousEvent.time)
             previousTextView.text = String.format("⬅️ %s %s", emoji, time)
             previousTextView.setOnClickListener {
                 alertDialog.cancel()
-                showEventDetailDialog(previousEvent)
+                showEventDetailDialog(previousEvent, items)
             }
         } else {
             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)
             nextTextView.text = String.format("%s %s ➡️", time, emoji)
             nextTextView.setOnClickListener {
                 alertDialog.cancel()
-                showEventDetailDialog(nextEvent)
+                showEventDetailDialog(nextEvent, items)
             }
         } else {
             nextTextView.visibility = View.GONE
@@ -1175,41 +801,41 @@ 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 {
-                addNoteEvent(LunaEvent(LunaEvent.TYPE_MEDICINE))
+                askNotes(LunaEvent(LunaEvent.TYPE_MEDICINE))
                 dismiss()
             }
-            contentView.findViewById<View>(R.id.button_enema).setOnClickListener {
-                addPlainEvent(LunaEvent(LunaEvent.TYPE_ENEMA))
+            contentView.findViewById<View>(R.id.button_enema).setOnClickListener({
+                logEvent(LunaEvent(LunaEvent.TYPE_ENEMA))
                 dismiss()
-            }
-            contentView.findViewById<View>(R.id.button_note).setOnClickListener {
-                addNoteEvent(LunaEvent(LunaEvent.TYPE_NOTE))
+            })
+            contentView.findViewById<View>(R.id.button_note).setOnClickListener({
+                askNotes(LunaEvent(LunaEvent.TYPE_NOTE))
                 dismiss()
-            }
-            contentView.findViewById<View>(R.id.button_temperature).setOnClickListener {
-                addTemperatureEvent(LunaEvent(LunaEvent.TYPE_TEMPERATURE))
+            })
+            contentView.findViewById<View>(R.id.button_temperature).setOnClickListener({
+                askTemperatureValue()
                 dismiss()
-            }
-            contentView.findViewById<View>(R.id.button_puke).setOnClickListener {
-                addAmountEvent(LunaEvent(LunaEvent.TYPE_PUKE))
+            })
+            contentView.findViewById<View>(R.id.button_puke).setOnClickListener({
+                askPukeValue()
                 dismiss()
-            }
-            contentView.findViewById<View>(R.id.button_sleep).setOnClickListener {
-                addSleepEvent(LunaEvent(LunaEvent.TYPE_SLEEP))
+            })
+            contentView.findViewById<View>(R.id.button_colic).setOnClickListener({
+                logEvent(
+                    LunaEvent(LunaEvent.TYPE_COLIC)
+                )
                 dismiss()
-            }
-            contentView.findViewById<View>(R.id.button_colic).setOnClickListener {
-                addPlainEvent(LunaEvent(LunaEvent.TYPE_COLIC))
+            })
+            contentView.findViewById<View>(R.id.button_scale).setOnClickListener({
+                askWeightValue()
                 dismiss()
-            }
-            contentView.findViewById<View>(R.id.button_scale).setOnClickListener {
-                addWeightEvent(LunaEvent(LunaEvent.TYPE_WEIGHT))
+            })
+            contentView.findViewById<View>(R.id.button_bath).setOnClickListener({
+                logEvent(
+                    LunaEvent(LunaEvent.TYPE_BATH)
+                )
                 dismiss()
-            }
-            contentView.findViewById<View>(R.id.button_bath).setOnClickListener {
-                addPlainEvent(LunaEvent(LunaEvent.TYPE_BATH))
-                dismiss()
-            }
+            })
         }.also { popupWindow ->
             popupWindow.setOnDismissListener({
                 Handler(mainLooper).postDelayed({

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

@@ -30,7 +30,6 @@ class LunaEvent: Comparable<LunaEvent> {
         const val TYPE_FOOD = "FOOD"
         const val TYPE_PUKE = "PUKE"
         const val TYPE_BATH = "BATH"
-        const val TYPE_SLEEP = "SLEEP"
     }
 
     private val jo: JSONObject
@@ -50,8 +49,6 @@ class LunaEvent: Comparable<LunaEvent> {
         set(value) {
             if (value > 0)
                 jo.put("quantity", value)
-            else
-                jo.remove("quantity")
         }
     var notes: String
         get(): String = jo.optString("notes")
@@ -72,15 +69,6 @@ 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
@@ -98,7 +86,7 @@ class LunaEvent: Comparable<LunaEvent> {
         return context.getString(
             when (type) {
                 TYPE_BABY_BOTTLE -> R.string.event_bottle_type
-                TYPE_WEIGHT -> R.string.event_weight_type
+                TYPE_WEIGHT -> R.string.event_scale_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
@@ -112,7 +100,6 @@ class LunaEvent: Comparable<LunaEvent> {
                 TYPE_FOOD -> R.string.event_food_type
                 TYPE_PUKE -> R.string.event_puke_type
                 TYPE_BATH -> R.string.event_bath_type
-                TYPE_SLEEP -> R.string.event_sleep_type
                 else -> R.string.event_unknown_type
             }
         )
@@ -122,7 +109,7 @@ class LunaEvent: Comparable<LunaEvent> {
         return context.getString(
             when (type) {
                 TYPE_BABY_BOTTLE -> R.string.event_bottle_desc
-                TYPE_WEIGHT -> R.string.event_weight_desc
+                TYPE_WEIGHT -> R.string.event_scale_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
@@ -136,26 +123,16 @@ class LunaEvent: Comparable<LunaEvent> {
                 TYPE_FOOD -> R.string.event_food_desc
                 TYPE_PUKE -> R.string.event_puke_desc
                 TYPE_BATH -> R.string.event_bath_desc
-                TYPE_SLEEP -> R.string.event_sleep_desc
                 else -> R.string.event_unknown_desc
             }
         )
     }
 
     fun getDialogMessage(context: Context): String? {
-        return context.getString(
-            when(type) {
-                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
-                TYPE_SLEEP -> R.string.log_sleep_dialog_description
-                else -> R.string.log_unknown_dialog_description
-            }
-        )
+        return when(type) {
+            TYPE_MEDICINE -> context.getString(R.string.log_medicine_dialog_description)
+            else -> null
+        }
     }
 
     fun toJson(): JSONObject {

app/src/main/java/it/danieleverducci/lunatracker/repository/LocalSettingsRepository.kt

@@ -23,6 +23,14 @@ class LocalSettingsRepository(val context: Context) {
         sharedPreferences = context.getSharedPreferences(SHARED_PREFS_FILE_NAME, MODE_PRIVATE)
     }
 
+    fun saveBabyBottleContent(content: Int) {
+        sharedPreferences.edit { putInt(SHARED_PREFS_BB_CONTENT, content) }
+    }
+
+    fun loadBabyBottleContent(): Int {
+        return sharedPreferences.getInt(SHARED_PREFS_BB_CONTENT, 1)
+    }
+
     fun saveSignature(content: String) {
         sharedPreferences.edit { putString(SHARED_PREFS_SIGNATURE, content) }
     }

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

@@ -62,8 +62,10 @@ class DateUtils {
                 return format(days, hours, R.string.day_ago, R.string.days_ago, R.string.hour_ago, R.string.hours_ago)
             } else if (hours > 0) {
                 return format(hours, minutes, R.string.hour_ago, R.string.hours_ago, R.string.minute_ago, R.string.minutes_ago)
-            } else {
+            } else if (minutes > 0) {
                 return format(minutes, seconds, R.string.minute_ago, R.string.minute_ago, R.string.second_ago, R.string.seconds_ago)
+            } else {
+                return context.getString(R.string.now)
             }
         }
 

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

@@ -4,10 +4,8 @@ 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 utils.DateUtils.Companion.formatTimeDuration
 import java.text.NumberFormat
 
 class NumericUtils (val context: Context) {
@@ -62,29 +60,21 @@ class NumericUtils (val context: Context) {
         )
     }
 
-    fun formatEventQuantity(event: LunaEvent): String {
+    fun formatEventQuantity(item: LunaEvent): String {
         val formatted = StringBuilder()
-        if (event.quantity > 0) {
-            formatted.append(when (event.type) {
+        if (item.quantity > 0) {
+            formatted.append(when (item.type) {
                 LunaEvent.TYPE_TEMPERATURE ->
-                    (event.quantity / 10.0f).toString()
-                LunaEvent.TYPE_DIAPERCHANGE_POO,
-                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 ""
-                    }
-                }
-                LunaEvent.TYPE_SLEEP -> formatTimeDuration(context, event.quantity.toLong())
+                    (item.quantity / 10.0f).toString()
+                LunaEvent.TYPE_PUKE ->
+                    context.resources.getStringArray(R.array.AmountLabels)[item.quantity - 1]
                 else ->
-                    event.quantity
+                    item.quantity
             })
 
             formatted.append(" ")
             formatted.append(
-                when (event.type) {
+                when (item.type) {
                     LunaEvent.TYPE_BABY_BOTTLE -> measurement_unit_liquid_base
                     LunaEvent.TYPE_WEIGHT -> measurement_unit_weight_base
                     LunaEvent.TYPE_MEDICINE -> measurement_unit_weight_tiny
@@ -92,11 +82,6 @@ class NumericUtils (val context: Context) {
                     else -> ""
                 }
             )
-        } else {
-            formatted.append(when (event.type) {
-                LunaEvent.TYPE_SLEEP -> "💤" // baby is sleeping
-                else -> ""
-            })
         }
         return formatted.toString()
     }

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

@@ -1,35 +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:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <NumberPicker
-            android:id="@+id/dialog_number_picker"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:text="ml"/>
-
-    </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_edit_duration.xml

@@ -1,69 +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"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/dialog_date_duration"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="20sp"
-        android:text="💤"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginTop="20dp"
-        android:layout_marginHorizontal="10dp"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/dialog_date_duration_minus15"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="-15"/>
-
-        <Button
-            android:id="@+id/dialog_date_duration_minus5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="-5"/>
-
-        <Button
-            android:id="@+id/dialog_date_duration_now"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/now"/>
-
-        <Button
-            android:id="@+id/dialog_date_duration_plus5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="+5"/>
-
-        <Button
-            android:id="@+id/dialog_date_duration_plus15"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="+15"/>
-
-    </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_edit_weight.xml

@@ -1,38 +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: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_detail.xml

@@ -36,7 +36,9 @@
         android:drawablePadding="10dp"
         android:drawableTint="@color/accent"
         android:textSize="16sp"
-        android:textStyle="bold"/>
+        android:textStyle="bold"
+        android:text="@string/dialog_event_detail_datetime_icon"
+        app:drawableEndCompat="@drawable/ic_edit" />
 
     <TextView
         android:id="@+id/dialog_event_detail_type_quantity"

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

@@ -24,34 +24,4 @@
         android:hint="@string/log_notes_dialog_note_hint"
         android:background="@drawable/textview_background"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:gravity="end"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/notes_template_prev"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="18dp"
-            android:text="⬅️"/>
-
-        <TextView
-            android:id="@+id/notes_template_next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="18dp"
-            android:text="➡️"/>
-
-    </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/more_events_popup.xml

@@ -49,16 +49,6 @@
                 style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_puke"/>
 
-            <TextView
-                android:id="@+id/button_sleep"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:background="@drawable/dropdown_list_item_background"
-                style="@style/OverflowMenuText"
-                android:text="@string/overflow_event_sleep"/>
-
             <TextView
                 android:id="@+id/button_colic"
                 android:layout_width="match_parent"
@@ -77,7 +67,7 @@
                 android:padding="10dp"
                 android:background="@drawable/dropdown_list_item_background"
                 style="@style/OverflowMenuText"
-                android:text="@string/overflow_event_weight"/>
+                android:text="@string/overflow_event_scale"/>
 
             <TextView
                 android:id="@+id/button_bath"

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

@@ -0,0 +1,22 @@
+<?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/layout/number_picker_dialog.xml

@@ -4,12 +4,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
-    android:gravity="center"
-    android:orientation="vertical">
+    android:gravity="center">
 
-    <TextView
-        android:id="@+id/dialog_date_picker"
-        android:layout_width="wrap_content"
+    <NumberPicker
+        android:id="@+id/dialog_number_picker"
+        android:layout_width="150dp"
         android:layout_height="wrap_content"/>
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:text="ml"/>
 </LinearLayout>

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

@@ -8,16 +8,10 @@
     android:orientation="vertical">
 
     <Spinner
-        android:id="@+id/dialog_amount_value"
+        android:id="@+id/dialog_puke_value"
         android:layout_width="250dp"
         android:layout_height="wrap_content"
         android:paddingHorizontal="16dp"
         android:paddingVertical="8dp"/>
 
-    <TextView
-        android:id="@+id/dialog_date_picker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"/>
-
 </LinearLayout>

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

@@ -23,11 +23,4 @@
         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_marginTop="20dp"/>
-
 </LinearLayout>

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

@@ -3,9 +3,18 @@
     <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_weight_desc">Gewicht</string>
+    <string name="event_scale_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>
@@ -18,7 +27,7 @@
     <string name="event_colic_desc">Blähungskolik</string>
     <string name="event_unknown_desc"></string>
 
-    <string name="overflow_event_weight">⚖️ Gewicht</string>
+    <string name="overflow_event_scale">⚖️ Gewicht</string>
     <string name="overflow_event_medicine">💊 Medikament</string>
     <string name="overflow_event_enema">🪠 Einlauf</string>
     <string name="overflow_event_note">📝 Notiz</string>
@@ -68,13 +77,10 @@
     <string name="trim_logbook_dialog_button_ok">Jetzt bereinigen</string>
     <string name="trim_logbook_dialog_button_cancel">Später erinnern</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_description">Notizen:</string>
-    <string name="log_notes_dialog_note_hint">Notiz 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_temperature_dialog_description">Temperatur eingeben</string>
-    <string name="log_weight_dialog_description">Gewicht eingeben</string>
+    <string name="log_notes_dialog_note_hint">Notiz 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,9 +3,18 @@
     <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_weight_desc">Poids</string>
+    <string name="event_scale_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>
@@ -18,7 +27,7 @@
     <string name="event_colic_desc">Colique gazeuse</string>
     <string name="event_unknown_desc"></string>
 
-    <string name="overflow_event_weight">⚖️ Poids</string>
+    <string name="overflow_event_scale">⚖️ Poids</string>
     <string name="overflow_event_medicine">💊 Médicament</string>
     <string name="overflow_event_enema">🪠 Lavement</string>
     <string name="overflow_event_note">📝 Note</string>
@@ -67,13 +76,10 @@
     <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_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_description">Notes:</string>
-    <string name="log_notes_dialog_note_hint">Notes ...</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_temperature_dialog_description">Renseignez la Température</string>
-    <string name="log_weight_dialog_description">Renseignez le poids</string>
+    <string name="log_notes_dialog_note_hint">Notes ...</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,7 +3,16 @@
     <string name="title">🌜 LunaTracker 🌛</string>
     <string name="logbook">Diario di bordo</string>
 
-    <string name="overflow_event_weight">⚖️ Peso</string>
+    <string name="log_bottle_dialog_title">Biberon</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>
@@ -12,7 +21,7 @@
 
     <string name="event_bottle_desc">Biberon</string>
     <string name="event_food_desc">Cibo</string>
-    <string name="event_weight_desc">Pesata</string>
+    <string name="event_scale_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>
@@ -67,13 +76,10 @@
     <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_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_description">Note:</string>
-    <string name="log_notes_dialog_note_hint">Inserisci le note</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_temperature_dialog_description">Inserisci la temperatura</string>
-    <string name="log_weight_dialog_description">Inserisci il peso rilevato</string>
+    <string name="log_notes_dialog_note_hint">Inserisci le note</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,7 +1,6 @@
 <?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,9 +3,21 @@
     <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="event_bottle_type" translatable="false">🍼</string>
     <string name="event_food_type" translatable="false">🥣</string>
-    <string name="event_weight_type" translatable="false">⚖️</string>
+    <string name="event_scale_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>
@@ -18,12 +30,11 @@
     <string name="event_colic_type" translatable="false">💨</string>
     <string name="event_puke_type" translatable="false">🤮</string>
     <string name="event_bath_type" translatable="false">🛁</string>
-    <string name="event_sleep_type" translatable="false">💤</string>
     <string name="event_unknown_type" translatable="false">\?</string>
 
     <string name="event_bottle_desc">Baby bottle</string>
     <string name="event_food_desc">Food</string>
-    <string name="event_weight_desc">Weight</string>
+    <string name="event_scale_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>
@@ -36,24 +47,21 @@
     <string name="event_colic_desc">Gaseous colic</string>
     <string name="event_puke_desc">Puke</string>
     <string name="event_bath_desc">Bath</string>
-    <string name="event_sleep_desc">Sleep</string>
     <string name="event_unknown_desc"></string>
 
-    <string name="overflow_event_weight">⚖️ Weight</string>
+    <string name="overflow_event_scale">⚖️ Weight</string>
     <string name="overflow_event_medicine">💊 Medicine</string>
     <string name="overflow_event_enema">🪠 Enema</string>
     <string name="overflow_event_note">📝 Note</string>
     <string name="overflow_event_temperature">🌡️ Temperature</string>
     <string name="overflow_event_colic">💨 Gaseous colic</string>
     <string name="overflow_event_puke">🤮 Puke</string>
-    <string name="overflow_event_sleep">💤 Sleep</string>
     <string name="overflow_event_bath">🛁 Bath</string>
 
     <string name="toast_event_added">Event logged</string>
     <string name="toast_logbook_saved">Logbook saved</string>
     <string name="toast_event_add_error">Unable to log the event</string>
     <string name="toast_integer_error">Invalid value. Insert an integer.</string>
-    <string name="toast_date_error">Invalid date.</string>
 
     <string name="now">now</string>
     <string name="second_ago">sec</string>
@@ -67,7 +75,6 @@
     <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>
@@ -107,16 +114,10 @@
     <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_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_description">Notes:</string>
-    <string name="log_notes_dialog_note_hint">Write some notes</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_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="log_sleep_dialog_description">Set sleep duration:</string>
+    <string name="log_notes_dialog_note_hint">Write some notes</string>
 
     <string name="measurement_unit_liquid_base_metric" translatable="false">ml</string>
     <string name="measurement_unit_weight_base_metric" translatable="false">g</string>
@@ -132,6 +133,7 @@
     <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>