diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardSuitAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardSuitAdapter.kt index 8be0851d..5ba78709 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardSuitAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardSuitAdapter.kt @@ -61,6 +61,14 @@ class CardSuitAdapter(private var keyboardListener: KeyboardListener) : keyboardListener.cardSuitSelected(this.suits[position]) } +// override fun textColor(position: Int, row: RowRepresentable): Int? { +// return this.suits[position].color +// } + + override fun backgroundColor(position: Int, row: RowRepresentable): Int? { + return this.suits[position].color + } + // override fun isEnabled(row: RowRepresentable, tag: Int): Boolean { // val suit = row as Card.Suit // return this.centralizer?.isSuitAvailable(suit, null) ?: true diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardValueAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardValueAdapter.kt index eed898b2..e71de41a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardValueAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardValueAdapter.kt @@ -59,9 +59,13 @@ class CardValueAdapter(var keyboardListener: KeyboardListener) : keyboardListener.cardValueSelected(Card.Value.values[position]) } -// override fun isEnabled(row: RowRepresentable, tag: Int): Boolean { -// val value = row as Card.Value -// return this.centralizer?.isValueAvailable(value) ?: true + +// override fun textColor(position: Int, row: RowRepresentable): Int? { +// return R.color.black +// } +// +// override fun backgroundColor(position: Int, row: RowRepresentable): Int? { +// return R.color.white // } } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt index 963195ad..2e1703ca 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt @@ -1,6 +1,5 @@ package net.pokeranalytics.android.ui.view.holder -import android.content.res.ColorStateList import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.AppCompatImageView @@ -100,16 +99,16 @@ class RowViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Bindabl } // Title - itemView.findViewById(R.id.title)?.let { + itemView.findViewById(R.id.title)?.let { textView -> val title = row.resId?.let { _ -> row.localizedTitle(itemView.context) } ?: run { row.getDisplayName(itemView.context) } - it.text = title + textView.text = title adapter.dataSource.textColor(position, row)?.let { textColor -> - it.setTextColor(itemView.context.getColor(textColor)) + textView.setTextColor(itemView.context.getColor(textColor)) } // val color = if (adapter.dataSource.isEnabled(row, 0)) {