From 090a44d34e865707a47b8c420fcf67071a470bb6 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 25 Jun 2020 12:19:46 +0200 Subject: [PATCH] Fixes number parsing --- .../android/ui/modules/handhistory/HandHistoryFragment.kt | 6 +++--- .../ui/modules/handhistory/model/HandHistoryViewModel.kt | 6 +++++- app/src/main/res/menu/toolbar_hand_history.xml | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt index a25482f9..0e92e503 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt @@ -210,12 +210,12 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL * Update menu UI */ private fun updateMenuUI() { - val titleResId = if (this.model.isEdited) R.string.save else R.string.edit - val iconResId = if (this.model.isEdited) R.drawable.ic_baseline_save else R.drawable.ic_edit +// val titleResId = if (this.model.isEdited) R.string.save else R.string.edit + val iconResId = if (this.model.isEdited) R.drawable.ic_check else R.drawable.ic_edit this.menu?.let { menu -> menu.findItem(R.id.edit_save)?.let { - it.setTitle(titleResId) +// it.setTitle(titleResId) it.setIcon(iconResId) } this.replayerItem = menu.findItem(R.id.replayer) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt index 6d7e7f7c..4e49c679 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt @@ -29,6 +29,7 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepres import net.pokeranalytics.android.util.extensions.findById import net.pokeranalytics.android.util.extensions.formatted import timber.log.Timber +import java.text.DecimalFormat import kotlin.coroutines.CoroutineContext import kotlin.reflect.KClass @@ -521,7 +522,10 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra // } val amount = try { - this.currentAmount?.toDouble() + this.currentAmount?.let { + DecimalFormat.getNumberInstance().parse(it).toDouble() + } +// this.currentAmount?.toDouble() } catch (e: NumberFormatException) { Timber.w("Parsing exception: ${e.message}") return diff --git a/app/src/main/res/menu/toolbar_hand_history.xml b/app/src/main/res/menu/toolbar_hand_history.xml index 52f2c4ca..1c68d8bd 100644 --- a/app/src/main/res/menu/toolbar_hand_history.xml +++ b/app/src/main/res/menu/toolbar_hand_history.xml @@ -10,7 +10,7 @@