showMoonDialog

fixes bug where the moon dialog shows today's information instead of the selected day (#858)
forrestguice · Jan 6, 2025 · d44addd · d44addd
1 parent 32bba6a
commit d44addd
Showing 1 changed file with 12 additions and 25 deletions.
diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/SuntimesActivity.java b/app/src/main/java/com/forrestguice/suntimeswidget/SuntimesActivity.java
@@ -1382,22 +1382,6 @@ public void onNoteChanged(NoteData note, int transition)
         });
     }
 
-    private View.OnClickListener onMoonriseClick = new ViewUtils.ThrottledClickListener(new View.OnClickListener()
-    {
-        @Override
-        public void onClick(View v) {
-            showMoonDialog();
-        }
-    });
-    private View.OnLongClickListener onMoonriseLongClick = new View.OnLongClickListener()
-    {
-        @Override
-        public boolean onLongClick(View v) {
-            showMoonDialog();
-            return true;
-        }
-    };
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu)
     {
@@ -2186,21 +2170,14 @@ public boolean onNoonHeaderLongClick(CardAdapter adapter, int position) {
 
         @Override
         public void onMoonHeaderClick(CardAdapter adapter, int position) {
-            onMoonHeaderAction(adapter, position);
+            showMoonPositionAt(adapter, position);
         }
         @Override
         public boolean onMoonHeaderLongClick(CardAdapter adapter, int position)
         {
-            onMoonHeaderAction(adapter, position);
+            showMoonPositionAt(adapter, position);
             return true;
         }
-        protected void onMoonHeaderAction(CardAdapter adapter, int position)
-        {
-            Pair<SuntimesRiseSetDataset, SuntimesMoonData> cardData = adapter.initData(SuntimesActivity.this, position);
-            if (Math.abs(CardAdapter.TODAY_POSITION - position) > 1 && cardData != null) {
-                showMoonPositionAt(cardData.first.dataNoon.calendar().getTimeInMillis());
-            } else showMoonDialog();
-        }
 
         @Override
         public void onLightmapClick(CardAdapter adapter, int position) {
@@ -2638,6 +2615,16 @@ public void showMoonPositionAt(@Nullable Long dateTime)
         dialog = showMoonDialog();
         dialog.showPositionAt(dateTime);
     }
+    protected void showMoonPositionAt(CardAdapter adapter, int position)
+    {
+        Pair<SuntimesRiseSetDataset, SuntimesMoonData> cardData = ((adapter != null) ? adapter.initData(SuntimesActivity.this, position) : null);
+        if (cardData != null) {
+            showMoonPositionAt(cardData.first.dataNoon.calendar().getTimeInMillis());
+        } else showMoonDialog();
+    }
+    protected void showMoonPositionAt() {
+        showMoonPositionAt(card_adapter, card_layout.findFirstVisibleItemPosition());
+    }
 
     /**
      * Show data source labels / ui.