diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt index 6e5604ff..8079f8e9 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt @@ -19,6 +19,7 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepres import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow import net.pokeranalytics.android.util.NULL_TEXT import net.pokeranalytics.android.util.Preferences +import net.pokeranalytics.android.util.UserDefaults import net.pokeranalytics.android.util.extensions.toRate import retrofit2.Call import retrofit2.Response @@ -145,7 +146,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS */ private fun initData() { - defaultCurrency = Currency.getInstance(Preferences.getCurrencyLocale(this.parentActivity)) + defaultCurrency = UserDefaults.currency if (!isUpdating) { bankroll.currency = net.pokeranalytics.android.model.realm.Currency() diff --git a/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt b/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt index 4c81b519..cfc53b7f 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt @@ -49,7 +49,7 @@ class Preferences { return getString(Keys.CURRENCY_CODE, context) } - fun getCurrencyLocale(context : Context) : Locale? { + private fun getCurrencyLocale(context : Context) : Locale? { getCurrencyCode(context)?.let { currencyCode -> Locale.getAvailableLocales().filter { try { @@ -90,11 +90,9 @@ class UserDefaults private constructor(context: Context) { companion object : SingletonHolder(::UserDefaults) { lateinit var currency : Currency - var currencyLocale : Locale? = null fun setCurrencyValues(context: Context) { currency = Preferences.getDefaultCurrency(context) ?: getLocaleCurrency() - currencyLocale = Preferences.getCurrencyLocale(context) } /** diff --git a/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt b/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt index 0b7d22e6..5e2bb841 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt @@ -24,7 +24,7 @@ fun Double.formatted(): String { fun Double.toCurrency(currency: Currency? = null): String { - val currencyFormatter = UserDefaults.currencyLocale?.let { NumberFormat.getCurrencyInstance(it) } ?: run { NumberFormat.getCurrencyInstance() } + val currencyFormatter = NumberFormat.getCurrencyInstance() currency?.let { currencyFormatter.currency = currency }