mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-05-19 14:22:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Balance validation fixes

Browse Source 
Remove old string which may sometimes display "does not seem like a
valid balance." and default to 0 as balance if field is emptied.
This commit is contained in:
Sylvia van Os
2023-09-17 17:59:42 +02:00
parent c3daa1cc86
commit 4aa56a55fe
32 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
View File

@@ -403,6 +403,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
balanceField.setOnFocusChangeListener((v, hasFocus) -> {
if (!hasFocus && !onResuming && !onRestoring) {
if (balanceField.getText().toString().isEmpty()) {
updateTempState(LoyaltyCardField.balance, BigDecimal.valueOf(0));
}
balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(tempLoyaltyCard.balance, tempLoyaltyCard.balanceType));
}
});
@@ -414,10 +418,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
try {
BigDecimal balance = Utils.parseBalance(s.toString(), tempLoyaltyCard.balanceType);
updateTempState(LoyaltyCardField.balance, balance);
balanceField.setError(null);
validBalance = true;
} catch (ParseException e) {
validBalance = false;
e.printStackTrace();
balanceField.setError(getString(R.string.balanceParsingFailed));
validBalance = false;
}
}
});
@@ -1506,7 +1512,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
}
if (!validBalance) {
balanceField.setError(getString(R.string.parsingBalanceFailed, balanceField.getText().toString()));
balanceField.setError(getString(R.string.balanceParsingFailed));
// Focus element if first error element
if (!hasError) {