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 0a108750..0ceff616 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 @@ -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) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt index 49c099e1..1956eb3b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt +++ b/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()) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt index 5173c661..24e583f0 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt +++ b/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(R.id.playerImage)?.let { playerImageView -> + itemView.findViewById(R.id.player_image)?.let { playerImageView -> playerImageView.setPlayer(row, PlayerImageView.Size.SMALL) } itemView.findViewById(R.id.playerName)?.let { textView -> diff --git a/app/src/main/res/layout/row_hhsettings_player_setup.xml b/app/src/main/res/layout/row_hhsettings_player_setup.xml index f3480668..e1b68af5 100644 --- a/app/src/main/res/layout/row_hhsettings_player_setup.xml +++ b/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"> diff --git a/app/src/main/res/layout/row_hhsettings_player_setup_read.xml b/app/src/main/res/layout/row_hhsettings_player_setup_read.xml index 3371d7c7..c322e834 100644 --- a/app/src/main/res/layout/row_hhsettings_player_setup_read.xml +++ b/app/src/main/res/layout/row_hhsettings_player_setup_read.xml @@ -6,12 +6,12 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - + \ No newline at end of file diff --git a/app/src/main/res/layout/row_player.xml b/app/src/main/res/layout/row_player.xml index 7f2d73c5..3a8582f1 100644 --- a/app/src/main/res/layout/row_player.xml +++ b/app/src/main/res/layout/row_player.xml @@ -16,7 +16,7 @@ android:foreground="?selectableItemBackground">