event: add support for height
This commit is contained in:
@@ -344,6 +344,53 @@ class MainActivity : AppCompatActivity() {
|
||||
alertDialog.show()
|
||||
}
|
||||
|
||||
fun addHeightEvent(event: LunaEvent) {
|
||||
setToPreviousQuantity(event)
|
||||
askHeightValue(event, true) { saveEvent(event) }
|
||||
}
|
||||
|
||||
fun askHeightValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
|
||||
// Show number picker dialog
|
||||
val d = AlertDialog.Builder(this)
|
||||
val dialogView = layoutInflater.inflate(R.layout.dialog_edit_height, null)
|
||||
d.setTitle(event.getDialogTitle(this))
|
||||
d.setMessage(event.getDialogMessage(this))
|
||||
d.setView(dialogView)
|
||||
|
||||
val heightET = dialogView.findViewById<EditText>(R.id.dialog_number_edittext)
|
||||
heightET.setText(event.quantity.toString())
|
||||
|
||||
val unitTV = dialogView.findViewById<TextView>(R.id.dialog_number_unit)
|
||||
unitTV.text = NumericUtils(this).measurement_unit_height_base
|
||||
|
||||
val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
|
||||
val pickedTime = dateTimePicker(event.time, dateTV)
|
||||
|
||||
if (!showTime) {
|
||||
dateTV.visibility = View.GONE
|
||||
}
|
||||
|
||||
d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
|
||||
val height = heightET.text.toString().toIntOrNull()
|
||||
if (height != null) {
|
||||
event.time = pickedTime.time.time / 1000
|
||||
event.quantity = height
|
||||
onPositive()
|
||||
} else {
|
||||
Toast.makeText(this, R.string.toast_integer_error, Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
|
||||
dialogInterface.dismiss()
|
||||
}
|
||||
|
||||
d.setNegativeButton(android.R.string.cancel) { dialogInterface, i ->
|
||||
dialogInterface.dismiss()
|
||||
}
|
||||
|
||||
val alertDialog = d.create()
|
||||
alertDialog.show()
|
||||
}
|
||||
|
||||
fun addTemperatureEvent(event: LunaEvent) {
|
||||
setToPreviousQuantity(event)
|
||||
askTemperatureValue(event, true) { saveEvent(event) }
|
||||
@@ -868,6 +915,7 @@ class MainActivity : AppCompatActivity() {
|
||||
when (event.type) {
|
||||
LunaEvent.Type.BABY_BOTTLE -> askBabyBottleContent(event, false, updateValues)
|
||||
LunaEvent.Type.WEIGHT -> askWeightValue(event, false, updateValues)
|
||||
LunaEvent.Type.HEIGHT -> askHeightValue(event, false, updateValues)
|
||||
LunaEvent.Type.DIAPERCHANGE_POO,
|
||||
LunaEvent.Type.DIAPERCHANGE_PEE,
|
||||
LunaEvent.Type.PUKE -> askAmountValue(event, false, updateValues)
|
||||
@@ -1289,6 +1337,7 @@ class MainActivity : AppCompatActivity() {
|
||||
when (type) {
|
||||
LunaEvent.Type.BABY_BOTTLE -> addBabyBottleEvent(event)
|
||||
LunaEvent.Type.WEIGHT -> addWeightEvent(event)
|
||||
LunaEvent.Type.HEIGHT -> addHeightEvent(event)
|
||||
LunaEvent.Type.BREASTFEEDING_LEFT_NIPPLE -> addPlainEvent(event)
|
||||
LunaEvent.Type.BREASTFEEDING_BOTH_NIPPLE -> addPlainEvent(event)
|
||||
LunaEvent.Type.BREASTFEEDING_RIGHT_NIPPLE -> addPlainEvent(event)
|
||||
|
||||
Reference in New Issue
Block a user