LunaEvent: rework sleep event

Remove adjustment buttons and simplify design.
MainActivity: rename datepicker
2026-02-11 22:05:36 +01:00 · 2026-02-11 22:05:29 +01:00 · 2026-02-11 22:02:42 +01:00 · 2026-02-11 22:02:42 +01:00 · 2026-02-11 22:02:38 +01:00
11 changed files with 864 additions and 342 deletions
--- a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
@@ -276,7 +276,7 @@ class MainActivity : AppCompatActivity() {
        numberPicker.value = event.quantity / 10

        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        val pickedTime = datePickerHelper(event.time, dateTV)
+        val pickedTime = dateTimePicker(event.time, dateTV)

        if (!showTime) {
            dateTV.visibility = View.GONE
@@ -314,7 +314,7 @@ class MainActivity : AppCompatActivity() {
        weightET.setText(event.quantity.toString())

        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        val pickedTime = datePickerHelper(event.time, dateTV)
+        val pickedTime = dateTimePicker(event.time, dateTV)

        if (!showTime) {
            dateTV.visibility = View.GONE
@@ -365,7 +365,7 @@ class MainActivity : AppCompatActivity() {
        }

        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        val pickedTime = datePickerHelper(event.time, dateTV)
+        val pickedTime = dateTimePicker(event.time, dateTV)
        if (!showTime) {
            dateTV.visibility = View.GONE
        }
@@ -389,7 +389,8 @@ class MainActivity : AppCompatActivity() {
        alertDialog.show()
    }

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

        val dateTime = Calendar.getInstance()
@@ -420,97 +421,83 @@ class MainActivity : AppCompatActivity() {
        return dateTime
    }

-    fun saveEvent(event: LunaEvent) {
-        if (!allEvents.contains(event)) {
-            // new event
-            logEvent(event)
-        }
-
-        logbook?.sort()
-        recyclerView.adapter?.notifyDataSetChanged()
-        saveLogbook()
-    }
-
    fun addSleepEvent(event: LunaEvent) {
        askSleepValue(event, true) { saveEvent(event) }
    }

-    fun askSleepValue(event: LunaEvent, hideDurationButtons: Boolean, onPositive: () -> Unit) {
+    fun askSleepValue(event: LunaEvent, showTime: 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 datePickerBegin = dialogView.findViewById<TextView>(R.id.dialog_date_picker_begin)
+        val datePickerEnd = dialogView.findViewById<TextView>(R.id.dialog_date_picker_end)

        val currentDurationTextColor = durationTextView.currentTextColor
        val invalidDurationTextColor = ContextCompat.getColor(this, R.color.danger)

-        var duration = event.quantity
+        // in seconds
+        var sleepStart = event.time
+        var sleepEnd = event.time + event.quantity

-        fun isValidTime(timeSeconds: Long, durationSeconds: Int): Boolean {
+        fun isValidTimeSpan(timeBeginUnix: Long, timeEndUnix: Long): Boolean {
            val now = System.currentTimeMillis() / 1000
-            return (timeSeconds + durationSeconds) <= now && durationSeconds < (24 * 60 * 60)
+            return (timeBeginUnix > 0)
+                && (timeEndUnix > 0)
+                && (timeBeginUnix <= timeEndUnix)
+                && (timeBeginUnix <= now)
+                && (timeEndUnix <= now)
+                && (timeEndUnix - timeBeginUnix) < (24 * 60 * 60)
        }

-        val onDateChange = { time: Long ->
-            durationTextView.setTextColor(currentDurationTextColor)
+        // prevent printing of seconds
+        fun adjustToMinute(unixTime: Long): Long {
+            return unixTime - (unixTime % 60)
+        }

-            if (duration == 0) {
+        fun updateDuration() {
+            durationTextView.setTextColor(currentDurationTextColor)
+            val duration = sleepEnd - sleepStart
+            if (duration == 0L) {
                // baby is sleeping
                durationTextView.text = "💤"
            } else {
-                durationTextView.text = DateUtils.formatTimeDuration(applicationContext, duration.toLong())
-                if (!isValidTime(time, duration)) {
+                durationTextView.text = DateUtils.formatTimeDuration(applicationContext, duration)
+                if (!isValidTimeSpan(sleepStart, sleepEnd)) {
                    durationTextView.setTextColor(invalidDurationTextColor)
                }
            }
        }

-        val pickedDateTime = datePickerHelper(event.time, datePicker, onDateChange)
+        val pickedDateTimeBegin = dateTimePicker(event.time, datePickerBegin) { time: Long ->
+            sleepStart = adjustToMinute(time)
+            updateDuration()
+        }

-        onDateChange(pickedDateTime.time.time / 1000)
+        val pickedDateTimeEnd = dateTimePicker(event.time + event.quantity, datePickerEnd) { time: Long ->
+            sleepEnd = adjustToMinute(time)
+            updateDuration()
+        }

-        if (hideDurationButtons) {
-            durationButtons.visibility = View.GONE
-            d.setMessage(getString(R.string.log_sleep_dialog_description_start))
+        sleepStart = adjustToMinute(pickedDateTimeBegin.time.time / 1000)
+        sleepEnd = adjustToMinute(pickedDateTimeEnd.time.time / 1000)
+        updateDuration()
+
+        if (showTime) {
+            datePickerEnd.visibility = View.GONE
+            durationTextView.visibility = View.GONE
+            //d.setMessage("")
        } else {
-            durationButtons.visibility = View.VISIBLE
+            durationTextView.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
+            if (isValidTimeSpan(sleepStart, sleepEnd)) {
+                event.time = sleepStart
+                event.quantity = (sleepEnd - sleepStart).toInt()
                onPositive()
            } else {
                Toast.makeText(this, R.string.toast_date_error, Toast.LENGTH_SHORT).show()
@@ -548,7 +535,7 @@ class MainActivity : AppCompatActivity() {
        spinner.setSelection(event.quantity.coerceIn(0, spinner.count - 1))

        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        val pickedTime = datePickerHelper(event.time, dateTV)
+        val pickedTime = dateTimePicker(event.time, dateTV)
        if (!showTime) {
            dateTV.visibility = View.GONE
        }
@@ -581,7 +568,7 @@ class MainActivity : AppCompatActivity() {
        d.setView(dialogView)

        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        val pickedDateTime = datePickerHelper(event.time, dateTV)
+        val pickedDateTime = dateTimePicker(event.time, dateTV)
        if (!showTime) {
            dateTV.visibility = View.GONE
        }
@@ -616,7 +603,7 @@ class MainActivity : AppCompatActivity() {
        val qtyET = dialogView.findViewById<EditText>(R.id.notes_qty_edittext)

        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        val pickedTime = datePickerHelper(event.time, dateTV)
+        val pickedTime = dateTimePicker(event.time, dateTV)

        if (!showTime) {
            dateTV.visibility = View.GONE
@@ -828,7 +815,7 @@ class MainActivity : AppCompatActivity() {
            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.text = DateUtils.formatDateTime(event.getEndTime())
                dateEndTextView.visibility = View.VISIBLE
            } else {
                dateEndTextView.visibility = View.GONE
@@ -842,7 +829,7 @@ class MainActivity : AppCompatActivity() {
        }
        updateValues()

-        datePickerHelper(event.time, dateTextView, { newTime: Long ->
+        dateTimePicker(event.time, dateTextView, { newTime: Long ->
            event.time = newTime
            updateValues()
        })
@@ -886,7 +873,7 @@ class MainActivity : AppCompatActivity() {
        val previousEvent = getPreviousSameEvent(event, allEvents)
        if (previousEvent != null) {
            val emoji = previousEvent.getHeaderEmoji(applicationContext)
-            val time = DateUtils.formatTimeDuration(applicationContext, event.time - previousEvent.time)
+            val time = DateUtils.formatTimeDuration(applicationContext, event.getStartTime() - previousEvent.getEndTime())
            previousTextView.text = String.format("⬅️ %s %s", emoji, time)
            previousTextView.setOnClickListener {
                alertDialog.cancel()
@@ -901,7 +888,7 @@ class MainActivity : AppCompatActivity() {
        val nextEvent = getNextSameEvent(event, allEvents)
        if (nextEvent != null) {
            val emoji = nextEvent.getHeaderEmoji(applicationContext)
-            val time = DateUtils.formatTimeDuration(applicationContext, nextEvent.time - event.time)
+            val time = DateUtils.formatTimeDuration(applicationContext, nextEvent.getStartTime() - event.getEndTime())
            nextTextView.text = String.format("%s %s ➡️", time, emoji)
            nextTextView.setOnClickListener {
                alertDialog.cancel()
@@ -1126,23 +1113,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)
@@ -1154,6 +1124,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.
--- 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
@@ -58,12 +58,7 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
            LunaEvent.Type.NOTE -> item.notes
            else -> item.getRowItemTitle(context)
        }
-        val endTime = if (item.type == LunaEvent.Type.SLEEP) {
-            item.quantity + item.time
-        } else {
-            item.time
-        }
-        holder.time.text = DateUtils.formatTimeAgo(context, endTime)
+        holder.time.text = DateUtils.formatTimeAgo(context, item.getEndTime())
        var quantityText = numericUtils.formatEventQuantity(item)

        // if the event is weight, show difference with the last one
--- a/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt
@@ -115,6 +115,18 @@ class LunaEvent: Comparable<LunaEvent> {
        return getDialogMessage(context, type)
    }

+    fun getStartTime(): Long {
+        return time
+    }
+
+    fun getEndTime(): Long {
+        return if (type == Type.SLEEP) {
+            time + quantity
+        } else {
+            time
+        }
+    }
+
    fun toJson(): JSONObject {
        return jo
    }
--- a/app/src/main/java/utils/DateUtils.kt
+++ b/app/src/main/java/utils/DateUtils.kt
@@ -56,11 +56,11 @@ class DateUtils {
                return builder.toString()
            }

-            if (years > 0) {
+            if (years != 0L) {
                return format(years, days, R.string.year_ago, R.string.years_ago, R.string.day_ago, R.string.days_ago)
-            } else if (days > 0) {
+            } else if (days != 0L) {
                return format(days, hours, R.string.day_ago, R.string.days_ago, R.string.hour_ago, R.string.hours_ago)
-            } else if (hours > 0) {
+            } else if (hours != 0L) {
                return format(hours, minutes, R.string.hour_ago, R.string.hours_ago, R.string.minute_ago, R.string.minutes_ago)
            } else {
                return format(minutes, seconds, R.string.minute_ago, R.string.minute_ago, R.string.second_ago, R.string.seconds_ago)
--- 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
@@ -177,15 +177,16 @@
                    android:gravity="center_horizontal"
                    android:textSize="30sp"/>

-                <ImageView
+                <TextView
                    android:id="@+id/button_more"
-                    android:layout_width="60dp"
-                    android:layout_height="match_parent"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
                    android:layout_margin="5dp"
-                    android:layout_weight="0"
+                    android:layout_weight="1"
                    android:background="@drawable/button_background"
                    android:gravity="center_horizontal"
-                    android:src="@drawable/ic_more"
+                    android:textSize="30sp"
+                    android:text="☰"
                    app:tint="@android:color/darker_gray"/>

            </LinearLayout>
--- a/app/src/main/res/layout/activity_statistics.xml
+++ b/app/src/main/res/layout/activity_statistics.xml
@@ -21,7 +21,7 @@
            android:layout_height="match_parent"
            android:visibility="gone"
            android:gravity="center"
-            android:text="No Data"/>
+            android:text="@string/statistics_no_data"/>

    </FrameLayout>

@@ -32,25 +32,18 @@
        android:orientation="horizontal">

        <Spinner
-            android:id="@+id/type_selection"
+            android:id="@+id/graph_type_selection"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_weight="1" />
+            android:layout_weight="1"
+            android:gravity="center"/>

        <Spinner
-            android:id="@+id/data_selection"
+            android:id="@+id/time_range_selection"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_weight="1"/>
-
-        <Spinner
-            android:id="@+id/time_selection"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_weight="1"/>
+            android:layout_weight="1"
+            android:gravity="center"/>

    </LinearLayout>

--- a/app/src/main/res/layout/dialog_edit_duration.xml
+++ b/app/src/main/res/layout/dialog_edit_duration.xml
@@ -7,47 +7,23 @@
    android:gravity="center"
    android:orientation="vertical">

+    <TextView
+        android:id="@+id/dialog_date_picker_begin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="10dp"/>
+
    <TextView
        android:id="@+id/dialog_date_duration"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
        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:id="@+id/dialog_date_picker_end"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -8,23 +8,19 @@
    </string-array>

    <string-array name="StatisticsTypeLabels">
-        <item>Bottle</item>
-        <item>Sleep</item>
+        <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>
    </string-array>

    <string-array name="StatisticsTypeValues">
-        <item>BOTTLE</item>
-        <item>SLEEP</item>
-    </string-array>
-
-    <string-array name="StatisticsDataLabels">
-        <item>Event</item>
-        <item>Amount</item>
-    </string-array>
-
-    <string-array name="StatisticsDataValues">
-        <item>EVENT</item>
-        <item>AMOUNT</item>
+        <item>BOTTLE_SUM</item>
+        <item>BOTTLE_EVENTS</item>
+        <item>SLEEP_SUM</item>
+        <item>SLEEP_EVENTS</item>
+        <item>SLEEP_PATTERN</item>
    </string-array>

    <string-array name="StatisticsTimeLabels">
@@ -38,5 +34,4 @@
        <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
@@ -89,6 +89,7 @@
    <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>
@@ -130,7 +131,6 @@
    <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>
@@ -141,6 +141,13 @@
    <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>
Author	SHA1	Message	Date
Moritz Warning	be5463bf18	LunaEvent: rework sleep event Remove adjustment buttons and simplify design.	2026-02-11 22:05:36 +01:00
Moritz Warning	260e70a1b7	MainActivity: rename datepicker	2026-02-11 22:05:29 +01:00
Moritz Warning	c2e7116da1	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-11 22:02:42 +01:00
Moritz Warning	8c922943ee	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-11 22:02:42 +01:00
Moritz Warning	d9d79d397a	StatisticsActivity: rework all statistics Improve the overall code.	2026-02-11 22:02:38 +01:00