diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index da66e3c87..6f485038a 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -54,6 +54,7 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import com.google.android.material.color.MaterialColors; import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import com.google.android.material.snackbar.Snackbar; import com.google.android.material.textfield.TextInputEditText; import com.google.zxing.BarcodeFormat; @@ -72,6 +73,7 @@ import java.util.function.Predicate; import protect.card_locker.async.TaskHandler; import protect.card_locker.databinding.LoyaltyCardViewLayoutBinding; import protect.card_locker.preferences.Settings; +import protect.card_locker.preferences.SettingsActivity; public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements BarcodeImageWriterResultCallback { private LoyaltyCardViewLayoutBinding binding; @@ -683,7 +685,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this); if (nfcAdapter != null) { nfcAdapter.enableReaderMode(this, tag -> { - // Intentionally empty: pause all NFC tag discoveries + Snackbar snackbar = Snackbar.make(binding.container, R.string.nfc_blocked_while_viewing_card, Snackbar.LENGTH_LONG) + .setAnchorView(binding.fabEdit) + .setAction(R.string.change_settings, view -> { + // Open settings activity + Intent intent = new Intent(getApplicationContext(), SettingsActivity.class); + startActivity(intent); + }); + snackbar.show(); }, NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_NFC_B | NfcAdapter.FLAG_READER_NFC_F | NfcAdapter.FLAG_READER_NFC_V | NfcAdapter.FLAG_READER_NFC_BARCODE diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bb19d3d97..dec3a326a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -348,4 +348,6 @@ No value found Barcode encoding Back + NFC is paused + Change settings