diff --git a/app/src/main/java/net/pokeranalytics/android/model/handhistory/HandSetup.kt b/app/src/main/java/net/pokeranalytics/android/model/handhistory/HandSetup.kt
index 403e6187..dba24761 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/handhistory/HandSetup.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/handhistory/HandSetup.kt
@@ -6,7 +6,6 @@ import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.model.realm.handhistory.HandHistory
import net.pokeranalytics.android.util.extensions.findById
import timber.log.Timber
-import java.util.*
class HandSetup {
@@ -79,6 +78,7 @@ class HandSetup {
}
this.type = session.sessionType
this.blinds = session.cgBlinds
+ this.ante = session.cgAnte
this.tableSize = session.tableSize
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStakesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStakesFragment.kt
index 359403b2..60c6b70d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStakesFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStakesFragment.kt
@@ -13,6 +13,7 @@ import net.pokeranalytics.android.databinding.BottomSheetStakesBinding
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorException
import java.text.NumberFormat
+import java.text.ParseException
class BottomSheetStakesFragment : BottomSheetFragment() {
@@ -80,23 +81,23 @@ class BottomSheetStakesFragment : BottomSheetFragment() {
throw RowRepresentableEditDescriptorException("RowRepresentableEditDescriptor inconsistency")
}
+ // Ante
val anteED = data[0]
- val blindsED = data[1]
-
- blindsED.defaultValue?.let {
- binding.blindsEditText.hint = it as? String
- } ?: run {
- blindsED.hintResId?.let { binding.blindsEditText.hint = getString(it) }
- }
-
anteED.defaultValue?.let {
- binding.anteEditText.hint = it as? String
+ binding.anteEditText.hint = NumberFormat.getInstance().format(it as Double)
} ?: run {
anteED.hintResId?.let { binding.anteEditText.hint = getString(it) }
}
- binding.anteEditText.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
+ binding.anteEditText.inputType = anteED.inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
+ // Blinds
+ val blindsED = data[1]
+ blindsED.defaultValue?.let {
+ binding.blindsEditText.hint = it as? String
+ } ?: run {
+ blindsED.hintResId?.let { binding.blindsEditText.hint = getString(it) }
+ }
// data[0].hintResId?.let { binding.anteEditText.hint = getString(it) }
// data[1].hintResId?.let { binding.blindsEditText.hint = getString(it) }
@@ -156,7 +157,13 @@ class BottomSheetStakesFragment : BottomSheetFragment() {
binding.anteEditText.addTextChangedListener { text ->
text?.let {
- this.model.ante = NumberFormat.getInstance().parse(it.toString())?.toDouble()
+
+ val ante = try {
+ NumberFormat.getInstance().parse(it.toString())
+ } catch(e: ParseException) {
+ null
+ }
+ this.model.ante = ante?.toDouble()
}
}
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index dd3b4830..ab9ff401 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -529,7 +529,7 @@
Jetons
Tapis initial (en grosses blindes)
Tapis
- Montants
+ Mises
Standard
Ecart type
Démarrer