Support multi-deleting cards

2026-04-04 23:53:51 -04:00 · 2021-07-29 20:38:37 +02:00
parent cbcf1bcd99
commit d57cb307c3
25 changed files with 61 additions and 79 deletions
--- 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)

--- 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();

--- 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;
            }

--- 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"/>

    <item
        android:id="@+id/action_share"
        android:title="@string/share"
        android:icon="@drawable/ic_share"
        android:titleCondensed="@string/share"
-        app:showAsAction="always"/>
+        app:showAsAction="ifRoom"/>

    <item
        android:id="@+id/action_edit"
        android:icon="@drawable/ic_edit"
        android:title="@string/editCardTitle"
        android:titleCondensed="@string/editCardTitle"
-        app:showAsAction="always"/>
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_delete"
+        android:icon="@drawable/ic_delete_white_24dp"
+        android:title="@string/delete"
+        android:titleCondensed="@string/delete"
+        app:showAsAction="ifRoom"/>

 </menu>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -122,8 +122,6 @@
    <string name="share">Споделя</string>
    <string name="copy_to_clipboard">Копира идентификатора в междинната памет</string>
    <string name="ok">Добре</string>
-    <string name="deleteConfirmation">Потвърдете премахване на карта</string>
-    <string name="deleteTitle">Премахване на карта</string>
    <string name="importSuccessful">Картите са внесени успешно</string>
    <string name="chooseImportType">От къде ще внесете\?</string>
    <string name="importCatimaMessage">Изберете файла <i>catima.zip</i>, предварително изнесен от Catima.
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -12,8 +12,6 @@
    <string name="edit">Editovat</string>
    <string name="delete">Smazat</string>
    <string name="confirm">Potvrdit</string>
-    <string name="deleteTitle">Odstzranit věrnostní kartu</string>
-    <string name="deleteConfirmation">Opravdu chcete smazat tuto věrnostní kartu?</string>
    <string name="ok">Ano</string>
    <string name="copy_to_clipboard">Kopírovat ID do schránky</string>
    <string name="sendLabel">Odeslat&#8230;</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -16,8 +16,6 @@
    <string name="unlockScreen">Rotation zulassen</string>
    <string name="star">Zu den Favoriten hinzufügen</string>
    <string name="unstar">Aus der Favoritenliste entfernen</string>
-    <string name="deleteTitle">Karte entfernen</string>
-    <string name="deleteConfirmation">Diese Karte löschen\?</string>
    <string name="ok">OK</string>
    <string name="copy_to_clipboard">Nummer in die Zwischenablage kopieren</string>
    <string name="sendLabel">Senden …</string>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -12,8 +12,6 @@
    <string name="confirm">Επιβεβαίωση</string>
    <string name="lockScreen">Αποκλεισμός Περιστροφής</string>
    <string name="unlockScreen">Περιστροφή</string>
-    <string name="deleteTitle">Αφαίρεση Κάρτας</string>
-    <string name="deleteConfirmation">Παρακαλώ επιβεβαιώστε ότι θέλετε να διαγράψετε αυτή την κάρτα.</string>
    <string name="ok">Εντάξει</string>
    <string name="copy_to_clipboard">Αντιγραφή κωδικού στο πρόχειρο</string>
    <string name="sendLabel">Αποστολή…</string>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="deleteConfirmation">Ĉu forigi ĉi tiun karton\?</string>
-    <string name="deleteTitle">Forigi karton</string>
    <string name="barcodeNoBarcode">Strekokodo mankas al karto</string>
    <string name="delete">Forigi</string>
    <string name="noBarcode">Sen strekokodo</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -12,8 +12,6 @@
    <string name="confirm">Confirmar</string>
    <string name="lockScreen">Bloquear giro</string>
    <string name="unlockScreen">Desbloquear giro</string>
-    <string name="deleteTitle">Eliminar tarjeta</string>
-    <string name="deleteConfirmation">¿Quiere eliminar esta tarjeta\?</string>
    <string name="ok">Aceptar</string>
    <string name="copy_to_clipboard">Copiar id. en portapapeles</string>
    <string name="sendLabel">Enviar…</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -128,8 +128,6 @@
    <string name="share">Jaa</string>
    <string name="copy_to_clipboard">Kopioi ID-tunnus leikepöydälle</string>
    <string name="ok">OK</string>
-    <string name="deleteConfirmation">Poista tämä kortti\?</string>
-    <string name="deleteTitle">Poista kortti</string>
    <string name="unlockScreen">Poista kierron esto</string>
    <string name="lockScreen">Estä kierto</string>
    <string name="confirm">Vahvista</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -12,8 +12,6 @@
    <string name="confirm">Confirmer</string>
    <string name="lockScreen">Désactiver la rotation</string>
    <string name="unlockScreen">Activer la rotation</string>
-    <string name="deleteTitle">Supprimer la carte de fidélité</string>
-    <string name="deleteConfirmation">Supprimer cette carte \?</string>
    <string name="ok">OK</string>
    <string name="copy_to_clipboard">Copier le numéro dans le presse-papier</string>
    <string name="sendLabel">Envoyer…</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -15,8 +15,6 @@
    <string name="confirm">Conferma</string>
    <string name="lockScreen">Blocca rotazione</string>
    <string name="unlockScreen">Sblocca rotazione</string>
-    <string name="deleteTitle">Rimuovi carta fedeltà</string>
-    <string name="deleteConfirmation">Eliminare questa carta\?</string>
    <string name="ok">OK</string>
    <string name="copy_to_clipboard">Copia ID negli appunti</string>
    <string name="share">Condividi</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -120,8 +120,6 @@
    <string name="share">共有</string>
    <string name="copy_to_clipboard">カード番号をクリップボードにコピーする</string>
    <string name="ok">確定</string>
-    <string name="deleteConfirmation">このカードを削除しますか？</string>
-    <string name="deleteTitle">カードの削除</string>
    <string name="unlockScreen">自動回転を無効にしない</string>
    <string name="lockScreen">自動回転を無効にする</string>
    <string name="confirm">確認</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -31,8 +31,6 @@
    <string name="share">공유</string>
    <string name="copy_to_clipboard">ID를 클립보드에 복사</string>
    <string name="ok">확인</string>
-    <string name="deleteConfirmation">정말 이 카드를 삭제하시겠습니까\?</string>
-    <string name="deleteTitle">카드 제거</string>
    <string name="unlockScreen">회전 잠금 해제</string>
    <string name="lockScreen">회전 잠금</string>
    <string name="confirm">확인</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -10,8 +10,6 @@
    <string name="edit">Redaguoti</string>
    <string name="delete">Ištrinti</string>
    <string name="confirm">Patvirtinti</string>
-    <string name="deleteTitle">Panaikinti lojalumo kortelę</string>
-    <string name="deleteConfirmation">Ištrinti šią kortelę\?</string>
    <string name="ok">Gerai</string>
    <string name="copy_to_clipboard">Nukopijuoti ID į iškarpinę</string>
    <string name="editCardTitle">Redaguoti lojalumo kortelę</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -13,8 +13,6 @@
    <string name="confirm">Bekreft</string>
    <string name="lockScreen">Ingen rotering</string>
    <string name="unlockScreen">Skru på rotering</string>
-    <string name="deleteTitle">Fjern kundekort</string>
-    <string name="deleteConfirmation">Slett dette kortet\?</string>
    <string name="ok">OK</string>
    <string name="copy_to_clipboard">Kopier ID til utklippstavle</string>
    <string name="sendLabel">Send…</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -16,8 +16,6 @@
    <string name="confirm">Bevestigen</string>
    <string name="lockScreen">Draaien niet toestaan</string>
    <string name="unlockScreen">Draaien toestaan</string>
-    <string name="deleteTitle">Kaart verwijderen</string>
-    <string name="deleteConfirmation">Kaart verwijderen\?</string>
    <string name="ok">Oké</string>
    <string name="copy_to_clipboard">Kaartnummer kopiëren naar klembord</string>
    <string name="share">Delen</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -15,8 +15,6 @@
    <string name="confirm">Potwierdź</string>
    <string name="lockScreen">Zablokuj autoobracanie ekranu</string>
    <string name="unlockScreen">Odblokuj autoobracanie ekranu</string>
-    <string name="deleteTitle">Usuń kartę lojalnościową</string>
-    <string name="deleteConfirmation">Potwierdź, że chcesz usunąć tę kartę.</string>
    <string name="ok">OK</string>
    <string name="copy_to_clipboard">Skopiuj identyfikator do schowka</string>
    <string name="share">Udostępnij</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -16,8 +16,6 @@
    <string name="confirm">Подтвердить</string>
    <string name="lockScreen">Блокировать поворот экрана</string>
    <string name="unlockScreen">Автоповорот экрана</string>
-    <string name="deleteTitle">Удаление карты</string>
-    <string name="deleteConfirmation">Удалить карту\?</string>
    <string name="ok">ОК</string>
    <string name="copy_to_clipboard">Копировать номер карты</string>
    <string name="share">Переслать</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -14,8 +14,6 @@
    <string name="confirm">Potvrdiť</string>
    <string name="lockScreen">Zakázať rotáciu</string>
    <string name="unlockScreen">Povoliť rotáciu</string>
-    <string name="deleteTitle">Odstrániť kartu</string>
-    <string name="deleteConfirmation">Naozaj chcete túto kartu odstrániť?</string>
    <string name="ok">Áno</string>
    <string name="copy_to_clipboard">Kopírovať ID do schránky</string>
    <string name="sendLabel">Odoslať&#8230;</string>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -12,8 +12,6 @@
    <string name="confirm">Potrdi</string>
    <string name="lockScreen">Onemogoči obračanje zaslona</string>
    <string name="unlockScreen">Omogoči obračanje zaslona</string>
-    <string name="deleteTitle">Odstrani kartico zvestobe</string>
-    <string name="deleteConfirmation">Prosim potrdite, če želite izbrisati to kartico.</string>
    <string name="ok">Vredu</string>
    <string name="copy_to_clipboard">Kopirajte številko kartice</string>
    <string name="sendLabel">Pošlji…</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -134,8 +134,6 @@
    <string name="share">Поділитися</string>
    <string name="copy_to_clipboard">Копіювати ID до буферу обміну</string>
    <string name="ok">ОК</string>
-    <string name="deleteConfirmation">Бажаєте видалити карту\?</string>
-    <string name="deleteTitle">Видалити карту</string>
    <string name="unlockScreen">Розблокувати обертання</string>
    <string name="lockScreen">Блокувати обертання</string>
    <string name="confirm">Підтвердити</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -123,8 +123,6 @@
    <string name="share">分享</string>
    <string name="copy_to_clipboard">复制卡号到剪贴板</string>
    <string name="ok">确定</string>
-    <string name="deleteConfirmation">删除此卡？</string>
-    <string name="deleteTitle">移除卡片</string>
    <string name="unlockScreen">解除旋转锁定</string>
    <string name="lockScreen">锁定旋转</string>
    <string name="confirm">确认</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,8 +29,14 @@
    <string name="confirm">Confirm</string>
    <string name="lockScreen">Block Rotation</string>
    <string name="unlockScreen">Unblock Rotation</string>
-    <string name="deleteTitle">Remove Card</string>
-    <string name="deleteConfirmation">Delete this card?</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Delete Card</item>
+        <item quantity="other">Delete Cards</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Are you sure you want to permanently delete this card? This cannot be undone.</item>
+        <item quantity="other">Are you sure you want to permanently delete these <xliff:g>%d</xliff:g> cards? This cannot be undone.</item>
+    </plurals>
    <string name="ok">OK</string>
    <string name="copy_to_clipboard">Copy ID to clipboard</string>
    <string name="share">Share</string>