diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
index 506bc3d6..39c60935 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
@@ -275,10 +275,6 @@ class HandHistoryAdapter(
editText.requestFocus()
} else {
editText.clearFocus()
-// if (editText.hasFocus()) {
-// editText.isFocusable = false
-// editText.isFocusableInTouchMode = false
-// }
}
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/StraddleRowRepresentable.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/StraddleRowRepresentable.kt
index 5510daf2..4baac1f1 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/StraddleRowRepresentable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/StraddleRowRepresentable.kt
@@ -11,21 +11,16 @@ class StraddleRowRepresentable(
override val viewType: Int = HandRowType.STRADDLE.ordinal
/***
- * Tries to add a position if the position is next to another
+ * Adds the position to the straddle selections
+ * Returns whether the position has been added or not
*/
fun add(position: Position): Boolean {
- val canAdd = this.selectedPositions.isEmpty()
- || this.selectedPositions.any { it.ordinal == position.ordinal + 1 || it.ordinal == position.ordinal - 1 }
-
- if (canAdd) {
- this.selectedPositions.add(position)
- }
- return canAdd
+ this.selectedPositions.add(position)
+ return true
}
/***
- * Removes a position
- * Should not let holes
+ * Removes a position from the straddle list
*/
fun remove(position: Position) {
this.selectedPositions.remove(position)
diff --git a/app/src/main/res/menu/toolbar_hand_history.xml b/app/src/main/res/menu/toolbar_hand_history.xml
index fc35bc22..d2d36210 100644
--- a/app/src/main/res/menu/toolbar_hand_history.xml
+++ b/app/src/main/res/menu/toolbar_hand_history.xml
@@ -13,11 +13,11 @@
android:icon="@drawable/ic_get_app"
app:showAsAction="always" />
-
+
+
+
+
+