From 02fb44056ac9a1a4123792637bd63f424521e615 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Tue, 12 Jul 2022 16:10:47 +0200
Subject: [PATCH] Fixes

---
 .../android/model/realm/Session.kt            |  9 ++-
 .../bottomsheet/BottomSheetStakesFragment.kt  | 59 ++++++++++++-------
 2 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index 598d12c6..dc0b18bd 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -763,8 +763,13 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			SessionPropertiesRow.BANKROLL -> bankroll = value as Bankroll?
 			SessionPropertiesRow.STAKES -> if (value is Stakes) {
 
-				this.cgAnte = value.ante
-				this.cgBlinds = value.blinds
+				if (value.ante != null) {
+					this.cgAnte = value.ante
+				}
+
+				if (value.blinds != null) {
+					this.cgBlinds = value.blinds
+				}
 
 //				cgSmallBlind = try {
 //					(value[0] as String? ?: "0").toDouble()
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 6bc986a6..359403b2 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
@@ -80,9 +80,30 @@ class BottomSheetStakesFragment : BottomSheetFragment() {
             throw RowRepresentableEditDescriptorException("RowRepresentableEditDescriptor inconsistency")
         }
 
-        data[0].hintResId?.let { binding.anteEditText.hint = getString(it) }
+        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
+        } ?: 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
-        data[1].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) }
+
+
+
+
 
 //        binding.editText2.setRawInputType(InputType.TYPE_CLASS_TEXT)  //= InputType.TYPE_NULL // data[1].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
 //        binding.editText2.inputType = InputType.TYPE_NULL
@@ -116,24 +137,22 @@ class BottomSheetStakesFragment : BottomSheetFragment() {
 
         } ?: throw PAIllegalStateException("No connection for editText")
 
-        if (this.model.valueAsHint) {
-
-            this.model.stringValue?.let {
-                if (it.isNotBlank()) {
-                    binding.anteEditText.hint = it
-                }
-            }
-            this.model.secondStringValue?.let {
-                if (it.isNotBlank()) {
-                    binding.blindsEditText.hint = it
-                }
-            }
-//            if (this.viewModel.stringValue?.isNotBlank()) { editText.hint = values[0] }
-//            if (values[1].isNotBlank()) { editText2.hint = values[1] }
-        } else {
-            binding.anteEditText.setText(this.model.stringValue)
-            binding.blindsEditText.setText(this.model.secondStringValue)
-        }
+//        if (this.model.valueAsHint) {
+//
+//            this.model.ante?.let {
+//                binding.anteEditText.hint = NumberFormat.getInstance().format(it)
+//            }
+//            this.model.stringValue?.let {
+//                if (it.isNotBlank()) {
+//                    binding.blindsEditText.hint = it
+//                }
+//            }
+////            if (this.viewModel.stringValue?.isNotBlank()) { editText.hint = values[0] }
+////            if (values[1].isNotBlank()) { editText2.hint = values[1] }
+//        } else {
+//            binding.anteEditText.setText(this.model.stringValue)
+//            binding.blindsEditText.setText(this.model.secondStringValue)
+//        }
 
         binding.anteEditText.addTextChangedListener { text ->
             text?.let {