From 841da9e28e5278a30f711e200095315d1c619cdd Mon Sep 17 00:00:00 2001
From: Daniele Verducci <daniele.verducci@ichibi.eu>
Date: Sun, 24 Nov 2024 09:32:05 +0100
Subject: [PATCH] Added type Note

---
 .../java/it/danieleverducci/lunatracker/MainActivity.kt  | 6 ++++++
 .../lunatracker/adapters/LunaEventRecyclerAdapter.kt     | 7 ++++++-
 .../it/danieleverducci/lunatracker/entities/LunaEvent.kt | 3 +++
 app/src/main/res/layout/more_events_popup.xml            | 9 +++++++++
 app/src/main/res/values-it/strings.xml                   | 2 ++
 app/src/main/res/values/strings.xml                      | 3 +++
 6 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
index ac93d57..2bcc986 100644
--- a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
@@ -210,6 +210,8 @@ class MainActivity : AppCompatActivity() {
         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()) {
@@ -440,6 +442,10 @@ class MainActivity : AppCompatActivity() {
                 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()
diff --git a/app/src/main/java/it/danieleverducci/lunatracker/adapters/LunaEventRecyclerAdapter.kt b/app/src/main/java/it/danieleverducci/lunatracker/adapters/LunaEventRecyclerAdapter.kt
index 23ab1ba..65ce6ec 100644
--- a/app/src/main/java/it/danieleverducci/lunatracker/adapters/LunaEventRecyclerAdapter.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/adapters/LunaEventRecyclerAdapter.kt
@@ -59,7 +59,12 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
     ) {
         val item = items.get(position)
         holder.type.text = item.getTypeEmoji(context)
-        holder.description.text = item.getTypeDescription(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 = formatTimeAgo(context, item.time)
         val qtyText = if ((item.quantity ?: 0) > 0) {
             item.quantity.toString() + " " + when (item.type) {
diff --git a/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt b/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt
index 44b877c..3b6ec5f 100644
--- a/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt
@@ -23,6 +23,7 @@ class LunaEvent {
         val TYPE_DIAPERCHANGE_PEE = "DIAPERCHANGE_PEE"
         val TYPE_MEDICINE = "MEDICINE"
         val TYPE_ENEMA = "ENEMA"
+        val TYPE_NOTE = "NOTE"
         val TYPE_CUSTOM = "CUSTOM"
     }
 
@@ -82,6 +83,7 @@ class LunaEvent {
                 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
             }
         )
@@ -99,6 +101,7 @@ class LunaEvent {
                 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
             }
         )
diff --git a/app/src/main/res/layout/more_events_popup.xml b/app/src/main/res/layout/more_events_popup.xml
index b507d7e..ba4598f 100644
--- a/app/src/main/res/layout/more_events_popup.xml
+++ b/app/src/main/res/layout/more_events_popup.xml
@@ -27,6 +27,15 @@
                 android:background="@drawable/button_background"
                 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"
+                android:text="@string/overflow_event_note"/>
+
 
             <LinearLayout
                 android:id="@+id/overflow_event_custom_container"
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 809bc8d..fc63997 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -12,6 +12,7 @@
 
     <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="event_bottle_desc">Biberon</string>
@@ -23,6 +24,7 @@
     <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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d5a6af0..a517c04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
     <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>
@@ -30,10 +31,12 @@
     <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 event</string>
 
     <string name="toast_event_added">Event logged</string>