From 4e5cd493c2465836b0feb70258d108745f0170f4 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 26 Mar 2020 15:27:54 +0100 Subject: [PATCH] Fixes useless card layout hint in read mode --- .../android/ui/modules/handhistory/HandHistoryAdapter.kt | 9 ++++++--- .../main/res/layout/row_hhsettings_player_setup_read.xml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) 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 c82ea359..dba34f7c 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 @@ -39,6 +39,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.holder.RowViewHolder import net.pokeranalytics.android.ui.view.rowrepresentable.ViewIdentifier import net.pokeranalytics.android.util.extensions.formatted +import java.util.* enum class HandRowType(var layoutRes: Int) : ViewIdentifier, RowRepresentable { @@ -314,29 +315,31 @@ class HandHistoryAdapter( val focused = dataSource.isSelected(this.currentPosition, row, layout.tag as Int) + // 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) + // Cards dataSource.contentForRow(row, itemView.context, Card::class).forEach { card -> val cardView = card.view(itemView.context, inflater, layout) layout.addView(cardView) } - if (layout.isEmpty()) { + if (layout.isEmpty() && isEdited) { // adds layout hint val hintView = TextView(itemView.context) val hintResId = if (isBoard) R.string.board else R.string.hand - hintView.text = itemView.context.getString(hintResId) + hintView.text = itemView.context.getString(hintResId).capitalize() layout.addView(hintView) layout.gravity = Gravity.CENTER } else { layout.gravity = if (isBoard || !isEdited) Gravity.START or Gravity.CENTER_VERTICAL else Gravity.CENTER } + // Listener layout.setOnClickListener { delegate?.onRowSelected(this.currentPosition, row, layout.tag as Int) } 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 89cfb538..31ee6f80 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 @@ -45,7 +45,7 @@ android:layout_weight="1" android:gravity="end|center" android:maxLines="1" - android:layout_marginEnd="8dp" + android:layout_marginEnd="16dp" tools:text="120" /> \ No newline at end of file