change read mode layout

hh
Laurent 6 years ago
parent 024ea38b52
commit 5d3035667b
  1. 9
      app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Action.kt
  2. 7
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
  3. 6
      app/src/main/res/drawable/rounded_green_rect.xml
  4. 2
      app/src/main/res/drawable/rounded_kaki_medium_rect.xml
  5. 6
      app/src/main/res/drawable/rounded_red_rect.xml
  6. 16
      app/src/main/res/layout/row_hand_action_read.xml

@ -122,6 +122,15 @@ open class Action : RealmObject() {
} }
} }
val background: Int
get() {
return when (this) {
POST_SB, POST_BB, CALL, CHECK, CALL_ALLIN -> R.drawable.rounded_kaki_medium_rect
FOLD -> R.drawable.rounded_red_rect
else -> R.drawable.rounded_green_rect
}
}
override val viewType: Int = RowViewType.TITLE_GRID.ordinal override val viewType: Int = RowViewType.TITLE_GRID.ordinal
companion object { companion object {

@ -421,9 +421,14 @@ class HandHistoryAdapter(
actionReadRow.action?.let { type -> actionReadRow.action?.let { type ->
itemView.actionText.text = type.localizedTitle(itemView.context) itemView.actionText.text = type.localizedTitle(itemView.context)
itemView.actionText.setTextColor(itemView.context.getColor(type.color)) val background = itemView.context.getDrawable(type.background)
itemView.action_container.background = background
} }
// actionReadRow.action?.let { type ->
// itemView.actionText.setTextColor(itemView.context.getColor(type.color))
// }
itemView.amountText.text = actionReadRow.amount?.formatted() itemView.amountText.text = actionReadRow.amount?.formatted()
} }

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

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/kaki_medium"/> <solid android:color="@color/kaki_medium"/>
<!-- <stroke android:width="3dp" android:color="#B1BCBE" />--> <!-- <stroke android:width="3dp" android:color="#B1BCBE" />-->
<corners android:radius="6dp"/> <corners android:radius="8dp"/>
</shape> </shape>

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

@ -4,6 +4,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"> android:layout_marginBottom="2dp">
@ -14,6 +15,13 @@
android:layout_height="44dp" android:layout_height="44dp"
android:background="@android:color/transparent" /> android:background="@android:color/transparent" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="32dp"
android:id="@+id/action_container"
android:layout_marginStart="8dp"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/playersText" android:id="@+id/playersText"
style="@style/PokerAnalyticsTheme.TextView.RowTitle" style="@style/PokerAnalyticsTheme.TextView.RowTitle"
@ -29,7 +37,7 @@
style="@style/PokerAnalyticsTheme.TextView.RowTitle" style="@style/PokerAnalyticsTheme.TextView.RowTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="8dp" android:layout_marginStart="6dp"
android:gravity="center_vertical" android:gravity="center_vertical"
tools:text="raises"/> tools:text="raises"/>
@ -38,9 +46,13 @@
style="@style/PokerAnalyticsTheme.TextView.RowTitle" style="@style/PokerAnalyticsTheme.TextView.RowTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="8dp" android:layout_marginStart="6dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:gravity="end|center_vertical" android:gravity="end|center_vertical"
tools:text="120" /> tools:text="120" />
</LinearLayout> </LinearLayout>
</LinearLayout>
Loading…
Cancel
Save