1 Commits

Author SHA1 Message Date
b719903a73 use creation dialog as edit dialog 2025-11-10 20:53:51 +01:00

View File

@@ -217,8 +217,8 @@ class MainActivity : AppCompatActivity() {
val time = pickedDateTime.time.time / 1000 val time = pickedDateTime.time.time / 1000
if (event.time != time || event.quantity != quantity) { if (event.time != time || event.quantity != quantity) {
event.quantity = quantity
event.time = time event.time = time
event.quantity = quantity
saveEvent(event) saveEvent(event)
} }
@@ -256,9 +256,9 @@ class MainActivity : AppCompatActivity() {
if (weight != null) { if (weight != null) {
val quantity = weight val quantity = weight
val time = pickedDateTime.time.time / 1000 val time = pickedDateTime.time.time / 1000
if (event.quantity != quantity || event.time != time) { if (event.time != time || event.quantity != quantity) {
event.quantity = quantity
event.time = time event.time = time
event.quantity = quantity
saveEvent(event) saveEvent(event)
} }
} else { } else {
@@ -305,8 +305,8 @@ class MainActivity : AppCompatActivity() {
val quantity = (tempSlider.value * 10).toInt() // temperature in tenth of a grade val quantity = (tempSlider.value * 10).toInt() // temperature in tenth of a grade
val time = pickedDateTime.time.time / 1000 val time = pickedDateTime.time.time / 1000
if (event.time != time || event.quantity != quantity) { if (event.time != time || event.quantity != quantity) {
event.quantity = quantity
event.time = time event.time = time
event.quantity = quantity
saveEvent(event) saveEvent(event)
} }
@@ -378,9 +378,9 @@ class MainActivity : AppCompatActivity() {
d.setPositiveButton(android.R.string.ok) { dialogInterface, i -> d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
val quantity = spinner.selectedItemPosition + 1 val quantity = spinner.selectedItemPosition + 1
val time = pickedDateTime.time.time / 1000 val time = pickedDateTime.time.time / 1000
if (event.quantity != quantity || event.time != time) { if (event.time != time || event.quantity != quantity) {
event.quantity = quantity
event.time = time event.time = time
event.quantity = quantity
saveEvent(event) saveEvent(event)
} }
@@ -432,6 +432,9 @@ class MainActivity : AppCompatActivity() {
val alertDialog = d.create() val alertDialog = d.create()
alertDialog.show() alertDialog.show()
// a shortcut, since the only value to change is the date
dateTV.performClick()
} }
fun askNotes(event: LunaEvent, showDetailsAtEnd: Boolean = false) { fun askNotes(event: LunaEvent, showDetailsAtEnd: Boolean = false) {
@@ -464,9 +467,9 @@ class MainActivity : AppCompatActivity() {
val quantity = qtyET.text.toString().toIntOrNull() val quantity = qtyET.text.toString().toIntOrNull()
if (quantity != null) { if (quantity != null) {
if (event.time != time || event.notes != notes || event.quantity != quantity ) { if (event.time != time || event.notes != notes || event.quantity != quantity ) {
event.quantity = quantity
event.notes = notes
event.time = time event.time = time
event.notes = notes
event.quantity = quantity
saveEvent(event) saveEvent(event)
} }
} else { } else {
@@ -478,8 +481,8 @@ class MainActivity : AppCompatActivity() {
} }
} else { } else {
if (event.time != time || event.notes != notes) { if (event.time != time || event.notes != notes) {
event.notes = notes
event.time = time event.time = time
event.notes = notes
saveEvent(event) saveEvent(event)
} }
@@ -571,7 +574,6 @@ class MainActivity : AppCompatActivity() {
d.setPositiveButton(R.string.dialog_event_detail_close_button) { dialogInterface, i -> dialogInterface.dismiss() } d.setPositiveButton(R.string.dialog_event_detail_close_button) { dialogInterface, i -> dialogInterface.dismiss() }
d.setNeutralButton(R.string.dialog_event_detail_delete_button) { dialogInterface, i -> deleteEvent(event) } d.setNeutralButton(R.string.dialog_event_detail_delete_button) { dialogInterface, i -> deleteEvent(event) }
d.setNegativeButton(R.string.dialog_event_detail_edit_button) { dialogInterface, i -> d.setNegativeButton(R.string.dialog_event_detail_edit_button) { dialogInterface, i ->
Log.d("MainActivity", "negative button pressed: ${event.type}")
when (event.type) { when (event.type) {
LunaEvent.TYPE_BABY_BOTTLE -> askBabyBottleContent(event, true) LunaEvent.TYPE_BABY_BOTTLE -> askBabyBottleContent(event, true)
LunaEvent.TYPE_WEIGHT -> askWeightValue(event, true) LunaEvent.TYPE_WEIGHT -> askWeightValue(event, true)
@@ -608,7 +610,6 @@ class MainActivity : AppCompatActivity() {
} }
// create next/previous links to events of the same type // create next/previous links to events of the same type
val previousTextView = dialogView.findViewById<TextView>(R.id.dialog_event_previous) val previousTextView = dialogView.findViewById<TextView>(R.id.dialog_event_previous)
val nextTextView = dialogView.findViewById<TextView>(R.id.dialog_event_next) val nextTextView = dialogView.findViewById<TextView>(R.id.dialog_event_next)
val allEvents = getAllEvents() val allEvents = getAllEvents()
@@ -1009,7 +1010,7 @@ class MainActivity : AppCompatActivity() {
dismiss() dismiss()
} }
contentView.findViewById<View>(R.id.button_puke).setOnClickListener { contentView.findViewById<View>(R.id.button_puke).setOnClickListener {
askPukeValue(LunaEvent(LunaEvent.TYPE_PUKE)) askPukeValue(LunaEvent(LunaEvent.TYPE_PUKE, 1))
dismiss() dismiss()
} }
contentView.findViewById<View>(R.id.button_colic).setOnClickListener { contentView.findViewById<View>(R.id.button_colic).setOnClickListener {