Merge pull request #2856 from Philoul/wear/SimplifySteampunk

Steampunk Watchface simplification

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/weardata/EventData.kt

@@ -186,7 +186,9 @@ sealed class EventData : Event() {
         val sgv: Double,
         val high: Double, // highLine
         val low: Double, // lowLine
-        val color: Int = 0
+        val color: Int = 0,
+        val deltaMgdl: Double? = null,
+        val avgDeltaMgdl: Double? = null
     ) : EventData(), Comparable<SingleBg> {
 
         override fun equals(other: Any?): Boolean =

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataHandlerMobile.kt

@@ -986,7 +986,9 @@ class DataHandlerMobile @Inject constructor(
             sgv = glucoseValue.recalculated,
             high = highLine,
             low = lowLine,
-            color = 0
+            color = 0,
+            deltaMgdl = glucoseStatus?.delta,
+            avgDeltaMgdl = glucoseStatus?.shortAvgDelta
         )
     }
 

wear/src/main/kotlin/app/aaps/wear/data/RawDisplayData.kt

@@ -27,7 +27,9 @@ class RawDisplayData {
         sgv = 0.0,
         high = 0.0,
         low = 0.0,
-        color = 0
+        color = 0,
+        deltaMgdl = null,
+        avgDeltaMgdl = null
     )
 
     // status bundle

wear/src/main/kotlin/app/aaps/wear/watchfaces/SteampunkWatchface.kt

@@ -8,7 +8,6 @@ import android.view.animation.LinearInterpolator
 import android.view.animation.RotateAnimation
 import androidx.core.content.ContextCompat
 import androidx.viewbinding.ViewBinding
-import app.aaps.core.interfaces.utils.SafeParse.stringToFloat
 import app.aaps.wear.R
 import app.aaps.wear.databinding.ActivitySteampunkBinding
 import app.aaps.wear.watchfaces.utils.BaseWatchFace
@@ -51,9 +50,7 @@ class SteampunkWatchface : BaseWatchFace() {
                 binding.glucoseDial.setImageResource(if (singleBg.glucoseUnits == "mmol") R.drawable.steampunk_dial_mmol else R.drawable.steampunk_dial_mgdl)
 
                 // convert the Sgv to degrees of rotation
-                rotationAngle =
+                rotationAngle = singleBg.sgv.toFloat()
-                    if (singleBg.glucoseUnits == "mmol") stringToFloat(singleBg.sgvString) * 18f //convert to mg/dL, which is equivalent to degrees
-                    else stringToFloat(singleBg.sgvString) // if glucose a value is received, use it to determine the amount of rotation of the dial.
             }
             if (rotationAngle > 330) rotationAngle = 330f // if the glucose value is higher than 330 then show "HIGH" on the dial. ("HIGH" is at 330 degrees on the dial)
             if (rotationAngle != 0f && rotationAngle < 30) rotationAngle = 30f // if the glucose value is lower than 30 show "LOW" on the dial. ("LOW" is at 30 degrees on the dial)
@@ -69,38 +66,10 @@ class SteampunkWatchface : BaseWatchFace() {
             lastEndDegrees = rotationAngle //store the final angle as a starting point for the next rotation.
         }
 
-        // set the delta gauge and rotate the delta pointer
+        singleBg.avgDeltaMgdl?.let {// if a legitimate delta value is
-        var deltaIsNegative = 1f // by default go clockwise
+            val absAvgDelta = it.toFloat()
-        if (singleBg.avgDelta != "--") {      // if a legitimate delta value is
-            // received,
-            // then...
-            if (singleBg.avgDelta[0] == '-') deltaIsNegative = -1f //if the delta is negative, go counter-clockwise
-            val absAvgDelta = stringToFloat(singleBg.avgDelta.substring(1)) //get rid of the sign so it can be converted to float.
             var autoGranularity = "0" //auto-granularity off
             // ensure the delta gauge is the right units and granularity
-            if (singleBg.glucoseUnits != "-") {
-                if (singleBg.glucoseUnits == "mmol") {
-                    if (sp.getString("delta_granularity", "2") == "4") {  //Auto granularity
-                        autoGranularity =
-                            when {
-                                absAvgDelta < 0.3 -> "3" // high if below 0.3 mmol/l
-                                absAvgDelta < 0.5 -> "2" // medium if below 0.5 mmol/l
-                                else              -> "1" // low (init)
-                            }
-                    }
-                    if (sp.getString("delta_granularity", "2") == "1" || autoGranularity == "1") {  //low
-                        binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_10)
-                        deltaRotationAngle = absAvgDelta * 30f
-                    }
-                    if (sp.getString("delta_granularity", "2") == "2" || autoGranularity == "2") {  //medium
-                        binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_05)
-                        deltaRotationAngle = absAvgDelta * 60f
-                    }
-                    if (sp.getString("delta_granularity", "2") == "3" || autoGranularity == "3") {  //high
-                        binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_03)
-                        deltaRotationAngle = absAvgDelta * 100f
-                    }
-                } else {
             if (sp.getString("delta_granularity", "2") == "4") {  //Auto granularity
                 autoGranularity =
                     when {
@@ -110,21 +79,28 @@ class SteampunkWatchface : BaseWatchFace() {
                     }
             }
             if (sp.getString("delta_granularity", "2") == "1" || autoGranularity == "1") {  //low
+                if (singleBg.glucoseUnits == "mmol")
+                    binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_10)
+                else
                     binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mgdl_20)
                 deltaRotationAngle = absAvgDelta * 1.5f
             }
             if (sp.getString("delta_granularity", "2") == "2" || autoGranularity == "2") {  //medium
+                if (singleBg.glucoseUnits == "mmol")
+                    binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_05)
+                else
                     binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mgdl_10)
                 deltaRotationAngle = absAvgDelta * 3f
             }
             if (sp.getString("delta_granularity", "2") == "3" || autoGranularity == "3") {  //high
+                if (singleBg.glucoseUnits == "mmol")
+                    binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_03)
+                else
                     binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mgdl_5)
                 deltaRotationAngle = absAvgDelta * 6f
             }
-                }
-            }
             if (deltaRotationAngle > 40) deltaRotationAngle = 40f
-            binding.deltaPointer.rotation = deltaRotationAngle * deltaIsNegative
+            binding.deltaPointer.rotation = deltaRotationAngle
         }
 
         // rotate the minute hand.