ThrottledMenuItemClickListener

throttle menu click listeners to once a second
forrestguice · Sep 4, 2023 · 8568230 · 8568230
1 parent 31aba51
commit 8568230
Show file tree

Hide file tree

Showing 16 changed files with 100 additions and 56 deletions.
diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/AlarmDialog.java b/app/src/main/java/com/forrestguice/suntimeswidget/AlarmDialog.java
@@ -467,7 +467,7 @@ public void onClick(View v)
     });
     private List<AlarmAddon.EventPickerInfo> alarmPickers = null;
 
-    private PopupMenu.OnMenuItemClickListener onMoreMenuClick = new PopupMenu.OnMenuItemClickListener()
+    private final PopupMenu.OnMenuItemClickListener onMoreMenuClick = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem item)
@@ -497,7 +497,7 @@ public boolean onMenuItemClick(MenuItem item)
                 return false;
             }
         }
-    };
+    });
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data)

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/EquinoxDialog.java b/app/src/main/java/com/forrestguice/suntimeswidget/EquinoxDialog.java
@@ -285,7 +285,7 @@ private void onTrackingModeChanged(Context context, int id)
         } else Log.w("EquinoxDialog", "setTrackingMode: invalid item id " + id);
     }
 
-    private PopupMenu.OnMenuItemClickListener onOverflowMenuClick = new PopupMenu.OnMenuItemClickListener()
+    private final PopupMenu.OnMenuItemClickListener onOverflowMenuClick = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem item)
@@ -304,7 +304,7 @@ public boolean onMenuItemClick(MenuItem item)
                     return false;
             }
         }
-    };
+    });
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -365,7 +365,7 @@ public void run() {                      // a submenu may be shown after the pop
         }
     };
 
-    private PopupMenu.OnMenuItemClickListener onContextMenuClick = new PopupMenu.OnMenuItemClickListener()
+    private final PopupMenu.OnMenuItemClickListener onContextMenuClick = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem item)
@@ -424,7 +424,7 @@ public boolean onMenuItemClick(MenuItem item)
                     return false;
             }
         }
-    };
+    });
 
     protected void shareItem(Context context, Intent itemData)  // TODO: refactor to use ViewUtils after v0.15.0 branches are merged
     {

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/LightMapDialog.java b/app/src/main/java/com/forrestguice/suntimeswidget/LightMapDialog.java
@@ -520,7 +520,7 @@ public void onClick(View v)
 
 
 
-    private PopupMenu.OnMenuItemClickListener onContextMenuClick = new PopupMenu.OnMenuItemClickListener()
+    private final PopupMenu.OnMenuItemClickListener onContextMenuClick = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem item)
@@ -621,7 +621,7 @@ public void run() {
                     return false;
             }
         }
-    };
+    });
 
     private void updateContextMenu(Context context, PopupMenu popupMenu)
     {
@@ -702,7 +702,7 @@ private void updateSpeedMenu(Context context, PopupMenu menu)
         }
     }
 
-    private PopupMenu.OnMenuItemClickListener onSpeedMenuClick = new PopupMenu.OnMenuItemClickListener()
+    private final PopupMenu.OnMenuItemClickListener onSpeedMenuClick = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem item)
@@ -732,7 +732,7 @@ public boolean onMenuItemClick(MenuItem item)
                     return false;
             }
         }
-    };
+    });
 
     protected boolean showTimeZoneMenu(Context context, View view)
     {
@@ -741,7 +741,7 @@ protected boolean showTimeZoneMenu(Context context, View view)
         menu.show();
         return true;
     }
-    private PopupMenu.OnMenuItemClickListener onTimeZoneMenuClick = new PopupMenu.OnMenuItemClickListener()
+    private final PopupMenu.OnMenuItemClickListener onTimeZoneMenuClick = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem item)
@@ -756,7 +756,7 @@ public boolean onMenuItemClick(MenuItem item)
                 return (tzID != null);
             } else return false;
         }
-    };
+    });
 
     private void updateMediaButtons()
     {

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/MoonDialog.java b/app/src/main/java/com/forrestguice/suntimeswidget/MoonDialog.java
@@ -684,7 +684,7 @@ private void updateOverflowMenu(Context context, PopupMenu popup)
             lunarNoonItem.setChecked(AppSettings.loadShowLunarNoonPref(context));
         }
     }
-    private PopupMenu.OnMenuItemClickListener onOverflowMenuClick = new PopupMenu.OnMenuItemClickListener()
+    private final PopupMenu.OnMenuItemClickListener onOverflowMenuClick = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem item)
@@ -707,7 +707,7 @@ public boolean onMenuItemClick(MenuItem item)
                     return false;
             }
         }
-    };
+    });
 
     /**
      * MediaMenu
@@ -952,7 +952,7 @@ private static void setDataToMenu(Menu m, Intent data)
         }
     }
 
-    private PopupMenu.OnMenuItemClickListener onContextMenuClick = new PopupMenu.OnMenuItemClickListener()
+    private final PopupMenu.OnMenuItemClickListener onContextMenuClick = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem item)
@@ -1010,7 +1010,7 @@ public boolean onMenuItemClick(MenuItem item)
                     return false;
             }
         }
-    };
+    });
 
     protected void shareItem(Context context, Intent itemData)
     {

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/SuntimesConfigActivity0.java b/app/src/main/java/com/forrestguice/suntimeswidget/SuntimesConfigActivity0.java
@@ -90,6 +90,7 @@
 import com.forrestguice.suntimeswidget.themes.WidgetThemeListActivity;
 import com.forrestguice.suntimeswidget.views.PopupMenuCompat;
 import com.forrestguice.suntimeswidget.views.TooltipCompat;
+import com.forrestguice.suntimeswidget.views.ViewUtils;
 
 import java.lang.ref.WeakReference;
 import java.security.InvalidParameterException;
@@ -1251,7 +1252,7 @@ protected void showTimeModeMenu(Context context, View v)
     protected void prepareTimeModeMenu(Context context, Menu menu) {
     }
 
-    protected PopupMenu.OnMenuItemClickListener onTimeModeMenuClicked = new PopupMenu.OnMenuItemClickListener()
+    protected PopupMenu.OnMenuItemClickListener onTimeModeMenuClicked = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem menuItem)
@@ -1270,7 +1271,7 @@ public boolean onMenuItemClick(MenuItem menuItem)
                     return false;
             }
         }
-    };
+    });
 
     protected void showTimeModeHelp()
     {
@@ -1434,7 +1435,7 @@ protected boolean showTimeZoneSortMenu(Context context, View view)
         menu.show();
         return true;
     }
-    private final PopupMenu.OnMenuItemClickListener onTimeZoneSortMenuClick = new PopupMenu.OnMenuItemClickListener()
+    private final PopupMenu.OnMenuItemClickListener onTimeZoneSortMenuClick = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem item)
@@ -1461,7 +1462,7 @@ public void onSaveSortMode( WidgetTimezones.TimeZoneSort sortMode )
             sortActionBase.init(context, spinner_timezone);
             return sortActionBase.onActionItemClicked(item.getItemId());
         }
-    };
+    });
 
     /**
      *

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/TimeZoneDialog.java b/app/src/main/java/com/forrestguice/suntimeswidget/TimeZoneDialog.java
@@ -615,7 +615,7 @@ public static void setChecked(@Nullable MenuItem item, boolean value) {
             item.setChecked(value);
         }
     }
-    private final PopupMenu.OnMenuItemClickListener onTimeZoneSortMenuClick = new PopupMenu.OnMenuItemClickListener()
+    private final PopupMenu.OnMenuItemClickListener onTimeZoneSortMenuClick = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem item) {
@@ -658,7 +658,7 @@ public void onSaveSortMode( WidgetTimezones.TimeZoneSort sortMode )
             sortActionBase.init(context, spinner_timezone);
             return sortActionBase.onActionItemClicked(item.getItemId());
         }
-    };
+    });
 
     /**
      * trigger the time zone ActionMode

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/actions/ActionListHelper.java b/app/src/main/java/com/forrestguice/suntimeswidget/actions/ActionListHelper.java
@@ -50,6 +50,7 @@
 import com.forrestguice.suntimeswidget.SuntimesUtils;
 import com.forrestguice.suntimeswidget.calculator.SuntimesData;
 import com.forrestguice.suntimeswidget.settings.WidgetActions;
+import com.forrestguice.suntimeswidget.views.ViewUtils;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -274,7 +275,7 @@ protected void prepareOverflowMenu(Context context, Menu menu)
         }
     }
 
-    protected PopupMenu.OnMenuItemClickListener onMenuItemClicked = new PopupMenu.OnMenuItemClickListener()
+    protected PopupMenu.OnMenuItemClickListener onMenuItemClicked = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem menuItem)
@@ -301,7 +302,7 @@ public boolean onMenuItemClick(MenuItem menuItem)
                     return false;
             }
         }
-    };
+    });
 
     public void addAction()
     {

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/actions/EditActionView.java b/app/src/main/java/com/forrestguice/suntimeswidget/actions/EditActionView.java
@@ -57,6 +57,7 @@
 import com.forrestguice.suntimeswidget.SuntimesUtils;
 import com.forrestguice.suntimeswidget.calculator.SuntimesData;
 import com.forrestguice.suntimeswidget.settings.WidgetActions;
+import com.forrestguice.suntimeswidget.views.ViewUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -540,7 +541,7 @@ protected void showOverflowMenu(Context context, View parent)
         menu.show();
     }
 
-    protected PopupMenu.OnMenuItemClickListener onMenuItemClicked = new PopupMenu.OnMenuItemClickListener()
+    protected PopupMenu.OnMenuItemClickListener onMenuItemClicked = new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
     {
         @Override
         public boolean onMenuItemClick(MenuItem menuItem)
@@ -563,7 +564,7 @@ public boolean onMenuItemClick(MenuItem menuItem)
                     return false;
             }
         }
-    };
+    });
 
     public void saveIntent()
     {

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/ui/AlarmEditActivity.java b/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/ui/AlarmEditActivity.java
@@ -69,6 +69,7 @@
 import com.forrestguice.suntimeswidget.settings.WidgetSettings;
 import com.forrestguice.suntimeswidget.settings.WidgetThemes;
 import com.forrestguice.suntimeswidget.themes.SuntimesTheme;
+import com.forrestguice.suntimeswidget.views.ViewUtils;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -712,7 +713,7 @@ public void showDismissChallengePopup(View v, @NonNull final AlarmClockItem item
             c++;
         }
 
-        popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
+        popup.setOnMenuItemClickListener(new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
         {
             @Override
             public boolean onMenuItemClick(MenuItem menuItem)
@@ -721,7 +722,7 @@ public boolean onMenuItemClick(MenuItem menuItem)
                 onDismissChallengeResult(itemID);
                 return true;
             }
-        });
+        }));
 
         SuntimesUtils.forceActionBarIcons(popup.getMenu());
         popup.show();
@@ -746,7 +747,7 @@ public void showAlarmSoundPopup(View v, @NonNull final AlarmClockItem item)
         MenuInflater inflater = popup.getMenuInflater();
         inflater.inflate(R.menu.alarmsound, popup.getMenu());
 
-        popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
+        popup.setOnMenuItemClickListener(new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
         {
             @Override
             public boolean onMenuItemClick(MenuItem menuItem)
@@ -767,7 +768,7 @@ public boolean onMenuItemClick(MenuItem menuItem)
                 }
                 return false;
             }
-        });
+        }));
         SuntimesUtils.forceActionBarIcons(popup.getMenu());
         popup.show();
     }

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/ui/AlarmEditDialog.java b/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/ui/AlarmEditDialog.java
@@ -315,7 +315,7 @@ protected void showAlarmTypeMenu(Context context, final AlarmClockItem item, fin
         MenuInflater inflater = menu.getMenuInflater();
         inflater.inflate(R.menu.alarmtype, menu.getMenu());
 
-        menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
+        menu.setOnMenuItemClickListener(new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
         {
             @Override
             public boolean onMenuItemClick(MenuItem menuItem)
@@ -337,7 +337,7 @@ public boolean onMenuItemClick(MenuItem menuItem)
                 notifyItemChanged();
                 return true;
             }
-        });
+        }));
 
         SuntimesUtils.forceActionBarIcons(menu.getMenu());
         menu.show();
@@ -360,7 +360,7 @@ protected void showOverflowMenu(final Context context, final AlarmClockItem item
             }
         }
 
-        menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
+        menu.setOnMenuItemClickListener(new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
         {
             @Override
             public boolean onMenuItemClick(MenuItem menuItem)
@@ -375,7 +375,7 @@ public boolean onMenuItemClick(MenuItem menuItem)
                         return false;
                 }
             }
-        });
+        }));
 
         SuntimesUtils.forceActionBarIcons(menu.getMenu());
         menu.show();

diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/ui/AlarmItemArrayAdapter.java b/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/ui/AlarmItemArrayAdapter.java
@@ -66,6 +66,7 @@
 import com.forrestguice.suntimeswidget.alarmclock.AlarmState;
 import com.forrestguice.suntimeswidget.settings.SolarEvents;
 import com.forrestguice.suntimeswidget.themes.SuntimesTheme;
+import com.forrestguice.suntimeswidget.views.ViewUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -825,7 +826,7 @@ protected void showOverflowMenu(final AlarmClockItem item, final View buttonView
             }
         }
 
-        menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
+        menu.setOnMenuItemClickListener(new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
         {
             @Override
             public boolean onMenuItemClick(MenuItem menuItem)
@@ -898,7 +899,7 @@ public boolean onMenuItemClick(MenuItem menuItem)
                         return false;
                 }
             }
-        });
+        }));
 
         SuntimesUtils.forceActionBarIcons(menu.getMenu());
         menu.show();
@@ -916,7 +917,7 @@ protected void showAlarmTypeMenu(final AlarmClockItem item, final View buttonVie
         MenuInflater inflater = menu.getMenuInflater();
         inflater.inflate(R.menu.alarmtype, menu.getMenu());
 
-        menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
+        menu.setOnMenuItemClickListener(new ViewUtils.ThrottledMenuItemClickListener(new PopupMenu.OnMenuItemClickListener()
         {
             @Override
             public boolean onMenuItemClick(MenuItem menuItem)
@@ -937,7 +938,7 @@ public boolean onMenuItemClick(MenuItem menuItem)
                         return changeAlarmType(item, AlarmClockItem.AlarmType.ALARM);
                 }
             }
-        });
+        }));
 
         SuntimesUtils.forceActionBarIcons(menu.getMenu());
         menu.show();