Show moon phase in AR

kylecorry31 · Dec 29, 2023 · ac1323a · ac1323a
1 parent 0e2d827
commit ac1323a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/ARAstronomyLayer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/ARAstronomyLayer.kt
@@ -5,6 +5,8 @@ import com.kylecorry.andromeda.canvas.ICanvasDrawer
 import com.kylecorry.andromeda.core.ui.Colors.withAlpha
 import com.kylecorry.andromeda.core.units.PixelCoordinate
 import com.kylecorry.luna.coroutines.CoroutineQueueRunner
+import com.kylecorry.sol.science.astronomy.Astronomy
+import com.kylecorry.sol.science.astronomy.moon.MoonPhase
 import com.kylecorry.sol.time.Time
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
@@ -22,7 +24,7 @@ class ARAstronomyLayer(
     private val drawLines: Boolean,
     private val drawBelowHorizon: Boolean,
     private val onSunFocus: (time: ZonedDateTime) -> Boolean,
-    private val onMoonFocus: (time: ZonedDateTime) -> Boolean
+    private val onMoonFocus: (time: ZonedDateTime, phase: MoonPhase) -> Boolean
 ) : ARLayer {
 
     private val scope = CoroutineScope(Dispatchers.Default)
@@ -152,6 +154,8 @@ class ARAstronomyLayer(
                         moonAfterPathObject
                     }
 
+                    val phase = Astronomy.getMoonPhase(it)
+
                     ARMarker(
                         SphericalARPoint(
                             astro.getMoonAzimuth(location, it).value,
@@ -161,7 +165,7 @@ class ARAstronomyLayer(
                         ),
                         canvasObject = obj,
                         onFocusedFn = {
-                            onMoonFocus(it)
+                            onMoonFocus(it, phase)
                         }
                     )
                 }.map { it.value }
@@ -198,7 +202,7 @@ class ARAstronomyLayer(
                 val sunAltitude = astro.getSunAltitude(location)
                 val sunAzimuth = astro.getSunAzimuth(location).value
 
-                val phase = astro.getMoonPhase(time.toLocalDate())
+                val phase = Astronomy.getMoonPhase(time)
                 val moonIconId = MoonPhaseImageMapper().getPhaseImage(phase.phase)
                 val moonImageSize = drawer.dp(24f).toInt()
                 val moonBitmap = bitmapLoader?.load(moonIconId, moonImageSize)
@@ -213,7 +217,7 @@ class ARAstronomyLayer(
                     canvasObject = moonBitmap?.let { CanvasBitmap(moonBitmap) }
                         ?: CanvasCircle(Color.WHITE),
                     onFocusedFn = {
-                        onMoonFocus(time)
+                        onMoonFocus(time, phase)
                     }
                 )
 

diff --git a/...c/main/java/com/kylecorry/trail_sense/tools/augmented_reality/AugmentedRealityFragment.kt b/...c/main/java/com/kylecorry/trail_sense/tools/augmented_reality/AugmentedRealityFragment.kt
@@ -12,6 +12,8 @@ import com.kylecorry.andromeda.core.system.Resources
 import com.kylecorry.andromeda.core.ui.Colors.withAlpha
 import com.kylecorry.andromeda.fragments.BoundFragment
 import com.kylecorry.andromeda.fragments.observeFlow
+import com.kylecorry.sol.science.astronomy.Astronomy
+import com.kylecorry.sol.science.astronomy.moon.MoonPhase
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.databinding.FragmentAugmentedRealityBinding
@@ -169,12 +171,14 @@ class AugmentedRealityFragment : BoundFragment<FragmentAugmentedRealityBinding>(
         return true
     }
 
-    private fun onMoonFocused(time: ZonedDateTime): Boolean {
+    private fun onMoonFocused(time: ZonedDateTime, phase: MoonPhase): Boolean {
         binding.arView.focusText =
             getString(R.string.moon) + "\n" + formatter.formatRelativeDateTime(
                 time,
                 includeSeconds = false
-            )
+            ) + "\n${formatter.formatMoonPhase(phase.phase)} (${formatter.formatPercentage(
+                phase.illumination
+            )})"
         return true
     }