From 5f30b844dc82c3d1445de206232b66c43493ebc1 Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 17 Mar 2020 11:39:24 +0100 Subject: [PATCH] cleanup, improvement and bug fix --- .../android/ui/modules/handhistory/model/ActionList.kt | 5 +++-- .../ui/modules/handhistory/model/ComputedAction.kt | 4 ---- .../ui/modules/handhistory/views/KeyboardActionView.kt | 7 ------- .../ui/modules/handhistory/views/KeyboardCardView.kt | 5 ----- .../ui/modules/handhistory/views/KeyboardContainer.kt | 9 +-------- app/src/main/res/layout/view_hand_keyboard_card.xml | 1 - app/src/main/res/values/styles.xml | 2 +- 7 files changed, 5 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt index be31784a..ad677bae 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt @@ -584,10 +584,11 @@ class ActionList(var listener: ActionListListener) : ArrayList() } /*** - * Returns all positions of the street, identified by the action at the given [index] + * Returns all positions to act in the street after the action at the given [index] */ fun positionsToActAfterIndex(index: Int): List { - val nextActions = this.drop(index + 1) + val street = this[index].street + val nextActions = this.drop(index + 1).filter { it.street == street } return nextActions.map { it.position } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt index 48ddee97..c7d5f0dd 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt @@ -233,10 +233,6 @@ class ComputedAction(var manager: ActionManager, this.setEffectiveAmount(significantAmount - committedAmount) } -// private fun getStreetSignificantActionBefore(index: Int): ComputedAction? { -// return this.manager.getStreetLastSignificantAction(this.street, index - 1) -// } - private fun getStreetLastSignificantAction(): ComputedAction? { return this.manager.getStreetLastSignificantAction(this.street, this.action.index - 1) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt index d5016d20..d26d7ba7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt @@ -91,11 +91,4 @@ class KeyboardActionView(context: Context) : AbstractKeyboardView(context), this.dataAdapter.notifyDataSetChanged() } -// override fun charSequenceForRow(row: RowRepresentable): String { -// this.context?.let { -// return row.localizedTitle(it) -// } -// return "UNKNOWN CONTEXT FOR ROW $row" -// } - } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt index b161bf38..9d48d599 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt @@ -79,9 +79,4 @@ class KeyboardCardView(context: Context) : AbstractKeyboardView(context) { } -// fun setCardCentralizer(centralizer: CardCentralizer) { -// this.cardValueAdapter.centralizer = centralizer -// this.cardSuitAdapter.centralizer = centralizer -// } - } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt index 120e5686..93c74c11 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt @@ -73,15 +73,13 @@ class KeyboardContainer : FrameLayout { } fun show(type: HHKeyboard) { -// Timber.d("show keyboard : $type") - -// showAnimated() this.keyboards[type]?.let { show(it) } ?: run { throw PAIllegalStateException("missing keyboard") } + } private fun show(keyboardView: AbstractKeyboardView) { @@ -105,9 +103,4 @@ class KeyboardContainer : FrameLayout { actionKeyboard.setAvailableActions(availableActions) } -// fun setCardCentralizer(centralizer: CardCentralizer) { -// val cardKeyboard = this.keyboards[HHKeyboard.CARD] as KeyboardCardView -// cardKeyboard.setCardCentralizer(centralizer) -// } - } \ No newline at end of file diff --git a/app/src/main/res/layout/view_hand_keyboard_card.xml b/app/src/main/res/layout/view_hand_keyboard_card.xml index 8459d8ba..6345759f 100644 --- a/app/src/main/res/layout/view_hand_keyboard_card.xml +++ b/app/src/main/res/layout/view_hand_keyboard_card.xml @@ -19,7 +19,6 @@ android:id="@+id/closeButton" style="@style/PokerAnalyticsTheme.Button" app:icon="@drawable/ic_close" - android:gravity="center" android:layout_width="44dp" android:layout_height="44dp" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1441fee9..0e88ec16 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -343,7 +343,7 @@ @font/roboto_medium @color/black 4dp - 8dp + 4dp 12sp