diff --git a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt index 30699d1..0efdb79 100644 --- a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt +++ b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt @@ -821,6 +821,12 @@ class MainActivity : AppCompatActivity() { askWeightValue() dismiss() }) + contentView.findViewById(R.id.button_bath).setOnClickListener({ + logEvent( + LunaEvent(LunaEvent.TYPE_BATH) + ) + dismiss() + }) }.also { popupWindow -> popupWindow.setOnDismissListener({ Handler(mainLooper).postDelayed({ 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 10db157..f00f64a 100644 --- a/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt +++ b/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt @@ -29,6 +29,7 @@ class LunaEvent: Comparable { const val TYPE_TEMPERATURE = "TEMPERATURE" const val TYPE_FOOD = "FOOD" const val TYPE_PUKE = "PUKE" + const val TYPE_BATH = "BATH" } private val jo: JSONObject @@ -92,6 +93,7 @@ class LunaEvent: Comparable { TYPE_COLIC -> R.string.event_colic_type TYPE_FOOD -> R.string.event_food_type TYPE_PUKE -> R.string.event_puke_type + TYPE_BATH -> R.string.event_bath_type else -> R.string.event_unknown_type } ) @@ -114,6 +116,7 @@ class LunaEvent: Comparable { TYPE_COLIC -> R.string.event_colic_desc TYPE_FOOD -> R.string.event_food_desc TYPE_PUKE -> R.string.event_puke_desc + TYPE_BATH -> R.string.event_bath_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 b7ac137..34ee31b 100644 --- a/app/src/main/res/layout/more_events_popup.xml +++ b/app/src/main/res/layout/more_events_popup.xml @@ -69,6 +69,16 @@ style="@style/OverflowMenuText" android:text="@string/overflow_event_scale"/> + + 🌡️ 💨 🤮 + 🛁 \? Baby bottle @@ -45,6 +46,7 @@ Temperature Gaseous colic Puke + Bath ⚖️ Weight @@ -54,6 +56,7 @@ 🌡️ Temperature 💨 Gaseous colic 🤮 Puke + 🛁 Bath Event logged Logbook saved