Cleanups

Author: TheLastProject

app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java

@@ -708,13 +708,10 @@ protected void onResume() {
             AlertDialog.Builder builder = new MaterialAlertDialogBuilder(LoyaltyCardViewActivity.this);
             builder.setTitle(R.string.cardId);
             builder.setView(cardIdView);
-            builder.setPositiveButton(R.string.copy_value, (dialog, which) -> {
-                ClipboardManager cm = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-                cm.setPrimaryClip(ClipData.newPlainText("QR value", loyaltyCard.cardId));
-                // Optional app toast; comment out if you rely on Android's privacy toast only
-                Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show();
+            builder.setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss());
+            builder.setNeutralButton(R.string.copy_value, (dialog, which) -> {
+                copyValueToClipboard();
             });
-            builder.setNegativeButton(android.R.string.ok, (dialog, which) -> dialog.dismiss());
             AlertDialog dialog = builder.create();
             dialog.show();
         });
@@ -924,9 +921,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
             AlertDialog dialog = builder.create();
             dialog.show();
 
-            return true;
-        } else if (id == R.id.action_copy_value) {
-            copyValueToClipboard();          // <— helper you added earlier
             return true;
         }
 
@@ -1271,10 +1265,9 @@ private void copyValueToClipboard() {
         }
 
         ClipboardManager cm = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-        ClipData clip = ClipData.newPlainText("Card value", value);
+        ClipData clip = ClipData.newPlainText(getString(R.string.cardId), value);
         cm.setPrimaryClip(clip);
 
         Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show();
     }
-
 }

app/src/main/res/drawable/baseline_content_copy_24.xml

@@ -27,11 +27,6 @@
                 android:title="@string/duplicateCard"
                 app:showAsAction="never" />
 
-            <item
-                android:id="@+id/action_copy_value"
-                android:title="@string/copy_value"
-                app:showAsAction="ifRoom" />
-
             <item
                 android:id="@+id/action_archive"
                 android:title="@string/archive"