activity_main: lower margin from 10 to 5dp

The buttons are big enough for fingers.
Let's make the view more compact.

.idea/.name

@@ -1 +0,0 @@
-LunaTracker

.idea/AndroidProjectSystem.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>

.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
-  </component>
-</project>

README.md

@@ -1,7 +1,5 @@
 # 🌜 LunaTracker 🌛
 
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/it/packages/it.danieleverducci.lunatracker/)
-
 LunaTracker is a newborn baby tracking app.
 
 Parenting can be tough. You get home from the hospital, exhausted, with this little fragile unknown thingy that has no user manual and a single way to let you know something's not ok: crying.
@@ -13,8 +11,7 @@ Dedicated to my daughter Luna.
 
 ![Screenshot](fastlane/metadata/android/en-US/images/phoneScreenshots/1.png)
 
-## Thanks for the valuable contributions to:
+Thanks for the valuable contributions to:
 
-- Chepycou (French translation)
-- Daniel Neubauer (German translation)
-- Moritz Warning (Various bugfixes and new features)
+Chepycou (French translation)
+Daniel Neubauer (German translation)

app/build.gradle.kts

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

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

@@ -41,14 +41,15 @@ import okio.IOException
 import org.json.JSONException
 import utils.DateUtils
 import utils.NumericUtils
+import java.text.DateFormat
 import java.util.Calendar
 import java.util.Date
 
 class MainActivity : AppCompatActivity() {
     companion object {
-        const val TAG = "MainActivity"
-        const val UPDATE_EVERY_SECS: Long = 30
-        const val DEBUG_CHECK_LOGBOOK_CONSISTENCY = false
+        val TAG = "MainActivity"
+        val UPDATE_EVERY_SECS: Long = 30
+        val DEBUG_CHECK_LOGBOOK_CONSISTENCY = false
     }
 
     var logbook: Logbook? = null
@@ -57,7 +58,6 @@ class MainActivity : AppCompatActivity() {
     lateinit var buttonsContainer: ViewGroup
     lateinit var recyclerView: RecyclerView
     lateinit var handler: Handler
-    var signature = ""
     var savingEvent = false
     val updateListRunnable: Runnable = Runnable {
         if (logbook != null && !pauseLogbookUpdate)
@@ -81,54 +81,58 @@ 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()
-        }
-        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)
         }
-        findViewById<View>(R.id.button_no_connection_settings).setOnClickListener {
+        findViewById<View>(R.id.button_no_connection_settings).setOnClickListener({
             showSettings()
-        }
-        findViewById<View>(R.id.button_settings).setOnClickListener {
+        })
+        findViewById<View>(R.id.button_settings).setOnClickListener({
             showSettings()
-        }
-        findViewById<View>(R.id.button_no_connection_retry).setOnClickListener {
+        })
+        findViewById<View>(R.id.button_no_connection_retry).setOnClickListener({
             // This may happen at start, when logbook is still null: better ask the logbook list
             loadLogbookList()
-        }
-        findViewById<View>(R.id.button_sync).setOnClickListener {
+        })
+        findViewById<View>(R.id.button_sync).setOnClickListener({
             loadLogbookList()
-        }
+        })
     }
 
     private fun setListAdapter(items: ArrayList<LunaEvent>) {
         val adapter = LunaEventRecyclerAdapter(this, items)
         adapter.onItemClickListener = object: LunaEventRecyclerAdapter.OnItemClickListener{
             override fun onItemClick(event: LunaEvent) {
-                showEventDetailDialog(event)
+                showEventDetailDialog(event, items)
             }
         }
         recyclerView.adapter = adapter
@@ -165,8 +169,6 @@ class MainActivity : AppCompatActivity() {
             logbookRepo = FileLogbookRepository()
         }
 
-        signature = settingsRepository.loadSignature()
-
         val noBreastfeeding = settingsRepository.loadNoBreastfeeding()
         findViewById<View>(R.id.layout_nipples).visibility = when (noBreastfeeding) {
             true -> View.GONE
@@ -191,314 +193,98 @@ class MainActivity : AppCompatActivity() {
         super.onStop()
     }
 
-    fun getAllEvents(): ArrayList<LunaEvent> {
-        return logbook?.logs ?: arrayListOf()
-    }
-
-    fun addBabyBottleEvent() {
-        val event = LunaEvent(LunaEvent.TYPE_BABY_BOTTLE)
-        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) {
-        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) {
-        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()
+        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): 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) {
+    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.notes_date_picker)
-        val pickedTime = datePickerHelper(event.time, dateTV)
-
-        if (!showTime) {
-            dateTV.visibility = View.GONE
-        }
-
-        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
-        }
-
         d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
+            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
+                }
+                lunaEvent.quantity = qty
+            }
             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 {
-                    Toast.makeText(applicationContext, R.string.toast_integer_error, Toast.LENGTH_SHORT).show()
+            lunaEvent.notes = notes
+            logEvent(lunaEvent)
         }
-
-            } else {
-                event.time = pickedTime.time.time / 1000
-                event.notes = notes
-                onPositive()
-            }
-
-            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()
     }
@@ -551,120 +337,84 @@ 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 dateFormat = DateFormat.getDateTimeInstance()
         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 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 currentDateTime = Calendar.getInstance()
+        currentDateTime.time = Date(event.time * 1000)
         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), dateFormat.format(currentDateTime.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)
+            DatePickerDialog(this, { _, year, month, day ->
+                TimePickerDialog(this, { _, hour, minute ->
+                    val pickedDateTime = Calendar.getInstance()
+                    pickedDateTime.set(year, month, day, hour, minute)
+                    currentDateTime.time = pickedDateTime.time
+                    dateTextView.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), dateFormat.format(currentDateTime.time))
 
-        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)
-            }
-        }
-
-        notesTextView.setOnClickListener {
-            when (event.type) {
-                LunaEvent.TYPE_FOOD,
-                LunaEvent.TYPE_MEDICINE,
-                LunaEvent.TYPE_NOTE -> askNotes(event, false, updateValues)
-            }
+                    // Save event and move it to the right position in the logbook
+                    event.time = currentDateTime.time.time / 1000 // Seconds since epoch
+                    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()) {
-            val signatureTextEdit = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_signature)
-            signatureTextEdit.text =  String.format(getString(R.string.dialog_event_detail_signature), event.signature)
-            signatureTextEdit.visibility = View.VISIBLE
-        }
+        // create next/previous links to events of the same type
 
-        val allEvents = getAllEvents()
-
-        // 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
@@ -772,7 +522,7 @@ class MainActivity : AppCompatActivity() {
                 runOnUiThread({
                     setLoading(false)
                     loadLogbookList()
-                    Toast.makeText(applicationContext, getString(R.string.logbook_created) + logbookName, Toast.LENGTH_SHORT).show()
+                    Toast.makeText(this@MainActivity, getString(R.string.logbook_created) + logbookName, Toast.LENGTH_SHORT).show()
                 })
             }
 
@@ -888,8 +638,6 @@ class MainActivity : AppCompatActivity() {
     fun logEvent(event: LunaEvent) {
         savingEvent(true)
 
-        event.signature = signature
-
         setLoading(true)
         logbook?.logs?.add(0, event)
         recyclerView.adapter?.notifyItemInserted(0)
@@ -929,7 +677,7 @@ class MainActivity : AppCompatActivity() {
                     setLoading(false)
 
                     Toast.makeText(
-                        applicationContext,
+                        this@MainActivity,
                         if (lastEventAdded != null)
                             R.string.toast_event_added
                         else
@@ -991,7 +739,7 @@ class MainActivity : AppCompatActivity() {
         runOnUiThread({
             setLoading(false)
 
-            Toast.makeText(applicationContext, R.string.toast_event_add_error, Toast.LENGTH_SHORT).show()
+            Toast.makeText(this@MainActivity, R.string.toast_event_add_error, Toast.LENGTH_SHORT).show()
             recyclerView.adapter?.notifyDataSetChanged()
             savingEvent(false)
         })
@@ -1024,37 +772,31 @@ 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_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))
-                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/SettingsActivity.kt

@@ -2,7 +2,6 @@ package it.danieleverducci.lunatracker
 
 import android.os.Bundle
 import android.view.View
-import android.widget.EditText
 import android.widget.RadioButton
 import android.widget.TextView
 import android.widget.Toast
@@ -25,7 +24,6 @@ open class SettingsActivity : AppCompatActivity() {
     protected lateinit var textViewWebDAVPass: TextView
     protected lateinit var progressIndicator: LinearProgressIndicator
     protected lateinit var switchNoBreastfeeding: SwitchMaterial
-    protected lateinit var textViewSignature: EditText
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -38,7 +36,6 @@ open class SettingsActivity : AppCompatActivity() {
         textViewWebDAVPass = findViewById(R.id.settings_data_webdav_pass)
         progressIndicator = findViewById(R.id.progress_indicator)
         switchNoBreastfeeding = findViewById(R.id.switch_no_breastfeeding)
-        textViewSignature = findViewById(R.id.settings_signature)
 
         findViewById<View>(R.id.settings_save).setOnClickListener({
             validateAndSave()
@@ -55,20 +52,18 @@ open class SettingsActivity : AppCompatActivity() {
         val dataRepo = settingsRepository.loadDataRepository()
         val webDavCredentials = settingsRepository.loadWebdavCredentials()
         val noBreastfeeding = settingsRepository.loadNoBreastfeeding()
-        val signature = settingsRepository.loadSignature()
 
         when (dataRepo) {
             LocalSettingsRepository.DATA_REPO.LOCAL_FILE -> radioDataLocal.isChecked = true
             LocalSettingsRepository.DATA_REPO.WEBDAV -> radioDataWebDAV.isChecked = true
         }
 
-        textViewSignature.setText(signature)
         switchNoBreastfeeding.isChecked = noBreastfeeding
 
         if (webDavCredentials != null) {
-            textViewWebDAVUrl.text = webDavCredentials[0]
-            textViewWebDAVUser.text = webDavCredentials[1]
-            textViewWebDAVPass.text = webDavCredentials[2]
+            textViewWebDAVUrl.setText(webDavCredentials[0])
+            textViewWebDAVUser.setText(webDavCredentials[1])
+            textViewWebDAVPass.setText(webDavCredentials[2])
         }
     }
 
@@ -161,7 +156,6 @@ open class SettingsActivity : AppCompatActivity() {
             else LocalSettingsRepository.DATA_REPO.LOCAL_FILE
         )
         settingsRepository.saveNoBreastfeeding(switchNoBreastfeeding.isChecked)
-        settingsRepository.saveSignature(textViewSignature.text.toString())
         settingsRepository.saveWebdavCredentials(
             textViewWebDAVUrl.text.toString(),
             textViewWebDAVUser.text.toString(),
@@ -176,7 +170,7 @@ open class SettingsActivity : AppCompatActivity() {
      */
     private fun copyLocalLogbooksToWebdav(webDAVLogbookRepository: WebDAVLogbookRepository, listener: OnCopyLocalLogbooksToWebdavFinishedListener) {
         Thread(Runnable {
-            val errors = StringBuilder()
+            var errors = StringBuilder()
             val fileLogbookRepo = FileLogbookRepository()
             val logbooks = fileLogbookRepo.getAllLogbooks(this)
             for (logbook in logbooks) {

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

@@ -28,8 +28,6 @@ class LunaEvent: Comparable<LunaEvent> {
         const val TYPE_COLIC = "COLIC"
         const val TYPE_TEMPERATURE = "TEMPERATURE"
         const val TYPE_FOOD = "FOOD"
-        const val TYPE_PUKE = "PUKE"
-        const val TYPE_BATH = "BATH"
     }
 
     private val jo: JSONObject
@@ -45,9 +43,9 @@ class LunaEvent: Comparable<LunaEvent> {
             jo.put("type", value)
         }
     var quantity: Int
-        get() = jo.optInt("quantity", -1)
+        get() = jo.optInt("quantity")
         set(value) {
-            if (value >= 0)
+            if (value > 0)
                 jo.put("quantity", value)
         }
     var notes: String
@@ -55,12 +53,6 @@ class LunaEvent: Comparable<LunaEvent> {
         set(value) {
             jo.put("notes", value)
         }
-    var signature: String
-        get(): String = jo.optString("signature")
-        set(value) {
-            if (value.isNotEmpty())
-                jo.put("signature", value)
-        }
 
     constructor(jo: JSONObject) {
         this.jo = jo
@@ -69,15 +61,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
@@ -95,7 +78,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
@@ -107,8 +90,6 @@ class LunaEvent: Comparable<LunaEvent> {
                 TYPE_TEMPERATURE -> R.string.event_temperature_type
                 TYPE_COLIC -> R.string.event_colic_type
                 TYPE_FOOD -> R.string.event_food_type
-                TYPE_PUKE -> R.string.event_puke_type
-                TYPE_BATH -> R.string.event_bath_type
                 else -> R.string.event_unknown_type
             }
         )
@@ -118,7 +99,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
@@ -130,26 +111,16 @@ class LunaEvent: Comparable<LunaEvent> {
                 TYPE_TEMPERATURE -> R.string.event_temperature_desc
                 TYPE_COLIC -> R.string.event_colic_desc
                 TYPE_FOOD -> R.string.event_food_desc
-                TYPE_PUKE -> R.string.event_puke_desc
-                TYPE_BATH -> R.string.event_bath_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
-                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 {
@@ -157,7 +128,7 @@ class LunaEvent: Comparable<LunaEvent> {
     }
 
     override fun toString(): String {
-        return "$type qty: $quantity time: ${Date(time * 1000)}"
+        return "${type} qty: $quantity time: ${Date(time * 1000)}"
     }
 
     override fun compareTo(other: LunaEvent): Int {

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

@@ -13,9 +13,9 @@ import java.io.FilenameFilter
 
 class FileLogbookRepository: LogbookRepository {
     companion object {
-        const val TAG = "FileLogbookRepository"
-        const val FILE_NAME_START = "data"
-        const val FILE_NAME_END = ".json"
+        val TAG = "FileLogbookRepository"
+        val FILE_NAME_START = "data"
+        val FILE_NAME_END = ".json"
     }
 
     override fun loadLogbook(context: Context, name: String, listener: LogbookLoadedListener) {
@@ -32,7 +32,7 @@ class FileLogbookRepository: LogbookRepository {
     fun loadLogbook(context: Context, name: String): Logbook {
         val logbook = Logbook(name)
         val fileName = getFileName(name)
-        val file = File(context.filesDir, fileName)
+        val file = File(context.getFilesDir(), fileName)
         val json = FileInputStream(file).bufferedReader().use { it.readText() }
         val ja = JSONArray(json)
         for (i in 0 until ja.length()) {
@@ -58,7 +58,7 @@ class FileLogbookRepository: LogbookRepository {
 
     fun saveLogbook(context: Context, logbook: Logbook) {
         val fileName = getFileName(logbook.name)
-        val file = File(context.filesDir, fileName)
+        val file = File(context.getFilesDir(), fileName)
         val ja = JSONArray()
         for (l in logbook.logs) {
             ja.put(l.toJson())
@@ -82,7 +82,7 @@ class FileLogbookRepository: LogbookRepository {
     }
 
     private fun listLogbooks(context: Context): ArrayList<String> {
-        val logbooksFileNames = context.filesDir.list(object: FilenameFilter {
+        val logbooksFileNames = context.getFilesDir().list(object: FilenameFilter {
             override fun accept(dir: File?, name: String?): Boolean {
                 if (name == null)
                     return false

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

@@ -7,14 +7,13 @@ import androidx.core.content.edit
 
 class LocalSettingsRepository(val context: Context) {
     companion object {
-        const val SHARED_PREFS_FILE_NAME = "lunasettings"
-        const val SHARED_PREFS_BB_CONTENT = "bbcontent"
-        const val SHARED_PREFS_DATA_REPO = "data_repo"
-        const val SHARED_PREFS_DAV_URL = "webdav_url"
-        const val SHARED_PREFS_DAV_USER = "webdav_user"
-        const val SHARED_PREFS_DAV_PASS = "webdav_password"
-        const val SHARED_PREFS_NO_BREASTFEEDING = "no_breastfeeding"
-        const val SHARED_PREFS_SIGNATURE = "signature"
+        val SHARED_PREFS_FILE_NAME = "lunasettings"
+        val SHARED_PREFS_BB_CONTENT = "bbcontent"
+        val SHARED_PREFS_DATA_REPO = "data_repo"
+        val SHARED_PREFS_DAV_URL = "webdav_url"
+        val SHARED_PREFS_DAV_USER = "webdav_user"
+        val SHARED_PREFS_DAV_PASS = "webdav_password"
+        val SHARED_PREFS_NO_BREASTFEEDING = "no_breastfeeding"
     }
     enum class DATA_REPO {LOCAL_FILE, WEBDAV}
     val sharedPreferences: SharedPreferences
@@ -23,16 +22,16 @@ class LocalSettingsRepository(val context: Context) {
         sharedPreferences = context.getSharedPreferences(SHARED_PREFS_FILE_NAME, MODE_PRIVATE)
     }
 
-    fun saveSignature(content: String) {
-        sharedPreferences.edit { putString(SHARED_PREFS_SIGNATURE, content) }
+    fun saveBabyBottleContent(content: Int) {
+        sharedPreferences.edit().putInt(SHARED_PREFS_BB_CONTENT, content).apply()
     }
 
-    fun loadSignature(): String {
-        return sharedPreferences.getString(SHARED_PREFS_SIGNATURE, "") ?: ""
+    fun loadBabyBottleContent(): Int {
+        return sharedPreferences.getInt(SHARED_PREFS_BB_CONTENT, 1)
     }
 
     fun saveNoBreastfeeding(content: Boolean) {
-        sharedPreferences.edit { putBoolean(SHARED_PREFS_NO_BREASTFEEDING, content) }
+        sharedPreferences.edit().putBoolean(SHARED_PREFS_NO_BREASTFEEDING, content).apply()
     }
 
     fun loadNoBreastfeeding(): Boolean {
@@ -40,15 +39,15 @@ class LocalSettingsRepository(val context: Context) {
     }
 
     fun saveDataRepository(repo: DATA_REPO) {
-        sharedPreferences.edit(commit = true) {
-            putString(
+        val spe = sharedPreferences.edit()
+        spe.putString(
             SHARED_PREFS_DATA_REPO,
             when (repo) {
                 DATA_REPO.WEBDAV -> "webdav"
                 DATA_REPO.LOCAL_FILE -> "localfile"
             }
         )
-        }
+        spe.commit()
     }
 
     fun loadDataRepository(): DATA_REPO {
@@ -61,11 +60,11 @@ class LocalSettingsRepository(val context: Context) {
     }
 
     fun saveWebdavCredentials(url: String, username: String, password: String) {
-        sharedPreferences.edit(commit = true) {
-            putString(SHARED_PREFS_DAV_URL, url)
-            putString(SHARED_PREFS_DAV_USER, username)
-            putString(SHARED_PREFS_DAV_PASS, password)
-        }
+        val spe = sharedPreferences.edit()
+        spe.putString(SHARED_PREFS_DAV_URL, url)
+        spe.putString(SHARED_PREFS_DAV_USER, username)
+        spe.putString(SHARED_PREFS_DAV_PASS, password)
+        spe.commit()
     }
 
     fun loadWebdavCredentials(): Array<String>? {

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

@@ -1,17 +1,12 @@
 package utils
 
 import android.content.Context
-import android.os.Build
 import android.text.format.DateFormat
 import it.danieleverducci.lunatracker.R
 import java.util.Date
 
 class DateUtils {
     companion object {
-        /**
-         * Format time duration in seconds as e.g. "2 hours, 1 min".
-         * Used for the duration to the next/previous event in the event details dialog.
-         */
         fun formatTimeDuration(context: Context, secondsDiff: Long): String {
             var seconds = secondsDiff
 
@@ -70,8 +65,7 @@ class DateUtils {
         }
 
         /**
-         * Formats the provided unix timestamp in a string like "3 hours, 26 minutes ago".
-         * Used for the event list.
+         * Formats the provided unix timestamp in a string like "3 hours, 26 minutes ago)
          */
         fun formatTimeAgo(context: Context, unixTime: Long): String {
             val secondsDiff = (System.currentTimeMillis() / 1000) - unixTime
@@ -106,21 +100,5 @@ class DateUtils {
             }
             return formattedTime.toString()
         }
-
-        /**
-         * Format time as localized string without seconds. E.g. "Sept 18, 2025, 03:36 PM".
-         * Used in the event detail dialog.
-         */
-        fun formatDateTime(unixTime: Long): String {
-            val date = Date(unixTime * 1000)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                val dateFormat = android.icu.text.DateFormat.getDateTimeInstance(android.icu.text.DateFormat.DEFAULT, android.icu.text.DateFormat.SHORT)
-                return dateFormat.format(date)
-            } else {
-                // fallback
-                val dateFormat = java.text.DateFormat.getDateTimeInstance()
-                return dateFormat.format(date)
-            }
-        }
     }
 }

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

@@ -3,8 +3,6 @@ package utils
 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
@@ -16,73 +14,46 @@ class NumericUtils (val context: Context) {
     val measurement_unit_weight_tiny: String
     val measurement_unit_temperature_base: String
 
-    private fun isMetricSystem(): Boolean {
-       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            val measurementSystem = LocaleData.getMeasurementSystem(ULocale.getDefault())
-            return (measurementSystem == LocaleData.MeasurementSystem.SI)
-       } else {
-            val locale = context.resources.configuration.locale
-            return when (locale.country) {
-                // https://en.wikipedia.org/wiki/United_States_customary_units
-                // https://en.wikipedia.org/wiki/Imperial_units
-                "US" -> false // US IMPERIAL
-                // UK, Myanmar, Liberia,
-                "GB", "MM", "LR" -> false // IMPERIAL
-                else -> true // METRIC
-            }
-       }
-    }
-
     init {
         this.numberFormat = NumberFormat.getInstance()
+        val measurementSystem = LocaleData.getMeasurementSystem(ULocale.getDefault())
         this.measurement_unit_liquid_base = context.getString(
-            if (isMetricSystem())
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
                 R.string.measurement_unit_liquid_base_metric
             else
                 R.string.measurement_unit_liquid_base_imperial
         )
         this.measurement_unit_weight_base = context.getString(
-            if (isMetricSystem())
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
                 R.string.measurement_unit_weight_base_metric
             else
                 R.string.measurement_unit_weight_base_imperial
         )
         this.measurement_unit_weight_tiny = context.getString(
-            if (isMetricSystem())
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
                 R.string.measurement_unit_weight_tiny_metric
             else
                 R.string.measurement_unit_weight_tiny_imperial
         )
         this.measurement_unit_temperature_base = context.getString(
-            if (isMetricSystem())
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
                 R.string.measurement_unit_temperature_base_metric
             else
                 R.string.measurement_unit_temperature_base_imperial
         )
     }
 
-    fun formatEventQuantity(event: LunaEvent): String {
+    fun formatEventQuantity(item: LunaEvent): String {
         val formatted = StringBuilder()
-        if (event.quantity >= 0) {
-            formatted.append(when (event.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 ""
-                    }
-                }
-                else ->
-                    event.quantity
-            })
+        if ((item.quantity ?: 0) > 0) {
+            if (item.type == LunaEvent.TYPE_TEMPERATURE)
+                formatted.append((item.quantity / 10.0f).toString())
+            else
+                formatted.append(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
@@ -99,9 +70,10 @@ class NumericUtils (val context: Context) {
      * @return min, max, normal
      */
     fun getValidEventQuantityRange(lunaEventType: String): Triple<Int, Int, Int>? {
+        val measurementSystem = LocaleData.getMeasurementSystem(ULocale.getDefault())
         return when (lunaEventType) {
             LunaEvent.TYPE_TEMPERATURE -> {
-                if (isMetricSystem())
+                if (measurementSystem == LocaleData. MeasurementSystem.SI)
                     Triple(
                         context.resources.getInteger(R.integer.human_body_temp_min_metric),
                         context.resources.getInteger(R.integer.human_body_temp_max_metric),

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

@@ -119,57 +119,28 @@
                 android:visibility="invisible"/>
         </RadioGroup>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:text="@string/settings_signature" />
-
-        <EditText
-            android:id="@+id/settings_signature"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="5dp"
-            android:inputType="textEmailAddress"
-            android:background="@drawable/textview_background"/>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginTop="5dp"
-            android:text="@string/settings_signature_desc"/>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:layout_marginTop="20dp">
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="30dp">
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:textStyle="bold"
-                android:text="@string/settings_no_breastfeeding" />
+                android:text="@string/no_breastfeeding" />
 
             <com.google.android.material.switchmaterial.SwitchMaterial
                 android:id="@+id/switch_no_breastfeeding"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
                 android:layout_weight="1" />
 
         </LinearLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginTop="5dp"
-            android:text="@string/settings_no_breastfeeding_desc"/>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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="match_parent"
-        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_marginEnd="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

@@ -4,9 +4,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="20dp"
-    android:paddingBottom="10dp"
-    android:paddingHorizontal="20dp">
+    android:padding="20dp">
 
     <TextView
         android:id="@+id/dialog_event_detail_type_emoji"
@@ -36,7 +34,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"
@@ -61,14 +61,6 @@
 
     </ScrollView>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:id="@+id/dialog_event_detail_type_signature"
-        android:layout_marginBottom="5dp"
-        android:visibility="gone"/>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -24,11 +24,4 @@
         android:hint="@string/log_notes_dialog_note_hint"
         android:background="@drawable/textview_background"/>
 
-    <TextView
-        android:id="@+id/notes_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

@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="10dp"
+    android:padding="20dp"
     android:background="@color/transparent">
 
     <LinearLayout
@@ -14,17 +14,27 @@
                 android:id="@+id/button_medicine"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="10dp"
+                android:padding="20dp"
                 android:background="@drawable/dropdown_list_item_background"
                 style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_medicine"/>
 
+            <TextView
+                android:id="@+id/button_enema"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:padding="20dp"
+                android:background="@drawable/dropdown_list_item_background"
+                style="@style/OverflowMenuText"
+                android:text="@string/overflow_event_enema"/>
+
             <TextView
                 android:id="@+id/button_note"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="10dp"
-                android:padding="10dp"
+                android:padding="20dp"
                 android:background="@drawable/dropdown_list_item_background"
                 style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_note"/>
@@ -34,27 +44,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="10dp"
-                android:padding="10dp"
+                android:padding="20dp"
                 android:background="@drawable/dropdown_list_item_background"
                 style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_temperature"/>
 
-            <TextView
-                android:id="@+id/button_puke"
-                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_puke"/>
-
             <TextView
                 android:id="@+id/button_colic"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="10dp"
-                android:padding="10dp"
+                android:padding="20dp"
                 android:background="@drawable/dropdown_list_item_background"
                 style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_colic"/>
@@ -64,30 +64,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="10dp"
-                android:padding="10dp"
+                android:padding="20dp"
                 android:background="@drawable/dropdown_list_item_background"
                 style="@style/OverflowMenuText"
-                android:text="@string/overflow_event_weight"/>
-
-            <TextView
-                android:id="@+id/button_bath"
-                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_bath"/>
-
-            <TextView
-                android:id="@+id/button_enema"
-                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_enema"/>
+                android:text="@string/overflow_event_scale"/>
 
     </LinearLayout>
 

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

@@ -3,14 +3,17 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_gravity="center"
+    android:gravity="center">
+
+    <NumberPicker
+        android:id="@+id/dialog_number_picker"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"/>
 
     <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"
-        android:layout_marginEnd="20dp"/>
-
+        android:layout_marginStart="10dp"
+        android:text="ml"/>
 </LinearLayout>

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

@@ -23,12 +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_gravity="center"
-        android:layout_marginEnd="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>
@@ -41,8 +50,9 @@
     <string name="no_connection_go_to_settings">Einstellungen</string>
     <string name="no_connection_retry">Erneut versuchen</string>
 
+    <string name="no_breastfeeding">Kein Stillen</string>
+
     <string name="settings_title">Einstellungen</string>
-    <string name="settings_no_breastfeeding">Kein Stillen</string>
     <string name="settings_storage">Speicherort für Daten auswählen</string>
     <string name="settings_storage_local">Auf dem Gerät</string>
     <string name="settings_storage_local_desc">Datenschutzfreundlichste Lösung: Deine Daten verlassen dein Gerät nicht</string>
@@ -68,13 +78,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,9 +0,0 @@
-<?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>
-    </string-array>
-</resources>

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

@@ -3,9 +3,18 @@
     <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="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>
@@ -16,13 +25,11 @@
     <string name="event_note_type" translatable="false">📝</string>
     <string name="event_temperature_type" translatable="false">🌡️</string>
     <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_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>
@@ -33,18 +40,14 @@
     <string name="event_note_desc">Note</string>
     <string name="event_temperature_desc">Temperature</string>
     <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_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_bath">🛁 Bath</string>
 
     <string name="toast_event_added">Event logged</string>
     <string name="toast_logbook_saved">Logbook saved</string>
@@ -58,24 +61,19 @@
     <string name="minutes_ago">mins</string>
     <string name="hour_ago">hour</string>
     <string name="hours_ago">hours</string>
-    <string name="day_ago">day</string>
-    <string name="days_ago">days</string>
+    <string name="day_ago">year</string>
+    <string name="days_ago">years</string>
     <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>
-
     <string name="no_connection">No connection</string>
     <string name="no_connection_explain">Unable to reach WebDAV service</string>
     <string name="no_connection_go_to_settings">Settings</string>
     <string name="no_connection_retry">Retry</string>
 
+    <string name="no_breastfeeding">No Breastfeeding</string>
+
     <string name="settings_title">Settings</string>
-    <string name="settings_signature">Signature</string>
-    <string name="settings_signature_desc">Attach a signature to each event you create and for others to see. Useful if multiple people add events.</string>
     <string name="settings_storage">Choose where to save data</string>
     <string name="settings_storage_local">On device</string>
     <string name="settings_storage_local_desc">Most privacy-friendly solution: data doesn\'t leave your device</string>
@@ -91,8 +89,6 @@
     <string name="settings_webdav_error_generic">Error while trying to access WebDAV:</string>
     <string name="settings_webdav_creation_error_generic">Unable to save a file on the WebDAV server:</string>
     <string name="settings_webdav_creation_ok">Successfully connected with the WebDAV server</string>
-    <string name="settings_no_breastfeeding">No Breastfeeding</string>
-    <string name="settings_no_breastfeeding_desc">Hide the Breastfeeding buttons for when they are not needed.</string>
     <string name="settings_json_error">There\'s a save file on the server, but it is corrupted or unreadable. Please delete it </string>
     <string name="settings_generic_error">Error: </string>
     <string name="settings_webdav_upload_error">Error while uploading local logbook %1$s to webdav: %2$s</string>
@@ -103,15 +99,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_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>
@@ -127,11 +118,11 @@
     <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>
     <string name="dialog_event_detail_notes">Notes</string>
-    <string name="dialog_event_detail_signature">by %s</string>
 
     <string name="dialog_add_logbook_title">Add logbook</string>
     <string name="dialog_add_logbook_logbookname">👶 Logbook name</string>

fastlane/metadata/android/en-US/full_description.txt

@@ -6,7 +6,6 @@ This app is meant to log all the relevant events (diaper change, breastfeeding,
 Dedicated to my daughter Luna.
 
 
-A HUGE thanks to all our contributors. See https://git.ichibi.eu/penguin86/luna-tracker/src/branch/master/README.md
 
 NOTE: The content on this app is for informational or educational purposes only and does not substitute professional medical advice or consultations with healthcare professionals.
 Feature graphic ("Baby and baby milk bottle. Baby feeding."): © Vyacheslav Argenberg / http://www.vascoplanet.com/, CC BY 4.0 <https://creativecommons.org/licenses/by/4.0>, via Wikimedia Commons

fastlane/metadata/android/fr-FR/full_description.txt

@@ -8,8 +8,6 @@ Elle permet de synchroniser les données entre différents appareils (en utilisa
 Dédié à ma fille Luna.
 
 
-Un grand merci à tous nos contributeurs. Voir https://git.ichibi.eu/penguin86/luna-tracker/src/branch/master/README.md
-
 REMARQUE : le contenu de cette application est fourni à titre informatif ou éducatif uniquement et ne remplace pas les conseils médicaux professionnels ou les consultations avec des professionnels de la santé.
 
 Crédit image ("Baby and baby milk bottle. Baby feeding."): © Vyacheslav Argenberg / http://www.vascoplanet.com/, CC BY 4.0 <https://creativecommons.org/licenses/by/4.0>, via Wikimedia Commons

fastlane/metadata/android/it-IT/full_description.txt

@@ -6,7 +6,6 @@ Quest'app è pensata per memorizzare tutti gli eventi del bambino (cambio di pan
 Dedicato a mia figlia Luna.
 
 
-Un grandissimo ringraziamento a tutti i contributors! Vedi https://git.ichibi.eu/penguin86/luna-tracker/src/branch/master/README.md
 
 NOTA: il contenuto di quest'app ha solo scopo informativo o didattico e non sostituisce il consulto medico professionale o le consulenze con operatori sanitari.
 Feature graphic ("Baby and baby milk bottle. Baby feeding."): © Vyacheslav Argenberg / http://www.vascoplanet.com/, CC BY 4.0 <https://creativecommons.org/licenses/by/4.0>, via Wikimedia Commons

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.13.0"
+agp = "8.7.2"
 kotlin = "2.0.0"
 coreKtx = "1.10.1"
 junit = "4.13.2"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Nov 02 10:58:51 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists