1 Commits

Author SHA1 Message Date
ff48d1af59 LunaEvent: rework sleep event
Make the UI more flexible and
slightly easier to understand.
2026-02-13 14:51:35 +01:00

View File

@@ -462,7 +462,7 @@ class MainActivity : AppCompatActivity() {
return unixTime - (unixTime % 60) return unixTime - (unixTime % 60)
} }
fun updateFields() { fun udpateFields() {
datePickerBegin.text = DateUtils.formatDateTime(sleepBegin) datePickerBegin.text = DateUtils.formatDateTime(sleepBegin)
datePickerEnd.text = DateUtils.formatDateTime(sleepEnd) datePickerEnd.text = DateUtils.formatDateTime(sleepEnd)
@@ -484,18 +484,18 @@ class MainActivity : AppCompatActivity() {
val pickedDateTimeBegin = dateTimePicker(event.time, datePickerBegin) { time: Long -> val pickedDateTimeBegin = dateTimePicker(event.time, datePickerBegin) { time: Long ->
sleepBegin = adjustToMinute(time) sleepBegin = adjustToMinute(time)
updateFields() udpateFields()
} }
val pickedDateTimeEnd = dateTimePicker(event.time + event.quantity, datePickerEnd) { time: Long -> val pickedDateTimeEnd = dateTimePicker(event.time + event.quantity, datePickerEnd) { time: Long ->
sleepEnd = adjustToMinute(time) sleepEnd = adjustToMinute(time)
updateFields() udpateFields()
} }
sleepBegin = adjustToMinute(pickedDateTimeBegin.time.time / 1000) sleepBegin = adjustToMinute(pickedDateTimeBegin.time.time / 1000)
sleepEnd = adjustToMinute(pickedDateTimeEnd.time.time / 1000) sleepEnd = adjustToMinute(pickedDateTimeEnd.time.time / 1000)
updateFields() udpateFields()
if (showTime) { if (showTime) {
dateDelimiter.visibility = View.GONE dateDelimiter.visibility = View.GONE
@@ -513,23 +513,23 @@ class MainActivity : AppCompatActivity() {
durationMinus5Button.setOnClickListener { durationMinus5Button.setOnClickListener {
sleepEnd = (sleepEnd - 300).coerceAtLeast(sleepBegin) sleepEnd = (sleepEnd - 300).coerceAtLeast(sleepBegin)
updateFields() udpateFields()
} }
durationPlus5Button.setOnClickListener { durationPlus5Button.setOnClickListener {
sleepEnd = (sleepEnd + 300).coerceAtLeast(sleepBegin) sleepEnd = (sleepEnd + 300).coerceAtLeast(sleepBegin)
updateFields() udpateFields()
} }
durationAsleepButton.setOnClickListener { durationAsleepButton.setOnClickListener {
sleepEnd = sleepBegin sleepEnd = sleepBegin
updateFields() udpateFields()
} }
durationNowButton.setOnClickListener { durationNowButton.setOnClickListener {
val now = System.currentTimeMillis() / 1000 val now = System.currentTimeMillis() / 1000
sleepEnd = adjustToMinute(now) sleepEnd = adjustToMinute(now)
updateFields() udpateFields()
} }
d.setPositiveButton(android.R.string.ok) { dialogInterface, i -> d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->