Added Temperature and Gaseous colic events, removed custom event stub

README.md

@@ -3,7 +3,7 @@
 LunaTracker is a newborn baby tracking app.
 
 Parenting can be tough. You get home from the hospital, exhausted, with this little fragile unknown thingy that has no user manual and a single way to let you know something's not ok: crying.
-You have to react fast, event if it's 4 AM and you have no idea why is crying.
+You have to react fast, even if it's 4 AM and you have no idea why is crying.
 
 This app is meant to log all the relevant events (diaper change, breastfeeding, baby bottle feeding...), so you can always remember when has been done last time. It supports syncing the data between different devices (using your WebDAV server for the best privacy) so that when the baby needs attentions, the dad can step in leaving the mom sleeping peacefully.
 

app/build.gradle.kts

@@ -10,10 +10,10 @@ android {
 
     defaultConfig {
         applicationId = "it.danieleverducci.lunatracker"
-        minSdk = 29
+        minSdk = 21
         targetSdk = 34
-        versionCode = 1
-        versionName = "0.2"
+        versionCode = 2
+        versionName = "0.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -17,6 +17,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.progressindicator.LinearProgressIndicator
+import com.google.android.material.slider.Slider
 import com.thegrizzlylabs.sardineandroid.impl.SardineException
 import it.danieleverducci.lunatracker.adapters.LunaEventRecyclerAdapter
 import it.danieleverducci.lunatracker.entities.Logbook
@@ -30,11 +31,15 @@ import it.danieleverducci.lunatracker.repository.WebDAVLogbookRepository
 import kotlinx.coroutines.Runnable
 import okio.IOException
 import org.json.JSONException
+import utils.NumericUtils
+import java.text.DateFormat
+import java.util.Date
 
 class MainActivity : AppCompatActivity() {
     companion object {
         val TAG = "MainActivity"
         val UPDATE_EVERY_SECS: Long = 30
+        val DEBUG_CHECK_LOGBOOK_CONSISTENCY = false
     }
 
     lateinit var logbook: Logbook
@@ -49,12 +54,18 @@ class MainActivity : AppCompatActivity() {
         handler.postDelayed(updateListRunnable, 1000*60)
     }
     var logbookRepo: LogbookRepository? = null
+    var showingOverflowPopupWindow = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         handler = Handler(mainLooper)
         adapter = LunaEventRecyclerAdapter(this)
+        adapter.onItemClickListener = object: LunaEventRecyclerAdapter.OnItemClickListener{
+            override fun onItemClick(event: LunaEvent) {
+                showEventDetailDialog(event)
+            }
+        }
 
         // Show view
         setContentView(R.layout.activity_main)
@@ -197,6 +208,30 @@ class MainActivity : AppCompatActivity() {
         alertDialog.show()
     }
 
+    fun askTemperatureValue() {
+        // Show number picker dialog
+        val d = AlertDialog.Builder(this)
+        val dialogView = layoutInflater.inflate(R.layout.temperature_dialog, null)
+        d.setTitle(R.string.log_temperature_dialog_title)
+        d.setMessage(R.string.log_temperature_dialog_description)
+        d.setView(dialogView)
+        val tempSlider = dialogView.findViewById<Slider>(R.id.dialog_temperature_value)
+        val range = NumericUtils(this).getValidEventQuantityRange(LunaEvent.TYPE_TEMPERATURE)!!
+        tempSlider.valueFrom = range.first.toFloat()
+        tempSlider.valueTo = range.second.toFloat()
+        tempSlider.value = range.third.toFloat()
+        val tempTextView = dialogView.findViewById<TextView>(R.id.dialog_temperature_display)
+        tempTextView.text = range.third.toString()
+        tempSlider.addOnChangeListener({s, v, b -> tempTextView.text = v.toString()})
+        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
+            val temperature = (tempSlider.value * 10).toInt()   // In tenth of a grade
+            logEvent(LunaEvent(LunaEvent.TYPE_TEMPERATURE, temperature))
+        }
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i -> dialogInterface.dismiss() }
+        val alertDialog = d.create()
+        alertDialog.show()
+    }
+
     fun askNotes(lunaEvent: LunaEvent) {
         val d = AlertDialog.Builder(this)
         val dialogView = layoutInflater.inflate(R.layout.dialog_notes, null)
@@ -251,6 +286,24 @@ class MainActivity : AppCompatActivity() {
         alertDialog.show()
     }
 
+    fun showEventDetailDialog(event: LunaEvent) {
+        val dateFormat = DateFormat.getDateTimeInstance();
+        val d = AlertDialog.Builder(this)
+        d.setTitle(R.string.dialog_event_detail_title)
+        val dialogView = layoutInflater.inflate(R.layout.dialog_event_detail, null)
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_emoji).setText(event.getTypeEmoji(this))
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_description).setText(event.getTypeDescription(this))
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_date).setText(dateFormat.format(Date(event.time * 1000)))
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_quantity).setText(
+            NumericUtils(this).formatEventQuantity(event)
+        )
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_notes).setText(event.notes)
+        d.setView(dialogView)
+        d.setPositiveButton(android.R.string.ok) { dialogInterface, i -> dialogInterface.dismiss() }
+        val alertDialog = d.create()
+        alertDialog.show()
+    }
+
     fun loadLogbook() {
         if (savingEvent)
             return
@@ -268,6 +321,15 @@ class MainActivity : AppCompatActivity() {
                     findViewById<View>(R.id.no_connection_screen).visibility = View.GONE
                     logbook = lb
                     showLogbook()
+
+                    if (DEBUG_CHECK_LOGBOOK_CONSISTENCY) {
+                        for (e in logbook.logs) {
+                            val em = e.getTypeEmoji(this@MainActivity)
+                            if (em == getString(R.string.event_unknown_type)) {
+                                Log.e(TAG, "UNKNOWN: ${e.type}")
+                            }
+                        }
+                    }
                 })
             }
 
@@ -430,6 +492,9 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun showOverflowPopupWindow(anchor: View) {
+        if (showingOverflowPopupWindow)
+            return
+
         PopupWindow(anchor.context).apply {
             isOutsideTouchable = true
             val inflater = LayoutInflater.from(anchor.context)
@@ -446,12 +511,24 @@ class MainActivity : AppCompatActivity() {
                 askNotes(LunaEvent(LunaEvent.TYPE_NOTE))
                 dismiss()
             })
-            contentView.findViewById<View>(R.id.button_custom).setOnClickListener({
-                Toast.makeText(anchor.context, "TODO: Implement custom events", Toast.LENGTH_SHORT).show()
+            contentView.findViewById<View>(R.id.button_temperature).setOnClickListener({
+                askTemperatureValue()
+                dismiss()
+            })
+            contentView.findViewById<View>(R.id.button_colic).setOnClickListener({
+                logEvent(
+                    LunaEvent(LunaEvent.TYPE_COLIC)
+                )
                 dismiss()
             })
         }.also { popupWindow ->
+            popupWindow.setOnDismissListener({
+                Handler(mainLooper).postDelayed({
+                    showingOverflowPopupWindow = false
+                }, 500)
+            })
             popupWindow.showAsDropDown(anchor)
+            showingOverflowPopupWindow = true
         }
     }
 }

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

@@ -1,55 +1,42 @@
 package it.danieleverducci.lunatracker.adapters
 
 import android.content.Context
-import android.icu.util.LocaleData
-import android.icu.util.ULocale
-import android.text.format.DateFormat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import it.danieleverducci.lunatracker.entities.LunaEvent
 import it.danieleverducci.lunatracker.R
-import java.util.Date
-import java.util.Locale
+import utils.DateUtils
+import utils.NumericUtils
 
 class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.LunaEventVH> {
     private val context: Context
     val items = ArrayList<LunaEvent>()
-    val measurement_unit_liquid_base: String
-    val measurement_unit_weight_base: String
-    val measurement_unit_weight_tiny: String
+    val numericUtils: NumericUtils
+    var onItemClickListener: OnItemClickListener? = null
+    val layoutRes: Int
 
     constructor(context: Context) {
         this.context = context
-        val measurementSystem = LocaleData.getMeasurementSystem(ULocale.getDefault())
-        this.measurement_unit_liquid_base = context.getString(
-            if (measurementSystem == LocaleData. MeasurementSystem.SI)
-                R.string.measurement_unit_liquid_base_metric
+        this.numericUtils = NumericUtils(context)
+
+        val fontScale = context.resources.configuration.fontScale
+        val screenSize = context.resources.configuration.screenWidthDp
+        this.layoutRes =
+            if(fontScale > 1.2 || screenSize < 320 || (fontScale > 1 && screenSize < 400))
+                R.layout.row_luna_event_vertical
             else
-                R.string.measurement_unit_liquid_base_imperial
-        )
-        this.measurement_unit_weight_base = context.getString(
-            if (measurementSystem == LocaleData. MeasurementSystem.SI)
-                R.string.measurement_unit_weight_base_metric
-            else
-                R.string.measurement_unit_weight_base_imperial
-        )
-        this.measurement_unit_weight_tiny = context.getString(
-            if (measurementSystem == LocaleData. MeasurementSystem.SI)
-                R.string.measurement_unit_weight_tiny_metric
-            else
-                R.string.measurement_unit_weight_tiny_imperial
-        )
+                R.layout.row_luna_event
     }
 
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
     ): LunaEventVH {
-
-        val view = LayoutInflater.from(context).inflate(R.layout.row_luna_event, parent, false)
+        val view = LayoutInflater.from(context).inflate(layoutRes, parent, false)
         return LunaEventVH(view)
     }
 
@@ -58,6 +45,12 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
         position: Int
     ) {
         val item = items.get(position)
+        // Colors
+        holder.root.setBackgroundResource(
+            if (position % 2 == 0) R.color.list_background_even else R.color.list_background_odd
+        )
+        holder.quantity.setTextColor(ContextCompat.getColor(context, R.color.textColor))
+        // Contents
         holder.type.text = item.getTypeEmoji(context)
         holder.description.text = when(item.type) {
             LunaEvent.TYPE_MEDICINE -> item.notes
@@ -65,72 +58,65 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
             LunaEvent.TYPE_CUSTOM -> item.notes
             else -> item.getTypeDescription(context)
         }
-        holder.time.text = formatTimeAgo(context, item.time)
-        val qtyText = if ((item.quantity ?: 0) > 0) {
-            item.quantity.toString() + " " + when (item.type) {
-                LunaEvent.TYPE_BABY_BOTTLE -> measurement_unit_liquid_base
-                LunaEvent.TYPE_WEIGHT -> measurement_unit_weight_base
-                LunaEvent.TYPE_MEDICINE -> measurement_unit_weight_tiny
-                else -> ""
+        holder.time.text = DateUtils.formatTimeAgo(context, item.time)
+        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)
+            if (lastWeight != null) {
+                val differenceInWeight = item.quantity - lastWeight.quantity
+                val sign = if (differenceInWeight > 0) "+" else ""
+                quantityText += "\n($sign$differenceInWeight)"
+                if (differenceInWeight < 0) {
+                    holder.quantity.setTextColor(ContextCompat.getColor(context, R.color.danger))
                 }
-        } else {
-            ""
             }
-        holder.quantity.text = qtyText
+        }
+
+        holder.quantity.text = quantityText
+
+        // Listeners
+        if (onItemClickListener != null) {
+            holder.root.setOnClickListener({
+                onItemClickListener?.onItemClick(item)
+            })
+        }
     }
 
     override fun getItemCount(): Int {
         return items.size
     }
 
-    /**
-     * Formats the provided unix timestamp in a string like "3 hours, 26 minutes ago)
-     */
-    fun formatTimeAgo(context: Context, unixTime: Long): String {
-        val secondsDiff = (System.currentTimeMillis() / 1000) - unixTime
-        val minutesDiff = secondsDiff / 60
-
-        if (minutesDiff < 1)
-            return context.getString(R.string.now)
-
-        val hoursAgo = (secondsDiff / (60 * 60)).toInt()
-        val minutesAgo = (minutesDiff % 60).toInt()
-
-        if (hoursAgo > 24)
-            return DateFormat.getDateFormat(context).format(Date(unixTime*1000)) + "\n" +
-                DateFormat.getTimeFormat(context).format(Date(unixTime*1000))
-
-        var formattedTime = StringBuilder()
-        if (hoursAgo > 0) {
-            formattedTime.append(hoursAgo).append(" ")
-            if (hoursAgo.toInt() == 1)
-                formattedTime.append(context.getString(R.string.hour_ago))
-            else
-                formattedTime.append(context.getString(R.string.hours_ago))
+    private fun getPreviousWeightEvent(startFromPosition: Int): 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)
+                continue
+            return item
         }
-        if (minutesAgo > 0) {
-            if (formattedTime.isNotEmpty())
-                formattedTime.append(", ")
-            formattedTime.append(minutesAgo).append(" ")
-            if (minutesAgo.toInt() == 1)
-                formattedTime.append(context.getString(R.string.minute_ago))
-            else
-                formattedTime.append(context.getString(R.string.minutes_ago))
-        }
-        return formattedTime.toString()
+        return null
     }
 
     class LunaEventVH: RecyclerView.ViewHolder {
+        val root: View
         val type: TextView
         val description: TextView
         val quantity: TextView
         val time: TextView
 
         constructor(v: View) : super(v) {
+            root = v
             type = v.findViewById<TextView>(R.id.type)
             description = v.findViewById<TextView>(R.id.description)
             quantity = v.findViewById<TextView>(R.id.quantity)
             time = v.findViewById<TextView>(R.id.time)
         }
     }
+
+    interface OnItemClickListener {
+        fun onItemClick(event: LunaEvent)
+    }
 }

app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt

@@ -25,6 +25,8 @@ class LunaEvent {
         val TYPE_ENEMA = "ENEMA"
         val TYPE_NOTE = "NOTE"
         val TYPE_CUSTOM = "CUSTOM"
+        val TYPE_COLIC = "COLIC"
+        val TYPE_TEMPERATURE = "TEMPERATURE"
     }
 
     private val jo: JSONObject
@@ -46,7 +48,7 @@ class LunaEvent {
                 jo.put("quantity", value)
         }
     var notes: String
-        get(): String = jo.getString("notes")
+        get(): String = jo.optString("notes")
         set(value) {
             jo.put("notes", value)
         }
@@ -84,6 +86,8 @@ class LunaEvent {
                 TYPE_MEDICINE -> R.string.event_medicine_type
                 TYPE_ENEMA -> R.string.event_enema_type
                 TYPE_NOTE -> R.string.event_note_type
+                TYPE_TEMPERATURE -> R.string.event_temperature_type
+                TYPE_COLIC -> R.string.event_colic_type
                 else -> R.string.event_unknown_type
             }
         )
@@ -102,6 +106,8 @@ class LunaEvent {
                 TYPE_MEDICINE -> R.string.event_medicine_desc
                 TYPE_ENEMA -> R.string.event_enema_desc
                 TYPE_NOTE -> R.string.event_note_desc
+                TYPE_TEMPERATURE -> R.string.event_temperature_desc
+                TYPE_COLIC -> R.string.event_colic_desc
                 else -> R.string.event_unknown_desc
             }
         )

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

@@ -0,0 +1,48 @@
+package utils
+
+import android.content.Context
+import android.text.format.DateFormat
+import it.danieleverducci.lunatracker.R
+import java.util.Date
+
+class DateUtils {
+    companion object {
+
+        /**
+         * Formats the provided unix timestamp in a string like "3 hours, 26 minutes ago)
+         */
+        fun formatTimeAgo(context: Context, unixTime: Long): String {
+            val secondsDiff = (System.currentTimeMillis() / 1000) - unixTime
+            val minutesDiff = secondsDiff / 60
+
+            if (minutesDiff < 1)
+                return context.getString(R.string.now)
+
+            val hoursAgo = (secondsDiff / (60 * 60)).toInt()
+            val minutesAgo = (minutesDiff % 60).toInt()
+
+            if (hoursAgo > 24)
+                return DateFormat.getDateFormat(context).format(Date(unixTime*1000)) + "\n" +
+                        DateFormat.getTimeFormat(context).format(Date(unixTime*1000))
+
+            var formattedTime = StringBuilder()
+            if (hoursAgo > 0) {
+                formattedTime.append(hoursAgo).append(" ")
+                if (hoursAgo.toInt() == 1)
+                    formattedTime.append(context.getString(R.string.hour_ago))
+                else
+                    formattedTime.append(context.getString(R.string.hours_ago))
+            }
+            if (minutesAgo > 0) {
+                if (formattedTime.isNotEmpty())
+                    formattedTime.append(", ")
+                formattedTime.append(minutesAgo).append(" ")
+                if (minutesAgo.toInt() == 1)
+                    formattedTime.append(context.getString(R.string.minute_ago))
+                else
+                    formattedTime.append(context.getString(R.string.minutes_ago))
+            }
+            return formattedTime.toString()
+        }
+    }
+}

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

@@ -0,0 +1,92 @@
+package utils
+
+import android.content.Context
+import android.icu.util.LocaleData
+import android.icu.util.ULocale
+import it.danieleverducci.lunatracker.R
+import it.danieleverducci.lunatracker.entities.LunaEvent
+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_temperature_base: String
+
+    init {
+        this.numberFormat = NumberFormat.getInstance()
+        val measurementSystem = LocaleData.getMeasurementSystem(ULocale.getDefault())
+        this.measurement_unit_liquid_base = context.getString(
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
+                R.string.measurement_unit_liquid_base_metric
+            else
+                R.string.measurement_unit_liquid_base_imperial
+        )
+        this.measurement_unit_weight_base = context.getString(
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
+                R.string.measurement_unit_weight_base_metric
+            else
+                R.string.measurement_unit_weight_base_imperial
+        )
+        this.measurement_unit_weight_tiny = context.getString(
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
+                R.string.measurement_unit_weight_tiny_metric
+            else
+                R.string.measurement_unit_weight_tiny_imperial
+        )
+        this.measurement_unit_temperature_base = context.getString(
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
+                R.string.measurement_unit_temperature_base_metric
+            else
+                R.string.measurement_unit_temperature_base_imperial
+        )
+    }
+
+    fun formatEventQuantity(item: LunaEvent): String {
+        val formatted = StringBuilder()
+        if ((item.quantity ?: 0) > 0) {
+            if (item.type == LunaEvent.TYPE_TEMPERATURE)
+                formatted.append((item.quantity / 10.0f).toString())
+            else
+                formatted.append(item.quantity)
+
+            formatted.append(" ")
+            formatted.append(
+                when (item.type) {
+                    LunaEvent.TYPE_BABY_BOTTLE -> measurement_unit_liquid_base
+                    LunaEvent.TYPE_WEIGHT -> measurement_unit_weight_base
+                    LunaEvent.TYPE_MEDICINE -> measurement_unit_weight_tiny
+                    LunaEvent.TYPE_TEMPERATURE -> measurement_unit_temperature_base
+                    else -> ""
+                }
+            )
+        }
+        return formatted.toString()
+    }
+
+    /**
+     * Returns a valid quantity range for the event type.
+     * @return min, max, normal
+     */
+    fun getValidEventQuantityRange(lunaEventType: String): Triple<Int, Int, Int>? {
+        val measurementSystem = LocaleData.getMeasurementSystem(ULocale.getDefault())
+        return when (lunaEventType) {
+            LunaEvent.TYPE_TEMPERATURE -> {
+                if (measurementSystem == LocaleData. MeasurementSystem.SI)
+                    Triple(
+                        context.resources.getInteger(R.integer.human_body_temp_min_metric),
+                        context.resources.getInteger(R.integer.human_body_temp_max_metric),
+                        context.resources.getInteger(R.integer.human_body_temp_normal_metric)
+                    )
+                else
+                    Triple(
+                        context.resources.getInteger(R.integer.human_body_temp_min_imperial),
+                        context.resources.getInteger(R.integer.human_body_temp_max_imperial),
+                        context.resources.getInteger(R.integer.human_body_temp_normal_imperial)
+                    )
+            }
+            else -> null
+        }
+    }
+}

app/src/main/res/drawable/textview_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="2dp"
+        android:color="@color/grey" />
+    <corners android:radius="10dp" />
+    <padding
+        android:bottom="10dp"
+        android:left="20dp"
+        android:right="20dp"
+        android:top="10dp" />
+</shape>

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

@@ -6,7 +6,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:orientation="vertical"
         android:paddingTop="30dp"
         android:paddingLeft="15dp"
@@ -16,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/title"
-            android:textSize="30sp"
+            android:textSize="30dp"
             android:gravity="center_horizontal"/>
 
         <TextView
@@ -152,7 +151,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Diario di bordo"
+            android:text="@string/logbook"
             android:textColor="@color/accent"
             android:textStyle="bold"/>
 

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

@@ -68,7 +68,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="30dp"
                 android:hint="@string/settings_storage_dav_url_hint"
-                android:inputType="textUri"/>
+                android:inputType="textUri"
+                android:background="@drawable/textview_background"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -83,7 +84,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="30dp"
-                android:inputType="textEmailAddress"/>
+                android:inputType="textEmailAddress"
+                android:background="@drawable/textview_background"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -98,7 +100,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="30dp"
-                android:inputType="textPassword"/>
+                android:inputType="textPassword"
+                android:background="@drawable/textview_background"/>
 
             <com.google.android.material.progressindicator.LinearProgressIndicator
                 android:id="@+id/progress_indicator"
@@ -119,6 +122,9 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:layout_marginRight="20dp"
+                    android:background="@drawable/button_background"
+                    android:textColor="@color/accent"
                     android:text="@android:string/cancel"/>
 
                 <Button
@@ -127,6 +133,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:textColor="@color/accent"
+                    android:background="@drawable/button_background"
                     android:text="@android:string/ok"/>
 
             </LinearLayout>

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

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp">
+
+    <TextView
+        android:id="@+id/dialog_event_detail_type_emoji"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="60dp"
+        android:text="@string/event_diaperchange_pee_type"/>
+
+    <TextView
+        android:id="@+id/dialog_event_detail_type_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:gravity="center_horizontal"
+        android:textColor="@color/accent"
+        android:textSize="24dp"
+        android:text="@string/event_diaperchange_pee_desc"/>
+
+    <TextView
+        android:id="@+id/dialog_event_detail_type_date"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:gravity="center_horizontal"
+        android:textStyle="bold"
+        android:text="2020"/>
+
+    <TextView
+        android:id="@+id/dialog_event_detail_type_quantity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="2020"/>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_marginTop="20dp">
+
+        <TextView
+            android:id="@+id/dialog_event_detail_type_notes"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textStyle="italic"
+            android:text="Lorem ipsum"/>
+
+    </ScrollView>
+</LinearLayout>

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

@@ -11,13 +11,17 @@
         android:layout_height="wrap_content"
         android:lines="1"
         android:inputType="number"
-        android:hint="@string/log_notes_dialog_qty_hint"/>
+        android:hint="@string/log_notes_dialog_qty_hint"
+        android:background="@drawable/textview_background"/>
 
     <EditText
         android:id="@+id/notes_edittext"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
         android:gravity="top"
-        android:lines="10"/>
+        android:lines="10"
+        android:hint="@string/log_notes_dialog_note_hint"
+        android:background="@drawable/textview_background"/>
 
 </LinearLayout>

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

@@ -16,6 +16,7 @@
                 android:layout_height="match_parent"
                 android:padding="20dp"
                 android:background="@drawable/button_background"
+                style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_medicine"/>
 
             <TextView
@@ -25,6 +26,7 @@
                 android:layout_marginTop="10dp"
                 android:padding="20dp"
                 android:background="@drawable/button_background"
+                style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_enema"/>
 
             <TextView
@@ -34,24 +36,28 @@
                 android:layout_marginTop="10dp"
                 android:padding="20dp"
                 android:background="@drawable/button_background"
+                style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_note"/>
 
-
-            <LinearLayout
-                android:id="@+id/overflow_event_custom_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-            </LinearLayout>
-
             <TextView
-                android:id="@+id/button_custom"
+                android:id="@+id/button_temperature"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="10dp"
                 android:padding="20dp"
                 android:background="@drawable/button_background"
-                android:text="@string/overflow_event_custom"/>
+                style="@style/OverflowMenuText"
+                android:text="@string/overflow_event_temperature"/>
+
+            <TextView
+                android:id="@+id/button_colic"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:padding="20dp"
+                android:background="@drawable/button_background"
+                style="@style/OverflowMenuText"
+                android:text="@string/overflow_event_colic"/>
 
     </LinearLayout>
 

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

@@ -11,7 +11,8 @@
         android:layout_width="150dp"
         android:layout_height="wrap_content"
         android:inputType="number"
-        android:hint="0"/>
+        android:hint="0"
+        android:background="@drawable/textview_background"/>
 
     <TextView
         android:layout_width="wrap_content"

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

@@ -3,12 +3,15 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingTop="10dp"
+    android:paddingBottom="10dp"
     android:gravity="center_vertical">
 
     <TextView
         android:id="@+id/type"
-        android:layout_width="80dp"
+        android:layout_width="90dp"
         android:layout_height="wrap_content"
+        android:paddingLeft="10dp"
         android:textSize="28sp"
         android:lines="1"
         android:maxLines="1"
@@ -21,6 +24,7 @@
         android:layout_weight="2"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textColor="@color/accent"
         android:text="Description"/>
 
     <TextView
@@ -31,8 +35,6 @@
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
         android:gravity="center_horizontal"
-        android:lines="1"
-        android:maxLines="1"
         android:text="Qty"/>
 
     <TextView

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

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="10dp"
+    android:paddingBottom="10dp"
+    android:gravity="center_vertical">
+
+    <TextView
+        android:id="@+id/type"
+        android:layout_width="90dp"
+        android:layout_height="wrap_content"
+        android:textSize="28sp"
+        android:lines="1"
+        android:maxLines="1"
+        android:text="@string/event_diaperchange_pee_type"/>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:gravity="center_horizontal"
+            android:textColor="@color/accent"
+            android:text="Description"/>
+
+        <TextView
+            android:id="@+id/quantity"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:gravity="center_horizontal"
+            android:text="Qty"/>
+
+        <TextView
+            android:id="@+id/time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:gravity="center_horizontal"
+            android:textStyle="bold"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:text="Time"/>
+
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <com.google.android.material.slider.Slider
+        android:id="@+id/dialog_temperature_value"
+        android:layout_width="250dp"
+        android:layout_height="wrap_content"
+        android:valueFrom="@integer/human_body_temp_min_metric"
+        android:valueTo="@integer/human_body_temp_max_metric"
+        android:stepSize="0.1"
+        android:value="@integer/human_body_temp_normal_metric"
+        android:theme="@style/LTSlider"/>
+
+    <TextView
+        android:id="@+id/dialog_temperature_display"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="30sp"
+        android:textColor="@color/accent"/>
+</LinearLayout>

app/src/main/res/values-it/strings.xml

@@ -10,10 +10,14 @@
     <string name="log_weight_dialog_title">Pesata</string>
     <string name="log_weight_dialog_description">Inserisci il peso rilevato</string>
 
+    <string name="log_temperature_dialog_title">Temperatura</string>
+    <string name="log_temperature_dialog_description">Inserisci la temperatura</string>
+
     <string name="overflow_event_medicine">💊 Medicina</string>
     <string name="overflow_event_enema">🪠 Clistere</string>
     <string name="overflow_event_note">📝 Nota</string>
-    <string name="overflow_event_custom">➕ Aggiungi evento personalizzato</string>
+    <string name="overflow_event_temperature">🌡️ Temperatura</string>
+    <string name="overflow_event_colic">💨 Colichette</string>
 
     <string name="event_bottle_desc">Biberon</string>
     <string name="event_scale_desc">Pesata</string>
@@ -25,6 +29,8 @@
     <string name="event_medicine_desc">Medicina</string>
     <string name="event_enema_desc">Clistere</string>
     <string name="event_note_desc">Nota</string>
+    <string name="event_temperature_desc">Temperatura</string>
+    <string name="event_colic_desc">Colichette</string>
     <string name="event_unknown_desc"></string>
 
     <string name="toast_event_added">Evento aggiunto</string>
@@ -48,7 +54,7 @@
     <string name="settings_storage_local">Sul dispositivo</string>
     <string name="settings_storage_local_desc">La soluzione più privacy-friendly: i dati non escono mai dal tuo dispositivo</string>
     <string name="settings_storage_dav">Su un server WebDAV</string>
-    <string name="settings_storage_dav_desc">Puoi usare un qualunque servizio che supporti WebDAV (come ad esempio Nextcloud, Owncloud, Dropbox, Box...) per salvare i dati. In questo modo puoi sincronizzarli tra più dispositivi, ad esempio quello del papà, della mamma, dei nonni... Ti servirà l\'url WebDAV, che trovi nella documentazione del tuo provider (ad es. in Nextcloud è nelle impostazioni di Files)</string>
+    <string name="settings_storage_dav_desc">Puoi usare un qualunque servizio che supporti WebDAV (come ad esempio Nextcloud, Owncloud, Dropbox, Box…) per salvare i dati. In questo modo puoi sincronizzarli tra più dispositivi, ad esempio quello del papà, della mamma, dei nonni… Ti servirà l\'url WebDAV, che trovi nella documentazione del tuo provider (ad es. in Nextcloud è nelle impostazioni di Files)</string>
     <string name="settings_storage_dav_url">Url WebDAV</string>
     <string name="settings_storage_dav_url_hint">https://</string>
     <string name="settings_storage_dav_user">Username</string>
@@ -69,6 +75,9 @@
 
     <string name="log_notes_dialog_description">Note:</string>
     <string name="log_medicine_dialog_description">Nome della medicina, quantità, formato, note…:</string>
-    <string name="log_notes_dialog_qty_hint">Quantità (numero intero), o lascia vuoto</string>
+    <string name="log_notes_dialog_qty_hint">Quantità, o vuoto</string>
+    <string name="log_notes_dialog_note_hint">Inserisci le note</string>
+
+    <string name="dialog_event_detail_title">Dettaglio evento</string>
 
 </resources>

app/src/main/res/values/colors.xml

@@ -6,4 +6,8 @@
     <color name="translucent">#c000</color>
     <color name="transparent">#0000</color>
     <color name="grey">#ccc</color>
+    <color name="list_background_odd">#423B25</color>
+    <color name="list_background_even">@color/transparent</color>
+    <color name="danger">#f00</color>
+    <color name="textColor">@color/grey</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -10,6 +10,9 @@
     <string name="log_weight_dialog_title">Weight</string>
     <string name="log_weight_dialog_description">Insert the weight</string>
 
+    <string name="log_temperature_dialog_title">Temperature</string>
+    <string name="log_temperature_dialog_description">Insert the temperature</string>
+
     <string name="event_bottle_type" translatable="false">🍼</string>
     <string name="event_scale_type" translatable="false">⚖️</string>
     <string name="event_breastfeeding_left_type" translatable="false">🤱 ←</string>
@@ -20,6 +23,8 @@
     <string name="event_medicine_type" translatable="false">💊</string>
     <string name="event_enema_type" translatable="false">🪠</string>
     <string name="event_note_type" translatable="false">📝</string>
+    <string name="event_temperature_type" translatable="false">🌡️</string>
+    <string name="event_colic_type" translatable="false">💨</string>
     <string name="event_unknown_type" translatable="false">\?</string>
 
     <string name="event_bottle_desc">Baby bottle</string>
@@ -32,12 +37,15 @@
     <string name="event_medicine_desc">Medicine</string>
     <string name="event_enema_desc">Enema</string>
     <string name="event_note_desc">Note</string>
+    <string name="event_temperature_desc">Temperature</string>
+    <string name="event_colic_desc">Gaseous colic</string>
     <string name="event_unknown_desc"></string>
 
     <string name="overflow_event_medicine">💊 Medicine</string>
     <string name="overflow_event_enema">🪠 Enema</string>
     <string name="overflow_event_note">📝 Note</string>
-    <string name="overflow_event_custom">➕ Add custom event</string>
+    <string name="overflow_event_temperature">🌡️ Temperature</string>
+    <string name="overflow_event_colic">💨 Gaseous colic</string>
 
     <string name="toast_event_added">Event logged</string>
     <string name="toast_logbook_saved">Logbook saved</string>
@@ -81,7 +89,8 @@
 
     <string name="log_notes_dialog_description">Notes:</string>
     <string name="log_medicine_dialog_description">Medicine name, quantity, type, notes…:</string>
-    <string name="log_notes_dialog_qty_hint">Integer quantity, or leave blank</string>
+    <string name="log_notes_dialog_qty_hint">Quantity (or empty)</string>
+    <string name="log_notes_dialog_note_hint">Write some notes</string>
 
     <string name="measurement_unit_liquid_base_metric" translatable="false">ml</string>
     <string name="measurement_unit_weight_base_metric" translatable="false">g</string>
@@ -89,5 +98,9 @@
     <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_temperature_base_imperial" translatable="false">°F</string>
+    <string name="measurement_unit_temperature_base_metric" translatable="false">°C</string>
+
+    <string name="dialog_event_detail_title">Event detail</string>
 
 </resources>

app/src/main/res/values/themes.xml

@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.LunaTracker" parent="Theme.AppCompat.NoActionBar" />
+    <style name="Theme.LunaTracker" parent="Theme.AppCompat.NoActionBar">
+        <item name="colorAccent">@color/accent</item>
+        <item name="android:textColor">@color/textColor</item>
+    </style>
+
+    <style name="OverflowMenuText">
+        <item name="android:textSize">20sp</item>
+    </style>
+
+    <style name="LTSlider" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="colorPrimary">@color/accent</item>
+    </style>
+
 </resources>

app/src/main/res/values/values.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="human_body_temp_min_imperial">91</integer>
+    <integer name="human_body_temp_min_metric">33</integer>
+    <integer name="human_body_temp_max_imperial">109</integer>
+    <integer name="human_body_temp_max_metric">43</integer>
+    <integer name="human_body_temp_normal_imperial">98</integer>
+    <integer name="human_body_temp_normal_metric">37</integer>
+</resources>

fastlane/metadata/android/en-US/full_description.txt

@@ -1,7 +1,5 @@
-LunaTracker is a newborn baby tracking app.
-
 Parenting can be tough. You get home from the hospital, exhausted, with this little fragile unknown thingy that has no user manual and a single way to let you know something's not ok: crying.
-You have to react fast, event if it's 4 AM and you have no idea why is crying.
+You have to react fast, even if it's 4 AM and you have no idea why is crying.
 
 This app is meant to log all the relevant events (diaper change, breastfeeding, baby bottle feeding...), so you can always remember when has been done last time. It supports syncing the data between different devices (using your WebDAV server for the best privacy) so that when the baby needs attentions, the dad can step in leaving the mom sleeping peacefully.
 

fastlane/metadata/android/it-IT/full_description.txt

@@ -1,5 +1,3 @@
-LunaTracker è un'app di tracciamento neonatale
-
 Essere genitori può essere dura. Arrivate a casa dall'ospedale, esausti, con questo cosino fragile e sconosciuto che non ha un manuale d'uso, e ha un solo modo per segnalare che c'è qualcosa che non va: piangere.
 Dovete essere sempre pronti a reagire, anche se sono le 4 di mattina e non avete idea del perché stia piangendo.