Skip to content

Commit fe0bb7b

Browse files
Branden ArcherBranden Archer
Branden Archer
authored and
Branden Archer
committed
Add a confirmation before deleting card
#53
1 parent 925f780 commit fe0bb7b

File tree

4 files changed

+38
-5
lines changed

4 files changed

+38
-5
lines changed

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

+28-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33

44
import android.app.Activity;
5+
import android.content.DialogInterface;
56
import android.content.Intent;
67
import android.os.Build;
78
import android.os.Bundle;
89
import android.support.design.widget.Snackbar;
910
import android.support.v7.app.ActionBar;
11+
import android.support.v7.app.AlertDialog;
1012
import android.support.v7.app.AppCompatActivity;
1113
import android.support.v7.widget.Toolbar;
1214
import android.util.Log;
@@ -291,11 +293,33 @@ public boolean onOptionsItemSelected(MenuItem item)
291293
break;
292294

293295
case R.id.action_delete:
294-
Log.e(TAG, "Deleting card: " + loyaltyCardId);
296+
AlertDialog.Builder builder = new AlertDialog.Builder(this);
297+
builder.setTitle(R.string.deleteTitle);
298+
builder.setMessage(R.string.deleteConfirmation);
299+
builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener()
300+
{
301+
@Override
302+
public void onClick(DialogInterface dialog, int which)
303+
{
304+
Log.e(TAG, "Deleting card: " + loyaltyCardId);
305+
306+
DBHelper db = new DBHelper(LoyaltyCardViewActivity.this);
307+
db.deleteLoyaltyCard(loyaltyCardId);
308+
finish();
309+
dialog.dismiss();
310+
}
311+
});
312+
builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener()
313+
{
314+
@Override
315+
public void onClick(DialogInterface dialog, int which)
316+
{
317+
dialog.dismiss();
318+
}
319+
});
320+
AlertDialog dialog = builder.create();
321+
dialog.show();
295322

296-
DBHelper db = new DBHelper(this);
297-
db.deleteLoyaltyCard(loyaltyCardId);
298-
finish();
299323
return true;
300324
case R.id.action_edit:
301325
Intent intent = new Intent(getApplicationContext(), LoyaltyCardViewActivity.class);

app/src/main/res/values-it/strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,7 @@
5454
<string name="enterBarcodeInstructions">Digita il valore del codice a barre, quindi seleziona l\'immagine che rappresenta il codice a barre che vuoi usare.</string>
5555
<string name="copy_to_clipboard">Copia ID negli appunti</string>
5656
<string name="copy_to_clipboard_toast">ID della carta copiato negli appunti</string>
57+
<string name="confirm">Conferma</string>
58+
<string name="deleteTitle">Rimuovi carta fedeltà</string>
59+
<string name="deleteConfirmation">Conferma che vuoi eliminare questa carta.</string>
5760
</resources>

app/src/main/res/values-nl/strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,7 @@
5454
<string name="enterBarcodeInstructions">Voer de waarde van de barcode in en kies daarna de afbeelding die de barcode die je wil gebruiken representeert</string>
5555
<string name="copy_to_clipboard">Kopieer het ID naar het klembord</string>
5656
<string name="copy_to_clipboard_toast">Het ID is naar het klembord gekopieerd</string>
57+
<string name="confirm">Bevestig</string>
58+
<string name="deleteConfirmation">Bevestig deze kaart te verwijderen.</string>
59+
<string name="deleteTitle">Verwijder kaart</string>
5760
</resources>

app/src/main/res/values/strings.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<string name="enterCard">Enter Card</string>
1818
<string name="edit">Edit</string>
1919
<string name="delete">Delete</string>
20+
<string name="confirm">Confirm</string>
21+
<string name="deleteTitle">Remove Loyalty Card</string>
22+
<string name="deleteConfirmation">Please confirm that you want to delete this card.</string>
2023
<string name="ok">OK</string>
2124
<string name="copy_to_clipboard">Copy ID to clipboard</string>
2225

@@ -59,4 +62,4 @@
5962

6063
<string name="copy_to_clipboard_toast">Card ID copied to clipboard</string>
6164

62-
</resources>
65+
</resources>

0 commit comments

Comments
 (0)