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

Update Top 10 UI

Browse Source
feature/top10
Aurelien Hubert 7 years ago
parent 6c40825aa4
commit d1136c317a
2 changed files with 94 additions and 15 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. 29
      app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
  2. 80
      app/src/main/res/layout/row_top_10.xml

29
app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
Unescape View File

@ -539,18 +539,27 @@ enum class RowViewType(private var layoutRes: Int) {
part1.text = row.getFormattedGameType(itemView.context)
}
itemView.findViewById<AppCompatTextView>(R.id.top10ResultPart2)?.let { part2 ->
var content = row.getFormattedDuration()
if (!row.location?.name.isNullOrEmpty()) {
content += " - " + row.location?.name
} else if (!row.bankroll?.name.isNullOrEmpty()) {
content += " - " + row.bankroll?.name
}
part2.text = content
// Duration
val durationIcon = itemView.findViewById<AppCompatImageView?>(R.id.sessionInfoDurationIcon)
val durationText = itemView.findViewById<AppCompatTextView?>(R.id.sessionInfoDuration)
durationIcon?.isVisible = true
durationText?.isVisible = true
durationText?.text = row.getFormattedDuration()
// Location
val locationIcon = itemView.findViewById<AppCompatImageView?>(R.id.sessionInfoLocationIcon)
val locationText = itemView.findViewById<AppCompatTextView?>(R.id.sessionInfoLocation)
if (!row.location?.name.isNullOrEmpty()) {
locationIcon?.isVisible = true
locationText?.isVisible = true
locationText?.text = row.location?.name
} else {
locationIcon?.isVisible = false
locationText?.isVisible = false
}
itemView.findViewById<AppCompatTextView>(R.id.top10ResultPart3)?.let { part3 ->
part3.text = row.creationDate.longDate()
}

80
app/src/main/res/layout/row_top_10.xml
Unescape View File

@ -13,8 +13,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:gravity="center"
android:layout_marginEnd="16dp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -25,17 +25,87 @@
style="@style/PokerAnalyticsTheme.TextView.Top10Row"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="16dp"
android:layout_marginEnd="8dp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/gameResult"
app:layout_constraintVertical_chainStyle="packed"
tools:text="$300 NL Hold'em" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/sessionInfoDurationIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="8dp"
android:src="@drawable/clock"
android:tint="@color/kaki_lighter"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/sessionInfoDuration"
app:layout_constraintEnd_toStartOf="@+id/sessionInfoDuration"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/sessionInfoDuration"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/sessionInfoDuration"
style="@style/PokerAnalyticsTheme.TextView.Top10Row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/kaki_lighter"
app:layout_constraintBottom_toTopOf="@+id/top10ResultPart3"
app:layout_constraintEnd_toStartOf="@+id/sessionInfoLocationIcon"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@+id/sessionInfoDurationIcon"
app:layout_constraintTop_toBottomOf="@+id/top10ResultPart1"
tools:text="4:21"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/sessionInfoLocationIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="8dp"
android:src="@drawable/pin"
android:tint="@color/kaki_lighter"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/sessionInfoDuration"
app:layout_constraintEnd_toStartOf="@+id/sessionInfoLocation"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/sessionInfoDuration"
app:layout_constraintTop_toTopOf="@+id/sessionInfoDuration"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/sessionInfoLocation"
style="@style/PokerAnalyticsTheme.TextView.Top10Row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/kaki_lighter"
app:layout_constraintBottom_toTopOf="@+id/top10ResultPart3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@+id/sessionInfoLocationIcon"
app:layout_constraintTop_toBottomOf="@+id/top10ResultPart1"
tools:text="Rennes, France"
tools:visibility="visible" />
<!--
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/top10ResultPart2"
style="@style/PokerAnalyticsTheme.TextView.Top10Row"
@ -49,7 +119,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/top10ResultPart1"
app:layout_constraintVertical_chainStyle="packed"
tools:text="10:30 - Hollywood Park" />
tools:text="10:30 - Hollywood Park" /> -->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/top10ResultPart3"

Write Preview
Loading…
Cancel
Save