LunaEvent: rework sleep event

Make the UI more flexible and slightly easier to understand.
2026-02-02 21:03:51 +01:00
parent 1bcfc18a71
commit ff48d1af59
6 changed files with 136 additions and 59 deletions
--- a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
@@ -425,82 +425,117 @@ class MainActivity : AppCompatActivity() {
        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 datePickerBegin = dialogView.findViewById<TextView>(R.id.dialog_date_picker_begin)
+        val datePickerEnd = dialogView.findViewById<TextView>(R.id.dialog_date_picker_end)
+        val dateDelimiter = dialogView.findViewById<TextView>(R.id.dialog_date_range_delimiter)
        val durationButtons = dialogView.findViewById<LinearLayout>(R.id.duration_buttons)
        val durationNowButton = dialogView.findViewById<Button>(R.id.dialog_date_duration_now)
+        val durationAsleepButton = dialogView.findViewById<Button>(R.id.dialog_date_duration_asleep)
        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
+        // in seconds
+        var sleepBegin = event.time
+        var sleepEnd = event.time + event.quantity

-        fun isValidTime(timeSeconds: Long, durationSeconds: Int): Boolean {
+        fun isValidTime(timeUnix: Long): Boolean {
            val now = System.currentTimeMillis() / 1000
-            return (timeSeconds + durationSeconds) <= now && durationSeconds < (24 * 60 * 60)
+            return timeUnix in 1..now
        }

-        val onDateChange = { time: Long ->
-            durationTextView.setTextColor(currentDurationTextColor)
+        fun isValidTimeSpan(timeBeginUnix: Long, timeEndUnix: Long): Boolean {
+            return (timeBeginUnix <= timeEndUnix) && (timeEndUnix - timeBeginUnix) < (24 * 60 * 60)
+        }

-            if (duration == 0) {
+        // prevent printing of seconds
+        fun adjustToMinute(unixTime: Long): Long {
+            return unixTime - (unixTime % 60)
+        }
+
+        fun udpateFields() {
+            datePickerBegin.text = DateUtils.formatDateTime(sleepBegin)
+            datePickerEnd.text = DateUtils.formatDateTime(sleepEnd)
+
+            durationTextView.setTextColor(currentDurationTextColor)
+            val duration = sleepEnd - sleepBegin
+            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(sleepBegin, sleepEnd)) {
                    durationTextView.setTextColor(invalidDurationTextColor)
                }
            }
+
+            datePickerBegin.setTextColor(if (isValidTime(sleepBegin)) { currentDurationTextColor } else { invalidDurationTextColor })
+            datePickerEnd.setTextColor(if (isValidTime(sleepEnd)) { currentDurationTextColor } else { invalidDurationTextColor })
        }

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

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

-        if (hideDurationButtons) {
+        sleepBegin = adjustToMinute(pickedDateTimeBegin.time.time / 1000)
+        sleepEnd = adjustToMinute(pickedDateTimeEnd.time.time / 1000)
+
+        udpateFields()
+
+        if (showTime) {
+            dateDelimiter.visibility = View.GONE
+            datePickerEnd.visibility = View.GONE
+            durationTextView.visibility = View.GONE
            durationButtons.visibility = View.GONE
-            d.setMessage(getString(R.string.log_sleep_dialog_description_start))
+            //d.setMessage("")
        } else {
+            dateDelimiter.visibility = View.VISIBLE
+            datePickerEnd.visibility = View.VISIBLE
+            durationTextView.visibility = View.VISIBLE
            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 {
+            sleepEnd = (sleepEnd - 300).coerceAtLeast(sleepBegin)
+            udpateFields()
+        }

-            durationMinus5Button.setOnClickListener { adjust(-5) }
-            durationPlus5Button.setOnClickListener { adjust(5) }
+        durationPlus5Button.setOnClickListener {
+            sleepEnd = (sleepEnd + 300).coerceAtLeast(sleepBegin)
+            udpateFields()
+        }

-            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)
-                }
-            }
+        durationAsleepButton.setOnClickListener {
+            sleepEnd = sleepBegin
+            udpateFields()
+        }
+
+        durationNowButton.setOnClickListener {
+            val now = System.currentTimeMillis() / 1000
+            sleepEnd = adjustToMinute(now)
+            udpateFields()
        }

        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 (isValidTime(sleepBegin) && isValidTime(sleepEnd) && isValidTimeSpan(sleepBegin, sleepEnd)) {
+                event.time = sleepBegin
+                event.quantity = (sleepEnd - sleepBegin).toInt()
                onPositive()
            } else {
                Toast.makeText(this, R.string.toast_date_error, Toast.LENGTH_SHORT).show()
@@ -818,7 +853,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
@@ -876,7 +911,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()
@@ -891,7 +926,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()
--- 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/layout/dialog_edit_duration.xml
+++ b/app/src/main/res/layout/dialog_edit_duration.xml
@@ -11,13 +11,14 @@
        android:id="@+id/dialog_date_duration"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
        android:textSize="20sp"
        android:text="💤"/>

    <LinearLayout
        android:id="@+id/duration_buttons"
-        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
        android:gravity="center"
        android:layout_marginTop="20dp"
        android:layout_marginHorizontal="10dp"
@@ -28,29 +29,61 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="-5"/>
+            android:text="-5 min"/>

        <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"/>
+            android:text="@string/dialog_duration_button_now"/>
+
+        <Button
+            android:id="@+id/dialog_date_duration_asleep"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/dialog_duration_button_asleep"/>

        <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"/>
+            android:text="+5 min"/>

    </LinearLayout>

-    <TextView
-        android:id="@+id/dialog_date_picker"
-        android:layout_width="wrap_content"
+    <LinearLayout
        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="20dp"/>
+        android:layout_width="match_parent"
+        android:gravity="center"
+        android:layout_marginTop="20dp"
+        android:layout_marginHorizontal="10dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/dialog_date_picker_begin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:layout_weight="1"/>
+
+        <TextView
+            android:id="@+id/dialog_date_range_delimiter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:layout_weight="1"
+            android:text="－"/>
+
+        <TextView
+            android:id="@+id/dialog_date_picker_end"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:layout_weight="1"/>
+
+    </LinearLayout>

 </LinearLayout>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -131,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>
@@ -161,6 +160,9 @@
    <string name="dialog_event_detail_notes">Notes</string>
    <string name="dialog_event_detail_signature">by %s</string>

+    <string name="dialog_duration_button_now">now</string>
+    <string name="dialog_duration_button_asleep">asleep</string>
+
    <string name="dialog_add_logbook_title">Add logbook</string>
    <string name="dialog_add_logbook_logbookname">👶 Logbook name</string>
    <string name="dialog_add_logbook_message">Write a name to identify this logbook. This name will appear on top of the screen and, if you use WebDAV, will be in the save file name as well.</string>