diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ef087770..75d495bb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
Changes:
- Fix selected colour in colour changing dialog
+- Support for deleting multiple cards at once
## v2.0.4 (2021-07-27)
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index a88812c8d..07fd5186a 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -1059,32 +1059,20 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
case R.id.action_delete:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle(R.string.deleteTitle);
- builder.setMessage(R.string.deleteConfirmation);
- builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener()
- {
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- Log.e(TAG, "Deleting card: " + loyaltyCardId);
+ builder.setTitle(getResources().getQuantityString(R.plurals.deleteCardsTitle, 1));
+ builder.setMessage(getResources().getQuantityString(R.plurals.deleteCardsConfirmation, 1, 1));
+ builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
+ Log.e(TAG, "Deleting card: " + loyaltyCardId);
- DBHelper db = new DBHelper(LoyaltyCardEditActivity.this);
- db.deleteLoyaltyCard(loyaltyCardId);
+ DBHelper db = new DBHelper(LoyaltyCardEditActivity.this);
+ db.deleteLoyaltyCard(loyaltyCardId);
- ShortcutHelper.removeShortcut(LoyaltyCardEditActivity.this, loyaltyCardId);
+ ShortcutHelper.removeShortcut(LoyaltyCardEditActivity.this, loyaltyCardId);
- finish();
- dialog.dismiss();
- }
- });
- builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener()
- {
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- dialog.dismiss();
- }
+ finish();
+ dialog.dismiss();
});
+ builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
AlertDialog dialog = builder.create();
dialog.show();
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index 152b264bb..bbd060ab2 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -25,6 +25,7 @@ import com.google.android.material.tabs.TabLayout;
import java.io.UnsupportedEncodingException;
import java.util.List;
+import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.view.ActionMode;
import androidx.appcompat.widget.SearchView;
@@ -50,8 +51,7 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback()
{
@Override
- public boolean onCreateActionMode(ActionMode inputMode, Menu inputMenu)
- {
+ public boolean onCreateActionMode(ActionMode inputMode, Menu inputMenu) {
inputMode.getMenuInflater().inflate(R.menu.card_longclick_menu, inputMenu);
return true;
}
@@ -63,10 +63,8 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
}
@Override
- public boolean onActionItemClicked(ActionMode inputMode, MenuItem inputItem)
- {
- if (inputItem.getItemId() == R.id.action_copy_to_clipboard)
- {
+ public boolean onActionItemClicked(ActionMode inputMode, MenuItem inputItem) {
+ if (inputItem.getItemId() == R.id.action_copy_to_clipboard) {
ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
String clipboardData;
@@ -94,9 +92,7 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
Toast.makeText(MainActivity.this, cardCount > 1 ? R.string.copy_to_clipboard_multiple_toast : R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
inputMode.finish();
return true;
- }
- else if (inputItem.getItemId() == R.id.action_share)
- {
+ } else if (inputItem.getItemId() == R.id.action_share) {
final ImportURIHelper importURIHelper = new ImportURIHelper(MainActivity.this);
try {
importURIHelper.startShareIntent(mAdapter.getSelectedItems());
@@ -106,9 +102,7 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
}
inputMode.finish();
return true;
- }
- else if(inputItem.getItemId() == R.id.action_edit)
- {
+ } else if(inputItem.getItemId() == R.id.action_edit) {
if (mAdapter.getSelectedItemCount() != 1) {
throw new IllegalArgumentException("Cannot edit more than 1 card at a time");
}
@@ -120,6 +114,32 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
intent.putExtras(bundle);
startActivity(intent);
inputMode.finish();
+ return true;
+ } else if(inputItem.getItemId() == R.id.action_delete) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+ builder.setTitle(getResources().getQuantityString(R.plurals.deleteCardsTitle, mAdapter.getSelectedItemCount()));
+ builder.setMessage(getResources().getQuantityString(R.plurals.deleteCardsConfirmation, mAdapter.getSelectedItemCount(), mAdapter.getSelectedItemCount()));
+ builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
+ DBHelper db = new DBHelper(MainActivity.this);
+
+ for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+ Log.e(TAG, "Deleting card: " + loyaltyCard.id);
+
+ db.deleteLoyaltyCard(loyaltyCard.id);
+
+ ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
+ }
+
+ TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
+
+ updateLoyaltyCardList(mFilter, tab != null ? tab.getTag() : null);
+
+ dialog.dismiss();
+ });
+ builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+ AlertDialog dialog = builder.create();
+ dialog.show();
+
return true;
}
diff --git a/app/src/main/res/menu/card_longclick_menu.xml b/app/src/main/res/menu/card_longclick_menu.xml
index 2e23a87de..54ea4b6a5 100644
--- a/app/src/main/res/menu/card_longclick_menu.xml
+++ b/app/src/main/res/menu/card_longclick_menu.xml
@@ -7,20 +7,27 @@
android:title="@string/copy_to_clipboard"
android:icon="@drawable/ic_copy"
android:titleCondensed="@string/copy_to_clipboard"
- app:showAsAction="always"/>
+ app:showAsAction="ifRoom"/>
- Delete Card
+ - Delete Cards
+
+
+ - Are you sure you want to permanently delete this card? This cannot be undone.
+ - Are you sure you want to permanently delete these %d cards? This cannot be undone.
+
OK
Copy ID to clipboard
Share