From 45e50b829ab0a6e723de45c0948176b9655a1018 Mon Sep 17 00:00:00 2001
From: Robert-0410 <62630290+Robert-0410@users.noreply.github.com>
Date: Mon, 23 Dec 2024 02:26:58 -0800
Subject: [PATCH] refactor: 24H and 48H intervals (#1500)

---
 .../geeksville/mesh/model/MetricsViewModel.kt  | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt b/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt
index a27d8a83b..c7ebaa2fc 100644
--- a/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt
@@ -135,9 +135,10 @@ enum class TimeFrame(
      */
     fun lineInterval(): Long {
         return when (this.ordinal) {
-            TWENTY_FOUR_HOURS.ordinal,
+            TWENTY_FOUR_HOURS.ordinal ->
+                TimeUnit.HOURS.toSeconds(6)
             FORTY_EIGHT_HOURS.ordinal ->
-                TimeUnit.HOURS.toSeconds(1)
+                TimeUnit.HOURS.toSeconds(12)
             ONE_WEEK.ordinal,
             TWO_WEEKS.ordinal ->
                 TimeUnit.DAYS.toSeconds(1)
@@ -152,18 +153,7 @@ enum class TimeFrame(
      * @param time in seconds
      */
     fun dp(screenWidth: Int, time: Long): Dp {
-
-        val timePerScreen = when (this.ordinal) {
-            TWENTY_FOUR_HOURS.ordinal,
-            FORTY_EIGHT_HOURS.ordinal ->
-                TimeUnit.HOURS.toSeconds(1)
-            ONE_WEEK.ordinal,
-            TWO_WEEKS.ordinal ->
-                TimeUnit.DAYS.toSeconds(1)
-            else ->
-                TimeUnit.DAYS.toSeconds(7)
-        }
-
+        val timePerScreen = this.lineInterval()
         val multiplier = time / timePerScreen
         val dp = (screenWidth * multiplier).toInt().dp
         return dp.takeIf { it != 0.dp } ?: screenWidth.dp