use creation dialog as edit dialog

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

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