From 3c8ca3171aae8803287f4cff76db534c80a81b3e Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Tue, 19 Feb 2019 08:54:19 +0100 Subject: [PATCH] Add double edit text management --- .../android/ui/fragment/NewSessionFragment.kt | 8 ++++++++ .../BottomSheetDoubleEditTextFragment.kt | 19 +++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt index bb8fce4f..ae0c5d3c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt @@ -52,6 +52,10 @@ class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, BottomS SessionRow.GAME -> currentSession.game = null SessionRow.BANKROLL -> currentSession.bankroll = null SessionRow.LOCATION -> currentSession.location = null + SessionRow.BLINDS -> { + currentSession.cgSmallBlind = null + currentSession.cgBigBlind = null + } } sessionAdapter.notifyItemChanged(SessionRow.values().indexOf(row)) } @@ -65,6 +69,10 @@ class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, BottomS SessionRow.GAME -> if (value is Game) currentSession.game = value SessionRow.BANKROLL -> if (value is Bankroll) currentSession.bankroll = value SessionRow.LOCATION -> if (value is Location) currentSession.location = value + SessionRow.BLINDS -> if (value is ArrayList<*>) { + currentSession.cgSmallBlind = (value[0] as String? ?: "0").toDouble() + currentSession.cgBigBlind = (value[1] as String? ?: "0").toDouble() + } } sessionAdapter.notifyItemChanged(SessionRow.values().indexOf(row)) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt index 38847de0..889c0ba5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.text.InputType import android.view.LayoutInflater import android.view.View +import android.view.inputmethod.EditorInfo import kotlinx.android.synthetic.main.bottom_sheet_double_edit_text.* import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.* import net.pokeranalytics.android.R @@ -35,7 +36,8 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() { val data = getData() - LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_double_edit_text, view?.bottomSheetContainer, true) + LayoutInflater.from(requireContext()) + .inflate(R.layout.bottom_sheet_double_edit_text, view?.bottomSheetContainer, true) if (data.size == 2) { @@ -46,8 +48,21 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() { editText2.hint = data[1].hint editText2.setText((data[1].defaultValue ?: "").toString()) editText2.inputType = data[1].inputType ?: InputType.TYPE_CLASS_TEXT - } + editText2.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_DONE) { + val values = ArrayList() + values.add(editText1.text.toString()) + values.add(editText2.text.toString()) + bottomSheetDelegate.setValue(values, row) + dismiss() + true + } else { + false + } + } + + } }