mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-05-11 09:33:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1371 from obfusk/currency-symbols

Browse Source 
LoyaltyCardEditActivity: work around Currency.getSymbol() bug
This commit is contained in:
Sylvia van Os
2023-06-22 19:58:17 +02:00
committed by GitHub
parent 827d5ba3f9 7c766d0832
commit 0b188f2ba7
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,6 +175,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
boolean validBalance = true;
HashMap<String, Currency> currencies = new HashMap<>();
HashMap<String, String> currencySymbols = new HashMap<>();
LoyaltyCard tempLoyaltyCard;
@@ -329,6 +330,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
for (Currency currency : Currency.getAvailableCurrencies()) {
currencies.put(currency.getSymbol(), currency);
currencySymbols.put(currency.getCurrencyCode(), currency.getSymbol());
}
tabs = binding.tabs;
@@ -1011,7 +1013,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
if (balanceType == null) {
balanceCurrencyField.setText(getString(R.string.points));
} else {
balanceCurrencyField.setText(balanceType.getSymbol());
balanceCurrencyField.setText(getCurrencySymbol(balanceType));
}
}
@@ -1639,11 +1641,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
private void currencyPrioritizeLocaleSymbols(ArrayList<String> currencyList, Locale locale) {
try {
String currencySymbol = Currency.getInstance(locale).getSymbol();
String currencySymbol = getCurrencySymbol(Currency.getInstance(locale));
currencyList.remove(currencySymbol);
currencyList.add(0, currencySymbol);
} catch (IllegalArgumentException e) {
Log.d(TAG, "Could not get currency data for locale info: " + e);
}
}
private String getCurrencySymbol(final Currency currency) {
// Workaround for Android bug where the output of Currency.getSymbol() changes.
return currencySymbols.get(currency.getCurrencyCode());
}
}