Really fix

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.9.1 (2021-02-23)
+
+Changes:
+
+- Improve balance parsing logic
+- Fix currency decimal display on main screen
+
 ## v1.9 (2021-02-22)
 
 Changes:

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 59
-        versionName "1.9"
+        versionCode 61
+        versionName "1.9.1"
 
         vectorDrawables.useSupportLibrary true
     }

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

@@ -214,7 +214,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 hasChanged = true;
 
                 try {
-                    BigDecimal balance = Utils.parseCurrency(s.toString());
+                    BigDecimal balance = Utils.parseCurrency(s.toString(), Utils.currencyHasDecimals((Currency) balanceCurrencyField.getTag()));
                     validBalance = true;
 
                     balanceField.setTag(balance);
@@ -246,7 +246,11 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
                 balanceCurrencyField.setTag(currency);
 
-                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol((BigDecimal) balanceField.getTag(), currency));
+                BigDecimal balance = (BigDecimal) balanceField.getTag();
+
+                if (balance != null) {
+                    balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(balance, currency));
+                }
             }
 
             @Override
@@ -366,10 +370,10 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         noteFieldEdit.setText("");
         expiryField.setTag(null);
         expiryField.setText("");
-        balanceField.setTag(null);
-        balanceField.setText("");
         balanceCurrencyField.setTag(null);
         balanceCurrencyField.setText("");
+        balanceField.setTag(null);
+        balanceField.setText("");
         cardIdFieldView.setText("");
         barcodeTypeField.setText("");
     }
@@ -409,18 +413,18 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 formatExpiryField(loyaltyCard.expiry);
             }
 
-            if(balanceField.getText().length() == 0)
-            {
-                balanceField.setTag(loyaltyCard.balance);
-                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(loyaltyCard.balance, loyaltyCard.balanceType));
-            }
-
             if(balanceCurrencyField.getText().length() == 0)
             {
                 balanceCurrencyField.setTag(loyaltyCard.balanceType);
                 formatBalanceCurrencyField(loyaltyCard.balanceType);
             }
 
+            if(balanceField.getText().length() == 0)
+            {
+                balanceField.setTag(loyaltyCard.balance);
+                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(loyaltyCard.balance, loyaltyCard.balanceType));
+            }
+
             if(cardIdFieldView.getText().length() == 0)
             {
                 cardIdFieldView.setText(loyaltyCard.cardId);

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

@@ -94,6 +94,8 @@ public class Utils {
 
         NumberFormat currencyFormat = NumberFormat.getCurrencyInstance();
         currencyFormat.setCurrency(currency);
+        currencyFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
+        currencyFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
 
         return currencyFormat.format(value);
     }
@@ -112,7 +114,21 @@ public class Utils {
         return numberFormat.format(value);
     }
 
-    static public BigDecimal parseCurrency(String value) throws NumberFormatException {
+    static public Boolean currencyHasDecimals(Currency currency) {
+        if (currency == null) {
+            return false;
+        }
+
+        return currency.getDefaultFractionDigits() != 0;
+    }
+
+    static public BigDecimal parseCurrency(String value, Boolean hasDecimals) throws NumberFormatException {
+        // If there are no decimals expected, remove all separators before parsing
+        if (!hasDecimals) {
+            value = value.replaceAll("\\.", "").replaceAll(",", "");
+            return new BigDecimal(value);
+        }
+
         // There are many ways users can write a currency, so we fix it up a bit
         // 1. Replace all commas with dots
         value = value.replace(',', '.');

app/src/test/java/protect/card_locker/UtilsTest.java

@@ -5,6 +5,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.Util;
+
+import java.math.BigDecimal;
+import java.util.Currency;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
@@ -16,21 +20,72 @@ public class UtilsTest
     @Test
     public void parseBalances()
     {
-        assertEquals("1000.00", Utils.parseCurrency("1.000.00").toPlainString());
-        assertEquals("1000.50", Utils.parseCurrency("1.000.50").toPlainString());
-        assertEquals("1000.50", Utils.parseCurrency("1.000,50").toPlainString());
-        assertEquals("1000.50", Utils.parseCurrency("1,000,50").toPlainString());
-        assertEquals("1000.50", Utils.parseCurrency("1,000.50").toPlainString());
-        assertEquals("1000", Utils.parseCurrency("1000").toPlainString());
-        assertEquals("995", Utils.parseCurrency("995").toPlainString());
-        assertEquals("9.95", Utils.parseCurrency("9.95").toPlainString());
-        assertEquals("9.95", Utils.parseCurrency("9,95").toPlainString());
+        assertEquals("1", Utils.parseCurrency("1", false).toPlainString());
 
-        assertThrows(NumberFormatException.class, () -> Utils.parseCurrency(""));
-        assertThrows(NumberFormatException.class, () -> Utils.parseCurrency("."));
-        assertThrows(NumberFormatException.class, () -> Utils.parseCurrency(","));
-        assertThrows(NumberFormatException.class, () -> Utils.parseCurrency(".,"));
-        assertThrows(NumberFormatException.class, () -> Utils.parseCurrency("a"));
-        assertThrows(NumberFormatException.class, () -> Utils.parseCurrency("......................"));
+        assertEquals("1", Utils.parseCurrency("1", true).toPlainString());
+        assertEquals("1.00", Utils.parseCurrency("1.00", true).toPlainString());
+        assertEquals("1.00", Utils.parseCurrency("1,00", true).toPlainString());
+
+        assertEquals("25", Utils.parseCurrency("2.5", false).toPlainString());
+        assertEquals("25", Utils.parseCurrency("2,5", false).toPlainString());
+        assertEquals("205", Utils.parseCurrency("2.05", false).toPlainString());
+        assertEquals("205", Utils.parseCurrency("2,05", false).toPlainString());
+
+        assertEquals("2.5", Utils.parseCurrency("2.5", true).toPlainString());
+        assertEquals("2.5", Utils.parseCurrency("2,5", true).toPlainString());
+        assertEquals("2.05", Utils.parseCurrency("2.05", true).toPlainString());
+        assertEquals("2.05", Utils.parseCurrency("2,05", true).toPlainString());
+        assertEquals("2.50", Utils.parseCurrency("2.50", true).toPlainString());
+        assertEquals("2.50", Utils.parseCurrency("2,50", true).toPlainString());
+
+        assertEquals("995", Utils.parseCurrency("9.95", false).toPlainString());
+        assertEquals("995", Utils.parseCurrency("9,95", false).toPlainString());
+
+        assertEquals("9.95", Utils.parseCurrency("9.95", true).toPlainString());
+        assertEquals("9.95", Utils.parseCurrency("9,95", true).toPlainString());
+
+        assertEquals("1234", Utils.parseCurrency("1234", false).toPlainString());
+        assertEquals("1234", Utils.parseCurrency("1.234", false).toPlainString());
+        assertEquals("1234", Utils.parseCurrency("1,234", false).toPlainString());
+
+        assertEquals("1234", Utils.parseCurrency("1234", true).toPlainString());
+        assertEquals("1234.00", Utils.parseCurrency("1234.00", true).toPlainString());
+        assertEquals("1234.00", Utils.parseCurrency("1.234.00", true).toPlainString());
+        assertEquals("1234.00", Utils.parseCurrency("1.234,00", true).toPlainString());
+        assertEquals("1234.00", Utils.parseCurrency("1,234.00", true).toPlainString());
+        assertEquals("1234.00", Utils.parseCurrency("1,234,00", true).toPlainString());
+    }
+
+    @Test
+    public void formatBalances()
+    {
+        Currency euro = Currency.getInstance("EUR");
+
+        assertEquals("1", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("1"), null));
+        assertEquals("1.00", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("1"), euro));
+
+        assertEquals("25", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("25"), null));
+        assertEquals("25.00", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("25"), euro));
+
+        assertEquals("2", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("2.5"), null));
+        assertEquals("2.50", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("2.5"), euro));
+
+        assertEquals("2", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("2.05"), null));
+        assertEquals("2.05", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("2.05"), euro));
+
+        assertEquals("2", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("2.50"), null));
+        assertEquals("2.50", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("2.50"), euro));
+
+        assertEquals("995", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("995"), null));
+        assertEquals("995.00", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("995"), euro));
+
+        assertEquals("10", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("9.95"), null));
+        assertEquals("9.95", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("9.95"), euro));
+
+        assertEquals("1,234", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("1234"), null));
+        assertEquals("1,234.00", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("1234"), euro));
+
+        assertEquals("1,234", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("1234.00"), null));
+        assertEquals("1,234.00", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("1234.00"), euro));
     }
 }