MoonPhaseView

fixes bug where moon dialog displays the wrong phase label for a given date/time (#843)
forrestguice · Nov 20, 2024 · 2c02773 · 2c02773
1 parent 7a9424a
commit 2c02773
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/calculator/SuntimesMoonData.java b/app/src/main/java/com/forrestguice/suntimeswidget/calculator/SuntimesMoonData.java
@@ -413,6 +413,18 @@ protected MoonPhaseDisplay findPhaseOf(Calendar calendar, boolean updateNext)
         return (nextPhaseIsToday ? toPhase(nextPhase) : prevMinorPhase(nextPhase));
     }
 
+    public static MoonPhaseDisplay findCurrentPhaseOf(Calendar calendar, SuntimesMoonData data)
+    {
+        SuntimesMoonData data1 = new SuntimesMoonData(data);
+        data1.setTodayIs(calendar);
+        data1.calculate();
+
+        SuntimesCalculator.MoonPhase nextPhase = data1.nextPhase(calendar);
+        Calendar nextPhaseDate = data1.moonPhases.get(nextPhase);
+        boolean nextPhaseIsNow = (nextPhaseDate != null) && (Math.abs(nextPhaseDate.getTimeInMillis() - calendar.getTimeInMillis()) <= (2000 * 60));
+        return (nextPhaseIsNow ? toPhase(nextPhase) : prevMinorPhase(nextPhase));
+    }
+
     public CharSequence getMoonPhaseLabel(Context context, SuntimesCalculator.MoonPhase majorPhase) {
         return getMoonPhaseLabel(context, majorPhase, moonPhaseCalendar(majorPhase));
     }

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/moon/MoonPhaseView.java b/app/src/main/java/com/forrestguice/suntimeswidget/moon/MoonPhaseView.java
@@ -251,7 +251,9 @@ public void updateViews(Context context, SuntimesMoonData data, @Nullable Calend
             themeIcons(context, themeOverride);
             hideIcons();
 
-            MoonPhaseDisplay phase = (tomorrowMode ? data.getMoonPhaseTomorrow() : data.getMoonPhaseToday());
+            MoonPhaseDisplay phase = (dateTime != null) ? SuntimesMoonData.findCurrentPhaseOf(dateTime, data)
+                                                        : (tomorrowMode ? data.getMoonPhaseTomorrow() : data.getMoonPhaseToday());
+
             if (phase != null)
             {
                 if (phase == MoonPhaseDisplay.FULL || phase == MoonPhaseDisplay.NEW) {