staxriver
/
poker-analytics
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use cute cards for board and players

Browse Source
hh
Laurent 6 years ago
parent 12dc039a1b
commit 2a00e529d5
10 changed files with 137 additions and 94 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Card.kt
  2. 104
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
  3. 16
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
  4. 7
      app/src/main/res/drawable/rounded_board_background.xml
  5. 0
      app/src/main/res/drawable/rounded_card_background.xml
  6. 36
      app/src/main/res/layout/row_hand_cards.xml
  7. 4
      app/src/main/res/layout/row_hand_history_view.xml
  8. 30
      app/src/main/res/layout/row_hand_player_summary.xml
  9. 28
      app/src/main/res/layout/row_hhsettings_player_setup.xml
  10. 2
      app/src/main/res/layout/view_card.xml

4
app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Card.kt
Unescape View File

@ -15,6 +15,7 @@ import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.handhistory.Street
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowViewType
import timber.log.Timber
interface CardProperty
@ -99,7 +100,7 @@ open class Card : RealmObject() {
}
fun format(suit: Suit?) : String {
return suit?.value ?: ""
return suit?.value ?: UNDEFINED.value
}
fun color(suit: Suit?) : Int {
return suit?.color ?: R.color.white
@ -191,6 +192,7 @@ open class Card : RealmObject() {
spannable.length,
SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
)
Timber.d("card format = $spannable")
return spannable
}

104
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
Unescape View File

@ -8,7 +8,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.EditText
import androidx.core.view.isVisible
import android.widget.LinearLayout
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.chip.Chip
@ -21,7 +21,7 @@ import kotlinx.android.synthetic.main.row_hhsettings_straddle.view.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.handhistory.Position
import net.pokeranalytics.android.model.handhistory.Street
import net.pokeranalytics.android.model.realm.handhistory.Card
import net.pokeranalytics.android.model.realm.handhistory.HandHistory
import net.pokeranalytics.android.ui.adapter.BindableHolder
import net.pokeranalytics.android.ui.adapter.RecyclerAdapter
@ -282,6 +282,26 @@ class HandHistoryAdapter(
return itemView.findViewWithTag(tag)
}
protected fun configureCardsLayout(layout: LinearLayout) {
layout.removeAllViews()
val inflater = LayoutInflater.from(itemView.context)
dataSource.rowRepresentableForPosition(this.currentPosition)?.let { row ->
dataSource.contentForRow(row, itemView.context, Card::class).forEach { card ->
val cardView = card.view(itemView.context, inflater, layout)
layout.addView(cardView)
}
layout.setOnClickListener {
delegate?.onRowSelected(this.currentPosition, row)
}
}
}
}
inner class RowHandBlinds(itemView: View) : RowHandHolder(itemView) {
@ -424,31 +444,24 @@ class HandHistoryAdapter(
init {
itemView.flopEditText.tag = Street.FLOP.ordinal
itemView.turnEditText.tag = Street.TURN.ordinal
itemView.riverEditText.tag = Street.RIVER.ordinal
setClickListener(itemView.flopEditText)
setClickListener(itemView.turnEditText)
setClickListener(itemView.riverEditText)
}
override fun onBind(position: Int, row: RowRepresentable, adapter: RecyclerAdapter) {
super.onBind(position, row, adapter)
val streetCardsRow = row as StreetCardsRow
val street = streetCardsRow.street
configureCardsLayout(itemView.cardsLayout)
configureEditTexts(Street.FLOP.ordinal..Street.RIVER.ordinal, position, row, adapter)
itemView.flopEditText.isEnabled = (street == Street.FLOP || street == Street.SUMMARY)
itemView.turnEditText.isEnabled = (street == Street.TURN || street == Street.SUMMARY)
itemView.riverEditText.isEnabled = (street == Street.RIVER || street == Street.SUMMARY)
itemView.flopEditText.isVisible = (street.ordinal >= Street.FLOP.ordinal)
itemView.turnEditText.isVisible = (street.ordinal >= Street.TURN.ordinal)
itemView.riverEditText.isVisible = (street.ordinal >= Street.RIVER.ordinal)
// itemView.cardsLayout.removeAllViews()
//
// val inflater = LayoutInflater.from(itemView.context)
// adapter.dataSource.contentForRow(row, itemView.context, Card::class).forEach { card ->
// val cardView = card.view(itemView.context, inflater, itemView.cardsLayout)
// itemView.cardsLayout.addView(cardView)
// }
//
// itemView.cardsLayout.setOnClickListener {
// adapter.delegate?.onRowSelected(position, row)
// }
}
@ -460,27 +473,27 @@ class HandHistoryAdapter(
inner class RowHandPlayerSummary(itemView: View) : RowHandHolder(itemView) {
init {
itemView.cardsEditText.tag = PlayerCardsRow.Tag.CARDS.ordinal
// itemView.cardsEditText.tag = PlayerCardsRow.Tag.CARDS.ordinal
// Cards
itemView.findViewById<EditText>(R.id.cardsEditText)?.let { cardsEditText ->
cardsEditText.isFocusableInTouchMode = true
cardsEditText.setOnTouchListener { _, event ->
if (event.action == MotionEvent.ACTION_UP) {
// Both are required, otherwise requestFocus() fails
cardsEditText.isFocusable = true
cardsEditText.isFocusableInTouchMode = true
cardsEditText.requestFocus()
editTextSelected(cardsEditText, true, PlayerCardsRow.Tag.CARDS.ordinal)
}
return@setOnTouchListener true
}
}
// itemView.findViewById<EditText>(R.id.cardsEditText)?.let { cardsEditText ->
//
// cardsEditText.isFocusableInTouchMode = true
// cardsEditText.setOnTouchListener { _, event ->
//
// if (event.action == MotionEvent.ACTION_UP) {
// // Both are required, otherwise requestFocus() fails
// cardsEditText.isFocusable = true
// cardsEditText.isFocusableInTouchMode = true
//
// cardsEditText.requestFocus()
//
// editTextSelected(cardsEditText, true, PlayerCardsRow.Tag.CARDS.ordinal)
// }
// return@setOnTouchListener true
// }
//
// }
}
override fun onBind(position: Int, row: RowRepresentable, adapter: RecyclerAdapter) {
@ -494,7 +507,9 @@ class HandHistoryAdapter(
positionButton.text = playerCardView.position?.value ?: throw PAIllegalStateException("Should not happen")
}
configureEditTexts(PlayerCardsRow.Tag.CARDS.ordinal, position, row, adapter)
configureCardsLayout(itemView.handLayout)
// configureEditTexts(PlayerCardsRow.Tag.CARDS.ordinal, position, row, adapter)
}
}
@ -506,10 +521,7 @@ class HandHistoryAdapter(
init {
itemView.handEditText.tag = PlayerSetupRow.Tag.HAND.ordinal
itemView.stackEditText.tag = PlayerSetupRow.Tag.STACK.ordinal
setClickListener(itemView.handEditText)
setClickListener(itemView.stackEditText)
// Position Recycler
@ -578,7 +590,9 @@ class HandHistoryAdapter(
// Settings
itemView.settings_container.visibility = if (state == PlayerSetupRow.State.POSITIONS_ONLY) View.GONE else View.VISIBLE
configureEditTexts(PlayerSetupRow.Tag.HAND.ordinal, position, row, adapter)
configureCardsLayout(itemView.psHandLayout)
// configureEditTexts(PlayerSetupRow.Tag.HAND.ordinal, position, row, adapter)
configureEditTexts(PlayerSetupRow.Tag.STACK.ordinal, position, row, adapter)
}

16
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
Unescape View File

@ -679,6 +679,22 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra
Position::class -> {
return this.handHistory.undefinedPositions() as List<T>
}
Card::class -> {
val cards = when (row) {
is StreetCardsRow -> {
this.handHistory.cardsForStreet(row.street)
}
is PlayerCardsRow -> {
row.cardHolder?.cards
}
is PlayerSetupRow -> {
row.cardHolder?.cards
}
else -> { throw PAIllegalStateException("unmanaged contentForRow for Card") }
}
return (cards ?: listOf<Card>()) as List<T>
}
}
return listOf()
}

7
app/src/main/res/drawable/rounded_board_background.xml
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/kaki"/>
<!-- <stroke android:width="3dp" android:color="#B1BCBE" />-->
<corners android:radius="6dp"/>
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
</shape>

0
app/src/main/res/drawable/rounded_background.xml → app/src/main/res/drawable/rounded_card_background.xml
Unescape View File

36
app/src/main/res/layout/row_hand_cards.xml
Unescape View File

@ -1,34 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/flopEditText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:layout_margin="4dp"/>
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/turnEditText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_margin="4dp" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/riverEditText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_margin="4dp" />
<Space
android:layout_width="0dp"
android:layout_height="44dp"
android:layout_weight="3" />
android:layout_width="wrap_content"
android:layout_height="50dp"
android:background="@drawable/rounded_board_background"
android:layout_marginStart="16dp"
android:paddingStart="4dp"
android:paddingEnd="0dp"
android:gravity="center_vertical"
android:id="@+id/cardsLayout">
<!-- <androidx.appcompat.widget.AppCompatEditText-->
<!-- android:id="@+id/flopEditText"-->

4
app/src/main/res/layout/row_hand_history_view.xml
Unescape View File

@ -22,7 +22,7 @@
<!-- android:layout_height="42dp"-->
<!-- style="@style/PokerAnalyticsTheme.CardTextView"-->
<!-- android:textColor="@color/black"-->
<!-- android:background="@drawable/rounded_background"-->
<!-- android:background="@drawable/rounded_card_background"-->
<!-- android:text="5\n♣︎"-->
<!-- android:gravity="center"-->
<!-- android:layout_marginEnd="4dp"-->
@ -34,7 +34,7 @@
<!-- android:layout_height="42dp"-->
<!-- style="@style/PokerAnalyticsTheme.CardTextView"-->
<!-- android:textColor="@color/black"-->
<!-- android:background="@drawable/rounded_background"-->
<!-- android:background="@drawable/rounded_card_background"-->
<!-- android:text="A\n♥︎︎"-->
<!-- android:gravity="center"-->
<!-- android:lines="2"-->

30
app/src/main/res/layout/row_hand_player_summary.xml
Unescape View File

@ -18,15 +18,27 @@
android:layout_height="44dp"
android:layout_marginStart="8dp"/>
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/cardsEditText"
style="@style/PokerAnalyticsTheme.EditText"
<LinearLayout
android:id="@+id/handLayout"
android:orientation="horizontal"
android:layout_width="0dp"
android:layout_weight="2"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:maxLines="1" />
android:layout_height="50dp"
android:layout_weight="1"
android:background="@drawable/rounded_board_background"
android:layout_marginStart="16dp"
android:paddingStart="4dp"
android:paddingEnd="0dp"
android:gravity="center"/>
<!-- <androidx.appcompat.widget.AppCompatEditText-->
<!-- android:id="@+id/cardsEditText"-->
<!-- style="@style/PokerAnalyticsTheme.EditText"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_weight="2"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="8dp"-->
<!-- android:layout_marginEnd="8dp"-->
<!-- android:gravity="center"-->
<!-- android:maxLines="1" />-->
</LinearLayout>

28
app/src/main/res/layout/row_hhsettings_player_setup.xml
Unescape View File

@ -37,16 +37,28 @@
android:layout_height="44dp"
android:layout_marginStart="8dp"/>
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/handEditText"
style="@style/PokerAnalyticsTheme.EditText"
<LinearLayout
android:id="@+id/psHandLayout"
android:orientation="horizontal"
android:layout_width="0dp"
android:hint="@string/hand"
android:layout_height="50dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center"
android:inputType="none"
android:maxLines="1" />
android:background="@drawable/rounded_board_background"
android:layout_marginStart="16dp"
android:paddingStart="4dp"
android:paddingEnd="0dp"
android:gravity="center"/>
<!-- <androidx.appcompat.widget.AppCompatEditText-->
<!-- android:id="@+id/handEditText"-->
<!-- style="@style/PokerAnalyticsTheme.EditText"-->
<!-- android:layout_width="0dp"-->
<!-- android:hint="@string/hand"-->
<!-- android:layout_weight="1"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center"-->
<!-- android:inputType="none"-->
<!-- android:maxLines="1" />-->
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/stackEditText"

2
app/src/main/res/layout/view_card.xml
Unescape View File

@ -6,7 +6,7 @@
android:layout_width="24dp"
android:layout_height="42dp"
android:layout_marginEnd="4dp"
android:background="@drawable/rounded_background"
android:background="@drawable/rounded_card_background"
android:gravity="center"
android:lines="2"
tools:text="5\n♣︎" />

Write Preview
Loading…
Cancel
Save