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

add quantity selection to poo and pee events #22

Closed
mwarning wants to merge 4 commits from mwarning/luna-tracker:quantity into master
pull from: mwarning/luna-tracker:quantity
merge into: penguin86:master
Conversation 2 Commits 4 Files Changed 18 +490 -206
13 changed files with 490 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0a8ca7f9d1 - Show all commits

4
app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt
View File

@@ -45,9 +45,9 @@ class LunaEvent: Comparable<LunaEvent> {
jo.put("type", value) jo.put("type", value)
} }
var quantity: Int var quantity: Int
get() = jo.optInt("quantity") get() = jo.optInt("quantity", -1)
set(value) { set(value) {
if (value > 0) if (value >= 0)
jo.put("quantity", value) jo.put("quantity", value)
} }
var notes: String var notes: String

2
app/src/main/java/utils/NumericUtils.kt
View File

@@ -62,7 +62,7 @@ class NumericUtils (val context: Context) {
fun formatEventQuantity(event: LunaEvent): String { fun formatEventQuantity(event: LunaEvent): String {
val formatted = StringBuilder() val formatted = StringBuilder()
if (event.quantity > 0) { if (event.quantity >= 0) {
formatted.append(when (event.type) { formatted.append(when (event.type) {
LunaEvent.TYPE_TEMPERATURE -> LunaEvent.TYPE_TEMPERATURE ->
(event.quantity / 10.0f).toString() (event.quantity / 10.0f).toString()