Merge pull request 'Add puke and bath events, add signature setting' (#16) from mwarning/luna-tracker:master into develop

Reviewed-on: #16

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

@@ -262,6 +262,26 @@ class MainActivity : AppCompatActivity() {
         alertDialog.show()
     }
 
+    fun askPukeValue() {
+        val d = AlertDialog.Builder(this)
+        val dialogView = layoutInflater.inflate(R.layout.puke_dialog, null)
+        d.setTitle(R.string.log_puke_dialog_title)
+        d.setMessage(R.string.log_puke_dialog_description)
+        d.setView(dialogView)
+
+        val spinner = dialogView.findViewById<Spinner>(R.id.dialog_puke_value)
+        spinner.adapter = ArrayAdapter.createFromResource(this, R.array.AmountLabels, android.R.layout.simple_spinner_dropdown_item)
+        spinner.setSelection(1)
+
+        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
+            val pos = spinner.selectedItemPosition
+            logEvent(LunaEvent(LunaEvent.TYPE_PUKE, pos))
+        }
+        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)
@@ -797,7 +817,7 @@ class MainActivity : AppCompatActivity() {
                 dismiss()
             })
             contentView.findViewById<View>(R.id.button_puke).setOnClickListener({
-                logEvent(LunaEvent(LunaEvent.TYPE_PUKE))
+                askPukeValue()
                 dismiss()
             })
             contentView.findViewById<View>(R.id.button_colic).setOnClickListener({

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

@@ -1,6 +1,7 @@
 package utils
 
 import android.content.Context
+import android.os.Build
 import android.text.format.DateFormat
 import it.danieleverducci.lunatracker.R
 import java.util.Date
@@ -107,15 +108,19 @@ class DateUtils {
         }
 
         /**
-         * Format time as localized string. E.g. "28 Sept 03:36:00".
-         * The seconds are set to 0 since they are distracting and not relevant.
+         * Format time as localized string without seconds. E.g. "Sept 18, 2025, 03:36 PM".
          * Used in the event detail dialog.
          */
         fun formatDateTime(unixTime: Long): String {
-            val roundedUnixTime = unixTime - (unixTime % 60)
-            val date = Date(roundedUnixTime * 1000)
-            val dateFormat = java.text.DateFormat.getDateTimeInstance()
-            return dateFormat.format(date)
+            val date = Date(unixTime * 1000)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                val dateFormat = android.icu.text.DateFormat.getDateTimeInstance(android.icu.text.DateFormat.DEFAULT, android.icu.text.DateFormat.SHORT)
+                return dateFormat.format(date)
+            } else {
+                // fallback
+                val dateFormat = java.text.DateFormat.getDateTimeInstance()
+                return dateFormat.format(date)
+            }
         }
     }
-}
+}

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

@@ -66,6 +66,8 @@ class NumericUtils (val context: Context) {
             formatted.append(when (item.type) {
                 LunaEvent.TYPE_TEMPERATURE ->
                     (item.quantity / 10.0f).toString()
+                LunaEvent.TYPE_PUKE ->
+                    context.resources.getStringArray(R.array.AmountLabels)[item.quantity]
                 else ->
                     item.quantity
             })

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

@@ -130,7 +130,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="5dp"
             android:inputType="textEmailAddress"
             android:background="@drawable/textview_background"/>
 

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

@@ -4,7 +4,9 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="20dp">
+    android:paddingTop="20dp"
+    android:paddingBottom="10dp"
+    android:paddingHorizontal="20dp">
 
     <TextView
         android:id="@+id/dialog_event_detail_type_emoji"

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

@@ -0,0 +1,17 @@
+<?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">
+
+    <Spinner
+        android:id="@+id/dialog_puke_value"
+        android:layout_width="250dp"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="8dp"/>
+
+</LinearLayout>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="AmountLabels">
+        <item>@string/amount_little</item>
+        <item>@string/amount_normal</item>
+        <item>@string/amount_plenty</item>
+    </string-array>
+</resources>

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

@@ -12,6 +12,9 @@
     <string name="log_temperature_dialog_title">Temperature</string>
     <string name="log_temperature_dialog_description">Insert the temperature</string>
 
+    <string name="log_puke_dialog_title">Puke</string>
+    <string name="log_puke_dialog_description">Select the amount</string>
+
     <string name="event_bottle_type" translatable="false">🍼</string>
     <string name="event_food_type" translatable="false">🥣</string>
     <string name="event_scale_type" translatable="false">⚖️</string>
@@ -72,6 +75,10 @@
     <string name="year_ago">year</string>
     <string name="years_ago">years</string>
 
+    <string name="amount_little">Little</string>
+    <string name="amount_normal">Normal</string>
+    <string name="amount_plenty">Plenty</string>
+
     <string name="no_connection">No connection</string>
     <string name="no_connection_explain">Unable to reach WebDAV service</string>
     <string name="no_connection_go_to_settings">Settings</string>