Puts color for suits in the card selection

hh
Laurent 6 years ago
parent 65e24d3088
commit d09c7273d9
  1. 8
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardSuitAdapter.kt
  2. 10
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardValueAdapter.kt
  3. 7
      app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt

@ -61,6 +61,14 @@ class CardSuitAdapter(private var keyboardListener: KeyboardListener) :
keyboardListener.cardSuitSelected(this.suits[position]) 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 { // override fun isEnabled(row: RowRepresentable, tag: Int): Boolean {
// val suit = row as Card.Suit // val suit = row as Card.Suit
// return this.centralizer?.isSuitAvailable(suit, null) ?: true // return this.centralizer?.isSuitAvailable(suit, null) ?: true

@ -59,9 +59,13 @@ class CardValueAdapter(var keyboardListener: KeyboardListener) :
keyboardListener.cardValueSelected(Card.Value.values[position]) keyboardListener.cardValueSelected(Card.Value.values[position])
} }
// override fun isEnabled(row: RowRepresentable, tag: Int): Boolean {
// val value = row as Card.Value // override fun textColor(position: Int, row: RowRepresentable): Int? {
// return this.centralizer?.isValueAvailable(value) ?: true // return R.color.black
// }
//
// override fun backgroundColor(position: Int, row: RowRepresentable): Int? {
// return R.color.white
// } // }
} }

@ -1,6 +1,5 @@
package net.pokeranalytics.android.ui.view.holder package net.pokeranalytics.android.ui.view.holder
import android.content.res.ColorStateList
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.appcompat.widget.AppCompatImageView import androidx.appcompat.widget.AppCompatImageView
@ -100,16 +99,16 @@ class RowViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Bindabl
} }
// Title // Title
itemView.findViewById<AppCompatTextView?>(R.id.title)?.let { itemView.findViewById<AppCompatTextView?>(R.id.title)?.let { textView ->
val title = row.resId?.let { _ -> val title = row.resId?.let { _ ->
row.localizedTitle(itemView.context) row.localizedTitle(itemView.context)
} ?: run { } ?: run {
row.getDisplayName(itemView.context) row.getDisplayName(itemView.context)
} }
it.text = title textView.text = title
adapter.dataSource.textColor(position, row)?.let { textColor -> 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)) { // val color = if (adapter.dataSource.isEnabled(row, 0)) {

Loading…
Cancel
Save