Skip to content

Commit c57653c

Browse files
shanavas123shanavas123
committed
fix Albania Currency issues
1 parent 3cebac7 commit c57653c

File tree

3 files changed

+96
-96
lines changed

3 files changed

+96
-96
lines changed

‎commonui/src/main/java/com/hyperwallet/android/ui/common/util/CurrencyParser.java‎

Lines changed: 91 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class CurrencyParser {
2424
private static CurrencyParser instance;
2525
private static final String CURRENCY_LIST = "currency.json";
2626
private final List<CurrencyDetails> currencyList;
27-
private final HashMap<String, LocalDetails> localeList = new HashMap<>();
27+
private final HashMap<String, LocaleDetails> localeList = new HashMap<>();
2828
private static final String REGEX_REMOVE_EMPTY_SPACE = "^\\s+|\\s+$";
2929

3030

@@ -98,7 +98,7 @@ int getNumberOfFractionDigits(String currencyCode) {
9898
public String formatCurrencyWithSymbol(String currency, String amount) {
9999
DecimalFormat currencyFormatter;
100100
if(localeList.containsKey(currency)) {
101-
LocalDetails locale = localeList.get(currency);
101+
LocaleDetails locale = localeList.get(currency);
102102
currencyFormatter = (DecimalFormat) DecimalFormat.getCurrencyInstance((new Locale(locale.getLanguage(),locale.getCountryCode())));
103103
}else {
104104
currencyFormatter = (DecimalFormat) DecimalFormat.getCurrencyInstance();
@@ -127,97 +127,97 @@ public CurrencyDetails getCurrency(String currencyCode) {
127127
*/
128128
public void setLocaleList() {
129129
localeList.clear();
130-
localeList.put("AED",new LocalDetails("en","AE"));
131-
localeList.put("ALL",new LocalDetails("en","AL"));
132-
localeList.put("AMD",new LocalDetails("hy","AM"));
133-
localeList.put("ARS",new LocalDetails("es","AR"));
134-
localeList.put("AUD",new LocalDetails("en","AU"));
135-
localeList.put("BAM",new LocalDetails("hr","BA"));
136-
localeList.put("BDT",new LocalDetails("en","BD"));
137-
localeList.put("BGN",new LocalDetails("bg","BG"));
138-
localeList.put("BHD",new LocalDetails("en","US"));
139-
localeList.put("BOB",new LocalDetails("qu","BO"));
140-
localeList.put("BRL",new LocalDetails("en","BR"));
141-
localeList.put("BWP",new LocalDetails("en","BW"));
142-
localeList.put("CAD",new LocalDetails("en","CA"));
143-
localeList.put("CHF",new LocalDetails("en","CH"));
144-
localeList.put("CLP",new LocalDetails("es","CL"));
145-
localeList.put("CNH",new LocalDetails("en","CN"));
146-
localeList.put("CNY",new LocalDetails("en","CN"));
147-
localeList.put("COP",new LocalDetails("es","CO"));
148-
localeList.put("CZK",new LocalDetails("cs","CZ"));
149-
localeList.put("DKK",new LocalDetails("en","DK"));
150-
localeList.put("EEK",new LocalDetails("en","US"));
151-
localeList.put("EGP",new LocalDetails("en","US"));
152-
localeList.put("ETB",new LocalDetails("so","ET"));
153-
localeList.put("EUR",new LocalDetails("es","EA"));
154-
localeList.put("FJD",new LocalDetails("en","FJ"));
155-
localeList.put("GBP",new LocalDetails("kw","GB"));
156-
localeList.put("GHS",new LocalDetails("ee","GH"));
157-
localeList.put("GMD",new LocalDetails("en","GM"));
158-
localeList.put("HKD",new LocalDetails("en","HK"));
159-
localeList.put("HRK",new LocalDetails("es","HR"));
160-
localeList.put("HUF",new LocalDetails("hu","HU"));
161-
localeList.put("IDR",new LocalDetails("jv","ID"));
162-
localeList.put("ILS",new LocalDetails("he","IL"));
163-
localeList.put("INR",new LocalDetails("en","IN"));
164-
localeList.put("ISK",new LocalDetails("en","US"));
165-
localeList.put("JMD",new LocalDetails("en","JM"));
166-
localeList.put("JOD",new LocalDetails("en","us"));
167-
localeList.put("JPY",new LocalDetails("en","JP"));
168-
localeList.put("KES",new LocalDetails("guz","KE"));
169-
localeList.put("KHR",new LocalDetails("km","KH"));
170-
localeList.put("KRW",new LocalDetails("en","KR"));
171-
localeList.put("KWD",new LocalDetails("en","US"));
172-
localeList.put("KZT",new LocalDetails("ru","KZ"));
173-
localeList.put("LAK",new LocalDetails("lo","LA"));
174-
localeList.put("LKR",new LocalDetails("ta","LK"));
175-
localeList.put("LSL",new LocalDetails("en","US"));
176-
localeList.put("MAD",new LocalDetails("zgh","MA"));
177-
localeList.put("MGA",new LocalDetails("en","MG"));
178-
localeList.put("MRU",new LocalDetails("ff","MR"));
179-
localeList.put("MUR",new LocalDetails("en","MU"));
180-
localeList.put("MWK",new LocalDetails("en","MW"));
181-
localeList.put("MXN",new LocalDetails("en","MX"));
182-
localeList.put("MYR",new LocalDetails("en","MY"));
183-
localeList.put("MZN",new LocalDetails("mgh","MZ"));
184-
localeList.put("NAD",new LocalDetails("af","NA"));
185-
localeList.put("NGN",new LocalDetails("en","NG"));
186-
localeList.put("NOK",new LocalDetails("nn","NO"));
187-
localeList.put("NPR",new LocalDetails("en","US"));
188-
localeList.put("NZD",new LocalDetails("en","PN"));
189-
localeList.put("OMR",new LocalDetails("ae","OM"));
190-
localeList.put("PEN",new LocalDetails("en","PE"));
191-
localeList.put("PGK",new LocalDetails("en","PG"));
192-
localeList.put("PHP",new LocalDetails("ceb","PH"));
193-
localeList.put("PKR",new LocalDetails("en","PK"));
194-
localeList.put("PLN",new LocalDetails("pl","PL"));
195-
localeList.put("QAR",new LocalDetails("en","US"));
196-
localeList.put("RON",new LocalDetails("ro","RO"));
197-
localeList.put("RSD",new LocalDetails("sr","Latn_RS"));
198-
localeList.put("RUB",new LocalDetails("ru","RU"));
199-
localeList.put("SBD",new LocalDetails("en","SB"));
200-
localeList.put("SEK",new LocalDetails("en","SE"));
201-
localeList.put("SGD",new LocalDetails("ta","SG"));
202-
localeList.put("SVG",new LocalDetails("en","US"));
203-
localeList.put("SZL",new LocalDetails("en","SZ"));
204-
localeList.put("THB",new LocalDetails("th","TH"));
205-
localeList.put("TND",new LocalDetails("ar","TN"));
206-
localeList.put("TOP",new LocalDetails("to","TO"));
207-
localeList.put("TRY",new LocalDetails("tr","TR"));
208-
localeList.put("TWD",new LocalDetails("zh","TW"));
209-
localeList.put("UGX",new LocalDetails("cgg","UG"));
210-
localeList.put("USD",new LocalDetails("es","US"));
211-
localeList.put("UYU",new LocalDetails("es","UY"));
212-
localeList.put("VND",new LocalDetails("vi","VN"));
213-
localeList.put("VUV",new LocalDetails("en","VU"));
214-
localeList.put("WST",new LocalDetails("en","WS"));
215-
localeList.put("XPF",new LocalDetails("fr","PF"));
216-
localeList.put("ZAR",new LocalDetails("en","ZA"));
217-
localeList.put("ZMW",new LocalDetails("en","ZM"));
130+
localeList.put("AED",new LocaleDetails("en","AE"));
131+
localeList.put("ALL",new LocaleDetails("en","AL"));
132+
localeList.put("AMD",new LocaleDetails("hy","AM"));
133+
localeList.put("ARS",new LocaleDetails("es","AR"));
134+
localeList.put("AUD",new LocaleDetails("en","AU"));
135+
localeList.put("BAM",new LocaleDetails("hr","BA"));
136+
localeList.put("BDT",new LocaleDetails("en","BD"));
137+
localeList.put("BGN",new LocaleDetails("bg","BG"));
138+
localeList.put("BHD",new LocaleDetails("en","US"));
139+
localeList.put("BOB",new LocaleDetails("qu","BO"));
140+
localeList.put("BRL",new LocaleDetails("en","BR"));
141+
localeList.put("BWP",new LocaleDetails("en","BW"));
142+
localeList.put("CAD",new LocaleDetails("en","CA"));
143+
localeList.put("CHF",new LocaleDetails("en","CH"));
144+
localeList.put("CLP",new LocaleDetails("es","CL"));
145+
localeList.put("CNH",new LocaleDetails("en","CN"));
146+
localeList.put("CNY",new LocaleDetails("en","CN"));
147+
localeList.put("COP",new LocaleDetails("es","CO"));
148+
localeList.put("CZK",new LocaleDetails("cs","CZ"));
149+
localeList.put("DKK",new LocaleDetails("en","DK"));
150+
localeList.put("EEK",new LocaleDetails("en","US"));
151+
localeList.put("EGP",new LocaleDetails("en","US"));
152+
localeList.put("ETB",new LocaleDetails("so","ET"));
153+
localeList.put("EUR",new LocaleDetails("es","EA"));
154+
localeList.put("FJD",new LocaleDetails("en","FJ"));
155+
localeList.put("GBP",new LocaleDetails("kw","GB"));
156+
localeList.put("GHS",new LocaleDetails("ee","GH"));
157+
localeList.put("GMD",new LocaleDetails("en","GM"));
158+
localeList.put("HKD",new LocaleDetails("en","HK"));
159+
localeList.put("HRK",new LocaleDetails("es","HR"));
160+
localeList.put("HUF",new LocaleDetails("hu","HU"));
161+
localeList.put("IDR",new LocaleDetails("jv","ID"));
162+
localeList.put("ILS",new LocaleDetails("he","IL"));
163+
localeList.put("INR",new LocaleDetails("en","IN"));
164+
localeList.put("ISK",new LocaleDetails("en","US"));
165+
localeList.put("JMD",new LocaleDetails("en","JM"));
166+
localeList.put("JOD",new LocaleDetails("en","us"));
167+
localeList.put("JPY",new LocaleDetails("en","JP"));
168+
localeList.put("KES",new LocaleDetails("guz","KE"));
169+
localeList.put("KHR",new LocaleDetails("km","KH"));
170+
localeList.put("KRW",new LocaleDetails("en","KR"));
171+
localeList.put("KWD",new LocaleDetails("en","US"));
172+
localeList.put("KZT",new LocaleDetails("ru","KZ"));
173+
localeList.put("LAK",new LocaleDetails("lo","LA"));
174+
localeList.put("LKR",new LocaleDetails("ta","LK"));
175+
localeList.put("LSL",new LocaleDetails("en","US"));
176+
localeList.put("MAD",new LocaleDetails("zgh","MA"));
177+
localeList.put("MGA",new LocaleDetails("en","MG"));
178+
localeList.put("MRU",new LocaleDetails("ff","MR"));
179+
localeList.put("MUR",new LocaleDetails("en","MU"));
180+
localeList.put("MWK",new LocaleDetails("en","MW"));
181+
localeList.put("MXN",new LocaleDetails("en","MX"));
182+
localeList.put("MYR",new LocaleDetails("en","MY"));
183+
localeList.put("MZN",new LocaleDetails("mgh","MZ"));
184+
localeList.put("NAD",new LocaleDetails("af","NA"));
185+
localeList.put("NGN",new LocaleDetails("en","NG"));
186+
localeList.put("NOK",new LocaleDetails("nn","NO"));
187+
localeList.put("NPR",new LocaleDetails("en","US"));
188+
localeList.put("NZD",new LocaleDetails("en","PN"));
189+
localeList.put("OMR",new LocaleDetails("ae","OM"));
190+
localeList.put("PEN",new LocaleDetails("en","PE"));
191+
localeList.put("PGK",new LocaleDetails("en","PG"));
192+
localeList.put("PHP",new LocaleDetails("ceb","PH"));
193+
localeList.put("PKR",new LocaleDetails("en","PK"));
194+
localeList.put("PLN",new LocaleDetails("pl","PL"));
195+
localeList.put("QAR",new LocaleDetails("en","US"));
196+
localeList.put("RON",new LocaleDetails("ro","RO"));
197+
localeList.put("RSD",new LocaleDetails("sr","Latn_RS"));
198+
localeList.put("RUB",new LocaleDetails("ru","RU"));
199+
localeList.put("SBD",new LocaleDetails("en","SB"));
200+
localeList.put("SEK",new LocaleDetails("en","SE"));
201+
localeList.put("SGD",new LocaleDetails("ta","SG"));
202+
localeList.put("SVG",new LocaleDetails("en","US"));
203+
localeList.put("SZL",new LocaleDetails("en","SZ"));
204+
localeList.put("THB",new LocaleDetails("th","TH"));
205+
localeList.put("TND",new LocaleDetails("ar","TN"));
206+
localeList.put("TOP",new LocaleDetails("to","TO"));
207+
localeList.put("TRY",new LocaleDetails("tr","TR"));
208+
localeList.put("TWD",new LocaleDetails("zh","TW"));
209+
localeList.put("UGX",new LocaleDetails("cgg","UG"));
210+
localeList.put("USD",new LocaleDetails("es","US"));
211+
localeList.put("UYU",new LocaleDetails("es","UY"));
212+
localeList.put("VND",new LocaleDetails("vi","VN"));
213+
localeList.put("VUV",new LocaleDetails("en","VU"));
214+
localeList.put("WST",new LocaleDetails("en","WS"));
215+
localeList.put("XPF",new LocaleDetails("fr","PF"));
216+
localeList.put("ZAR",new LocaleDetails("en","ZA"));
217+
localeList.put("ZMW",new LocaleDetails("en","ZM"));
218218
}
219219

220-
public HashMap<String, LocalDetails> getLocaleList()
220+
public HashMap<String, LocaleDetails> getLocaleList()
221221
{
222222
return localeList;
223223
}

‎commonui/src/main/java/com/hyperwallet/android/ui/common/util/LocalDetails.java‎ renamed to ‎commonui/src/main/java/com/hyperwallet/android/ui/common/util/LocaleDetails.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.hyperwallet.android.ui.common.util;
22

3-
public class LocalDetails {
3+
public class LocaleDetails {
44
private String language;
55
private String countryCode;
66

7-
public LocalDetails(String language, String countryCode) {
7+
public LocaleDetails(String language, String countryCode) {
88
this.language = language;
99
this.countryCode = countryCode;
1010
}

‎transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/CreateTransferFragment.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import com.hyperwallet.android.ui.common.repository.Event;
6363
import com.hyperwallet.android.ui.common.util.CurrencyDetails;
6464
import com.hyperwallet.android.ui.common.util.CurrencyParser;
65-
import com.hyperwallet.android.ui.common.util.LocalDetails;
65+
import com.hyperwallet.android.ui.common.util.LocaleDetails;
6666
import com.hyperwallet.android.ui.common.view.OneClickListener;
6767
import com.hyperwallet.android.ui.transfer.R;
6868
import com.hyperwallet.android.ui.transfer.TransferSource;
@@ -778,10 +778,10 @@ private void showTransferSource(@NonNull final TransferSource transferSource) {
778778
}
779779

780780
private String formattedAmount(final double amount, final String currencyCode) {
781-
HashMap<String, LocalDetails> localeList = CurrencyParser.getInstance(requireContext()).getLocaleList();
781+
HashMap<String, LocaleDetails> localeList = CurrencyParser.getInstance(requireContext()).getLocaleList();
782782
DecimalFormat currencyFormatter;
783783
if(localeList.containsKey(currencyCode)) {
784-
LocalDetails locale = localeList.get(currencyCode);
784+
LocaleDetails locale = localeList.get(currencyCode);
785785
currencyFormatter = (DecimalFormat) DecimalFormat.getCurrencyInstance((new Locale(locale.getLanguage(),locale.getCountryCode())));
786786
}else {
787787
currencyFormatter = (DecimalFormat) DecimalFormat.getCurrencyInstance();

0 commit comments

Comments
 (0)