From 91747a95c11ff8ecd9b106926878a1b59e97ccdc Mon Sep 17 00:00:00 2001
From: Kyle Corry <kylecorry31@gmail.com>
Date: Thu, 10 Mar 2022 06:48:41 -0500
Subject: [PATCH] Update dependencies

---
 app/build.gradle.kts                          |  4 ++--
 .../trail_sense/astronomy/ui/AstroChart.kt    |  2 +-
 .../shared/extensions/TimeExtensions.kt       | 22 +++++--------------
 .../trail_sense/tools/tides/ui/TideChart.kt   |  2 +-
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2e26134e8..94863ea78 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -82,10 +82,10 @@ dependencies {
     implementation("com.github.kylecorry31:subsampling-scale-image-view:v3.10.0")
 
     // Sol
-    implementation("com.github.kylecorry31:sol:5.8.0-beta01")
+    implementation("com.github.kylecorry31:sol:5.8.0")
 
     // Andromeda
-    val andromedaVersion = "2.8.0-beta04"
+    val andromedaVersion = "2.8.0"
     implementation("com.github.kylecorry31.andromeda:core:$andromedaVersion")
     implementation("com.github.kylecorry31.andromeda:fragments:$andromedaVersion")
     implementation("com.github.kylecorry31.andromeda:forms:$andromedaVersion")
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstroChart.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstroChart.kt
index 9243df377..3cfab2f66 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstroChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstroChart.kt
@@ -3,11 +3,11 @@ package com.kylecorry.trail_sense.astronomy.ui
 import com.github.mikephil.charting.charts.LineChart
 import com.kylecorry.andromeda.core.units.PixelCoordinate
 import com.kylecorry.sol.time.Time
+import com.kylecorry.sol.time.Time.hoursUntil
 import com.kylecorry.sol.time.Time.toZonedDateTime
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.FormatService
-import com.kylecorry.trail_sense.shared.extensions.hoursUntil
 import com.kylecorry.trail_sense.shared.views.SimpleLineChart
 import java.time.Instant
 import java.time.LocalTime
diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/extensions/TimeExtensions.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/extensions/TimeExtensions.kt
index 13caae6f6..25b1552b7 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/shared/extensions/TimeExtensions.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/shared/extensions/TimeExtensions.kt
@@ -1,23 +1,11 @@
 package com.kylecorry.trail_sense.shared.extensions
 
+import com.kylecorry.sol.time.Time.atEndOfDay
 import com.kylecorry.sol.units.Reading
-import java.time.*
-
-fun ZonedDateTime.roundNearestMinute(minutes: Long): ZonedDateTime {
-    val minute = this.minute
-    val newMinute = (minute / minutes) * minutes
-
-    val diff = newMinute - minute
-    return this.plusMinutes(diff)
-}
-
-fun Instant.hoursUntil(other: Instant): Float {
-    return Duration.between(this, other).seconds / (60f * 60f)
-}
-
-fun LocalDate.atEndOfDay(): LocalDateTime {
-    return atTime(LocalTime.MAX)
-}
+import java.time.Duration
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.ZonedDateTime
 
 fun <T> getReadings(
     date: LocalDate,
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/TideChart.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/TideChart.kt
index c6e0eb289..63ed6f41c 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/TideChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/TideChart.kt
@@ -5,12 +5,12 @@ import com.kylecorry.andromeda.core.units.PixelCoordinate
 import com.kylecorry.sol.math.Range
 import com.kylecorry.sol.math.SolMath.norm
 import com.kylecorry.sol.time.Time
+import com.kylecorry.sol.time.Time.hoursUntil
 import com.kylecorry.sol.time.Time.toZonedDateTime
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.colors.AppColor
-import com.kylecorry.trail_sense.shared.extensions.hoursUntil
 import com.kylecorry.trail_sense.shared.views.SimpleLineChart
 import java.time.Instant
 import java.time.LocalTime