From 2f33be6b3c46ee4abb177f4912e2886556c8d548 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 17 Sep 2023 17:20:32 +0200
Subject: [PATCH] Improve validation

If a field is empty when it shouldn't be, show it at the correct UI
element and focus
---
 .../card_locker/LoyaltyCardEditActivity.java  | 46 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index d20e19e1a..b6204fd0f 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -261,7 +261,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                 + ", updateLoyaltyCard=" + updateLoyaltyCard);
     }
 
-
     @Override
     public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
         super.onSaveInstanceState(savedInstanceState);
@@ -367,6 +366,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 updateTempState(LoyaltyCardField.store, s.toString());
                 generateIcon(s.toString());
+
+                if (s.length() == 0) {
+                    storeFieldEdit.setError(getString(R.string.field_may_not_be_empty));
+                } else {
+                    storeFieldEdit.setError(null);
+                }
             }
         });
 
@@ -488,6 +493,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 updateTempState(LoyaltyCardField.cardId, s.toString());
+
+                if (s.length() == 0) {
+                    cardIdFieldView.setError(getString(R.string.field_may_not_be_empty));
+                } else {
+                    cardIdFieldView.setError(null);
+                }
             }
         });
 
@@ -1471,18 +1482,41 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             return;
         }
 
+        boolean hasError = false;
+
         if (tempLoyaltyCard.store.isEmpty()) {
-            Snackbar.make(storeFieldEdit, R.string.noStoreError, Snackbar.LENGTH_LONG).show();
-            return;
+            storeFieldEdit.setError(getString(R.string.field_may_not_be_empty));
+
+            // Focus element
+            tabs.selectTab(tabs.getTabAt(0));
+            storeFieldEdit.requestFocus();
+
+            hasError = true;
         }
 
         if (tempLoyaltyCard.cardId.isEmpty()) {
-            Snackbar.make(cardIdFieldView, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
-            return;
+            cardIdFieldView.setError(getString(R.string.field_may_not_be_empty));
+
+            // Focus element if first error element
+            if (!hasError) {
+                tabs.selectTab(tabs.getTabAt(0));
+                cardIdFieldView.requestFocus();
+                hasError = true;
+            }
         }
 
         if (!validBalance) {
-            Snackbar.make(balanceField, getString(R.string.parsingBalanceFailed, balanceField.getText().toString()), Snackbar.LENGTH_LONG).show();
+            balanceField.setError(getString(R.string.parsingBalanceFailed, balanceField.getText().toString()));
+
+            // Focus element if first error element
+            if (!hasError) {
+                tabs.selectTab(tabs.getTabAt(1));
+                balanceField.requestFocus();
+                hasError = true;
+            }
+        }
+
+        if (hasError) {
             return;
         }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6c33f820f..65007d175 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -333,4 +333,5 @@
     <string name="action_display_options">Display options</string>
     <string name="show_archived_cards">Show archived cards</string>
     <string name="view_online">View online</string>
+    <string name="field_may_not_be_empty">Field may not be empty</string>
 </resources>