fix issue with main currency use & refresh

csv
Razmig Sarkissian 6 years ago
parent adb901879f
commit 2d37fb6b73
  1. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
  2. 11
      app/src/main/java/net/pokeranalytics/android/util/extensions/CurrencyExtensions.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt

@ -85,7 +85,10 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
initData() initData()
initUI() initUI()
}
override fun onResume() {
super.onResume()
launchStatComputation() launchStatComputation()
} }

@ -1,11 +0,0 @@
package net.pokeranalytics.android.util.extensions
import net.pokeranalytics.android.util.UserDefaults
import java.util.*
val Currency.locale : Locale
get() =
UserDefaults.availableCurrencyLocales.filter {
Currency.getInstance(it).currencyCode == this.currencyCode
}.firstOrNull() ?: Locale.getDefault()

@ -55,6 +55,8 @@ fun Double.toCurrency(currency: Currency? = null): String {
val currencyFormatter = NumberFormat.getCurrencyInstance(Locale.getDefault()) val currencyFormatter = NumberFormat.getCurrencyInstance(Locale.getDefault())
currency?.let { currency?.let {
currencyFormatter.currency = currency currencyFormatter.currency = currency
} ?: run {
currencyFormatter.currency = UserDefaults.currency
} }
currencyFormatter.maximumFractionDigits = 2 currencyFormatter.maximumFractionDigits = 2

Loading…
Cancel
Save