Fixes stuff

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

@@ -484,18 +484,38 @@ class HandHistoryAdapter(
 
 		}
 
+		protected fun configurePlayerImage(playerImageView: PlayerImageView, position: Int, row: PlayerSetupRow) {
+
+			// Player
+			val listener = View.OnClickListener {
+				delegate?.onItemClick(position, row, playerImageView.tag as Int)
+			}
+			playerImageView.setOnImageClickListener(listener)
+
+			val size = PlayerImageView.Size.SMALL
+			row.playerSetup?.player?.let { player ->
+				playerImageView.setPlayer(player, size)
+			} ?: run {
+				playerImageView.clear(size)
+			}
+
+		}
 	}
 
 	inner class RowHandReadOnlyPlayerSetup(itemView: View) : AbstractRowHandPlayerSetup(itemView) {
 
 		init {
-			itemView.stackTextView.tag = PlayerSetupRow.Tag.STACK.ordinal
+			itemView.ps_player_image.tag = PlayerSetupRow.Tag.PLAYER.ordinal
+			itemView.stack_text_view.tag = PlayerSetupRow.Tag.STACK.ordinal
 		}
 
 		override fun onBind(position: Int, row: RowRepresentable, adapter: RecyclerAdapter) {
 			super.onBind(position, row, adapter)
 
 			configureTextView(PlayerSetupRow.Tag.STACK.ordinal, row, adapter)
+
+			// Player
+			configurePlayerImage(itemView.ps_player_image, position, row as PlayerSetupRow)
 		}
 
 	}
@@ -507,14 +527,10 @@ class HandHistoryAdapter(
 
 		init {
 
-			itemView.playerImage.tag = PlayerSetupRow.Tag.PLAYER.ordinal
+			itemView.player_image.tag = PlayerSetupRow.Tag.PLAYER.ordinal
 			itemView.ps_hand_layout.tag = PlayerSetupRow.Tag.HAND.ordinal
-
-//			itemView.ps_player_button.pointerIcon =
-//			itemView.ps_player_button.ti = itemView.resources.getDrawable(R.drawable.circle, null)
-//			setOnItemClickListener(itemView.playerImage)
-
 			itemView.stack_edit_text.tag = PlayerSetupRow.Tag.STACK.ordinal
+
 			itemView.stack_edit_text.inputType = InputType.TYPE_NUMBER_FLAG_DECIMAL
 			setClickListener(itemView.stack_edit_text)
 
@@ -534,17 +550,7 @@ class HandHistoryAdapter(
 			val state = setupRow.state
 
 			// Player
-			val listener = View.OnClickListener {
-				delegate?.onItemClick(position, row, itemView.playerImage.tag as Int)
-			}
-			itemView.playerImage.setOnImageClickListener(listener)
-
-			val size = PlayerImageView.Size.SMALL
-			row.playerSetup?.player?.let { player ->
-				itemView.playerImage.setPlayer(player, size)
-			} ?: run {
-				itemView.playerImage.clear(size)
-			}
+			configurePlayerImage(itemView.player_image, position, setupRow)
 
 			// Title
 			itemView.title.text = setupRow.title(itemView.context)

app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt

@@ -100,11 +100,11 @@ class PlayerImageView : FrameLayout {
 				.load(player.picture)
 				.apply(RequestOptions().circleCrop())
 				.transition(withCrossFade())
-				.into(playerImageView.playerImage)
+				.into(playerImageView.player_image)
 
 		} else {
 			playerImageView.playerStroke.background = ResourcesCompat.getDrawable(resources, R.drawable.circle_stroke_kaki, null)
-			playerImageView.playerImage.setImageDrawable(null)
+			playerImageView.player_image.setImageDrawable(null)
 			playerImageView.playerInitial.text = playerInitial
 			playerImageView.playerInitial.setTextSize(TypedValue.COMPLEX_UNIT_SP, size.getFontSize())
 		}

app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt

@@ -532,7 +532,7 @@ enum class RowViewType(private var layoutRes: Int) : ViewIdentifier {
 		override fun onBind(position: Int, row: RowRepresentable, adapter: RecyclerAdapter) {
 
 			if (row is Player) {
-				itemView.findViewById<PlayerImageView?>(R.id.playerImage)?.let { playerImageView ->
+				itemView.findViewById<PlayerImageView?>(R.id.player_image)?.let { playerImageView ->
 					playerImageView.setPlayer(row, PlayerImageView.Size.SMALL)
 				}
 				itemView.findViewById<AppCompatTextView?>(R.id.playerName)?.let { textView ->

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

@@ -23,10 +23,11 @@
         android:id="@+id/settings_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp">
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp">
 
         <net.pokeranalytics.android.ui.view.PlayerImageView
-            android:id="@+id/playerImage"
+            android:id="@+id/player_image"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:background="@android:color/transparent" />

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

@@ -6,12 +6,12 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/player_button"
-        style="@style/PokerAnalyticsTheme.HHButton"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:layout_marginStart="8dp" />
+    <net.pokeranalytics.android.ui.view.PlayerImageView
+        android:id="@+id/ps_player_image"
+        android:layout_marginStart="8dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@android:color/transparent" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/position_button"
@@ -33,13 +33,14 @@
         android:paddingEnd="0dp" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/stackTextView"
+        android:id="@+id/stack_text_view"
         style="@style/PokerAnalyticsTheme.TextView.RowTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="end|center"
         android:maxLines="1"
+        android:layout_marginEnd="8dp"
         tools:text="120" />
 
 </LinearLayout>

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

@@ -16,7 +16,7 @@
 		android:foreground="?selectableItemBackground">
 
 		<net.pokeranalytics.android.ui.view.PlayerImageView
-			android:id="@+id/playerImage"
+			android:id="@+id/player_image"
 			android:layout_width="48dp"
 			android:layout_height="48dp"
 			android:layout_marginTop="8dp"
@@ -36,7 +36,7 @@
 			android:orientation="vertical"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toStartOf="@+id/nextArrow"
-			app:layout_constraintStart_toEndOf="@+id/playerImage"
+			app:layout_constraintStart_toEndOf="@+id/player_image"
 			app:layout_constraintTop_toTopOf="parent">
 
 			<androidx.appcompat.widget.AppCompatTextView

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

@@ -19,7 +19,7 @@
 		tools:text="AH" />
 
 	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/playerImage"
+		android:id="@+id/player_image"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
 		app:layout_constraintDimensionRatio="1:1"