penguin86/luna-tracker
1
2
Fork 3
Code Issues 13 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Add sleep tracking, statistics and backup features #23

Open
maximilian_vheyden wants to merge 3 commits from maximilian_vheyden/luna-tracker:feature/sleep-statistics-backup into develop
pull from: maximilian_vheyden/luna-tracker:feature/sleep-statistics-backup
merge into: penguin86:develop
Conversation 0 Commits 3 Files Changed 35 +3246 -15
35 changed files with 3246 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 97a138bdf6 - Show all commits

8
app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
View File

@@ -695,12 +695,18 @@ class MainActivity : AppCompatActivity() {
) )
picker.minValue = 1 picker.minValue = 1
picker.maxValue = if (isSleep) 180 else 60 picker.maxValue = if (isSleep) 180 else 60
val oldQuantity = event.quantity
picker.value = if (event.quantity > 0) Math.min(event.quantity, picker.maxValue) else if (isSleep) 30 else 15 picker.value = if (event.quantity > 0) Math.min(event.quantity, picker.maxValue) else if (isSleep) 30 else 15
pickerDialog.setTitle(if (isSleep) R.string.sleep_duration_title else R.string.breastfeeding_duration_title) pickerDialog.setTitle(if (isSleep) R.string.sleep_duration_title else R.string.breastfeeding_duration_title)
pickerDialog.setView(pickerView) pickerDialog.setView(pickerView)
pickerDialog.setPositiveButton(android.R.string.ok) { _, _ -> pickerDialog.setPositiveButton(android.R.string.ok) { _, _ ->
event.quantity = picker.value val newQuantity = picker.value
if (newQuantity != oldQuantity) {
// Adjust end time based on duration change (duration reduced = end time earlier)
event.time = event.time - (oldQuantity - newQuantity) * 60L
event.quantity = newQuantity
}
quantityTextView.text = NumericUtils(this@MainActivity).formatEventQuantity(event) quantityTextView.text = NumericUtils(this@MainActivity).formatEventQuantity(event)
recyclerView.adapter?.notifyDataSetChanged() recyclerView.adapter?.notifyDataSetChanged()
saveLogbook() saveLogbook()