forked from penguin86/luna-tracker
Compare commits
16 Commits
38930fe269
...
c636e48c7e
| Author | SHA1 | Date | |
|---|---|---|---|
| c636e48c7e | |||
| f39882edc4 | |||
| 0683f396ae | |||
| 2a446ea7d3 | |||
| b753703ff3 | |||
| f5bd345e23 | |||
| dc0cd6353c | |||
| 7a0343f464 | |||
| 389514ec4f | |||
| 7608fc756b | |||
| ced76d449e | |||
| 64e4fbbba2 | |||
| 98cf9587e8 | |||
| 3faaf6d6f0 | |||
| 86721fbbae | |||
| 155d53a6f0 |
@@ -468,10 +468,8 @@ class MainActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
if (hideDurationButtons) {
|
if (hideDurationButtons) {
|
||||||
durationButtons.visibility = View.GONE
|
durationButtons.visibility = View.GONE
|
||||||
d.setMessage(getString(R.string.log_sleep_dialog_description_start))
|
|
||||||
} else {
|
} else {
|
||||||
durationButtons.visibility = View.VISIBLE
|
durationButtons.visibility = View.VISIBLE
|
||||||
d.setMessage(event.getDialogMessage(this))
|
|
||||||
|
|
||||||
fun adjust(minutes: Int) {
|
fun adjust(minutes: Int) {
|
||||||
duration += minutes * 60
|
duration += minutes * 60
|
||||||
@@ -516,7 +514,6 @@ class MainActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun addAmountEvent(event: LunaEvent) {
|
fun addAmountEvent(event: LunaEvent) {
|
||||||
setToPreviousQuantity(event)
|
|
||||||
askAmountValue(event, true) { saveEvent(event) }
|
askAmountValue(event, true) { saveEvent(event) }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -533,7 +530,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
R.array.AmountLabels,
|
R.array.AmountLabels,
|
||||||
android.R.layout.simple_spinner_dropdown_item
|
android.R.layout.simple_spinner_dropdown_item
|
||||||
)
|
)
|
||||||
|
// set pre-selected item and ensure the quantity to index is in bounds
|
||||||
spinner.setSelection(event.quantity.coerceIn(0, spinner.count - 1))
|
spinner.setSelection(event.quantity.coerceIn(0, spinner.count - 1))
|
||||||
|
|
||||||
val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
|
val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
|
||||||
|
|||||||
@@ -131,7 +131,6 @@
|
|||||||
<string name="log_unknown_dialog_description"></string>
|
<string name="log_unknown_dialog_description"></string>
|
||||||
<string name="log_weight_dialog_description">Insert the weight:</string>
|
<string name="log_weight_dialog_description">Insert the weight:</string>
|
||||||
<string name="log_sleep_dialog_description">Set sleep duration:</string>
|
<string name="log_sleep_dialog_description">Set sleep duration:</string>
|
||||||
<string name="log_sleep_dialog_description_start">Start sleep cycle:</string>
|
|
||||||
|
|
||||||
<string name="measurement_unit_liquid_base_metric" translatable="false">ml</string>
|
<string name="measurement_unit_liquid_base_metric" translatable="false">ml</string>
|
||||||
<string name="measurement_unit_weight_base_metric" translatable="false">g</string>
|
<string name="measurement_unit_weight_base_metric" translatable="false">g</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user