diff --git a/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt b/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt index d442c970..c27b1d8a 100644 --- a/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt +++ b/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt @@ -46,47 +46,6 @@ class CurrencyRepository(val context: Context) { } } - fun getFlag(currencySymbol: String): String { - return when (currencySymbol) { - "EUR" -> "\uD83C\uDDEA\uD83C\uDDFA" // European Union - "USD" -> "\uD83C\uDDFA\uD83C\uDDF8" // United States - "JPY" -> "\uD83C\uDDEF\uD83C\uDDF5" // Japan - "GBP" -> "\uD83C\uDDEC\uD83C\uDDE7" // United Kingdom - "AUD" -> "\uD83C\uDDE6\uD83C\uDDFA" // Australia - "CAD" -> "\uD83C\uDDE8\uD83C\uDDE6" // Canada - "CHF" -> "\uD83C\uDDE8\uD83C\uDDED" // Switzerland - "CNY" -> "\uD83C\uDDE8\uD83C\uDDF3" // China - "SEK" -> "\uD83C\uDDF8\uD83C\uDDEA" // Sweden - "NZD" -> "\uD83C\uDDF3\uD83C\uDDFF" // New Zealand - - "HKD" -> "\uD83C\uDDED\uD83C\uDDF0" // Hong Kong - "IDR" -> "\uD83C\uDDEE\uD83C\uDDE9" // Indonesia - "ILS" -> "\uD83C\uDDEE\uD83C\uDDF1" // Israel - "DKK" -> "\uD83C\uDDE9\uD83C\uDDF0" // Denmark - "INR" -> "\uD83C\uDDEE\uD83C\uDDF3" // India - "MXN" -> "\uD83C\uDDF2\uD83C\uDDFD" // Mexico - "CZK" -> "\uD83C\uDDE8\uD83C\uDDFF" // Czechia - "SGD" -> "\uD83C\uDDF8\uD83C\uDDEC" // Singapore - "THB" -> "\uD83C\uDDF9\uD83C\uDDED" // Thailand - "HRK" -> "\uD83C\uDDED\uD83C\uDDF7" // Croatia - "MYR" -> "\uD83C\uDDF2\uD83C\uDDFE" // Malaysia - "NOK" -> "\uD83C\uDDF3\uD83C\uDDF4" // Norway - "BGN" -> "\uD83C\uDDE7\uD83C\uDDEC" // Bulgaria - "PHP" -> "\uD83C\uDDF5\uD83C\uDDED" // Philippines - "PLN" -> "\uD83C\uDDF5\uD83C\uDDF1" // Poland - "ZAR" -> "\uD83C\uDDFF\uD83C\uDDE6" // South Africa - "ISK" -> "\uD83C\uDDEE\uD83C\uDDF8" // Iceland - "BRL" -> "\uD83C\uDDE7\uD83C\uDDF7" // Brazil - "RON" -> "\uD83C\uDDF7\uD83C\uDDF4" // Romania - "TRY" -> "\uD83C\uDDF9\uD83C\uDDF7" // Turkey - "RUB" -> "\uD83C\uDDF7\uD83C\uDDFA" // Russia - "KRW" -> "\uD83C\uDDF0\uD83C\uDDF7" // South Korea - "HUF" -> "\uD83C\uDDED\uD83C\uDDFA" // Hungary - - else -> "" - } - } - suspend fun isValidCurrency(symbol: String): Boolean { return withContext(Dispatchers.IO) { AppDatabase.getInstance(context).currencyDao().exists(symbol) diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt b/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt index 8b138007..3fcc4295 100644 --- a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt +++ b/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt @@ -33,14 +33,12 @@ class CurrencyConverter(context: Context) : Converter(), KoinComponent { val currency = Currency.getInstance(symbol) ?: return formatNameFallback(symbol) val pluralCount = PluralRules.forLocale(Locale.getDefault()).select(value) text.append(currency.getName(Locale.getDefault(), Currency.PLURAL_LONG_NAME, pluralCount, booleanArrayOf(false))) - .append(" ") - .append(repository.getFlag(symbol)) return text.toString() } private fun formatNameFallback(symbol: String): String { - return "$symbol ${repository.getFlag(symbol)}" + return symbol } private fun formatValue(symbol: String, value: Double): String {