#287: It's now possible to deselect rows by clicking again on the "Se…

…lect all" menu.
Keidan · Nov 10, 2023 · 9cb202d · 9cb202d
1 parent d1d414c
commit 9cb202d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/app/src/main/java/fr/ralala/hexviewer/ui/adapters/SearchableListArrayAdapter.java b/app/src/main/java/fr/ralala/hexviewer/ui/adapters/SearchableListArrayAdapter.java
@@ -42,17 +42,12 @@ public abstract class SearchableListArrayAdapter extends ArrayAdapter<LineEntry>
   private final LineEntries mLineEntries;
   private Set<Integer> mSelectedItemsIds;
 
-  protected SearchableListArrayAdapter(final Context context,
-                                       final int layoutId,
-                                       final List<LineEntry> objects,
-                                       UserConfig userConfigPortrait,
-                                       UserConfig userConfigLandscape) {
+  protected SearchableListArrayAdapter(final Context context, final int layoutId, final List<LineEntry> objects, UserConfig userConfigPortrait, UserConfig userConfigLandscape) {
     super(context, layoutId, objects);
     mLineEntries = new LineEntries(objects);
     mUserConfigPortrait = userConfigPortrait;
     mUserConfigLandscape = userConfigLandscape;
-    mEntryFilter = new EntryFilter(context, this, this, mLineEntries,
-      userConfigPortrait, userConfigLandscape);
+    mEntryFilter = new EntryFilter(context, this, this, mLineEntries, userConfigPortrait, userConfigLandscape);
     mSelectedItemsIds = new HashSet<>();
   }
 
@@ -99,6 +94,15 @@ public List<Integer> getSelectedIds() {
     return li;
   }
 
+  /**
+   * Returns the selected count.
+   *
+   * @return count
+   */
+  public int getSelectedCount() {
+    return mSelectedItemsIds.size();
+  }
+
   /**
    * Returns the line entries.
    *
@@ -173,8 +177,7 @@ public void addAll(@NonNull Collection<? extends LineEntry> collection) {
    * @param convertView This value may be null.
    * @return The view.
    */
-  protected abstract @NonNull
-  View inflateView(final View convertView);
+  protected abstract @NonNull View inflateView(final View convertView);
 
   /**
    * Fills the view.
@@ -193,9 +196,7 @@ public void addAll(@NonNull Collection<? extends LineEntry> collection) {
    * @return This value cannot be null.
    */
   @Override
-  public @NonNull
-  View getView(final int position, final View convertView,
-               @NonNull final ViewGroup parent) {
+  public @NonNull View getView(final int position, final View convertView, @NonNull final ViewGroup parent) {
     View v = inflateView(convertView);
     fillView(v, position);
     return v;

diff --git a/app/src/main/java/fr/ralala/hexviewer/ui/multichoice/GenericMultiChoiceCallback.java b/app/src/main/java/fr/ralala/hexviewer/ui/multichoice/GenericMultiChoiceCallback.java
@@ -16,8 +16,6 @@
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import fr.ralala.hexviewer.ApplicationCtx;
 import fr.ralala.hexviewer.R;
 import fr.ralala.hexviewer.ui.activities.MainActivity;
@@ -42,6 +40,7 @@ public abstract class GenericMultiChoiceCallback implements AbsListView.MultiCho
   protected final SearchableListArrayAdapter mAdapter;
   protected final MainActivity mActivity;
   private final ClipboardManager mClipboard;
+  private int mFirstSelection = -1;
   private final AlertDialog mProgress;
 
   @SuppressLint("InflateParams")
@@ -138,6 +137,8 @@ public void onItemCheckedStateChanged(ActionMode mode, int position, long id, bo
     final int checkedCount = mListView.getCheckedItemCount();
     mode.setTitle(String.format(mActivity.getString(R.string.items_selected), checkedCount));
     mAdapter.toggleSelection(position, checked);
+    if (checkedCount == 1)
+      mFirstSelection = mAdapter.getSelectedIds().get(0);
   }
 
   /**
@@ -146,10 +147,13 @@ public void onItemCheckedStateChanged(ActionMode mode, int position, long id, bo
    * @param item The item that was clicked.
    */
   private void actionSelectAll(MenuItem item) {
+    final boolean checked = mAdapter.getSelectedCount() != mAdapter.getCount();
     setActionView(item, () -> {
       final int count = mAdapter.getCount();
       for (int i = 0; i < count; i++) {
-        mListView.setItemChecked(i, true);
+        if (mFirstSelection == i && !checked)
+          continue;
+        mListView.setItemChecked(i, checked);
       }
     });
   }
@@ -208,12 +212,12 @@ protected void displayError(@StringRes int message) {
    */
   protected void setActionView(final MenuItem item, final Runnable action) {
     UIHelper.showCircularProgressDialog(mProgress);
-    AtomicBoolean checkable = new AtomicBoolean(false);
     final Handler handler = new Handler(Looper.getMainLooper());
     handler.postDelayed(() -> {
       action.run();
       if (item != null) {
-        item.setCheckable(checkable.get());
+        item.setCheckable(true);
+        item.setChecked(mAdapter.getSelectedCount() == mAdapter.getCount());
         View view = item.getActionView();
         if (view != null) {
           view.clearAnimation();

diff --git a/app/src/main/res/menu/main_hex_multi_choice.xml b/app/src/main/res/menu/main_hex_multi_choice.xml
@@ -21,5 +21,6 @@
   <item android:id="@+id/action_select_all"
     android:icon="@drawable/ic_select_all"
     android:title="@string/menu_select_all"
+    android:checkable="true"
     app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/main_plain_multi_choice.xml b/app/src/main/res/menu/main_plain_multi_choice.xml
@@ -11,5 +11,6 @@
   <item android:id="@+id/action_select_all"
     android:icon="@drawable/ic_select_all"
     android:title="@string/menu_select_all"
+    android:checkable="true"
     app:showAsAction="ifRoom"/>
 </menu>