From 2396150123000ebe5ba968503abdea258dce8ebe Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 25 Feb 2020 11:33:05 +0100 Subject: [PATCH] Make ante effective --- .../pokeranalytics/android/model/TableSize.kt | 6 +++- .../BottomSheetDoubleEditTextFragment.kt | 4 +-- .../BottomSheetEditTextFragment.kt | 2 +- .../BottomSheetEditTextMultiLinesFragment.kt | 2 +- .../BottomSheetNumericTextFragment.kt | 2 +- .../bottomsheet/BottomSheetSumFragment.kt | 4 +-- .../handhistory/HandHistoryFragment.kt | 30 ++++--------------- .../handhistory/model/HandHistoryViewModel.kt | 9 ++++-- .../ui/view/RowRepresentableEditDescriptor.kt | 2 +- .../ui/view/rowrepresentable/SessionRow.kt | 2 +- 10 files changed, 27 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/TableSize.kt b/app/src/main/java/net/pokeranalytics/android/model/TableSize.kt index 0a08d9a2..95807cb7 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/TableSize.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/TableSize.kt @@ -6,7 +6,11 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType import net.pokeranalytics.android.util.Parser -class TableSize(var numberOfPlayer: Int, var rowViewType: Int = RowViewType.TITLE_GRID.ordinal, var alternativeLabels: Boolean = true) : RowRepresentable { +class TableSize( + var numberOfPlayer: Int, + var rowViewType: Int = RowViewType.TITLE_GRID.ordinal, + var alternativeLabels: Boolean = true +) : RowRepresentable { companion object { 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 cc039a2a..23899ad8 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 @@ -56,9 +56,9 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() { // values[0] = (data[0].defaultValue ?: "").toString() // values[1] = (data[1].defaultValue ?: "").toString() - data[0].hint?.let { editText.hint = getString(it) } + data[0].hintResId?.let { editText.hint = getString(it) } editText.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES - data[1].hint?.let { editText2.hint = getString(it) } + data[1].hintResId?.let { editText2.hint = getString(it) } editText2.inputType = data[1].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES if (this.viewModel.valueAsPlaceholder) { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt index 7e1312bf..cca1a864 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt @@ -36,7 +36,7 @@ class BottomSheetEditTextFragment : BottomSheetFragment() { LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_edit_text, view?.bottomSheetContainer, true) - data[0].hint?.let { editText.hint = getString(it) } + data[0].hintResId?.let { editText.hint = getString(it) } editText.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES editText.addTextChangedListener { this.viewModel.stringValue = it?.toString() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt index 124d7347..8d82e57f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt @@ -33,7 +33,7 @@ class BottomSheetEditTextMultiLinesFragment : BottomSheetFragment() { LayoutInflater.from(requireContext()).inflate(net.pokeranalytics.android.R.layout.bottom_sheet_edit_text_multi_lines, view?.bottomSheetContainer, true) - data[0].hint?.let { editText.hint = getString(it) } + data[0].hintResId?.let { editText.hint = getString(it) } editText.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES editText.addTextChangedListener { this.viewModel.stringValue = it?.toString() } data[0].defaultValue?.let { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt index e61e1552..28753884 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt @@ -36,7 +36,7 @@ class BottomSheetNumericTextFragment : BottomSheetFragment() { LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_edit_text, view?.bottomSheetContainer, true) - data[0].hint?.let { editText.hint = getString(it) } + data[0].hintResId?.let { editText.hint = getString(it) } editText.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES editText.addTextChangedListener { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt index 66d2423e..e3ec3a1b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt @@ -88,7 +88,7 @@ class BottomSheetSumFragment : BottomSheetFragment() { } // First edit text - data[3].hint?.let { editText.hint = getString(it) } + data[3].hintResId?.let { editText.hint = getString(it) } editText.inputType = data[3].inputType ?: InputType.TYPE_CLASS_TEXT editText.addTextChangedListener { val valueToAdd = try { @@ -101,7 +101,7 @@ class BottomSheetSumFragment : BottomSheetFragment() { } // Second edit text - data[4].hint?.let { editText2.hint = getString(it) } + data[4].hintResId?.let { editText2.hint = getString(it) } editText2.inputType = data[4].inputType ?: InputType.TYPE_CLASS_TEXT editText2.addTextChangedListener { this.viewModel.doubleValue = try { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt index 15906ddf..e3976ed7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt @@ -26,7 +26,6 @@ import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheet import net.pokeranalytics.android.ui.modules.handhistory.model.* import net.pokeranalytics.android.ui.modules.handhistory.views.KeyboardListener import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager import net.pokeranalytics.android.util.extensions.findById import timber.log.Timber @@ -140,27 +139,6 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL this.animateKeyboard(false) } -// val keyboard = row.keyboardForTag(it.tag) -// when (keyboard) { -// HHKeyboard.ACTION -> { -// configureActionKeyboard() -// } -// HHKeyboard.AMOUNT -> { -// retrieveEditTextInputConnection(selection) -// } -// else -> {} -// } -// -// keyboard?.let { kb -> -//// this.animateKeyboard(true) -// this.showKeyboard(kb) { -// this.scrollToPosition(selection.index) -// } -//// this.keyboard.show(it) -// } ?: run { -// this.animateKeyboard(false) -// } - } ?: run { this.animateKeyboard(false) } @@ -275,7 +253,7 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL when (row.bottomSheetType) { // Comment, number of players BottomSheetType.NONE -> {} else -> { - val editDescriptors = listOf(RowRepresentableEditDescriptor(this.model.handHistory.comment, R.string.comment)) + val editDescriptors = this.model.editDescriptors(row) BottomSheetFragment.create(this.fragmentManager, row, this, editDescriptors, alternativeLabels = true) return } @@ -309,7 +287,11 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL } HandRowType.ANTE -> { this.model.setAnte(value as Double? ?: 0.0) - this.handHistoryAdapter.notifyItemChanged(this.indexOfRowRepresentable(row)) + this.handHistoryAdapter.notifyDataSetChanged() + } + HandRowType.BIG_BLIND_ANTE -> { + this.model.setBigBlindAnte(value as Boolean) + this.handHistoryAdapter.notifyDataSetChanged() } is ComputedAction -> { this.model.currentAmount = value as String diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt index 79e4b677..512abc0f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt @@ -717,7 +717,8 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra override fun editDescriptors(row: RowRepresentable): List? { return when (row) { - HandRowType.ANTE -> listOf(RowRepresentableEditDescriptor(defaultValue = this.handHistory.ante, inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL)) + HandRowType.COMMENT -> listOf(RowRepresentableEditDescriptor(this.handHistory.comment, R.string.comment)) + HandRowType.ANTE -> listOf(RowRepresentableEditDescriptor(inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL)) else -> null } } @@ -821,7 +822,11 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra } fun setAnte(ante: Double) { - this.handSetup.ante = ante + this.handHistory.ante = ante + } + + fun setBigBlindAnte(bigBlindAnte: Boolean) { + this.handHistory.bigBlindAnte = bigBlindAnte } } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentableEditDescriptor.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentableEditDescriptor.kt index bdb6bf4b..64226c9c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentableEditDescriptor.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentableEditDescriptor.kt @@ -7,7 +7,7 @@ import io.realm.RealmResults */ class RowRepresentableEditDescriptor( var defaultValue: Any? = null, - var hint: Int? = null, + var hintResId: Int? = null, var inputType: Int? = null, var data: RealmResults? = null, var staticData: List? = null diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt index 688e46a2..8772735e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt @@ -238,7 +238,7 @@ enum class SessionRow : RowRepresentable { BREAK_TIME -> { arrayListOf( RowRepresentableEditDescriptor( - hint = R.string.in_minutes, inputType = InputType.TYPE_CLASS_NUMBER + hintResId = R.string.in_minutes, inputType = InputType.TYPE_CLASS_NUMBER ) ) }