From dfa91af21a01f534aa8642f12173c18634017a88 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Thu, 28 Feb 2019 18:08:02 +0100
Subject: [PATCH] Fix big blind edit text

---
 .../BottomSheetDoubleEditTextFragment.kt      | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
index 044082ba..1c98f209 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
@@ -26,7 +26,12 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 
 	override fun onStart() {
 		super.onStart()
-		editText1.requestFocus()
+
+		if (isEditingBlinds) {
+			editText2.requestFocus()
+		} else {
+			editText1.requestFocus()
+		}
 	}
 
 	override fun getValue(): Any? {
@@ -57,28 +62,29 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 
 		if (data.size == 2) {
 
+			editText1.setText((data[0].defaultValue ?: "").toString())
+			editText2.setText((data[1].defaultValue ?: "").toString())
+
 			data[0].hint?.let { editText1.hint = getString(it) }
 			editText1.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
 			editText1.addTextChangedListener {
 				values[0] = it?.toString() ?: ""
-				if (isEditingBlinds) {
-					try {
-						val smallBlind = values[0].toDouble()
-						editText2.setText((smallBlind * 2).round())
-					} catch (e: Exception) {
-						editText2.setText("")
-					}
-				}
 			}
 
 			data[1].hint?.let { editText2.hint = getString(it) }
 			editText2.inputType = data[1].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
 			editText2.addTextChangedListener {
 				values[1] = it?.toString() ?: ""
+				if (isEditingBlinds) {
+					try {
+						val bigBlind = values[1].toDouble()
+						editText1.setText((bigBlind / 2.0).round())
+					} catch (e: Exception) {
+						editText1.setText("")
+					}
+				}
 			}
 
-			editText1.setText((data[0].defaultValue ?: "").toString())
-			editText2.setText((data[1].defaultValue ?: "").toString())
 
 			editText2.setOnEditorActionListener { v, actionId, _ ->
 				if (actionId == EditorInfo.IME_ACTION_DONE) {