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

UI improvements

Browse Source
hh
Laurent 6 years ago
parent 46c20541bf
commit 223ca8ea18
9 changed files with 44 additions and 31 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. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardSuitAdapter.kt
  4. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardValueAdapter.kt
  5. 17
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
  6. 2
      app/src/main/res/layout/row_hand_cards.xml
  7. 18
      app/src/main/res/layout/row_hand_player_summary.xml
  8. 8
      app/src/main/res/layout/row_hhsettings_player_setup.xml
  9. 20
      app/src/main/res/layout/view_hand_keyboard_card.xml

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

@ -511,6 +511,8 @@ class HandHistoryAdapter(
positionButton.text = playerCardView.position.value positionButton.text = playerCardView.position.value
} }
configurePlayerImage(itemView.hps_player_image, position, row)
configureCardsLayout(itemView.handLayout, false) configureCardsLayout(itemView.handLayout, false)
} }
} }

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

@ -103,6 +103,10 @@ class ComputedAction(var manager: ActionManager,
*/ */
fun setAmount(amount: Double) { fun setAmount(amount: Double) {
if (amount <= 0) {
return
}
val minimumAmount = this.manager.minimumBetAmount(this.action.index) val minimumAmount = this.manager.minimumBetAmount(this.action.index)
val correctedAmount = max(minimumAmount, amount) val correctedAmount = max(minimumAmount, amount)

2
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardSuitAdapter.kt
Unescape View File

@ -26,7 +26,7 @@ class CardSuitAdapter(private var keyboardListener: KeyboardListener) :
private val suits = Card.Suit.displaySuits private val suits = Card.Suit.displaySuits
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
val layout = LayoutInflater.from(parent.context).inflate(R.layout.row_cell, parent, false) val layout = LayoutInflater.from(parent.context).inflate(R.layout.row_bottom_sheet_grid_title, parent, false)
return RowViewHolder(layout) return RowViewHolder(layout)
} }

2
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardValueAdapter.kt
Unescape View File

@ -24,7 +24,7 @@ class CardValueAdapter(var keyboardListener: KeyboardListener) :
// var centralizer: CardCentralizer? = null // var centralizer: CardCentralizer? = null
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
val layout = LayoutInflater.from(parent.context).inflate(R.layout.row_cell, parent, false) val layout = LayoutInflater.from(parent.context).inflate(R.layout.row_bottom_sheet_grid_title, parent, false)
return RowViewHolder(layout) return RowViewHolder(layout)
} }

17
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
Unescape View File

@ -10,6 +10,8 @@ import kotlinx.android.synthetic.main.view_hand_keyboard_card.view.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.realm.handhistory.Card import net.pokeranalytics.android.model.realm.handhistory.Card
import net.pokeranalytics.android.ui.extensions.px
import net.pokeranalytics.android.ui.view.GridSpacingItemDecoration
interface CardCentralizer { interface CardCentralizer {
fun isValueAvailable(value: Card.Value): Boolean fun isValueAvailable(value: Card.Value): Boolean
@ -52,20 +54,27 @@ class KeyboardCardView(context: Context) : AbstractKeyboardView(context) {
this.cardSuitAdapter = CardSuitAdapter(it) this.cardSuitAdapter = CardSuitAdapter(it)
} ?: throw PAIllegalStateException("keyboard listener not set") } ?: throw PAIllegalStateException("keyboard listener not set")
val cardValueViewManager = GridLayoutManager(this.context, 7) val spacing = 2.px
val includeEdge = false
val cardSpans = 7
val cardValueViewManager = GridLayoutManager(this.context, cardSpans)
this.valueRecyclerView.apply { this.valueRecyclerView.apply {
setHasFixedSize(true) setHasFixedSize(true)
layoutManager = cardValueViewManager layoutManager = cardValueViewManager
adapter = cardValueAdapter adapter = cardValueAdapter
// addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, includeEdge)) addItemDecoration(GridSpacingItemDecoration(cardSpans, spacing, includeEdge))
this.isNestedScrollingEnabled = false
} }
val cardSuitViewManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false) val suitSpans = 5
val cardSuitViewManager = GridLayoutManager(this.context, suitSpans)
this.suitRecyclerView.apply { this.suitRecyclerView.apply {
setHasFixedSize(true) setHasFixedSize(true)
layoutManager = cardSuitViewManager layoutManager = cardSuitViewManager
adapter = cardSuitAdapter adapter = cardSuitAdapter
// addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, includeEdge)) addItemDecoration(GridSpacingItemDecoration(suitSpans, spacing, includeEdge))
this.isNestedScrollingEnabled = false
} }
} }

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

@ -4,7 +4,7 @@
android:layout_width="144dp" android:layout_width="144dp"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@drawable/rounded_board_background" android:background="@drawable/rounded_board_background"
android:layout_marginStart="16dp" android:layout_marginStart="8dp"
android:paddingStart="4dp" android:paddingStart="4dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:gravity="center_vertical" android:gravity="center_vertical"

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

@ -4,12 +4,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton <net.pokeranalytics.android.ui.view.PlayerImageView
android:id="@+id/player_button" android:id="@+id/hps_player_image"
style="@style/PokerAnalyticsTheme.HHButton" android:layout_marginStart="8dp"
android:layout_width="44dp" android:layout_width="48dp"
android:layout_height="44dp" android:layout_height="48dp"
android:layout_marginStart="8dp"/> android:background="@android:color/transparent" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/positionButton" android:id="@+id/positionButton"
@ -25,10 +25,10 @@
android:layout_height="50dp" android:layout_height="50dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/rounded_board_background" android:background="@drawable/rounded_board_background"
android:layout_marginStart="16dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:paddingStart="4dp" android:paddingStart="4dp"
android:paddingEnd="0dp" android:paddingEnd="0dp" />
android:gravity="center"/>
<!-- <androidx.appcompat.widget.AppCompatEditText--> <!-- <androidx.appcompat.widget.AppCompatEditText-->
<!-- android:id="@+id/cardsEditText"--> <!-- android:id="@+id/cardsEditText"-->

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

@ -4,14 +4,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- android:id="@+id/title"-->
<!-- style="@style/PokerAnalyticsTheme.TextView.RowTitle"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="8dp"-->
<!-- android:layout_marginStart="8dp" />-->
<net.pokeranalytics.android.ui.view.PlayerImageView <net.pokeranalytics.android.ui.view.PlayerImageView
android:id="@+id/player_image" android:id="@+id/player_image"
android:layout_width="48dp" android:layout_width="48dp"

20
app/src/main/res/layout/view_hand_keyboard_card.xml
Unescape View File

@ -9,6 +9,8 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
@ -17,10 +19,9 @@
android:id="@+id/closeButton" android:id="@+id/closeButton"
style="@style/PokerAnalyticsTheme.Button" style="@style/PokerAnalyticsTheme.Button"
app:icon="@drawable/ic_close" app:icon="@drawable/ic_close"
android:gravity="center"
android:layout_width="44dp" android:layout_width="44dp"
android:layout_height="44dp" android:layout_height="44dp" />
android:layout_weight="1"
android:layout_marginStart="8dp"/>
<Space <Space
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -55,7 +56,8 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/valueRecyclerView" android:id="@+id/valueRecyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/suitRecyclerView" app:layout_constraintBottom_toTopOf="@id/suitRecyclerView"
@ -64,10 +66,12 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/suitRecyclerView" android:id="@+id/suitRecyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="wrap_content"
android:layout_marginStart="50dp"
android:layout_marginEnd="50dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/backSpaceButton" app:layout_constraintEnd_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@+id/backSpaceButton"
/> />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -76,6 +80,8 @@
android:text="@string/backspace" android:text="@string/backspace"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginEnd="8dp"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
/> />

Write Preview
Loading…
Cancel
Save