From 87dbc2efb795e2a7c555951e5fd5f97bcd149482 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Mon, 25 Feb 2019 17:47:20 +0100 Subject: [PATCH 1/2] Improve Session UI --- .../java/net/pokeranalytics/android/model/realm/Session.kt | 4 ++-- .../bottomsheet/BottomSheetTableSizeGridFragment.kt | 2 +- .../java/net/pokeranalytics/android/ui/view/SessionRowView.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 1fca6f2e..e71237ec 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -284,11 +284,11 @@ open class Session : RealmObject(), SessionInterface, Savable, override fun stringForRow(row: RowRepresentable): String { return when (row) { SessionRow.BUY_IN -> buyin.toCurrency() - SessionRow.BLINDS -> if (cgSmallBlind != null && cgBigBlind != null) "$cgSmallBlind / $cgBigBlind" else "--" + SessionRow.BLINDS -> getBlinds() SessionRow.GAME -> getGameTitle() SessionRow.LOCATION -> location?.name ?: "--" SessionRow.BANKROLL -> bankroll?.name ?: "--" - SessionRow.TABLE_SIZE -> tableSize?.toString() ?: "--" + SessionRow.TABLE_SIZE -> tableSize?.toString() ?: "--" // if (tableSize != null) TableSize(tableSize ?: 0).localizedTitle(context) else "--" SessionRow.START_DATE -> if (timeFrame != null) timeFrame?.startDate?.shortDateTime() ?: "--" else "--" SessionRow.END_DATE -> if (timeFrame != null) timeFrame?.endDate?.shortDateTime() ?: "--" else "--" SessionRow.COMMENT -> if (comment.isNotEmpty()) comment else "--" diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt index 43508ed7..4f4fff87 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt @@ -85,7 +85,7 @@ class BottomSheetTableSizeGridFragment : BottomSheetFragment(), } override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) { - this.delegate.onRowValueChanged((this.row as TableSize).numberOfPlayer, row) + this.delegate.onRowValueChanged((row as TableSize).numberOfPlayer, this.row) dismiss() } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt index b791200e..7835adb6 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt @@ -68,7 +68,7 @@ class SessionRowView : FrameLayout { title += session.getBlinds() } session.game?.let { - title += session.getGameTitle() + title += (if (title.isNotEmpty()) " " else "") + session.getGameTitle() } title += if (title.isEmpty()) "--" else "" @@ -92,7 +92,7 @@ class SessionRowView : FrameLayout { rowHistorySession.sessionInfoTableIcon.isVisible = session.tableSize != null rowHistorySession.sessionInfoTableValue.isVisible = session.tableSize != null session.tableSize?.let { - rowHistorySession.sessionInfoTableValue.text = TableSize.all[it].localizedTitle(context) + rowHistorySession.sessionInfoTableValue.text = TableSize(it).localizedTitle(context) } // State From f1cb310c9294f990ff3636dd07b316763cf09eba Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Mon, 25 Feb 2019 17:52:28 +0100 Subject: [PATCH 2/2] Fix toolbar background color --- app/src/main/res/values/styles.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 97a13d55..8848770a 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -31,6 +31,7 @@