activity_setting: fine tune layout style

For multiple users it helps to
keep track about who did what.

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

@@ -13,6 +13,7 @@ import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.EditText
+import android.widget.LinearLayout
 import android.widget.NumberPicker
 import android.widget.PopupWindow
 import android.widget.Spinner
@@ -262,26 +263,6 @@ 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)
@@ -410,10 +391,11 @@ class MainActivity : AppCompatActivity() {
         })
 
         // show optional signature
-        if (event.signature.isNotEmpty()) {
-            val signatureTextEdit = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_signature)
-            signatureTextEdit.text =  String.format(getString(R.string.dialog_event_detail_signature), event.signature)
-            signatureTextEdit.visibility = View.VISIBLE
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_signature).text = event.signature
+        dialogView.findViewById<LinearLayout>(R.id.dialog_event_signature_layout).visibility = if (event.signature.isNotEmpty()) {
+            View.VISIBLE
+        } else {
+            View.GONE
         }
 
         // create next/previous links to events of the same type
@@ -817,7 +799,9 @@ class MainActivity : AppCompatActivity() {
                 dismiss()
             })
             contentView.findViewById<View>(R.id.button_puke).setOnClickListener({
-                askPukeValue()
+                logEvent(
+                    LunaEvent(LunaEvent.TYPE_PUKE)
+                )
                 dismiss()
             })
             contentView.findViewById<View>(R.id.button_colic).setOnClickListener({

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

@@ -1,11 +1,11 @@
 package utils
 
 import android.content.Context
-import android.os.Build
 import android.text.format.DateFormat
 import it.danieleverducci.lunatracker.R
 import java.util.Date
 
+
 class DateUtils {
     companion object {
         /**
@@ -108,19 +108,15 @@ class DateUtils {
         }
 
         /**
-         * Format time as localized string without seconds. E.g. "Sept 18, 2025, 03:36 PM".
+         * 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.
          * Used in the event detail dialog.
          */
         fun formatDateTime(unixTime: Long): String {
-            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)
-            }
+            val roundedUnixTime = unixTime - (unixTime % 60)
+            val date = Date(roundedUnixTime * 1000)
+            val dateFormat = java.text.DateFormat.getDateTimeInstance()
+            return dateFormat.format(date)
         }
     }
 }

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

@@ -66,8 +66,6 @@ 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="5dp"
+            android:layout_marginTop="20dp"
             android:inputType="textEmailAddress"
             android:background="@drawable/textview_background"/>
 

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

@@ -4,9 +4,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="20dp"
-    android:paddingBottom="10dp"
-    android:paddingHorizontal="20dp">
+    android:padding="20dp">
 
     <TextView
         android:id="@+id/dialog_event_detail_type_emoji"
@@ -63,14 +61,6 @@
 
     </ScrollView>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:id="@+id/dialog_event_detail_type_signature"
-        android:layout_marginBottom="5dp"
-        android:visibility="gone"/>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -99,4 +89,25 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/dialog_event_signature_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="5dp"
+            android:text="@string/dialog_event_detail_signature"/>
+
+        <TextView
+            android:id="@+id/dialog_event_detail_type_signature"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:text="" />
+
+    </LinearLayout>
+
 </LinearLayout>

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

@@ -1,17 +0,0 @@
-<?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-de/strings.xml

@@ -50,8 +50,9 @@
     <string name="no_connection_go_to_settings">Einstellungen</string>
     <string name="no_connection_retry">Erneut versuchen</string>
 
+    <string name="no_breastfeeding">Kein Stillen</string>
+
     <string name="settings_title">Einstellungen</string>
-    <string name="settings_no_breastfeeding">Kein Stillen</string>
     <string name="settings_storage">Speicherort für Daten auswählen</string>
     <string name="settings_storage_local">Auf dem Gerät</string>
     <string name="settings_storage_local_desc">Datenschutzfreundlichste Lösung: Deine Daten verlassen dein Gerät nicht</string>

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

@@ -1,8 +0,0 @@
-<?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,9 +12,6 @@
     <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>
@@ -75,10 +72,6 @@
     <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>
@@ -86,7 +79,7 @@
 
     <string name="settings_title">Settings</string>
     <string name="settings_signature">Signature</string>
-    <string name="settings_signature_desc">Attach a signature to each event you create and for others to see. Useful if multiple people add events.</string>
+    <string name="settings_signature_desc">Attach a signature to each event your create and for others to see. Useful if multiple people add events.</string>
     <string name="settings_storage">Choose where to save data</string>
     <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>
@@ -138,7 +131,7 @@
     <string name="dialog_event_detail_delete_button">Delete</string>
     <string name="dialog_event_detail_quantity">Quantity</string>
     <string name="dialog_event_detail_notes">Notes</string>
-    <string name="dialog_event_detail_signature">by %s</string>
+    <string name="dialog_event_detail_signature">Created By</string>
 
     <string name="dialog_add_logbook_title">Add logbook</string>
     <string name="dialog_add_logbook_logbookname">👶 Logbook name</string>