mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-03-31 05:41:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Really fix

Browse Source
This commit is contained in:
Sylvia van Os
2021-02-23 20:55:01 +01:00
parent b265fadec3
commit bc808d3045
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@
Changes:
- Improve balance parsing logic
- Fix currency decimal display on main screen
## v1.9 (2021-02-22)

2
app/build.gradle
View File

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

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

@@ -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);

2
app/src/main/java/protect/card_locker/Utils.java
View File

@@ -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);
}