Fixes number parsing

hh
Laurent 5 years ago
parent 23728de185
commit 090a44d34e
  1. 6
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
  2. 6
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
  3. 2
      app/src/main/res/menu/toolbar_hand_history.xml

@ -210,12 +210,12 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
* Update menu UI * Update menu UI
*/ */
private fun updateMenuUI() { private fun updateMenuUI() {
val titleResId = if (this.model.isEdited) R.string.save else R.string.edit // 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 iconResId = if (this.model.isEdited) R.drawable.ic_check else R.drawable.ic_edit
this.menu?.let { menu -> this.menu?.let { menu ->
menu.findItem(R.id.edit_save)?.let { menu.findItem(R.id.edit_save)?.let {
it.setTitle(titleResId) // it.setTitle(titleResId)
it.setIcon(iconResId) it.setIcon(iconResId)
} }
this.replayerItem = menu.findItem(R.id.replayer) this.replayerItem = menu.findItem(R.id.replayer)

@ -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.findById
import net.pokeranalytics.android.util.extensions.formatted import net.pokeranalytics.android.util.extensions.formatted
import timber.log.Timber import timber.log.Timber
import java.text.DecimalFormat
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext
import kotlin.reflect.KClass import kotlin.reflect.KClass
@ -521,7 +522,10 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra
// } // }
val amount = try { val amount = try {
this.currentAmount?.toDouble() this.currentAmount?.let {
DecimalFormat.getNumberInstance().parse(it).toDouble()
}
// this.currentAmount?.toDouble()
} catch (e: NumberFormatException) { } catch (e: NumberFormatException) {
Timber.w("Parsing exception: ${e.message}") Timber.w("Parsing exception: ${e.message}")
return return

@ -10,7 +10,7 @@
<item <item
android:id="@+id/edit_save" android:id="@+id/edit_save"
android:icon="@drawable/ic_baseline_save" android:icon="@drawable/ic_check"
android:title="@string/save" android:title="@string/save"
app:showAsAction="always" /> app:showAsAction="always" />

Loading…
Cancel
Save