From 819d0a5ae58ec346081ecf77acb0ade62e865eb3 Mon Sep 17 00:00:00 2001
From: Andries Smit <mr.andries.smit@gmail.com>
Date: Thu, 29 Dec 2022 23:25:30 +0100
Subject: [PATCH] wear: fixup simple ui outdated logic

---
 .../androidaps/watchfaces/utils/SimpleUi.kt   | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/SimpleUi.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/SimpleUi.kt
index bdbdf8b640..5b2a414cb1 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/SimpleUi.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/SimpleUi.kt
@@ -24,6 +24,7 @@ class SimpleUi @Inject constructor(
     private val sp: SP,
     private val dateUtil: DateUtil
 ) {
+
     private var batteryReceiver: BroadcastReceiver? = null
     private var mBackgroundPaint = Paint()
     private lateinit var mTimePaint: Paint
@@ -89,19 +90,15 @@ class SimpleUi @Inject constructor(
         }
     }
 
-    private fun isOutdated(singleBg: EventData.SingleBg): Boolean {
-        val timeSince = (System.currentTimeMillis() - singleBg.timeStamp).toDouble()
-        return singleBg.timeStamp > 0 && (timeSince <= 1000 * 60 * 12)
-    }
+    private fun isOutdated(singleBg: EventData.SingleBg): Boolean =
+        singleBg.timeStamp > 0 && (System.currentTimeMillis() - singleBg.timeStamp) > 1000 * 60 * 12
 
-    private fun getBgColour(level: Long): Int {
-        if (level == 1L) {
-            return colorDarkHigh
+    private fun getBgColour(level: Long): Int =
+        when (level) {
+            1L   -> colorDarkHigh
+            0L   -> colorDarkMid
+            else -> colorDarkLow
         }
-        return if (level == 0L) {
-            colorDarkMid
-        } else colorDarkLow
-    }
 
     private val isCharging: Boolean
         get() {