Lowered minimum SDK

app/build.gradle.kts

@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         applicationId = "it.danieleverducci.lunatracker"
-        minSdk = 29
+        minSdk = 21
         targetSdk = 34
         versionCode = 1
         versionName = "0.2"

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

@@ -4,9 +4,12 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.util.Log
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.EditText
 import android.widget.NumberPicker
+import android.widget.PopupWindow
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
@@ -27,10 +30,15 @@ import it.danieleverducci.lunatracker.repository.WebDAVLogbookRepository
 import kotlinx.coroutines.Runnable
 import okio.IOException
 import org.json.JSONException
+import utils.DateUtils
+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
     }
 
     lateinit var logbook: Logbook
@@ -51,6 +59,11 @@ class MainActivity : AppCompatActivity() {
 
         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)
@@ -89,6 +102,10 @@ class MainActivity : AppCompatActivity() {
                 LunaEvent.TYPE_DIAPERCHANGE_PEE
             )
         ) }
+        val moreButton = findViewById<View>(R.id.button_more)
+        moreButton.setOnClickListener {
+            showOverflowPopupWindow(moreButton)
+        }
         findViewById<View>(R.id.button_no_connection_settings).setOnClickListener({
             showSettings()
         })
@@ -138,7 +155,6 @@ class MainActivity : AppCompatActivity() {
 
         // Reload data
         loadLogbook()
-        handler.postDelayed(updateListRunnable, 1000*30)
     }
 
     override fun onStop() {
@@ -177,7 +193,7 @@ class MainActivity : AppCompatActivity() {
         d.setTitle(R.string.log_weight_dialog_title)
         d.setMessage(R.string.log_weight_dialog_description)
         d.setView(dialogView)
-        val weightET = dialogView.findViewById<TextView>(R.id.dialog_number_edittext)
+        val weightET = dialogView.findViewById<EditText>(R.id.dialog_number_edittext)
         d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
             val weight = weightET.text.toString().toIntOrNull()
             if (weight != null)
@@ -190,6 +206,40 @@ class MainActivity : AppCompatActivity() {
         alertDialog.show()
     }
 
+    fun askNotes(lunaEvent: LunaEvent) {
+        val d = AlertDialog.Builder(this)
+        val dialogView = layoutInflater.inflate(R.layout.dialog_notes, null)
+        d.setTitle(lunaEvent.getTypeDescription(this))
+        d.setMessage(
+            when (lunaEvent.type){
+                LunaEvent.TYPE_MEDICINE -> R.string.log_medicine_dialog_description
+                else -> R.string.log_notes_dialog_description
+            }
+        )
+        d.setView(dialogView)
+        val notesET = dialogView.findViewById<EditText>(R.id.notes_edittext)
+        val qtyET = dialogView.findViewById<EditText>(R.id.notes_qty_edittext)
+        if (lunaEvent.type == LunaEvent.TYPE_NOTE || lunaEvent.type == LunaEvent.TYPE_CUSTOM)
+            qtyET.visibility = View.GONE
+        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
+            val qtyStr = qtyET.text.toString()
+            if (qtyStr.isNotEmpty()) {
+                val qty = qtyStr.toIntOrNull()
+                if (qty == null) {
+                    Toast.makeText(this, R.string.toast_integer_error, Toast.LENGTH_SHORT).show()
+                    return@setPositiveButton
+                }
+                lunaEvent.quantity = qty
+            }
+            val notes = notesET.text.toString()
+            lunaEvent.notes = notes
+            logEvent(lunaEvent)
+        }
+        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i -> dialogInterface.dismiss() }
+        val alertDialog = d.create()
+        alertDialog.show()
+    }
+
     fun askToTrimLogbook() {
         val d = AlertDialog.Builder(this)
         d.setTitle(R.string.trim_logbook_dialog_title)
@@ -210,10 +260,32 @@ 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
 
+        // Reset time counter
+        handler.removeCallbacks(updateListRunnable)
+        handler.postDelayed(updateListRunnable, UPDATE_EVERY_SECS*1000)
+
         // Load data
         setLoading(true)
         logbookRepo?.loadLogbook(this, object: LogbookLoadedListener{
@@ -384,4 +456,29 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun showOverflowPopupWindow(anchor: View) {
+        PopupWindow(anchor.context).apply {
+            isOutsideTouchable = true
+            val inflater = LayoutInflater.from(anchor.context)
+            contentView = inflater.inflate(R.layout.more_events_popup, null)
+            contentView.findViewById<View>(R.id.button_medicine).setOnClickListener({
+                askNotes(LunaEvent(LunaEvent.TYPE_MEDICINE))
+                dismiss()
+            })
+            contentView.findViewById<View>(R.id.button_enema).setOnClickListener({
+                logEvent(LunaEvent(LunaEvent.TYPE_ENEMA))
+                dismiss()
+            })
+            contentView.findViewById<View>(R.id.button_note).setOnClickListener({
+                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()
+                dismiss()
+            })
+        }.also { popupWindow ->
+            popupWindow.showAsDropDown(anchor)
+        }
+    }
 }

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

@@ -1,7 +1,6 @@
 package it.danieleverducci.lunatracker.adapters
 
 import android.content.Context
-import android.text.format.DateFormat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -9,14 +8,18 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import it.danieleverducci.lunatracker.entities.LunaEvent
 import it.danieleverducci.lunatracker.R
-import java.util.Date
+import utils.DateUtils
+import utils.NumericUtils
 
 class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.LunaEventVH> {
     private val context: Context
     val items = ArrayList<LunaEvent>()
+    val numericUtils: NumericUtils
+    var onItemClickListener: OnItemClickListener? = null
 
     constructor(context: Context) {
         this.context = context
+        this.numericUtils = NumericUtils(context)
     }
 
     override fun onCreateViewHolder(
@@ -33,86 +36,49 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
         position: Int
     ) {
         val item = items.get(position)
-        holder.type.text = context.getString(
-            when (item.type) {
-                LunaEvent.TYPE_BABY_BOTTLE -> R.string.event_bottle_type
-                LunaEvent.TYPE_WEIGHT -> R.string.event_scale_type
-                LunaEvent.TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_type
-                LunaEvent.TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_type
-                LunaEvent.TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_type
-                LunaEvent.TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_type
-                LunaEvent.TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_type
-                else -> R.string.event_unknown_type
-            }
+        // Colors
+        holder.root.setBackgroundResource(
+            if (position % 2 == 0) R.color.list_background_even else R.color.list_background_odd
         )
-        holder.description.text = context.getString(
-            when (item.type) {
-                LunaEvent.TYPE_BABY_BOTTLE -> R.string.event_bottle_desc
-                LunaEvent.TYPE_WEIGHT -> R.string.event_scale_desc
-                LunaEvent.TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_desc
-                LunaEvent.TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_desc
-                LunaEvent.TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_desc
-                LunaEvent.TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_desc
-                LunaEvent.TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_desc
-                else -> R.string.event_unknown_desc
-            }
-        )
-        holder.quantity.text = if ((item.quantity ?: 0) > 0) item.quantity.toString() else ""
-        holder.time.text = formatTimeAgo(context, item.time)
+        // Contents
+        holder.type.text = item.getTypeEmoji(context)
+        holder.description.text = when(item.type) {
+            LunaEvent.TYPE_MEDICINE -> item.notes
+            LunaEvent.TYPE_NOTE -> item.notes
+            LunaEvent.TYPE_CUSTOM -> item.notes
+            else -> item.getTypeDescription(context)
+        }
+        holder.time.text = DateUtils.formatTimeAgo(context, item.time)
+        holder.quantity.text = numericUtils.formatEventQuantity(item)
+        // 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))
-        }
-        if (formattedTime.isNotEmpty())
-            formattedTime.append(", ")
-        if (minutesAgo > 0) {
-            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()
-    }
-
     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

@@ -1,5 +1,7 @@
 package it.danieleverducci.lunatracker.entities
 
+import android.content.Context
+import it.danieleverducci.lunatracker.R
 import org.json.JSONObject
 import java.util.Date
 
@@ -19,6 +21,10 @@ class LunaEvent {
         val TYPE_BREASTFEEDING_RIGHT_NIPPLE = "BREASTFEEDING_RIGHT_NIPPLE"
         val TYPE_DIAPERCHANGE_POO = "DIAPERCHANGE_POO"
         val TYPE_DIAPERCHANGE_PEE = "DIAPERCHANGE_PEE"
+        val TYPE_MEDICINE = "MEDICINE"
+        val TYPE_ENEMA = "ENEMA"
+        val TYPE_NOTE = "NOTE"
+        val TYPE_CUSTOM = "CUSTOM"
     }
 
     private val jo: JSONObject
@@ -39,6 +45,11 @@ class LunaEvent {
             if (value > 0)
                 jo.put("quantity", value)
         }
+    var notes: String
+        get(): String = jo.optString("notes")
+        set(value) {
+            jo.put("notes", value)
+        }
 
     constructor(jo: JSONObject) {
         this.jo = jo
@@ -60,6 +71,42 @@ class LunaEvent {
         this.quantity = quantity
     }
 
+    fun getTypeEmoji(context: Context): String {
+        return context.getString(
+            when (type) {
+                TYPE_BABY_BOTTLE -> R.string.event_bottle_type
+                TYPE_WEIGHT -> R.string.event_scale_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
+                TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_type
+                TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_type
+                TYPE_MEDICINE -> R.string.event_medicine_type
+                TYPE_ENEMA -> R.string.event_enema_type
+                TYPE_NOTE -> R.string.event_note_type
+                else -> R.string.event_unknown_type
+            }
+        )
+    }
+
+    fun getTypeDescription(context: Context): String {
+        return context.getString(
+            when (type) {
+                TYPE_BABY_BOTTLE -> R.string.event_bottle_desc
+                TYPE_WEIGHT -> R.string.event_scale_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
+                TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_desc
+                TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_desc
+                TYPE_MEDICINE -> R.string.event_medicine_desc
+                TYPE_ENEMA -> R.string.event_enema_desc
+                TYPE_NOTE -> R.string.event_note_desc
+                else -> R.string.event_unknown_desc
+            }
+        )
+    }
+
     fun toJson(): JSONObject {
         return jo
     }

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,51 @@
+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
+
+    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
+        )
+    }
+
+    fun formatEventQuantity(item: LunaEvent): String {
+        return if ((item.quantity ?: 0) > 0) {
+            numberFormat.format(item.quantity) + " " + 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 -> ""
+            }
+        } else {
+            ""
+        }
+    }
+}

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

@@ -3,6 +3,8 @@
     <stroke
         android:width="2dp"
         android:color="@color/accent" />
+    <solid
+        android:color="@color/cardview_dark_background"/>
     <corners android:radius="15dp" />
     <padding
         android:bottom="5dp"

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

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+    
+</vector>

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

@@ -108,7 +108,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:layout_weight="1"
+                    android:layout_weight="2"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
                     android:textSize="30dp"
@@ -119,12 +119,23 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:layout_weight="1"
+                    android:layout_weight="2"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
                     android:textSize="30dp"
                     android:text="🚼 💧"/>
 
+                <ImageView
+                    android:id="@+id/button_more"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/button_background"
+                    android:gravity="center_horizontal"
+                    android:src="@drawable/ic_more"
+                    app:tint="@android:color/darker_gray"/>
+
             </LinearLayout>
 
         </LinearLayout>

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"

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

@@ -0,0 +1,27 @@
+<?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">
+
+    <EditText
+        android:id="@+id/notes_qty_edittext"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:lines="1"
+        android:inputType="number"
+        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:hint="@string/log_notes_dialog_note_hint"
+        android:background="@drawable/textview_background"/>
+
+</LinearLayout>

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

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp"
+    android:background="@color/transparent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/button_medicine"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="20dp"
+                android:background="@drawable/button_background"
+                style="@style/OverflowMenuText"
+                android:text="@string/overflow_event_medicine"/>
+
+            <TextView
+                android:id="@+id/button_enema"
+                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_enema"/>
+
+            <TextView
+                android:id="@+id/button_note"
+                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_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: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_custom"/>
+
+    </LinearLayout>
+
+</ScrollView>

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,21 +3,27 @@
     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="0dp"
+        android:layout_width="90dp"
         android:layout_height="wrap_content"
-        android:layout_weight="2"
+        android:paddingLeft="10dp"
         android:textSize="28sp"
-        android:text="Type"/>
+        android:lines="1"
+        android:maxLines="1"
+        android:text="@string/event_diaperchange_pee_type"/>
 
     <TextView
         android:id="@+id/description"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="2"
+        android:ellipsize="end"
+        android:maxLines="2"
         android:text="Description"/>
 
     <TextView
@@ -25,7 +31,11 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
         android:gravity="center_horizontal"
+        android:lines="1"
+        android:maxLines="1"
         android:text="Qty"/>
 
     <TextView
@@ -35,6 +45,8 @@
         android:layout_weight="2"
         android:gravity="center_horizontal"
         android:textStyle="bold"
+        android:ellipsize="end"
+        android:maxLines="2"
         android:text="Time"/>
 
 </LinearLayout>

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

@@ -10,14 +10,10 @@
     <string name="log_weight_dialog_title">Pesata</string>
     <string name="log_weight_dialog_description">Inserisci il peso rilevato</string>
 
-    <string name="event_bottle_type">🍼</string>
-    <string name="event_scale_type">⚖️</string>
-    <string name="event_breastfeeding_left_type">🤱 ←</string>
-    <string name="event_breastfeeding_both_type">🤱 ↔</string>
-    <string name="event_breastfeeding_right_type">🤱 →</string>
-    <string name="event_diaperchange_poo_type">🚼 💩</string>
-    <string name="event_diaperchange_pee_type">🚼 💧</string>
-    <string name="event_unknown_type">-</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">➕ Personalizzato</string>
 
     <string name="event_bottle_desc">Biberon</string>
     <string name="event_scale_desc">Pesata</string>
@@ -26,6 +22,9 @@
     <string name="event_breastfeeding_right_desc">Allatt. al seno (dx)</string>
     <string name="event_diaperchange_poo_desc">Cambio (con cacca)</string>
     <string name="event_diaperchange_pee_desc">Cambio (con pipì)</string>
+    <string name="event_medicine_desc">Medicina</string>
+    <string name="event_enema_desc">Clistere</string>
+    <string name="event_note_desc">Nota</string>
     <string name="event_unknown_desc"></string>
 
     <string name="toast_event_added">Evento aggiunto</string>
@@ -49,7 +48,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>
@@ -68,4 +67,11 @@
     <string name="trim_logbook_dialog_button_ok">Cancella i più vecchi</string>
     <string name="trim_logbook_dialog_button_cancel">Ricordamelo dopo</string>
 
+    <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à, 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

@@ -4,5 +4,8 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <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>
 </resources>

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

@@ -10,14 +10,17 @@
     <string name="log_weight_dialog_title">Weight</string>
     <string name="log_weight_dialog_description">Insert the weight</string>
 
-    <string name="event_bottle_type">🍼</string>
-    <string name="event_scale_type">⚖️</string>
-    <string name="event_breastfeeding_left_type">🤱 ←</string>
-    <string name="event_breastfeeding_both_type">🤱 ↔</string>
-    <string name="event_breastfeeding_right_type">🤱 →</string>
-    <string name="event_diaperchange_poo_type">🚼 💩</string>
-    <string name="event_diaperchange_pee_type">🚼 💧</string>
-    <string name="event_unknown_type">-</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>
+    <string name="event_breastfeeding_both_type" translatable="false">🤱 ↔</string>
+    <string name="event_breastfeeding_right_type" translatable="false">🤱 →</string>
+    <string name="event_diaperchange_poo_type" translatable="false">🚼 💩</string>
+    <string name="event_diaperchange_pee_type" translatable="false">🚼 💧</string>
+    <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_unknown_type" translatable="false">\?</string>
 
     <string name="event_bottle_desc">Baby bottle</string>
     <string name="event_scale_desc">Weight</string>
@@ -26,8 +29,16 @@
     <string name="event_breastfeeding_right_desc">Breastfeeding (right)</string>
     <string name="event_diaperchange_poo_desc">Diaper chg (poo)</string>
     <string name="event_diaperchange_pee_desc">Diaper chg (pee)</string>
+    <string name="event_medicine_desc">Medicine</string>
+    <string name="event_enema_desc">Enema</string>
+    <string name="event_note_desc">Note</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</string>
+
     <string name="toast_event_added">Event logged</string>
     <string name="toast_logbook_saved">Logbook saved</string>
     <string name="toast_event_add_error">Unable to log the event</string>
@@ -49,7 +60,7 @@
     <string name="settings_storage_local">On device</string>
     <string name="settings_storage_local_desc">Most privacy-friendly solution: data doesn\'t leave your device</string>
     <string name="settings_storage_dav">On a WebDAV server</string>
-    <string name="settings_storage_dav_desc">You can use any WebDAV service (i.e. Nextcloud, Owncloud, Dropbox, Box...) to save the data. In this way you can syncronize it between more devices, i.e. the dad\'s, the mom\'s, the grandma\'s... You will need the WebDAV url, you can find it in your provider\'s documentation (i.e. in Nextcloud web is in the Files app settings)</string>
+    <string name="settings_storage_dav_desc">You can use any WebDAV service (i.e. Nextcloud, Owncloud, Dropbox, Box…) to save the data. In this way you can syncronize it between more devices, i.e. the dad\'s, the mom\'s, the grandma\'s… You will need the WebDAV url, you can find it in your provider\'s documentation (i.e. in Nextcloud web is in the Files app settings)</string>
     <string name="settings_storage_dav_url">WebDAV url</string>
     <string name="settings_storage_dav_url_hint">https://</string>
     <string name="settings_storage_dav_user">Username</string>
@@ -68,4 +79,18 @@
     <string name="trim_logbook_dialog_button_ok">Trim it now</string>
     <string name="trim_logbook_dialog_button_cancel">Remind me later</string>
 
+    <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">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>
+    <string name="measurement_unit_weight_tiny_metric" translatable="false">mg</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="dialog_event_detail_title">Event detail</string>
+
 </resources>

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

@@ -1,5 +1,11 @@
 <?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>
+    </style>
+
+    <style name="OverflowMenuText">
+        <item name="android:textSize">20sp</item>
+    </style>
 </resources>