Order rise/set by time

kylecorry31 · Jun 6, 2023 · 401b641 · 401b641
1 parent 6b6abfe
commit 401b641
Showing 1 changed file with 31 additions and 4 deletions.
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/BaseAstroListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/BaseAstroListItemProducer.kt
@@ -72,21 +72,48 @@ abstract class BaseAstroListItemProducer(protected val context: Context) :
     }
 
     protected fun riseSet(rise: ZonedDateTime?, set: ZonedDateTime?): CharSequence {
+
+        val setBeforeRise = set != null && rise != null && set.isBefore(rise)
+
+        val firstIcon = if (setBeforeRise) {
+            R.drawable.ic_arrow_down
+        } else {
+            R.drawable.ic_arrow_up
+        }
+
+        val firstTime = if (setBeforeRise) {
+            set
+        } else {
+            rise
+        }
+
+        val secondIcon = if (setBeforeRise) {
+            R.drawable.ic_arrow_up
+        } else {
+            R.drawable.ic_arrow_down
+        }
+
+        val secondTime = if (setBeforeRise) {
+            rise
+        } else {
+            set
+        }
+
         return buildSpannedString {
             appendImage(
                 context,
-                R.drawable.ic_arrow_up,
+                firstIcon,
                 imageSize,
                 tint = secondaryColor
             )
-            append(" ${time(rise)}    ")
+            append(" ${time(firstTime)}    ")
             appendImage(
                 context,
-                R.drawable.ic_arrow_down,
+                secondIcon,
                 imageSize,
                 tint = secondaryColor
             )
-            append(" ${time(set)}")
+            append(" ${time(secondTime)}")
         }
     }