staxriver
/
poker-analytics
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ante effective

Browse Source
hh
Laurent 6 years ago
parent b2ecf5ebc7
commit 2396150123
10 changed files with 27 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      app/src/main/java/net/pokeranalytics/android/model/TableSize.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
  4. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
  5. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt
  6. 4
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
  7. 30
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
  8. 9
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
  9. 2
      app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentableEditDescriptor.kt
  10. 2
      app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt

6
app/src/main/java/net/pokeranalytics/android/model/TableSize.kt
Unescape View File

@ -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 {

4
app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
Unescape View File

@ -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) {

2
app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
Unescape View File

@ -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()

2
app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
Unescape View File

@ -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 {

2
app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt
Unescape View File

@ -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 {

4
app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
Unescape View File

@ -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 {

30
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
Unescape View File

@ -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

9
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
Unescape View File

@ -717,7 +717,8 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra
override fun editDescriptors(row: RowRepresentable): List<RowRepresentableEditDescriptor>? {
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
}
}

2
app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentableEditDescriptor.kt
Unescape View File

@ -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<RowRepresentable>? = null,
var staticData: List<RowRepresentable>? = null

2
app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt
Unescape View File

@ -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
)
)
}

Write Preview
Loading…
Cancel
Save