global: rename StatisticsActivity to LongTermStatisticsActivity

Make way for a future ShortTermStatisticsActivity.
sleep: fix date picker usage
2026-06-18 14:41:56 +02:00 · 2026-06-18 14:28:36 +02:00 · 2026-06-18 14:09:51 +02:00 · 2026-06-12 16:10:09 +02:00 · 2026-06-11 21:36:14 +02:00
9 changed files with 167 additions and 55 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,7 +31,7 @@
            android:label="@string/settings_title"
            android:theme="@style/Theme.LunaTracker"/>
        <activity
-            android:name=".StatisticsActivity"
+            android:name=".LongTermStatisticsActivity"
            android:label="@string/statistics_title"
            android:theme="@style/Theme.LunaTracker"/>
    </application>
--- a/app/src/main/java/it/danieleverducci/lunatracker/LongTermStatisticsActivity.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/LongTermStatisticsActivity.kt
@@ -35,7 +35,7 @@ import java.util.Locale
 import kotlin.math.max
 import kotlin.math.min

-class StatisticsActivity : AppCompatActivity() {
+class LongTermStatisticsActivity : AppCompatActivity() {
    var lastToastShown = 0L

    lateinit var barChart: BarChart
@@ -767,7 +767,7 @@ class StatisticsActivity : AppCompatActivity() {
            override fun onItemSelected(parent: AdapterView<*>?, view: View?, pos: Int, id: Long) {
                if (pos >= arrayValues.size) {
                    Toast.makeText(
-                        this@StatisticsActivity,
+                        this@LongTermStatisticsActivity,
                        "pos out of bounds: $arrayValues", Toast.LENGTH_SHORT
                    ).show()
                    return
@@ -784,7 +784,7 @@ class StatisticsActivity : AppCompatActivity() {
    }

    companion object {
-        const val TAG = "StatisticsActivity"
+        const val TAG = "LongTermStatisticsActivity"

        // 15 min steps
        const val SLEEP_PATTERN_GRANULARITY = 15 * 60
--- a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
@@ -344,6 +344,53 @@ class MainActivity : AppCompatActivity() {
        alertDialog.show()
    }

+    fun addHeightEvent(event: LunaEvent) {
+        setToPreviousQuantity(event)
+        askHeightValue(event, true) { saveEvent(event) }
+    }
+
+    fun askHeightValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
+        // Show number picker dialog
+        val d = AlertDialog.Builder(this)
+        val dialogView = layoutInflater.inflate(R.layout.dialog_edit_height, null)
+        d.setTitle(event.getDialogTitle(this))
+        d.setMessage(event.getDialogMessage(this))
+        d.setView(dialogView)
+
+        val heightET = dialogView.findViewById<EditText>(R.id.dialog_number_edittext)
+        heightET.setText(event.quantity.toString())
+
+        val unitTV = dialogView.findViewById<TextView>(R.id.dialog_number_unit)
+        unitTV.text = NumericUtils(this).measurement_unit_height_base
+
+        val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
+        val pickedTime = dateTimePicker(event.time, dateTV)
+
+        if (!showTime) {
+            dateTV.visibility = View.GONE
+        }
+
+        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
+            val height = heightET.text.toString().toIntOrNull()
+            if (height != null) {
+                event.time = pickedTime.time.time / 1000
+                event.quantity = height
+                onPositive()
+            } else {
+                Toast.makeText(this, R.string.toast_integer_error, Toast.LENGTH_SHORT).show()
+            }
+
+            dialogInterface.dismiss()
+        }
+
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
+            dialogInterface.dismiss()
+        }
+
+        val alertDialog = d.create()
+        alertDialog.show()
+    }
+
    fun addTemperatureEvent(event: LunaEvent) {
        setToPreviousQuantity(event)
        askTemperatureValue(event, true) { saveEvent(event) }
@@ -434,15 +481,15 @@ class MainActivity : AppCompatActivity() {
        d.setTitle(event.getDialogTitle(this))
        d.setView(dialogView)

-        val durationTextView = dialogView.findViewById<TextView>(R.id.dialog_date_duration)
-        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 durationTV = dialogView.findViewById<TextView>(R.id.dialog_date_duration)
+        val datePickerBeginTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker_begin)
+        val datePickerEndTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker_end)
+        val dateDelimiterTV = 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 durationClearButton = dialogView.findViewById<Button>(R.id.dialog_date_duration_clear)

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

        // in seconds
@@ -459,59 +506,59 @@ class MainActivity : AppCompatActivity() {
        }

        fun updateFields() {
-            datePickerBegin.text = DateUtils.formatDateTime(durationStart)
-            datePickerEnd.text = DateUtils.formatDateTime(durationEnd)
+            datePickerBeginTV.text = DateUtils.formatDateTime(durationStart)
+            datePickerEndTV.text = DateUtils.formatDateTime(durationEnd)

-            durationTextView.setTextColor(currentDurationTextColor)
+            dateTimePicker(durationStart, datePickerBeginTV) { pickedTime: Long ->
+                durationStart = pickedTime
+                if (datePickerEndTV.visibility == View.GONE) {
+                    durationEnd = pickedTime
+                }
+                updateFields()
+            }
+
+            dateTimePicker(durationEnd, datePickerEndTV) { pickedTime: Long ->
+                durationEnd = pickedTime
+                updateFields()
+            }
+
+            durationTV.setTextColor(currentDurationTextColor)
            val duration = durationEnd - durationStart
            if (duration == 0L) {
                // event is ongoing
-                durationTextView.text = "💤"
-                dateDelimiter.visibility = View.GONE
-                datePickerEnd.visibility = View.GONE
+                durationTV.text = "💤"
+                dateDelimiterTV.visibility = View.GONE
+                datePickerEndTV.visibility = View.GONE
            } else {
-                durationTextView.text = DateUtils.formatTimeDuration(applicationContext, duration)
+                durationTV.text = DateUtils.formatTimeDuration(applicationContext, duration)
                if (!isValidTimeSpan(durationStart, durationEnd)) {
-                    durationTextView.setTextColor(invalidDurationTextColor)
+                    durationTV.setTextColor(invalidDurationTextColor)
                }
-                dateDelimiter.visibility = View.VISIBLE
-                datePickerEnd.visibility = View.VISIBLE
+                dateDelimiterTV.visibility = View.VISIBLE
+                datePickerEndTV.visibility = View.VISIBLE
            }

-            datePickerBegin.setTextColor(if (isValidTime(durationStart)) { currentDurationTextColor } else { invalidDurationTextColor })
-            datePickerEnd.setTextColor(if (isValidTime(durationEnd)) { currentDurationTextColor } else { invalidDurationTextColor })
-        }
+            val colorBegin = if (isValidTime(durationStart)) { currentDurationTextColor } else { invalidDurationTextColor }
+            datePickerBeginTV.setTextColor(colorBegin)

-        val pickedDateTimeBegin = dateTimePicker(event.time, datePickerBegin) { pickedTime: Long ->
-            durationStart = pickedTime
-            if (datePickerEnd.visibility == View.GONE) {
-                durationEnd = pickedTime
-            }
-            updateFields()
-        }
-
-        val pickedDateTimeEnd = dateTimePicker(event.time + event.quantity, datePickerEnd) { pickedTime: Long ->
-            durationEnd = pickedTime
-            updateFields()
+            val colorEnd = if (isValidTime(durationEnd)) { currentDurationTextColor } else { invalidDurationTextColor }
+            datePickerEndTV.setTextColor(colorEnd)
        }

        if (showTime) {
-            dateDelimiter.visibility = View.GONE
-            datePickerEnd.visibility = View.GONE
-            durationTextView.visibility = View.GONE
+            dateDelimiterTV.visibility = View.GONE
+            datePickerEndTV.visibility = View.GONE
+            durationTV.visibility = View.GONE
            durationButtons.visibility = View.GONE
            //d.setMessage("")
        } else {
-            dateDelimiter.visibility = View.VISIBLE
-            datePickerEnd.visibility = View.VISIBLE
-            durationTextView.visibility = View.VISIBLE
+            dateDelimiterTV.visibility = View.VISIBLE
+            datePickerEndTV.visibility = View.VISIBLE
+            durationTV.visibility = View.VISIBLE
            durationButtons.visibility = View.VISIBLE
            d.setMessage(event.getDialogMessage(this))
        }

-        durationStart = pickedDateTimeBegin.time.time / 1000
-        durationEnd = pickedDateTimeEnd.time.time / 1000
-
        updateFields()

        durationClearButton.setOnClickListener {
@@ -648,9 +695,6 @@ class MainActivity : AppCompatActivity() {
            var nextEvent = getNextSameEvent(current, templates)

            notesET.setText(current.notes)
-            if (useQuantity) {
-                qtyET.setText(current.quantity.toString())
-            }

            if (nextEvent == null && current != event) {
                nextEvent = event
@@ -659,9 +703,6 @@ class MainActivity : AppCompatActivity() {
            if (nextEvent != null) {
                nextTextView.setOnClickListener {
                    notesET.setText(nextEvent.notes)
-                    if (useQuantity) {
-                        qtyET.setText(nextEvent.quantity.toString())
-                    }
                    updateContent(nextEvent)
                }
                nextTextView.alpha = 1.0f
@@ -673,9 +714,6 @@ class MainActivity : AppCompatActivity() {
            if (prevEvent != null) {
                prevTextView.setOnClickListener {
                    notesET.setText(prevEvent.notes)
-                    if (useQuantity) {
-                        qtyET.setText(prevEvent.quantity.toString())
-                    }
                    updateContent(prevEvent)
                }
                prevTextView.alpha = 1.0f
@@ -868,6 +906,7 @@ class MainActivity : AppCompatActivity() {
            when (event.type) {
                LunaEvent.Type.BABY_BOTTLE -> askBabyBottleContent(event, false, updateValues)
                LunaEvent.Type.WEIGHT -> askWeightValue(event, false, updateValues)
+                LunaEvent.Type.HEIGHT -> askHeightValue(event, false, updateValues)
                LunaEvent.Type.DIAPERCHANGE_POO,
                LunaEvent.Type.DIAPERCHANGE_PEE,
                LunaEvent.Type.PUKE -> askAmountValue(event, false, updateValues)
@@ -1289,6 +1328,7 @@ class MainActivity : AppCompatActivity() {
        when (type) {
            LunaEvent.Type.BABY_BOTTLE -> addBabyBottleEvent(event)
            LunaEvent.Type.WEIGHT -> addWeightEvent(event)
+            LunaEvent.Type.HEIGHT -> addHeightEvent(event)
            LunaEvent.Type.BREASTFEEDING_LEFT_NIPPLE -> addPlainEvent(event)
            LunaEvent.Type.BREASTFEEDING_BOTH_NIPPLE -> addPlainEvent(event)
            LunaEvent.Type.BREASTFEEDING_RIGHT_NIPPLE -> addPlainEvent(event)
@@ -1319,7 +1359,7 @@ class MainActivity : AppCompatActivity() {
            // Add statistics (hard coded)
            contentView.findViewById<View>(R.id.button_statistics).setOnClickListener {
                if (logbook != null && !pauseLogbookUpdate) {
-                    val i = Intent(applicationContext, StatisticsActivity::class.java)
+                    val i = Intent(applicationContext, LongTermStatisticsActivity::class.java)
                    i.putExtra("LOOGBOOK_NAME", logbook!!.name)
                    startActivity(i)
                } else {
--- a/app/src/main/java/it/danieleverducci/lunatracker/adapters/LunaEventRecyclerAdapter.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/adapters/LunaEventRecyclerAdapter.kt
@@ -63,7 +63,7 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu

        // if the event is weight, show difference with the last one
        if (item.type == LunaEvent.Type.WEIGHT) {
-            val lastWeight = getPreviousWeightEvent(position)
+            val lastWeight = getPreviousEvent(position, LunaEvent.Type.WEIGHT)
            if (lastWeight != null) {
                val differenceInWeight = item.quantity - lastWeight.quantity
                val sign = if (differenceInWeight > 0) "+" else ""
@@ -74,6 +74,19 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
            }
        }

+        // if the event is height, show difference with the last one
+        if (item.type == LunaEvent.Type.HEIGHT) {
+            val lastHeight = getPreviousEvent(position, LunaEvent.Type.HEIGHT)
+            if (lastHeight != null) {
+                val differenceInHeight = item.quantity - lastHeight.quantity
+                val sign = if (differenceInHeight > 0) "+" else ""
+                quantityText += "\n($sign$differenceInHeight)"
+                if (differenceInHeight < 0) {
+                    holder.quantity.setTextColor(ContextCompat.getColor(context, R.color.danger))
+                }
+            }
+        }
+
        holder.quantity.text = quantityText

        // Listeners
@@ -88,12 +101,12 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
        return items.size
    }

-    private fun getPreviousWeightEvent(startFromPosition: Int): LunaEvent? {
+    private fun getPreviousEvent(startFromPosition: Int, type: LunaEvent.Type): LunaEvent? {
        if (startFromPosition == items.size - 1)
            return null
        for (pos in startFromPosition + 1 until items.size) {
            val item = items.get(pos)
-            if (item.type != LunaEvent.Type.WEIGHT)
+            if (item.type != type)
                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
@@ -22,6 +22,7 @@ class LunaEvent: Comparable<LunaEvent> {
        DIAPERCHANGE_PEE,
        SLEEP,
        WEIGHT,
+        HEIGHT,
        MEDICINE,
        ENEMA,
        NOTE,
@@ -145,6 +146,7 @@ class LunaEvent: Comparable<LunaEvent> {
                when (type) {
                    Type.BABY_BOTTLE -> R.string.event_bottle_type
                    Type.WEIGHT -> R.string.event_weight_type
+                    Type.HEIGHT -> R.string.event_height_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
@@ -174,6 +176,7 @@ class LunaEvent: Comparable<LunaEvent> {
                    Type.DIAPERCHANGE_PEE,
                    Type.PUKE -> R.string.log_amount_dialog_description
                    Type.WEIGHT -> R.string.log_weight_dialog_description
+                    Type.HEIGHT -> R.string.log_height_dialog_description
                    Type.SLEEP -> R.string.log_duration_dialog_description
                    else -> R.string.log_unknown_dialog_description
                }
@@ -185,6 +188,7 @@ class LunaEvent: Comparable<LunaEvent> {
                when (type) {
                    Type.BABY_BOTTLE -> R.string.event_bottle_desc
                    Type.WEIGHT -> R.string.event_weight_desc
+                    Type.HEIGHT -> R.string.event_height_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
@@ -210,6 +214,7 @@ class LunaEvent: Comparable<LunaEvent> {
                when (type) {
                    Type.BABY_BOTTLE -> R.string.event_type_item_bottle
                    Type.WEIGHT -> R.string.event_type_item_weight
+                    Type.HEIGHT -> R.string.event_type_item_height
                    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
--- a/app/src/main/java/utils/NumericUtils.kt
+++ b/app/src/main/java/utils/NumericUtils.kt
@@ -14,6 +14,7 @@ class NumericUtils (val context: Context) {
    val measurement_unit_liquid_base: String
    val measurement_unit_weight_base: String
    val measurement_unit_weight_tiny: String
+    val measurement_unit_height_base: String
    val measurement_unit_temperature_base: String

    private fun isMetricSystem(): Boolean {
@@ -52,6 +53,12 @@ class NumericUtils (val context: Context) {
            else
                R.string.measurement_unit_weight_tiny_imperial
        )
+        this.measurement_unit_height_base = context.getString(
+            if (isMetricSystem())
+                R.string.measurement_unit_height_base_metric
+            else
+                R.string.measurement_unit_height_base_imperial
+        )
        this.measurement_unit_temperature_base = context.getString(
            if (isMetricSystem())
                R.string.measurement_unit_temperature_base_metric
@@ -88,6 +95,7 @@ class NumericUtils (val context: Context) {
                when (type) {
                    LunaEvent.Type.BABY_BOTTLE -> measurement_unit_liquid_base
                    LunaEvent.Type.WEIGHT -> measurement_unit_weight_base
+                    LunaEvent.Type.HEIGHT -> measurement_unit_height_base
                    LunaEvent.Type.MEDICINE -> measurement_unit_weight_tiny
                    LunaEvent.Type.TEMPERATURE -> measurement_unit_temperature_base
                    else -> ""
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -259,6 +259,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="10dp"
+            android:layout_marginHorizontal="10dp"
            android:gravity="center_horizontal"
            android:text="@string/no_connection_explain"/>

--- a/app/src/main/res/layout/dialog_edit_height.xml
+++ b/app/src/main/res/layout/dialog_edit_height.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/dialog_number_edittext"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:inputType="number"
+            android:hint="0"
+            android:background="@drawable/textview_background"/>
+
+        <TextView
+            android:id="@+id/dialog_number_unit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:text="cm"/>
+
+    </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/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
    <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_height_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>
@@ -26,6 +27,7 @@
    <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_height">📏 Height</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>
@@ -45,6 +47,7 @@
    <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_height_desc">Height</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>
@@ -130,14 +133,17 @@
    <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_height_dialog_description">Insert the height:</string>
    <string name="log_duration_dialog_description">Set duration:</string>

    <string name="measurement_unit_liquid_base_metric" translatable="false">ml</string>
    <string name="measurement_unit_weight_base_metric" translatable="false">g</string>
    <string name="measurement_unit_weight_tiny_metric" translatable="false">mg</string>
+    <string name="measurement_unit_height_base_metric" translatable="false">cm</string>
    <string name="measurement_unit_liquid_base_imperial" translatable="false">fl oz.</string>
    <string name="measurement_unit_weight_base_imperial" translatable="false">oz</string>
    <string name="measurement_unit_weight_tiny_imperial" translatable="false">gr</string>
+    <string name="measurement_unit_height_base_imperial" translatable="false">in</string>
    <string name="measurement_unit_temperature_base_imperial" translatable="false">°F</string>
    <string name="measurement_unit_temperature_base_metric" translatable="false">°C</string>
Author	SHA1	Message	Date
Moritz Warning	4f8209b793	global: rename StatisticsActivity to LongTermStatisticsActivity Make way for a future ShortTermStatisticsActivity.	2026-06-18 14:41:56 +02:00
Moritz Warning	ddcc2fc492	sleep: fix date picker usage The time the date picker uses needs to be updated. Also make some variable names more logical.	2026-06-18 14:28:36 +02:00
Moritz Warning	c75d4ed8a7	activity_main: add horizontal margin to error message	2026-06-18 14:09:51 +02:00
Moritz Warning	16e5b39d6f	notes: do not update quantity When using the tiny arrows to switch between older texts, do not change the quantity field.	2026-06-12 16:10:09 +02:00
Moritz Warning	7bbf480a7f	event: add support for height	2026-06-11 21:36:14 +02:00