caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix: display format split iob details

Browse source
This commit is contained in:
Andries Smit 2022-06-01 16:18:04 +02:00
parent 3c4abe9378
commit 1162638ce0
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wear/src/main/java/info/nightscout/androidaps/interaction/utils/DisplayFormat.kt
View file

@ -1,6 +1,5 @@
package info.nightscout.androidaps.interaction.utils package info.nightscout.androidaps.interaction.utils
import info.nightscout.androidaps.interaction.utils.Pair.Companion.create import info.nightscout.androidaps.interaction.utils.Pair.Companion.create
import javax.inject.Singleton import javax.inject.Singleton
import javax.inject.Inject import javax.inject.Inject
@ -10,12 +9,15 @@ import kotlin.math.max
@Singleton @Singleton
class DisplayFormat @Inject internal constructor() { class DisplayFormat @Inject internal constructor() {
companion object { companion object {
const val MAX_FIELD_LEN_LONG = 22 // this is found out empirical, for TYPE_LONG_TEXT const val MAX_FIELD_LEN_LONG = 22 // this is found out empirical, for TYPE_LONG_TEXT
const val MAX_FIELD_LEN_SHORT = 7 // according to Wear OS docs for TYPE_SHORT_TEXT const val MAX_FIELD_LEN_SHORT = 7 // according to Wear OS docs for TYPE_SHORT_TEXT
const val MIN_FIELD_LEN_COB = 3 // since carbs are usually 0..99g const val MIN_FIELD_LEN_COB = 3 // since carbs are usually 0..99g
const val MIN_FIELD_LEN_IOB = 3 // IoB can range from like .1U to 99U const val MIN_FIELD_LEN_IOB = 3 // IoB can range from like .1U to 99U
} }
@Inject lateinit var sp: SP @Inject lateinit var sp: SP
@Inject lateinit var wearUtil: WearUtil @Inject lateinit var wearUtil: WearUtil
@ -109,13 +111,13 @@ class DisplayFormat @Inject internal constructor() {
val iob1 = SmallestDoubleString(raw.status.iobSum, SmallestDoubleString.Units.USE).minimise(MAX_FIELD_LEN_SHORT) val iob1 = SmallestDoubleString(raw.status.iobSum, SmallestDoubleString.Units.USE).minimise(MAX_FIELD_LEN_SHORT)
var iob2 = "" var iob2 = ""
if (raw.status.iobDetail.contains("|")) { if (raw.status.iobDetail.contains("|")) {
val iobs = raw.status.iobDetail.replace("(", "").replace(")", "").split("\\|").toTypedArray() val iobs = raw.status.iobDetail.replace("(", "").replace(")", "").split("|").toTypedArray()
var iobBolus = SmallestDoubleString(iobs[0]).minimise(MIN_FIELD_LEN_IOB) var iobBolus = SmallestDoubleString(iobs[0]).minimise(MIN_FIELD_LEN_IOB)
if (iobBolus.trim { it <= ' ' }.isEmpty()) { if (iobBolus.trim().isEmpty()) {
iobBolus = "--" iobBolus = "--"
} }
var iobBasal = SmallestDoubleString(iobs[1]).minimise(MAX_FIELD_LEN_SHORT - 1 - max(MIN_FIELD_LEN_IOB, iobBolus.length)) var iobBasal = SmallestDoubleString(iobs[1]).minimise(MAX_FIELD_LEN_SHORT - 1 - max(MIN_FIELD_LEN_IOB, iobBolus.length))
if (iobBasal.trim { it <= ' ' }.isEmpty()) { if (iobBasal.trim().isEmpty()) {
iobBasal = "--" iobBasal = "--"
} }
iob2 = "$iobBolus $iobBasal" iob2 = "$iobBolus $iobBasal"