global: rename StatisticsActivity to LongTermStatisticsActivity

Make way for a future ShortTermStatisticsActivity.

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>

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

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

@@ -148,19 +148,23 @@ class MainActivity : AppCompatActivity() {
         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 {
+            // populate frequency map from all events of the last two weeks
+            val lastWeekTime = (System.currentTimeMillis() / 1000) - (14 * 24 * 60 * 60)
+            allEvents.forEach {
+                if (it.time > lastWeekTime) {
                     eventTypeStats[it.type] = 1 + (eventTypeStats[it.type] ?: 0)
                 }
             }
+        }
 
         // sort all event types by frequency and 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 usedEventCount = eventTypeStats.count { it.value > 0 }
+        val maxButtonCount = if (dynamicMenu) { usedEventCount } else { 7 }
+
         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)
@@ -186,7 +190,7 @@ class MainActivity : AppCompatActivity() {
 
         fun show(vararg tvs: TextView) {
             for (tv in tvs) {
-                    val type = sortedEventTypes[showCounter]
+                val type = eventTypesSorted[showCounter]
                 tv.text = LunaEvent.getHeaderEmoji(applicationContext, type)
                 tv.setOnClickListener { showCreateDialog(type) }
                 tv.visibility = View.VISIBLE
@@ -205,15 +209,8 @@ class MainActivity : AppCompatActivity() {
             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)
+        currentPopupItems = eventTypesSorted.subList(showCounter, eventTypesSorted.size)
     }
 
     override fun onStart() {
@@ -275,6 +272,9 @@ class MainActivity : AppCompatActivity() {
         numberPicker.wrapSelectorWheel = false
         numberPicker.value = event.quantity / 10
 
+        val numberPickerUnit = dialogView.findViewById<TextView>(R.id.dialog_number_picker_unit)
+        numberPickerUnit.text = NumericUtils(this).measurement_unit_liquid_base
+
         val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
         val pickedTime = dateTimePicker(event.time, dateTV)
 
@@ -313,6 +313,9 @@ class MainActivity : AppCompatActivity() {
         val weightET = dialogView.findViewById<EditText>(R.id.dialog_number_edittext)
         weightET.setText(event.quantity.toString())
 
+        val unitTV = dialogView.findViewById<TextView>(R.id.dialog_number_unit)
+        unitTV.text = NumericUtils(this).measurement_unit_weight_base
+
         val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
         val pickedTime = dateTimePicker(event.time, dateTV)
 
@@ -341,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) }
@@ -421,86 +471,110 @@ class MainActivity : AppCompatActivity() {
         return dateTime
     }
 
-    fun addSleepEvent(event: LunaEvent) {
-        askSleepValue(event, true) { saveEvent(event) }
+    fun addDurationEvent(event: LunaEvent) {
+        askDurationEvent(event, true) { saveEvent(event) }
     }
 
-    fun askSleepValue(event: LunaEvent, hideDurationButtons: Boolean, onPositive: () -> Unit) {
+    fun askDurationEvent(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 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 durationMinus5Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_minus5)
-        val durationPlus5Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_plus5)
+        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)
 
-        var duration = event.quantity
+        // in seconds
+        var durationStart = event.getStartTime()
+        var durationEnd = event.getEndTime()
 
-        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) {
-                // baby is sleeping
-                durationTextView.text = "💤"
+        fun updateFields() {
+            datePickerBeginTV.text = DateUtils.formatDateTime(durationStart)
+            datePickerEndTV.text = DateUtils.formatDateTime(durationEnd)
+
+            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
+                durationTV.text = "💤"
+                dateDelimiterTV.visibility = View.GONE
+                datePickerEndTV.visibility = View.GONE
             } else {
-                durationTextView.text = DateUtils.formatTimeDuration(applicationContext, duration.toLong())
-                if (!isValidTime(time, duration)) {
-                    durationTextView.setTextColor(invalidDurationTextColor)
-                }
+                durationTV.text = DateUtils.formatTimeDuration(applicationContext, duration)
+                if (!isValidTimeSpan(durationStart, durationEnd)) {
+                    durationTV.setTextColor(invalidDurationTextColor)
                 }
+                dateDelimiterTV.visibility = View.VISIBLE
+                datePickerEndTV.visibility = View.VISIBLE
             }
 
-        val pickedDateTime = dateTimePicker(event.time, datePicker, onDateChange)
+            val colorBegin = if (isValidTime(durationStart)) { currentDurationTextColor } else { invalidDurationTextColor }
+            datePickerBeginTV.setTextColor(colorBegin)
 
-        onDateChange(pickedDateTime.time.time / 1000)
+            val colorEnd = if (isValidTime(durationEnd)) { currentDurationTextColor } else { invalidDurationTextColor }
+            datePickerEndTV.setTextColor(colorEnd)
+        }
 
-        if (hideDurationButtons) {
+        if (showTime) {
+            dateDelimiterTV.visibility = View.GONE
+            datePickerEndTV.visibility = View.GONE
+            durationTV.visibility = View.GONE
             durationButtons.visibility = View.GONE
-            d.setMessage(getString(R.string.log_sleep_dialog_description_start))
+            //d.setMessage("")
         } else {
+            dateDelimiterTV.visibility = View.VISIBLE
+            datePickerEndTV.visibility = View.VISIBLE
+            durationTV.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 { adjust(-5) }
-            durationPlus5Button.setOnClickListener { adjust(5) }
+        updateFields()
+
+        durationClearButton.setOnClickListener {
+            durationEnd = durationStart
+            updateFields()
+        }
 
         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)
-                }
-            }
+            durationEnd = System.currentTimeMillis() / 1000
+            updateFields()
         }
 
         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(durationStart) && isValidTime(durationEnd) && isValidTimeSpan(durationStart, durationEnd)) {
+                event.time = durationStart
+                event.quantity = (durationEnd - durationStart).toInt()
                 onPositive()
             } else {
                 Toast.makeText(this, R.string.toast_date_error, Toast.LENGTH_SHORT).show()
@@ -621,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
@@ -632,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
@@ -646,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
@@ -818,7 +883,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
@@ -841,12 +906,15 @@ 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)
                 LunaEvent.Type.TEMPERATURE -> askTemperatureValue(event, false, updateValues)
+                LunaEvent.Type.FOOD,
+                LunaEvent.Type.MEDICINE,
                 LunaEvent.Type.NOTE -> askNotes(event, false, updateValues)
-                LunaEvent.Type.SLEEP -> askSleepValue(event, false, updateValues)
+                LunaEvent.Type.SLEEP -> askDurationEvent(event, false, updateValues)
                 else -> {
                     Log.w(TAG, "Unexpected type: ${event.type}")
                 }
@@ -876,7 +944,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 +959,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()
@@ -1260,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)
@@ -1273,7 +1342,7 @@ class MainActivity : AppCompatActivity() {
             LunaEvent.Type.FOOD -> addNoteEvent(event)
             LunaEvent.Type.PUKE -> addAmountEvent(event)
             LunaEvent.Type.BATH -> addPlainEvent(event)
-            LunaEvent.Type.SLEEP -> addSleepEvent(event)
+            LunaEvent.Type.SLEEP -> addDurationEvent(event)
             LunaEvent.Type.UNKNOWN -> {} // ignore
         }
     }
@@ -1290,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 {

app/src/main/java/it/danieleverducci/lunatracker/adapters/LunaEventRecyclerAdapter.kt

@@ -58,17 +58,12 @@ 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
         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 ""
@@ -79,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
@@ -93,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
         }

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,
@@ -115,6 +116,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
     }
@@ -133,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
@@ -162,7 +176,8 @@ class LunaEvent: Comparable<LunaEvent> {
                     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
+                    Type.HEIGHT -> R.string.log_height_dialog_description
+                    Type.SLEEP -> R.string.log_duration_dialog_description
                     else -> R.string.log_unknown_dialog_description
                 }
             )
@@ -173,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
@@ -198,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

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

@@ -9,10 +9,15 @@ import java.util.Date
 class DateUtils {
     companion object {
         /**
-         * Format time duration in seconds as e.g. "2 hours, 1 min".
+         * Format time duration in seconds as e.g. "2 hours, 1 min", rounded to minutes.
          * Used for the duration to the next/previous event in the event details dialog.
          */
         fun formatTimeDuration(context: Context, secondsDiff: Long): String {
+            val adjusted = (secondsDiff + 30) - (secondsDiff + 30) % 60
+            return formatTimeDurationExact(context, adjusted)
+        }
+
+        fun formatTimeDurationExact(context: Context, secondsDiff: Long): String {
             var seconds = secondsDiff
 
             val years = (seconds / (365 * 24 * 60 * 60F)).toLong()
@@ -56,11 +61,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)

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

@@ -11,10 +11,10 @@ import utils.DateUtils.Companion.formatTimeDuration
 import java.text.NumberFormat
 
 class NumericUtils (val context: Context) {
-    val numberFormat: NumberFormat
     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 {
@@ -35,7 +35,6 @@ class NumericUtils (val context: Context) {
     }
 
     init {
-        this.numberFormat = NumberFormat.getInstance()
         this.measurement_unit_liquid_base = context.getString(
             if (isMetricSystem())
                 R.string.measurement_unit_liquid_base_metric
@@ -54,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
@@ -90,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 -> ""

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"/>
 

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

@@ -18,6 +18,7 @@
             android:layout_height="wrap_content"/>
 
         <TextView
+            android:id="@+id/dialog_number_picker_unit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"

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

@@ -11,46 +11,65 @@
         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"
         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"/>
+            android:text="@string/dialog_duration_button_now"/>
 
         <Button
-            android:id="@+id/dialog_date_duration_plus5"
+            android:id="@+id/dialog_date_duration_clear"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="+5"/>
+            android:text="@string/dialog_duration_button_clear"/>
 
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_height="wrap_content"
+        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"
+            android:id="@+id/dialog_date_picker_begin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="20dp"/>
+            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>

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>

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

@@ -21,6 +21,7 @@
             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"

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,15 +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_sleep_dialog_description">Set sleep duration:</string>
-    <string name="log_sleep_dialog_description_start">Start sleep cycle:</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>
 
@@ -161,6 +166,11 @@
     <string name="dialog_event_detail_notes">Notes</string>
     <string name="dialog_event_detail_signature">by %s</string>
 
+    <string name="dialog_duration_button_clear">Clear</string>
+    <string name="dialog_duration_button_minus_5">-5 min</string>
+    <string name="dialog_duration_button_now">Now</string>
+    <string name="dialog_duration_button_plus_5">+5 min</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>