Crash fix + card layout in edit mode

app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt

@@ -288,11 +288,18 @@ class HandHistoryAdapter(
 
 			val inflater = LayoutInflater.from(itemView.context)
 
+			val isEdited = (dataSource as HandHistoryViewModel).isEdited
+
 			dataSource.rowRepresentableForPosition(this.currentPosition)?.let { row ->
 
 				val focused = dataSource.isSelected(this.currentPosition, row, layout.tag as Int)
 
-				val drawableId = if (focused) R.drawable.rounded_highlighted_board_background else R.drawable.rounded_board_background
+				val drawableId = when {
+					focused -> R.drawable.rounded_highlighted_board_background
+					isBoard || isEdited -> R.drawable.rounded_board_background
+					else -> R.drawable.transparent
+				}
+
 				layout.background = itemView.resources.getDrawable(drawableId, null)
 
 				dataSource.contentForRow(row, itemView.context, Card::class).forEach { card ->
@@ -489,6 +496,7 @@ class HandHistoryAdapter(
 			itemView.cardsLayout.tag = streetCardsRow.street.ordinal
 
 			configureCardsLayout(itemView.cardsLayout, true)
+
 		}
 
 	}
@@ -536,7 +544,7 @@ class HandHistoryAdapter(
 
 			// Position Button
 			itemView.position_button.text = adapter.dataSource.charSequenceForRow(row, itemView.context, PlayerSetupRow.Tag.POSITION.ordinal)
-			val positionSelected = adapter.dataSource.isSelected(position, row, PlayerSetupRow.Tag.POSITION.ordinal)
+//			val positionSelected = adapter.dataSource.isSelected(position, row, PlayerSetupRow.Tag.POSITION.ordinal)
 //			itemView.position_button.backgroundTintList = ColorStateList.valueOf(color(positionSelected))
 
 			val positionalRow = row as PositionalRow

app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt

@@ -232,8 +232,7 @@ class ComputedAction(var manager: ActionManager,
 
 		val significantAction = getStreetLastSignificantAction()
 			?: throw PAIllegalStateException("There must be a previously set significant action for a call to be set")
-		val significantAmount = significantAction.action.amount
+		val significantAmount = significantAction.action.amount ?: 0.0
-			?: throw PAIllegalStateException("There must be a set amount on the action for the call to be set")
 		val committedAmount = getPreviouslyCommittedAmount()
 
 		this.setEffectiveAmount(significantAmount - committedAmount)

app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/StreetCardsRow.kt

@@ -43,13 +43,6 @@ class StreetCardsRow(var street: Street, var handHistory: HandHistory) : CardsRo
 		}
 	}
 
-	override fun clear() {
-		when (this.street) {
-			Street.SUMMARY -> this.cardHolder?.cards?.clear()
-			else -> this.handHistory.cards.removeAll { it.street == this.street }
-		}
-	}
-
 	override fun isFieldNeedsInput(tag: Int, handHistory: HandHistory): Boolean {
 		val street = Street.values()[tag]
 		return this.cardCount < street.totalBoardCards || this.handHistory.cards.elementAtOrNull(street.totalBoardCards - 1)?.suit == null

app/src/main/res/drawable/transparent.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/transparent"/>
+</shape>

app/src/main/res/layout/row_hand_player_summary.xml

@@ -20,17 +20,23 @@
         android:layout_height="44dp"
         android:layout_marginStart="8dp"/>
 
-    <LinearLayout
+    <include layout="@layout/view_card_layout"
-        android:id="@+id/handLayout"
+        android:id="@+id/hand_layout"
-        android:orientation="horizontal"
-        android:layout_width="0dp"
-        android:layout_height="50dp"
         android:layout_weight="1"
-        android:background="@drawable/rounded_board_background"
+        android:layout_height="50dp"
-        android:layout_marginStart="8dp"
+        android:layout_width="0dp" />
-        android:layout_marginEnd="8dp"
+
-        android:paddingStart="4dp"
+<!--    <LinearLayout-->
-        android:paddingEnd="0dp" />
+<!--        android:id="@+id/handLayout"-->
+<!--        android:orientation="horizontal"-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="50dp"-->
+<!--        android:layout_weight="1"-->
+<!--        android:background="@drawable/rounded_board_background"-->
+<!--        android:layout_marginStart="8dp"-->
+<!--        android:layout_marginEnd="8dp"-->
+<!--        android:paddingStart="4dp"-->
+<!--        android:paddingEnd="0dp" />-->
 
 <!--    <androidx.appcompat.widget.AppCompatEditText-->
 <!--        android:id="@+id/cardsEditText"-->

app/src/main/res/layout/row_hhsettings_player_setup.xml

@@ -20,16 +20,21 @@
         android:layout_height="44dp"
         android:layout_marginStart="8dp" />
 
-    <LinearLayout
+    <include layout="@layout/view_card_layout"
         android:id="@+id/ps_hand_layout"
-        android:layout_width="144dp"
         android:layout_height="50dp"
-        android:layout_marginStart="8dp"
+        android:layout_width="144dp" />
-        android:background="@drawable/rounded_board_background"
+
-        android:gravity="center"
+<!--    <LinearLayout-->
-        android:orientation="horizontal"
+<!--        android:id="@+id/ps_hand_layout"-->
-        android:paddingStart="4dp"
+<!--        android:layout_width="144dp"-->
-        android:paddingEnd="0dp" />
+<!--        android:layout_height="50dp"-->
+<!--        android:layout_marginStart="8dp"-->
+<!--        android:background="@drawable/rounded_board_background"-->
+<!--        android:gravity="center"-->
+<!--        android:orientation="horizontal"-->
+<!--        android:paddingStart="4dp"-->
+<!--        android:paddingEnd="0dp" />-->
 
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/stack_edit_text"

app/src/main/res/layout/row_hhsettings_player_setup_read.xml

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginTop="2dp"
+    android:layout_marginBottom="2dp"
     android:orientation="horizontal">
 
     <net.pokeranalytics.android.ui.view.PlayerImageView
@@ -19,16 +21,21 @@
         android:layout_height="44dp"
         android:layout_marginStart="8dp" />
 
-    <LinearLayout
+    <include layout="@layout/view_card_layout"
         android:id="@+id/ps_hand_layout"
-        android:layout_width="144dp"
         android:layout_height="50dp"
-        android:layout_marginStart="8dp"
+        android:layout_width="144dp" />
-        android:background="@drawable/rounded_board_background"
+
-        android:gravity="center"
+<!--    <LinearLayout-->
-        android:orientation="horizontal"
+<!--        android:id="@+id/ps_hand_layout"-->
-        android:paddingStart="4dp"
+<!--        android:layout_width="144dp"-->
-        android:paddingEnd="0dp" />
+<!--        android:layout_height="50dp"-->
+<!--        android:layout_marginStart="8dp"-->
+<!--        android:background="@drawable/rounded_board_background"-->
+<!--        android:gravity="center"-->
+<!--        android:orientation="horizontal"-->
+<!--        android:paddingStart="4dp"-->
+<!--        android:paddingEnd="0dp" />-->
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/stack_text_view"

app/src/main/res/layout/view_card_layout.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="144dp"
+    android:layout_height="50dp"
+    android:layout_marginStart="8dp"
+    android:background="@drawable/rounded_board_background"
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:paddingStart="4dp"
+    android:paddingEnd="0dp" />
+
+<!--<androidx.constraintlayout.widget.ConstraintLayout-->
+<!--android:layout_width="match_parent"-->
+<!--android:layout_height="match_parent">-->
+
+<!--</androidx.constraintlayout.widget.ConstraintLayout>-->