diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt index dd70d1d9..cf3414de 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt @@ -5,10 +5,9 @@ import net.pokeranalytics.android.R import net.pokeranalytics.android.exceptions.FormattingException import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.util.Preferences +import net.pokeranalytics.android.util.FormatUtils import net.pokeranalytics.android.util.formatted import net.pokeranalytics.android.util.toMinutes -import java.text.NumberFormat /** * An enum representing all the types of Session statistics @@ -131,9 +130,7 @@ class ComputedStat(stat: Stat, value: Double) { // Amounts + red/green Stat.NETRESULT, Stat.HOURLY_RATE, Stat.AVERAGE, Stat.NET_BB_PER_100_HANDS, Stat.HOURLY_RATE_BB, Stat.AVERAGE_NET_BB -> { - val numberFormat = NumberFormat.getCurrencyInstance(Preferences.getCurrencyLocale(context)) - numberFormat.minimumFractionDigits = 0 - numberFormat.maximumFractionDigits = 2 + val numberFormat= FormatUtils.getCurrencyFormatter(context) val color = if (this.value >= this.stat.threshold) R.color.green else R.color.red return TextFormat(numberFormat.format(this.value), color) } // white integers @@ -149,9 +146,7 @@ class ComputedStat(stat: Stat, value: Double) { } // white amounts Stat.AVERAGE_BUYIN, Stat.STANDARD_DEVIATION, Stat.STANDARD_DEVIATION_HOURLY, Stat.STANDARD_DEVIATION_BB_PER_100_HANDS -> { - val numberFormat = NumberFormat.getCurrencyInstance(Preferences.getCurrencyLocale(context)) - numberFormat.minimumFractionDigits = 0 - numberFormat.maximumFractionDigits = 2 + val numberFormat= FormatUtils.getCurrencyFormatter(context) return TextFormat(numberFormat.format(this.value)) } else -> throw FormattingException("Stat formatting of ${this.stat.name} not handled") diff --git a/app/src/main/java/net/pokeranalytics/android/util/FormatUtils.kt b/app/src/main/java/net/pokeranalytics/android/util/FormatUtils.kt new file mode 100644 index 00000000..69620ad8 --- /dev/null +++ b/app/src/main/java/net/pokeranalytics/android/util/FormatUtils.kt @@ -0,0 +1,20 @@ +package net.pokeranalytics.android.util + +import android.content.Context +import java.text.NumberFormat + +class FormatUtils { + + companion object { + + fun getCurrencyFormatter(context: Context) : NumberFormat { + var formatter = NumberFormat.getCurrencyInstance(Preferences.getCurrencyLocale(context)) + formatter.minimumFractionDigits = 0 + formatter.maximumFractionDigits = 2 + return formatter + } + + } + + +} \ No newline at end of file