layout: replace menu icon with utf8 character

The three dot menu icosn looks odd when stretched due to the dynamic menu feature. Thus replace it with the hamburger menu character that looks better when scaled.
MainActivity: sort events before saving
2026-02-01 23:00:52 +01:00 · 2026-02-01 23:00:52 +01:00 · 2026-02-01 23:00:48 +01:00 · 2026-01-23 06:46:11 +01:00 · 2026-01-23 06:46:11 +01:00 · 2026-01-23 06:46:11 +01:00
27 changed files with 1927 additions and 465 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {

 android {
    namespace = "it.danieleverducci.lunatracker"
-    compileSdk = 34
+    compileSdk = 36

    defaultConfig {
        applicationId = "it.danieleverducci.lunatracker"
        minSdk = 21
-        targetSdk = 34
+        targetSdk = 36
        versionCode = 7
        versionName = "0.9"

@@ -31,6 +31,12 @@ android {
        sourceCompatibility = JavaVersion.VERSION_11
        targetCompatibility = JavaVersion.VERSION_11
    }
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
+        includeInBundle = false
+    }
    kotlinOptions {
        jvmTarget = "11"
    }
@@ -40,7 +46,6 @@ android {
 }

 dependencies {
-
    implementation(libs.androidx.core.ktx)
    implementation(libs.androidx.lifecycle.runtime.ktx)
    implementation(libs.androidx.activity.compose)
@@ -51,7 +56,7 @@ dependencies {
    implementation(libs.androidx.material3)
    implementation(libs.androidx.appcompat)
    implementation(libs.androidx.recyclerview)
-    implementation("com.github.thegrizzlylabs:sardine-android:v0.9")
+    implementation(libs.sardine.android)
    implementation(libs.material)
    testImplementation(libs.junit)
    androidTestImplementation(libs.androidx.junit)
@@ -60,4 +65,5 @@ dependencies {
    androidTestImplementation(libs.androidx.ui.test.junit4)
    debugImplementation(libs.androidx.ui.tooling)
    debugImplementation(libs.androidx.ui.test.manifest)
+    implementation(libs.mpandroidchart.vv310)
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,10 @@
            android:name=".SettingsActivity"
            android:label="@string/settings_title"
            android:theme="@style/Theme.LunaTracker"/>
+        <activity
+            android:name=".StatisticsActivity"
+            android:label="@string/statistics_title"
+            android:theme="@style/Theme.LunaTracker"/>
    </application>

 </manifest>
--- a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
@@ -6,13 +6,16 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
+import android.text.Editable
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.Button
 import android.widget.EditText
+import android.widget.LinearLayout
 import android.widget.NumberPicker
 import android.widget.PopupWindow
 import android.widget.Spinner
@@ -49,6 +52,9 @@ class MainActivity : AppCompatActivity() {
        const val TAG = "MainActivity"
        const val UPDATE_EVERY_SECS: Long = 30
        const val DEBUG_CHECK_LOGBOOK_CONSISTENCY = false
+        // list of all events
+        var allEvents = arrayListOf<LunaEvent>()
+        var currentPopupItems = listOf<LunaEvent.Type>()
    }

    var logbook: Logbook? = null
@@ -80,31 +86,13 @@ class MainActivity : AppCompatActivity() {
        recyclerView = findViewById(R.id.list_events)
        recyclerView.setLayoutManager(LinearLayoutManager(applicationContext))

+        populateHeaderMenu()
+
        // 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))
-        }
+
        val moreButton = findViewById<View>(R.id.button_more)
        moreButton.setOnClickListener {
            showOverflowPopupWindow(moreButton)
@@ -120,7 +108,11 @@ class MainActivity : AppCompatActivity() {
            loadLogbookList()
        }
        findViewById<View>(R.id.button_sync).setOnClickListener {
-            loadLogbookList()
+            if (logbook != null) {
+                loadLogbook(logbook!!.name)
+            } else {
+                loadLogbookList()
+            }
        }
    }

@@ -144,7 +136,84 @@ class MainActivity : AppCompatActivity() {
        if (logbook == null)
            Log.w(TAG, "showLogbook(): logbook is null!")

-        setListAdapter(logbook?.logs ?: arrayListOf())
+        allEvents = logbook?.logs ?: arrayListOf()
+        setListAdapter(allEvents)
+
+        populateHeaderMenu()
+    }
+
+    private fun populateHeaderMenu() {
+        val settingsRepository = LocalSettingsRepository(this)
+        val dynamicMenu = settingsRepository.loadDynamicMenu()
+        val eventTypeStats = mutableMapOf<LunaEvent.Type, Int>()
+
+        if (dynamicMenu) {
+            val sampleSize = 100
+            // populate frequency map from first 100 events
+            allEvents.take(sampleSize.coerceAtMost(allEvents.size)).forEach {
+                eventTypeStats[it.type] = 1 + (eventTypeStats[it.type] ?: 0)
+            }
+        }
+
+        // sort all event types by frequency or ordinal
+        val eventTypesSorted = LunaEvent.Type.entries.toList().sortedWith(
+            compareBy({ -1 * (eventTypeStats[it] ?: 0) }, { it.ordinal })
+        ).filter { it != LunaEvent.Type.UNKNOWN }
+
+        fun setupMenu(maxButtonCount: Int, sortedEventTypes: List<LunaEvent.Type>): Int {
+            val row1 = findViewById<View>(R.id.linear_layout_row1)
+            val row1Button1 = findViewById<TextView>(R.id.button1_row1)
+            val row1Button2 = findViewById<TextView>(R.id.button2_row1)
+
+            val row2 = findViewById<View>(R.id.linear_layout_row2)
+            val row2Button1 = findViewById<TextView>(R.id.button1_row2)
+            val row2Button2 = findViewById<TextView>(R.id.button2_row2)
+            val row2Button3 = findViewById<TextView>(R.id.button3_row2)
+
+            val row3 = findViewById<View>(R.id.linear_layout_row3)
+            val row3Button1 = findViewById<TextView>(R.id.button1_row3)
+            val row3Button2 = findViewById<TextView>(R.id.button2_row3)
+
+            // hide all rows/buttons (except row 3)
+            for (view in listOf(row1, row1Button1, row1Button2,
+                                row2, row2Button1, row2Button2, row2Button3,
+                                row3, row3Button1, row3Button2)) {
+                view.visibility = View.GONE
+            }
+            row3.visibility = View.VISIBLE
+
+            var showCounter = 0
+
+            fun show(vararg tvs: TextView) {
+                for (tv in tvs) {
+                    val type = sortedEventTypes[showCounter]
+                    tv.text = LunaEvent.getHeaderEmoji(applicationContext, type)
+                    tv.setOnClickListener { showCreateDialog(type) }
+                    tv.visibility = View.VISIBLE
+                    // show parent row
+                    (tv.parent as View).visibility = View.VISIBLE
+                    showCounter += 1
+                }
+            }
+
+            when (maxButtonCount) {
+                0 -> { } // ignore - show empty row3
+                1 -> show(row3Button1)
+                2 -> show(row3Button1, row3Button2)
+                3 -> show(row1Button1, row3Button1)
+                4, 5, 6 -> show(row1Button1, row1Button2, row3Button1, row3Button2)
+                else -> show(row1Button1, row1Button2, row2Button1, row2Button2, row2Button3, row3Button1, row3Button2)
+            }
+
+            return showCounter
+        }
+
+        val usedEventCount = eventTypeStats.count { it.value > 0 }
+        val maxButtonCount = if (dynamicMenu) { usedEventCount } else { 7 }
+        val eventsShown = setupMenu(maxButtonCount, eventTypesSorted)
+
+        // store left over events for popup menu
+        currentPopupItems = eventTypesSorted.subList(eventsShown, eventTypesSorted.size)
    }

    override fun onStart() {
@@ -167,12 +236,6 @@ class MainActivity : AppCompatActivity() {

        signature = settingsRepository.loadSignature()

-        val noBreastfeeding = settingsRepository.loadNoBreastfeeding()
-        findViewById<View>(R.id.layout_nipples).visibility = when (noBreastfeeding) {
-            true -> View.GONE
-            false -> View.VISIBLE
-        }
-
        // Update list dates
        recyclerView.adapter?.notifyDataSetChanged()

@@ -191,10 +254,6 @@ class MainActivity : AppCompatActivity() {
        super.onStop()
    }

-    fun getAllEvents(): ArrayList<LunaEvent> {
-        return logbook?.logs ?: arrayListOf()
-    }
-
    fun addBabyBottleEvent(event: LunaEvent) {
        setToPreviousQuantity(event)
        askBabyBottleContent(event, true) {
@@ -205,14 +264,14 @@ class MainActivity : AppCompatActivity() {
    fun askBabyBottleContent(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
        val d = AlertDialog.Builder(this)
        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_bottle, null)
-        d.setTitle(event.getTypeDescription(this))
+        d.setTitle(event.getDialogTitle(this))
        d.setMessage(event.getDialogMessage(this))
        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.maxValue = 34 // "340
+        numberPicker.displayedValues = ((10..340 step 10).map { it.toString() }.toTypedArray())
        numberPicker.wrapSelectorWheel = false
        numberPicker.value = event.quantity / 10

@@ -247,7 +306,7 @@ class MainActivity : AppCompatActivity() {
        // 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.setTitle(event.getDialogTitle(this))
        d.setMessage(event.getDialogMessage(this))
        d.setView(dialogView)

@@ -291,12 +350,12 @@ class MainActivity : AppCompatActivity() {
        // 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.setTitle(event.getDialogTitle(this))
        d.setMessage(event.getDialogMessage(this))
        d.setView(dialogView)

        val tempSlider = dialogView.findViewById<Slider>(R.id.dialog_temperature_value)
-        val range = NumericUtils(this).getValidEventQuantityRange(LunaEvent.TYPE_TEMPERATURE)!!
+        val range = NumericUtils(this).getValidEventQuantityRange(LunaEvent.Type.TEMPERATURE)!!
        tempSlider.valueFrom = range.first.toFloat()
        tempSlider.valueTo = range.second.toFloat()
        tempSlider.value = if (event.quantity == 0) {
@@ -330,7 +389,7 @@ class MainActivity : AppCompatActivity() {
        alertDialog.show()
    }

-    fun datePickerHelper(time: Long, dateTextView: TextView): Calendar {
+    fun datePickerHelper(time: Long, dateTextView: TextView, onChange: (Long) -> Unit = {}): Calendar {
        dateTextView.text = DateUtils.formatDateTime(time)

        val dateTime = Calendar.getInstance()
@@ -349,6 +408,7 @@ class MainActivity : AppCompatActivity() {
                    { _, 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,
@@ -360,25 +420,110 @@ class MainActivity : AppCompatActivity() {
        return dateTime
    }

-    fun saveEvent(event: LunaEvent) {
-        if (!getAllEvents().contains(event)) {
-            // new event
-            logEvent(event)
+    fun addSleepEvent(event: LunaEvent) {
+        askSleepValue(event, true) { saveEvent(event) }
+    }
+
+    fun askSleepValue(event: LunaEvent, hideDurationButtons: Boolean, onPositive: () -> Unit) {
+        val d = AlertDialog.Builder(this)
+        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_duration, null)
+        d.setTitle(event.getDialogTitle(this))
+        d.setMessage(event.getDialogMessage(this))
+        d.setView(dialogView)
+
+        val durationTextView = dialogView.findViewById<TextView>(R.id.dialog_date_duration)
+        val datePicker = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
+        val durationButtons = dialogView.findViewById<LinearLayout>(R.id.duration_buttons)
+        val durationNowButton = dialogView.findViewById<Button>(R.id.dialog_date_duration_now)
+        val durationMinus5Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_minus5)
+        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 = System.currentTimeMillis() / 1000
+            return (timeSeconds + durationSeconds) <= now && durationSeconds < (24 * 60 * 60)
        }

-        logbook?.sort()
-        recyclerView.adapter?.notifyDataSetChanged()
-        saveLogbook()
+        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)
+
+        if (hideDurationButtons) {
+            durationButtons.visibility = View.GONE
+            d.setMessage(getString(R.string.log_sleep_dialog_description_start))
+        } else {
+            durationButtons.visibility = View.VISIBLE
+            d.setMessage(event.getDialogMessage(this))
+
+            fun adjust(minutes: Int) {
+                duration += minutes * 60
+                if (duration < 0) {
+                    duration = 0
+                }
+                onDateChange(pickedDateTime.time.time / 1000)
+            }
+
+            durationMinus5Button.setOnClickListener { adjust(-5) }
+            durationPlus5Button.setOnClickListener { adjust(5) }
+
+            durationNowButton.setOnClickListener {
+                val now = System.currentTimeMillis() / 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)
+                }
+            }
+        }
+
+        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()
+        }
+
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
+            dialogInterface.dismiss()
+        }
+
+        val alertDialog = d.create()
+        alertDialog.show()
    }

    fun addAmountEvent(event: LunaEvent) {
+        setToPreviousQuantity(event)
        askAmountValue(event, true) { saveEvent(event) }
    }

    fun askAmountValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
        val d = AlertDialog.Builder(this)
        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_amount, null)
-        d.setTitle(event.getTypeDescription(this))
+        d.setTitle(event.getDialogTitle(this))
        d.setMessage(event.getDialogMessage(this))
        d.setView(dialogView)

@@ -388,7 +533,7 @@ class MainActivity : AppCompatActivity() {
            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)
@@ -420,7 +565,7 @@ class MainActivity : AppCompatActivity() {
    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.setTitle(event.getDialogTitle(this))
        d.setMessage(event.getDialogMessage(this))
        d.setView(dialogView)

@@ -449,11 +594,11 @@ class MainActivity : AppCompatActivity() {
    }

    fun askNotes(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
-        val useQuantity = (event.type != LunaEvent.TYPE_NOTE && event.type != LunaEvent.TYPE_CUSTOM)
+        val useQuantity = (event.type != LunaEvent.Type.NOTE)

        val d = AlertDialog.Builder(this)
        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_notes, null)
-        d.setTitle(event.getTypeDescription(this))
+        d.setTitle(event.getDialogTitle(this))
        d.setMessage(event.getDialogMessage(this))
        d.setView(dialogView)
        val notesET = dialogView.findViewById<EditText>(R.id.notes_edittext)
@@ -468,11 +613,11 @@ class MainActivity : AppCompatActivity() {

        val nextTextView = dialogView.findViewById<TextView>(R.id.notes_template_next)
        val prevTextView = dialogView.findViewById<TextView>(R.id.notes_template_prev)
+        val templates = allEvents.filter { it.type == event.type }.distinctBy { it.notes }.sortedBy { it.time }

        fun updateContent(current: LunaEvent) {
-            val allEvents = getAllEvents()
-            val prevEvent = getPreviousSameEvent(current, allEvents)
-            var nextEvent = getNextSameEvent(current, allEvents)
+            val prevEvent = getPreviousSameEvent(current, templates)
+            var nextEvent = getNextSameEvent(current, templates)

            notesET.setText(current.notes)
            if (useQuantity) {
@@ -523,7 +668,7 @@ class MainActivity : AppCompatActivity() {
        updateContent(event)

        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
-            val notes = notesET.text.toString()
+            val notes = notesET.text.toString().trim()

            if (useQuantity) {
                val quantity = qtyET.text.toString().toIntOrNull()
@@ -574,13 +719,13 @@ class MainActivity : AppCompatActivity() {
    }

    fun setToPreviousQuantity(event: LunaEvent) {
-        val prev = getPreviousSameEvent(event, getAllEvents())
+        val prev = getPreviousSameEvent(event, allEvents)
        if (prev != null) {
            event.quantity = prev.quantity
        }
    }

-    fun getPreviousSameEvent(event: LunaEvent, items: ArrayList<LunaEvent>): LunaEvent? {
+    fun getPreviousSameEvent(event: LunaEvent, items: List<LunaEvent>): LunaEvent? {
        var previousEvent: LunaEvent? = null
        for (item in items) {
            if (item.type == event.type && item.time < event.time) {
@@ -594,7 +739,7 @@ class MainActivity : AppCompatActivity() {
        return previousEvent
    }

-    fun getNextSameEvent(event: LunaEvent, items: ArrayList<LunaEvent>): LunaEvent? {
+    fun getNextSameEvent(event: LunaEvent, items: List<LunaEvent>): LunaEvent? {
        var nextEvent: LunaEvent? = null
        for (item in items) {
            if (item.type == event.type && item.time > event.time) {
@@ -611,6 +756,12 @@ class MainActivity : AppCompatActivity() {
    fun showEventDetailDialog(originalEvent: LunaEvent) {
        val event = LunaEvent(originalEvent)

+        fun eventValuesChanged(): Boolean {
+            return (event.time != originalEvent.time
+                || event.quantity != originalEvent.quantity
+                || event.notes != originalEvent.notes)
+        }
+
        // Do not update list while the detail is shown, to avoid changing the object below while it is changed by the user
        pauseLogbookUpdate = true

@@ -621,38 +772,12 @@ class MainActivity : AppCompatActivity() {
        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 dateEndTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_date_end)
        val quantityTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_quantity)
        val notesTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_notes)

-        emojiTextView.text = event.getTypeEmoji(this)
-        descriptionTextView.text = event.getTypeDescription(this)
-
-        val pickedTime = datePickerHelper(event.time, dateTextView)
-        val updateValues = {
-            quantityTextView.text = NumericUtils(this).formatEventQuantity(event)
-            notesTextView.text = event.notes
-        }
-        updateValues()
-
-        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)
-            }
-        }
+        emojiTextView.text = event.getHeaderEmoji(this)
+        descriptionTextView.text = event.getDialogTitle(this)

        d.setView(dialogView)

@@ -661,12 +786,8 @@ class MainActivity : AppCompatActivity() {
            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) {
+        d.setNegativeButton(R.string.dialog_event_detail_save_button) { dialogInterface, i ->
+            if (eventValuesChanged()) {
                originalEvent.time = event.time
                originalEvent.quantity = event.quantity
                originalEvent.notes = event.notes
@@ -676,6 +797,10 @@ class MainActivity : AppCompatActivity() {
            dialogInterface.dismiss()
        }

+        d.setPositiveButton(R.string.dialog_event_detail_close_button) { dialogInterface, i ->
+            dialogInterface.dismiss()
+        }
+
        val alertDialog = d.create()
        alertDialog.show()

@@ -688,6 +813,56 @@ class MainActivity : AppCompatActivity() {
            pauseLogbookUpdate = false
        }

+        val updateValues = {
+            quantityTextView.text = NumericUtils(this).formatEventQuantity(event)
+            notesTextView.text = event.notes
+            if (event.type == LunaEvent.Type.SLEEP && event.quantity > 0) {
+                dateEndTextView.text = DateUtils.formatDateTime(event.time + event.quantity)
+                dateEndTextView.visibility = View.VISIBLE
+            } else {
+                dateEndTextView.visibility = View.GONE
+            }
+
+            alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE).visibility = if (eventValuesChanged()) {
+                View.VISIBLE
+            } else {
+                View.GONE
+            }
+        }
+        updateValues()
+
+        datePickerHelper(event.time, dateTextView, { newTime: Long ->
+            event.time = newTime
+            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, false, updateValues)
+                else -> {
+                    Log.w(TAG, "Unexpected type: ${event.type}")
+                }
+            }
+        }
+
+        notesTextView.setOnClickListener {
+            when (event.type) {
+                LunaEvent.Type.FOOD,
+                LunaEvent.Type.MEDICINE,
+                LunaEvent.Type.NOTE -> askNotes(event, false, updateValues)
+                else -> {
+                    Log.w(TAG, "Unexpected type: ${event.type}")
+                }
+            }
+        }
+
        // show optional signature
        if (event.signature.isNotEmpty()) {
            val signatureTextEdit = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_signature)
@@ -695,13 +870,11 @@ class MainActivity : AppCompatActivity() {
            signatureTextEdit.visibility = View.VISIBLE
        }

-        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)
        if (previousEvent != null) {
-            val emoji = previousEvent.getTypeEmoji(applicationContext)
+            val emoji = previousEvent.getHeaderEmoji(applicationContext)
            val time = DateUtils.formatTimeDuration(applicationContext, event.time - previousEvent.time)
            previousTextView.text = String.format("⬅️ %s %s", emoji, time)
            previousTextView.setOnClickListener {
@@ -716,7 +889,7 @@ class MainActivity : AppCompatActivity() {
        val nextTextView = dialogView.findViewById<TextView>(R.id.dialog_event_next)
        val nextEvent = getNextSameEvent(event, allEvents)
        if (nextEvent != null) {
-            val emoji = nextEvent.getTypeEmoji(applicationContext)
+            val emoji = nextEvent.getHeaderEmoji(applicationContext)
            val time = DateUtils.formatTimeDuration(applicationContext, nextEvent.time - event.time)
            nextTextView.text = String.format("%s %s ➡️", time, emoji)
            nextTextView.setOnClickListener {
@@ -887,7 +1060,7 @@ class MainActivity : AppCompatActivity() {

                    if (DEBUG_CHECK_LOGBOOK_CONSISTENCY) {
                        for (e in logbook?.logs ?: listOf()) {
-                            val em = e.getTypeEmoji(this@MainActivity)
+                            val em = e.getHeaderEmoji(this@MainActivity)
                            if (em == getString(R.string.event_unknown_type)) {
                                Log.e(TAG, "UNKNOWN: ${e.type}")
                            }
@@ -942,23 +1115,6 @@ class MainActivity : AppCompatActivity() {
        })
    }

-    fun logEvent(event: LunaEvent) {
-        savingEvent(true)
-
-        event.signature = signature
-
-        setLoading(true)
-        logbook?.logs?.add(0, event)
-        recyclerView.adapter?.notifyItemInserted(0)
-        recyclerView.smoothScrollToPosition(0)
-        saveLogbook(event)
-
-        // Check logbook size to avoid OOM errors
-        if (logbook?.isTooBig() == true) {
-            askToTrimLogbook()
-        }
-    }
-
    fun deleteEvent(event: LunaEvent) {
        // Update view
        savingEvent(true)
@@ -970,6 +1126,32 @@ class MainActivity : AppCompatActivity() {
        saveLogbook()
    }

+    fun saveEvent(event: LunaEvent) {
+        if (allEvents.contains(event)) {
+            // event was modified
+            logbook?.sort()
+            recyclerView.adapter?.notifyDataSetChanged()
+            saveLogbook()
+        } else {
+            // add new event
+            savingEvent(true)
+            setLoading(true)
+            if (signature.isNotEmpty()) {
+                event.signature = signature
+            }
+            logbook?.logs?.add(0, event)
+            logbook?.sort()
+            recyclerView.adapter?.notifyDataSetChanged()
+            recyclerView.smoothScrollToPosition(0)
+            saveLogbook(event)
+
+            // Check logbook size to avoid OOM errors
+            if (logbook?.isTooBig() == true) {
+                askToTrimLogbook()
+            }
+        }
+    }
+
    /**
     * Saves the logbook. If saving while adding an event, please specify the event so in case
     * of error can be removed from the list.
@@ -1072,6 +1254,29 @@ class MainActivity : AppCompatActivity() {
        }
    }

+    private fun showCreateDialog(type: LunaEvent.Type) {
+        val event = LunaEvent(type)
+        when (type) {
+            LunaEvent.Type.BABY_BOTTLE -> addBabyBottleEvent(event)
+            LunaEvent.Type.WEIGHT -> addWeightEvent(event)
+            LunaEvent.Type.BREASTFEEDING_LEFT_NIPPLE -> addPlainEvent(event)
+            LunaEvent.Type.BREASTFEEDING_BOTH_NIPPLE -> addPlainEvent(event)
+            LunaEvent.Type.BREASTFEEDING_RIGHT_NIPPLE -> addPlainEvent(event)
+            LunaEvent.Type.DIAPERCHANGE_POO -> addAmountEvent(event)
+            LunaEvent.Type.DIAPERCHANGE_PEE -> addAmountEvent(event)
+            LunaEvent.Type.MEDICINE -> addNoteEvent(event)
+            LunaEvent.Type.ENEMA -> addNoteEvent(event)
+            LunaEvent.Type.NOTE -> addNoteEvent(event)
+            LunaEvent.Type.COLIC -> addPlainEvent(event)
+            LunaEvent.Type.TEMPERATURE -> addTemperatureEvent(event)
+            LunaEvent.Type.FOOD -> addNoteEvent(event)
+            LunaEvent.Type.PUKE -> addAmountEvent(event)
+            LunaEvent.Type.BATH -> addPlainEvent(event)
+            LunaEvent.Type.SLEEP -> addSleepEvent(event)
+            LunaEvent.Type.UNKNOWN -> {} // ignore
+        }
+    }
+
    private fun showOverflowPopupWindow(anchor: View) {
        if (showingOverflowPopupWindow)
            return
@@ -1080,37 +1285,31 @@ class MainActivity : AppCompatActivity() {
            isOutsideTouchable = true
            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))
+
+            // Add statistics (hard coded)
+            contentView.findViewById<View>(R.id.button_statistics).setOnClickListener {
+                if (logbook != null && !pauseLogbookUpdate) {
+                    val i = Intent(applicationContext, StatisticsActivity::class.java)
+                    i.putExtra("LOOGBOOK_NAME", logbook!!.name)
+                    startActivity(i)
+                } else {
+                    Toast.makeText(applicationContext, "No logbook selected!", Toast.LENGTH_SHORT).show()
+                }
                dismiss()
            }
-            contentView.findViewById<View>(R.id.button_enema).setOnClickListener {
-                addPlainEvent(LunaEvent(LunaEvent.TYPE_ENEMA))
-                dismiss()
-            }
-            contentView.findViewById<View>(R.id.button_note).setOnClickListener {
-                addNoteEvent(LunaEvent(LunaEvent.TYPE_NOTE))
-                dismiss()
-            }
-            contentView.findViewById<View>(R.id.button_temperature).setOnClickListener {
-                addTemperatureEvent(LunaEvent(LunaEvent.TYPE_TEMPERATURE))
-                dismiss()
-            }
-            contentView.findViewById<View>(R.id.button_puke).setOnClickListener {
-                addAmountEvent(LunaEvent(LunaEvent.TYPE_PUKE))
-                dismiss()
-            }
-            contentView.findViewById<View>(R.id.button_colic).setOnClickListener {
-                addPlainEvent(LunaEvent(LunaEvent.TYPE_COLIC))
-                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()
+
+            val linearLayout = contentView.findViewById<LinearLayout>(R.id.layout_list)
+
+            // Add buttons to create other events
+            for (type in currentPopupItems) {
+                val view = layoutInflater.inflate(R.layout.more_events_popup_item, linearLayout, false)
+                val textView = view.findViewById<TextView>(R.id.tv)
+                textView.text = LunaEvent.getPopupItemTitle(applicationContext, type)
+                textView.setOnClickListener {
+                    showCreateDialog(type)
+                    dismiss()
+                }
+                linearLayout.addView(textView)
            }
        }.also { popupWindow ->
            popupWindow.setOnDismissListener({
--- a/app/src/main/java/it/danieleverducci/lunatracker/SettingsActivity.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/SettingsActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.EditText
 import android.widget.RadioButton
+import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -24,7 +25,7 @@ open class SettingsActivity : AppCompatActivity() {
    protected lateinit var textViewWebDAVUser: TextView
    protected lateinit var textViewWebDAVPass: TextView
    protected lateinit var progressIndicator: LinearProgressIndicator
-    protected lateinit var switchNoBreastfeeding: SwitchMaterial
+    protected lateinit var switchDynamicMenu: SwitchMaterial
    protected lateinit var textViewSignature: EditText

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -37,7 +38,7 @@ open class SettingsActivity : AppCompatActivity() {
        textViewWebDAVUser = findViewById(R.id.settings_data_webdav_user)
        textViewWebDAVPass = findViewById(R.id.settings_data_webdav_pass)
        progressIndicator = findViewById(R.id.progress_indicator)
-        switchNoBreastfeeding = findViewById(R.id.switch_no_breastfeeding)
+        switchDynamicMenu = findViewById(R.id.switch_dynamic_menu)
        textViewSignature = findViewById(R.id.settings_signature)

        findViewById<View>(R.id.settings_save).setOnClickListener({
@@ -54,7 +55,7 @@ open class SettingsActivity : AppCompatActivity() {
    fun loadSettings() {
        val dataRepo = settingsRepository.loadDataRepository()
        val webDavCredentials = settingsRepository.loadWebdavCredentials()
-        val noBreastfeeding = settingsRepository.loadNoBreastfeeding()
+        val dynamicMenu = settingsRepository.loadDynamicMenu()
        val signature = settingsRepository.loadSignature()

        when (dataRepo) {
@@ -63,7 +64,7 @@ open class SettingsActivity : AppCompatActivity() {
        }

        textViewSignature.setText(signature)
-        switchNoBreastfeeding.isChecked = noBreastfeeding
+        switchDynamicMenu.isChecked = dynamicMenu

        if (webDavCredentials != null) {
            textViewWebDAVUrl.text = webDavCredentials[0]
@@ -160,7 +161,7 @@ open class SettingsActivity : AppCompatActivity() {
            if (radioDataWebDAV.isChecked) LocalSettingsRepository.DATA_REPO.WEBDAV
            else LocalSettingsRepository.DATA_REPO.LOCAL_FILE
        )
-        settingsRepository.saveNoBreastfeeding(switchNoBreastfeeding.isChecked)
+        settingsRepository.saveDynamicMenu(switchDynamicMenu.isChecked)
        settingsRepository.saveSignature(textViewSignature.text.toString())
        settingsRepository.saveWebdavCredentials(
            textViewWebDAVUrl.text.toString(),
--- a/app/src/main/java/it/danieleverducci/lunatracker/StatisticsActivity.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/StatisticsActivity.kt
--- a/app/src/main/java/it/danieleverducci/lunatracker/adapters/LunaEventRecyclerAdapter.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/adapters/LunaEventRecyclerAdapter.kt
@@ -52,18 +52,22 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
        )
        holder.quantity.setTextColor(ContextCompat.getColor(context, R.color.textColor))
        // Contents
-        holder.type.text = item.getTypeEmoji(context)
+        holder.type.text = item.getHeaderEmoji(context)
        holder.description.text = when (item.type) {
-            LunaEvent.TYPE_MEDICINE -> item.notes
-            LunaEvent.TYPE_NOTE -> item.notes
-            LunaEvent.TYPE_CUSTOM -> item.notes
-            else -> item.getTypeDescription(context)
+            LunaEvent.Type.MEDICINE -> item.notes
+            LunaEvent.Type.NOTE -> item.notes
+            else -> item.getRowItemTitle(context)
        }
-        holder.time.text = DateUtils.formatTimeAgo(context, item.time)
+        val endTime = if (item.type == LunaEvent.Type.SLEEP) {
+            item.quantity + item.time
+        } else {
+            item.time
+        }
+        holder.time.text = DateUtils.formatTimeAgo(context, endTime)
        var quantityText = numericUtils.formatEventQuantity(item)

        // if the event is weight, show difference with the last one
-        if (item.type == LunaEvent.TYPE_WEIGHT) {
+        if (item.type == LunaEvent.Type.WEIGHT) {
            val lastWeight = getPreviousWeightEvent(position)
            if (lastWeight != null) {
                val differenceInWeight = item.quantity - lastWeight.quantity
@@ -94,7 +98,7 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
            return null
        for (pos in startFromPosition + 1 until items.size) {
            val item = items.get(pos)
-            if (item.type != LunaEvent.TYPE_WEIGHT)
+            if (item.type != LunaEvent.Type.WEIGHT)
                continue
            return item
        }
--- a/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt
@@ -12,24 +12,24 @@ import java.util.Date
 * release, it is simply ignored by previous ones).
 */
 class LunaEvent: Comparable<LunaEvent> {
-
-    companion object {
-        const val TYPE_BABY_BOTTLE = "BABY_BOTTLE"
-        const val TYPE_WEIGHT = "WEIGHT"
-        const val TYPE_BREASTFEEDING_LEFT_NIPPLE = "BREASTFEEDING_LEFT_NIPPLE"
-        const val TYPE_BREASTFEEDING_BOTH_NIPPLE = "BREASTFEEDING_BOTH_NIPPLE"
-        const val TYPE_BREASTFEEDING_RIGHT_NIPPLE = "BREASTFEEDING_RIGHT_NIPPLE"
-        const val TYPE_DIAPERCHANGE_POO = "DIAPERCHANGE_POO"
-        const val TYPE_DIAPERCHANGE_PEE = "DIAPERCHANGE_PEE"
-        const val TYPE_MEDICINE = "MEDICINE"
-        const val TYPE_ENEMA = "ENEMA"
-        const val TYPE_NOTE = "NOTE"
-        const val TYPE_CUSTOM = "CUSTOM"
-        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"
+    enum class Type {
+        BABY_BOTTLE,
+        FOOD,
+        BREASTFEEDING_LEFT_NIPPLE,
+        BREASTFEEDING_BOTH_NIPPLE,
+        BREASTFEEDING_RIGHT_NIPPLE,
+        DIAPERCHANGE_POO,
+        DIAPERCHANGE_PEE,
+        SLEEP,
+        WEIGHT,
+        MEDICINE,
+        ENEMA,
+        NOTE,
+        COLIC,
+        TEMPERATURE,
+        PUKE,
+        BATH,
+        UNKNOWN
    }

    private val jo: JSONObject
@@ -39,10 +39,16 @@ class LunaEvent: Comparable<LunaEvent> {
        set(value) {
            jo.put("time", value)
        }
-    var type: String
-        get(): String = jo.getString("type")
+    var type: Type
+        get(): Type {
+            return try {
+                Type.valueOf(jo.getString("type"))
+            } catch (_: Exception) {
+                Type.UNKNOWN
+            }
+        }
        set(value) {
-            jo.put("type", value)
+            jo.put("type", value.name)
        }
    var quantity: Int
        get() = jo.optInt("quantity")
@@ -80,78 +86,33 @@ class LunaEvent: Comparable<LunaEvent> {
        this.signature = event.signature
    }

-    constructor(type: String) {
+    constructor(type: Type) {
        this.jo = JSONObject()
        this.time = System.currentTimeMillis() / 1000
        this.type = type
    }

-    constructor(type: String, quantity: Int) {
+    constructor(type: Type, quantity: Int) {
        this.jo = JSONObject()
        this.time = System.currentTimeMillis() / 1000
        this.type = type
        this.quantity = quantity
    }

-    fun getTypeEmoji(context: Context): String {
-        return context.getString(
-            when (type) {
-                TYPE_BABY_BOTTLE -> R.string.event_bottle_type
-                TYPE_WEIGHT -> R.string.event_weight_type
-                TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_type
-                TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_type
-                TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_type
-                TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_type
-                TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_type
-                TYPE_MEDICINE -> R.string.event_medicine_type
-                TYPE_ENEMA -> R.string.event_enema_type
-                TYPE_NOTE -> R.string.event_note_type
-                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
-            }
-        )
+    fun getHeaderEmoji(context: Context): String {
+        return getHeaderEmoji(context, type)
    }

-    fun getTypeDescription(context: Context): String {
-        return context.getString(
-            when (type) {
-                TYPE_BABY_BOTTLE -> R.string.event_bottle_desc
-                TYPE_WEIGHT -> R.string.event_weight_desc
-                TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_desc
-                TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_desc
-                TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_desc
-                TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_desc
-                TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_desc
-                TYPE_MEDICINE -> R.string.event_medicine_desc
-                TYPE_ENEMA -> R.string.event_enema_desc
-                TYPE_NOTE -> R.string.event_note_desc
-                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 getDialogTitle(context: Context): String {
+        return getDialogTitle(context, type)
    }

-    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
-            }
-        )
+    fun getRowItemTitle(context: Context): String {
+        return getPopupItemTitle(context, type).split(" ", limit = 2).last() // remove emoji
+    }
+
+    fun getDialogMessage(context: Context): String {
+        return getDialogMessage(context, type)
    }

    fun toJson(): JSONObject {
@@ -165,4 +126,95 @@ class LunaEvent: Comparable<LunaEvent> {
    override fun compareTo(other: LunaEvent): Int {
        return (this.time - other.time).toInt()
    }
+
+    companion object {
+        fun getHeaderEmoji(context: Context, type: Type): String {
+            return context.getString(
+                when (type) {
+                    Type.BABY_BOTTLE -> R.string.event_bottle_type
+                    Type.WEIGHT -> R.string.event_weight_type
+                    Type.BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_type
+                    Type.BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_type
+                    Type.BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_type
+                    Type.DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_type
+                    Type.DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_type
+                    Type.MEDICINE -> R.string.event_medicine_type
+                    Type.ENEMA -> R.string.event_enema_type
+                    Type.NOTE -> R.string.event_note_type
+                    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
+                    Type.SLEEP -> R.string.event_sleep_type
+                    Type.UNKNOWN -> R.string.event_unknown_type
+                }
+            )
+        }
+
+        fun getDialogMessage(context: Context, type: Type): 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
+                }
+            )
+        }
+
+        fun getDialogTitle(context: Context, type: Type): String {
+            return context.getString(
+                when (type) {
+                    Type.BABY_BOTTLE -> R.string.event_bottle_desc
+                    Type.WEIGHT -> R.string.event_weight_desc
+                    Type.BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_desc
+                    Type.BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_desc
+                    Type.BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_desc
+                    Type.DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_desc
+                    Type.DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_desc
+                    Type.MEDICINE -> R.string.event_medicine_desc
+                    Type.ENEMA -> R.string.event_enema_desc
+                    Type.NOTE -> R.string.event_note_desc
+                    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
+                    Type.SLEEP -> R.string.event_sleep_desc
+                    Type.UNKNOWN -> R.string.event_unknown_desc
+                }
+            )
+        }
+
+        // Entries for for popup list
+        fun getPopupItemTitle(context: Context, type: Type): String {
+            return context.getString(
+                when (type) {
+                    Type.BABY_BOTTLE -> R.string.event_type_item_bottle
+                    Type.WEIGHT -> R.string.event_type_item_weight
+                    Type.BREASTFEEDING_LEFT_NIPPLE -> R.string.event_type_item_breastfeeding_left
+                    Type.BREASTFEEDING_BOTH_NIPPLE -> R.string.event_type_item_breastfeeding_both
+                    Type.BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_type_item_breastfeeding_right
+                    Type.DIAPERCHANGE_POO -> R.string.event_type_item_diaperchange_poo
+                    Type.DIAPERCHANGE_PEE -> R.string.event_type_item_diaperchange_pee
+                    Type.MEDICINE -> R.string.event_type_item_medicine
+                    Type.ENEMA -> R.string.event_type_item_enema
+                    Type.NOTE -> R.string.event_type_item_note
+                    Type.TEMPERATURE -> R.string.event_type_item_temperature
+                    Type.COLIC -> R.string.event_type_item_colic
+                    Type.FOOD -> R.string.event_type_item_food
+                    Type.PUKE -> R.string.event_type_item_puke
+                    Type.BATH -> R.string.event_type_item_bath
+                    Type.SLEEP -> R.string.event_type_item_sleep
+                    Type.UNKNOWN -> R.string.event_type_item_unknown
+                }
+            )
+        }
+    }
 }
--- a/app/src/main/java/it/danieleverducci/lunatracker/repository/LocalSettingsRepository.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/repository/LocalSettingsRepository.kt
@@ -13,7 +13,7 @@ class LocalSettingsRepository(val context: Context) {
        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_DYNAMIC_MENU = "dynamic_menu"
        const val SHARED_PREFS_SIGNATURE = "signature"
    }
    enum class DATA_REPO {LOCAL_FILE, WEBDAV}
@@ -31,12 +31,12 @@ class LocalSettingsRepository(val context: Context) {
        return sharedPreferences.getString(SHARED_PREFS_SIGNATURE, "") ?: ""
    }

-    fun saveNoBreastfeeding(content: Boolean) {
-        sharedPreferences.edit { putBoolean(SHARED_PREFS_NO_BREASTFEEDING, content) }
+    fun saveDynamicMenu(content: Boolean) {
+        sharedPreferences.edit { putBoolean(SHARED_PREFS_DYNAMIC_MENU, content) }
    }

-    fun loadNoBreastfeeding(): Boolean {
-        return sharedPreferences.getBoolean(SHARED_PREFS_NO_BREASTFEEDING, false)
+    fun loadDynamicMenu(): Boolean {
+        return sharedPreferences.getBoolean(SHARED_PREFS_DYNAMIC_MENU, false)
    }

    fun saveDataRepository(repo: DATA_REPO) {
--- a/app/src/main/java/utils/DateUtils.kt
+++ b/app/src/main/java/utils/DateUtils.kt
@@ -62,10 +62,8 @@ 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 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)
+                return format(minutes, seconds, R.string.minute_ago, R.string.minute_ago, R.string.second_ago, R.string.seconds_ago)
            }
        }

--- a/app/src/main/java/utils/NumericUtils.kt
+++ b/app/src/main/java/utils/NumericUtils.kt
@@ -7,6 +7,7 @@ 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,45 +63,54 @@ class NumericUtils (val context: Context) {
    }

    fun formatEventQuantity(event: LunaEvent): String {
+        return formatEventQuantity(event.type, event.quantity)
+    }
+
+    fun formatEventQuantity(type: LunaEvent.Type, quantity: Int): 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 -> {
+        if (quantity > 0) {
+            formatted.append(when (type) {
+                LunaEvent.Type.TEMPERATURE ->
+                    (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 array.getOrElse(quantity) {
+                        Log.e("NumericUtils", "Invalid index $quantity")
                        return ""
                    }
                }
-                else ->
-                    event.quantity
+                LunaEvent.Type.SLEEP -> formatTimeDuration(context, quantity.toLong())
+                else -> quantity
            })

            formatted.append(" ")
            formatted.append(
-                when (event.type) {
-                    LunaEvent.TYPE_BABY_BOTTLE -> measurement_unit_liquid_base
-                    LunaEvent.TYPE_WEIGHT -> measurement_unit_weight_base
-                    LunaEvent.TYPE_MEDICINE -> measurement_unit_weight_tiny
-                    LunaEvent.TYPE_TEMPERATURE -> measurement_unit_temperature_base
+                when (type) {
+                    LunaEvent.Type.BABY_BOTTLE -> measurement_unit_liquid_base
+                    LunaEvent.Type.WEIGHT -> measurement_unit_weight_base
+                    LunaEvent.Type.MEDICINE -> measurement_unit_weight_tiny
+                    LunaEvent.Type.TEMPERATURE -> measurement_unit_temperature_base
                    else -> ""
                }
            )
+        } else {
+            formatted.append(when (type) {
+                LunaEvent.Type.SLEEP -> "💤" // baby is sleeping
+                else -> ""
+            })
        }
-        return formatted.toString()
+        return formatted.toString().trim()
    }

    /**
     * Returns a valid quantity range for the event type.
     * @return min, max, normal
     */
-    fun getValidEventQuantityRange(lunaEventType: String): Triple<Int, Int, Int>? {
+    fun getValidEventQuantityRange(lunaEventType: LunaEvent.Type): Triple<Int, Int, Int>? {
        return when (lunaEventType) {
-            LunaEvent.TYPE_TEMPERATURE -> {
+            LunaEvent.Type.TEMPERATURE -> {
                if (isMetricSystem())
                    Triple(
                        context.resources.getInteger(R.integer.human_body_temp_min_metric),
--- a/app/src/main/res/drawable/ic_more.xml
+++ b/app/src/main/res/drawable/ic_more.xml
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
-    
-</vector>
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -86,15 +86,16 @@
            android:orientation="vertical">

            <LinearLayout
+                android:id="@+id/linear_layout_row1"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal">

                <TextView
-                    android:id="@+id/button_bottle"
+                    android:id="@+id/button1_row1"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
+                    android:layout_weight="1"
                    android:layout_margin="5dp"
                    android:background="@drawable/button_background"
                    android:gravity="center_horizontal"
@@ -102,7 +103,7 @@
                    android:text="@string/event_bottle_type"/>

                <TextView
-                    android:id="@+id/button_food"
+                    android:id="@+id/button2_row1"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
@@ -115,80 +116,77 @@
            </LinearLayout>

            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/layout_nipples">
-
-                <TextView
-                    android:id="@+id/button_nipple_left"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/button_background"
-                    android:gravity="center_horizontal"
-                    android:textSize="30sp"
-                    android:text="🤱⬅️"/>
-
-                <TextView
-                    android:id="@+id/button_nipple_both"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/button_background"
-                    android:gravity="center_horizontal"
-                    android:textSize="30sp"
-                    android:text="🤱↔️"/>
-
-                <TextView
-                    android:id="@+id/button_nipple_right"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/button_background"
-                    android:gravity="center_horizontal"
-                    android:textSize="30sp"
-                    android:text="🤱➡️️"/>
-
-            </LinearLayout>
-
-            <LinearLayout
+                android:id="@+id/linear_layout_row2"
                android:layout_width="match_parent"
                android:layout_height="wrap_content">

                <TextView
-                    android:id="@+id/button_change_poo"
+                    android:id="@+id/button1_row2"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    android:layout_margin="5dp"
-                    android:layout_weight="2"
-                    android:background="@drawable/button_background"
-                    android:gravity="center_horizontal"
-                    android:textSize="30sp"
-                    android:text="🚼 💩"/>
-
-                <TextView
-                    android:id="@+id/button_change_pee"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:layout_weight="2"
-                    android:background="@drawable/button_background"
-                    android:gravity="center_horizontal"
-                    android:textSize="30sp"
-                    android:text="🚼 💧"/>
-
-                <ImageView
-                    android:id="@+id/button_more"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_margin="5dp"
                    android:layout_weight="1"
                    android:background="@drawable/button_background"
                    android:gravity="center_horizontal"
-                    android:src="@drawable/ic_more"
+                    android:textSize="30sp"/>
+
+                <TextView
+                    android:id="@+id/button2_row2"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/button_background"
+                    android:gravity="center_horizontal"
+                    android:textSize="30sp"/>
+
+                <TextView
+                    android:id="@+id/button3_row2"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/button_background"
+                    android:gravity="center_horizontal"
+                    android:textSize="30sp"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linear_layout_row3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/button1_row3"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/button_background"
+                    android:gravity="center_horizontal"
+                    android:textSize="30sp"/>
+
+                <TextView
+                    android:id="@+id/button2_row3"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/button_background"
+                    android:gravity="center_horizontal"
+                    android:textSize="30sp"/>
+
+                <TextView
+                    android:id="@+id/button_more"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/button_background"
+                    android:gravity="center_horizontal"
+                    android:textSize="30sp"
+                    android:text="☰"
                    app:tint="@android:color/darker_gray"/>

            </LinearLayout>
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -137,7 +137,7 @@
        <TextView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
+            android:layout_marginStart="20dp"
            android:layout_marginTop="5dp"
            android:text="@string/settings_signature_desc"/>

@@ -149,13 +149,13 @@

            <TextView
                android:layout_width="0dp"
-                android:layout_weight="1"
                android:layout_height="wrap_content"
+                android:layout_weight="1"
                android:textStyle="bold"
-                android:text="@string/settings_no_breastfeeding" />
+                android:text="@string/settings_dynamic_menu" />

            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_no_breastfeeding"
+                android:id="@+id/switch_dynamic_menu"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginEnd="20dp"
@@ -166,9 +166,9 @@
        <TextView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
+            android:layout_marginStart="20dp"
            android:layout_marginTop="5dp"
-            android:text="@string/settings_no_breastfeeding_desc"/>
+            android:text="@string/settings_dynamic_menu_desc"/>

        <LinearLayout
            android:layout_width="match_parent"
--- a/app/src/main/res/layout/activity_statistics.xml
+++ b/app/src/main/res/layout/activity_statistics.xml
@@ -0,0 +1,50 @@
+<?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"
+    android:padding="10dp">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <com.github.mikephil.charting.charts.HorizontalBarChart
+            android:id="@+id/bar_chart"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <TextView
+            android:id="@+id/no_data"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            android:gravity="center"
+            android:text="@string/statistics_no_data"/>
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:orientation="horizontal">
+
+        <Spinner
+            android:id="@+id/graph_type_selection"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"/>
+
+        <Spinner
+            android:id="@+id/time_range_selection"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"/>
+
+    </LinearLayout>
+
+</LinearLayout>
--- a/app/src/main/res/layout/dialog_edit_duration.xml
+++ b/app/src/main/res/layout/dialog_edit_duration.xml
@@ -0,0 +1,56 @@
+<?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:id="@+id/duration_buttons"
+        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_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"/>
+
+    </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>
--- a/app/src/main/res/layout/dialog_event_details.xml
+++ b/app/src/main/res/layout/dialog_event_details.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:orientation="vertical"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
@@ -46,6 +45,18 @@
        android:textSize="28sp"
        android:text="@string/dialog_event_detail_quantity"/>

+    <TextView
+        android:id="@+id/dialog_event_detail_type_date_end"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_vertical"
+        android:drawablePadding="10dp"
+        android:drawableTint="@color/accent"
+        android:visibility="gone"
+        android:textSize="16sp"
+        android:textStyle="bold"/>
+
    <ScrollView
        android:layout_width="match_parent"
        android:layout_height="200dp"
--- a/app/src/main/res/layout/more_events_popup.xml
+++ b/app/src/main/res/layout/more_events_popup.xml
@@ -6,89 +6,21 @@
    android:background="@color/transparent">

    <LinearLayout
+        android:id="@+id/layout_list"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical">

            <TextView
-                android:id="@+id/button_medicine"
+                android:id="@+id/button_statistics"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:padding="10dp"
                android:background="@drawable/dropdown_list_item_background"
                style="@style/OverflowMenuText"
-                android:text="@string/overflow_event_medicine"/>
-
-            <TextView
-                android:id="@+id/button_note"
-                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_note"/>
-
-            <TextView
-                android:id="@+id/button_temperature"
-                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_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:background="@drawable/dropdown_list_item_background"
-                style="@style/OverflowMenuText"
-                android:text="@string/overflow_event_colic"/>
-
-            <TextView
-                android:id="@+id/button_scale"
-                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_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="📊 Statistics"/>

+                <!-- Other buttons are inserted dynamically -->
    </LinearLayout>

 </ScrollView>
--- a/app/src/main/res/layout/more_events_popup_item.xml
+++ b/app/src/main/res/layout/more_events_popup_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tv"
+    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="Item Template"/>
--- a/app/src/main/res/layout/statistics_spinner_item.xml
+++ b/app/src/main/res/layout/statistics_spinner_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView  
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" 
+    android:layout_height="wrap_content"
+    android:textSize="20sp"
+    android:gravity="center"
+    android:padding="5dip" />
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -18,13 +18,6 @@
    <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_medicine">💊 Medikament</string>
-    <string name="overflow_event_enema">🪠 Einlauf</string>
-    <string name="overflow_event_note">📝 Notiz</string>
-    <string name="overflow_event_temperature">🌡️ Temperatur</string>
-    <string name="overflow_event_colic">💨 Blähungskolik</string>
-
    <string name="toast_event_added">Ereignis gespeichert</string>
    <string name="toast_logbook_saved">Logbuch gespeichert</string>
    <string name="toast_event_add_error">Ereignis konnte nicht protokolliert werden</string>
@@ -42,7 +35,6 @@
    <string name="no_connection_retry">Erneut versuchen</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>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -18,13 +18,6 @@
    <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_medicine">💊 Médicament</string>
-    <string name="overflow_event_enema">🪠 Lavement</string>
-    <string name="overflow_event_note">📝 Note</string>
-    <string name="overflow_event_temperature">🌡️ Température</string>
-    <string name="overflow_event_colic">💨 Colique gazeuse</string>
-
    <string name="toast_event_added">Entrée ajoutée</string>
    <string name="toast_logbook_saved">Journal ajouté</string>
    <string name="toast_event_add_error">Impossible d\'enregistrer cette entrée</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -3,13 +3,6 @@
    <string name="title">🌜 LunaTracker 🌛</string>
    <string name="logbook">Diario di bordo</string>

-    <string name="overflow_event_weight">⚖️ Peso</string>
-    <string name="overflow_event_medicine">💊 Medicina</string>
-    <string name="overflow_event_enema">🪠 Clistere</string>
-    <string name="overflow_event_note">📝 Nota</string>
-    <string name="overflow_event_temperature">🌡️ Temperatura</string>
-    <string name="overflow_event_colic">💨 Colichette</string>
-
    <string name="event_bottle_desc">Biberon</string>
    <string name="event_food_desc">Cibo</string>
    <string name="event_weight_desc">Pesata</string>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -6,4 +6,34 @@
        <item>@string/amount_normal</item>
        <item>@string/amount_plenty</item>
    </string-array>
+
+    <string-array name="StatisticsTypeLabels">
+        <item>@string/statistics_bottle_sum</item>
+        <item>@string/statistics_bottle_events</item>
+        <item>@string/statistics_sleep_sum</item>
+        <item>@string/statistics_sleep_events</item>
+        <item>@string/statistics_sleep_pattern</item>
+        <item>@string/statistics_medicine_events</item>
+    </string-array>
+
+    <string-array name="StatisticsTypeValues">
+        <item>BOTTLE_SUM</item>
+        <item>BOTTLE_EVENTS</item>
+        <item>SLEEP_SUM</item>
+        <item>SLEEP_EVENTS</item>
+        <item>SLEEP_PATTERN</item>
+        <item>MEDICINE_EVENTS</item>
+    </string-array>
+
+    <string-array name="StatisticsTimeLabels">
+        <item>Day</item>
+        <item>Week</item>
+        <item>Month</item>
+    </string-array>
+
+    <string-array name="StatisticsTimeValues">
+        <item>DAY</item>
+        <item>WEEK</item>
+        <item>MONTH</item>
+    </string-array>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,12 +3,13 @@
    <string name="title">🌜 LunaTracker 🌛</string>
    <string name="logbook">Logged events</string>

+    <!-- menu header items -->
    <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_breastfeeding_left_type" translatable="false">🤱 ←</string>
-    <string name="event_breastfeeding_both_type" translatable="false">🤱 ↔</string>
-    <string name="event_breastfeeding_right_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>
    <string name="event_diaperchange_poo_type" translatable="false">🚼 💩</string>
    <string name="event_diaperchange_pee_type" translatable="false">🚼 💧</string>
    <string name="event_medicine_type" translatable="false">💊</string>
@@ -18,16 +19,37 @@
    <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_sleep_type" translatable="false">💤</string>
+    <string name="event_unknown_type" translatable="false">❓</string>

-    <string name="event_bottle_desc">Baby bottle</string>
+    <!-- dropdown menu item -->
+    <string name="event_type_item_bottle">🍼 Bottle</string>
+    <string name="event_type_item_food">🥣 Food</string>
+    <string name="event_type_item_weight">⚖️ Weight</string>
+    <string name="event_type_item_breastfeeding_left">🤱⬅️ Nursing</string>
+    <string name="event_type_item_breastfeeding_both">🤱↔️ Nursing</string>
+    <string name="event_type_item_breastfeeding_right">🤱➡️️ Nursing</string>
+    <string name="event_type_item_diaperchange_poo">🚼💩 Diaper</string>
+    <string name="event_type_item_diaperchange_pee">🚼💧 Diaper</string>
+    <string name="event_type_item_medicine">💊 Medicine</string>
+    <string name="event_type_item_enema">🪠 Enema</string>
+    <string name="event_type_item_note">📝 Note</string>
+    <string name="event_type_item_temperature">🌡️ Temperature</string>
+    <string name="event_type_item_colic">💨 Colic</string>
+    <string name="event_type_item_puke">🤮 Puke</string>
+    <string name="event_type_item_sleep">💤 Sleep</string>
+    <string name="event_type_item_bath">🛁 Bath</string>
+    <string name="event_type_item_unknown">❓ Unknown</string>
+
+    <!-- dialog titles -->
+    <string name="event_bottle_desc">Milk Bottle</string>
    <string name="event_food_desc">Food</string>
    <string name="event_weight_desc">Weight</string>
-    <string name="event_breastfeeding_left_desc">Breastfeeding (left)</string>
-    <string name="event_breastfeeding_both_desc">Breastfeeding</string>
-    <string name="event_breastfeeding_right_desc">Breastfeeding (right)</string>
-    <string name="event_diaperchange_poo_desc">Diaper chg (poo)</string>
-    <string name="event_diaperchange_pee_desc">Diaper chg (pee)</string>
+    <string name="event_breastfeeding_left_desc">Nursing (left)</string>
+    <string name="event_breastfeeding_both_desc">Nursing (both)</string>
+    <string name="event_breastfeeding_right_desc">Nursing (right)</string>
+    <string name="event_diaperchange_poo_desc">Diaper Change (poo)</string>
+    <string name="event_diaperchange_pee_desc">Diaper Change (pee)</string>
    <string name="event_medicine_desc">Medicine</string>
    <string name="event_enema_desc">Enema</string>
    <string name="event_note_desc">Note</string>
@@ -35,21 +57,14 @@
    <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_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="event_sleep_desc">Sleep</string>
+    <string name="event_unknown_desc">Unknown</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>
@@ -73,6 +88,11 @@
    <string name="no_connection_go_to_settings">Settings</string>
    <string name="no_connection_retry">Retry</string>

+    <string name="statistics_title">Statistics</string>
+    <string name="statistics_no_data">No Data</string>
+
+    <string name="settings_dynamic_menu">Dynamic Menu</string>
+    <string name="settings_dynamic_menu_desc">Populate the header menu with the most used events.</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>
@@ -91,8 +111,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>
@@ -112,6 +130,8 @@
    <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_sleep_dialog_description_start">Start sleep cycle:</string>

    <string name="measurement_unit_liquid_base_metric" translatable="false">ml</string>
    <string name="measurement_unit_weight_base_metric" translatable="false">g</string>
@@ -122,12 +142,20 @@
    <string name="measurement_unit_temperature_base_imperial" translatable="false">°F</string>
    <string name="measurement_unit_temperature_base_metric" translatable="false">°C</string>

+    <string name="statistics_bottle_events">Bottle Events</string>
+    <string name="statistics_bottle_sum">Bottle Per Day</string>
+    <string name="statistics_medicine_events">Medicine Events</string>
+    <string name="statistics_sleep_sum">Sleep Per Day</string>
+    <string name="statistics_sleep_events">Sleep Events</string>
+    <string name="statistics_sleep_pattern">Sleep Pattern</string>
+
    <string name="row_luna_event_description">Description</string>
    <string name="row_luna_event_quantity">Qty</string>
    <string name="row_luna_event_time">Time</string>

    <string name="dialog_event_detail_title">Event detail</string>
-    <string name="dialog_event_detail_close_button">OK</string>
+    <string name="dialog_event_detail_close_button">Close</string>
+    <string name="dialog_event_detail_save_button">Save</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>
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,6 +4,11 @@
    <style name="Theme.LunaTracker" parent="Theme.AppCompat.NoActionBar">
        <item name="colorAccent">@color/accent</item>
        <item name="android:textColor">@color/textColor</item>
+
+        <!-- make the screen not overlap with the system bars -->
+        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
    </style>

    <style name="OverflowMenuText">
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,8 +9,11 @@ lifecycleRuntimeKtx = "2.6.1"
 activityCompose = "1.8.0"
 composeBom = "2024.04.01"
 appcompat = "1.7.0"
+mpandroidchart = "v4.2.2"
+mpandroidchartVersion = "v3.1.0"
 recyclerview = "1.3.2"
 material = "1.12.0"
+sardineAndroid = "v0.9"

 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -30,6 +33,9 @@ androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+mpandroidchart = { module = "com.github.PhilJay:MPAndroidChart", version.ref = "mpandroidchart" }
+mpandroidchart-vv310 = { module = "com.github.PhilJay:MPAndroidChart", version.ref = "mpandroidchartVersion" }
+sardine-android = { module = "com.github.thegrizzlylabs:sardine-android", version.ref = "sardineAndroid" }

 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
    repositories {
        google()
        mavenCentral()
-        maven(url = "https://jitpack.io")
+        maven(url = uri("https://jitpack.io"))
    }
 }
Author	SHA1	Message	Date
Moritz Warning	a4b5ae7cd0	layout: replace menu icon with utf8 character The three dot menu icosn looks odd when stretched due to the dynamic menu feature. Thus replace it with the hamburger menu character that looks better when scaled.	2026-02-01 23:00:52 +01:00
Moritz Warning	bed3350113	MainActivity: sort events before saving Also replace notifyItemInserted since it does not call the adapter to redraw the row striping when a new event is added.	2026-02-01 23:00:52 +01:00
Moritz Warning	758f37b510	StatisticsActivity: rework all statistics Improve the overall code.	2026-02-01 23:00:48 +01:00
Moritz Warning	c8c678b294	NumericUtils: remove possible trailing whitespace	2026-01-23 06:46:11 +01:00
Moritz Warning	45e798ac3b	MainActivity: do not switch logbook on reload	2026-01-23 06:46:11 +01:00
Moritz Warning	a06264091b	LunaEvent: reorganize event text getters Use method names that better reflect the use of the returned text.	2026-01-23 06:46:11 +01:00
Moritz Warning	1e82c94d83	MainAcitivty: add dynamic header setting The setting allows to build the menu and popup list to be populated by the frequency of events that has been created. This also makes the 'no breastfeeding' setting irrelevant.	2026-01-23 06:46:11 +01:00
Moritz Warning	85567cce77	LunaEvent: use enum class for event types This helps to have compile errors when some case it not handled while adding a new type. The enum class can also be interated over to create a complete drop down list.	2026-01-23 06:46:11 +01:00
Moritz Warning	80a51ea8ef	MainActivity: increase bottle volume to 340ml This is the maximum amount found in sold bottles.	2026-01-23 06:46:11 +01:00
Moritz Warning	28679a4a66	gradle: use uniform implementation directive for sardine-android	2026-01-23 06:46:11 +01:00
Moritz Warning	f73d3562a9	gradle: avoid inclusion of apk signing blobs See https://android.izzysoft.de/articles/named/iod-scan-apkchecks?lang=en#blobs	2026-01-23 06:46:11 +01:00
Moritz Warning	8a2932b1e7	gradle: set compileSDK/targetSdk to 36	2026-01-23 06:46:11 +01:00
Moritz Warning	2af8989777	StatisticsActivity: add statistics for bottle and sleep events	2026-01-23 06:46:11 +01:00
Moritz Warning	b417fe48a6	MainActivity: show save button if any values has changed	2026-01-23 06:46:11 +01:00
Moritz Warning	a887d9f29f	MainActivity: use unique templates for notes	2026-01-23 06:46:11 +01:00
Moritz Warning	44748506ff	LunaEvent: add sleep event	2026-01-23 06:46:07 +01:00