From 97922b3a4853f5684b334c8e38353d597050b2a0 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Thu, 28 Feb 2019 09:19:31 +0100
Subject: [PATCH] Improve Stats display

---
 .../android/ui/view/RowViewType.kt            | 20 ++++++-
 ...row_stat.xml => row_stats_title_value.xml} | 54 +++++++++++--------
 app/src/main/res/values/styles.xml            | 21 ++++++++
 3 files changed, 71 insertions(+), 24 deletions(-)
 rename app/src/main/res/layout/{row_stat.xml => row_stats_title_value.xml} (61%)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
index e64e1aed..badf2572 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
@@ -10,6 +10,7 @@ import kotlinx.android.synthetic.main.row_bottom_sheet_title.view.*
 import kotlinx.android.synthetic.main.row_header_title_amount.view.*
 import kotlinx.android.synthetic.main.row_header_title_value.view.*
 import kotlinx.android.synthetic.main.row_history_session.view.*
+import kotlinx.android.synthetic.main.row_stats_title_value.view.*
 import kotlinx.android.synthetic.main.row_title.view.*
 import kotlinx.android.synthetic.main.row_title_switch.view.*
 import kotlinx.android.synthetic.main.row_title_value.view.*
@@ -127,9 +128,9 @@ enum class RowViewType {
 					parent,
 					false)
 			)
-			STAT -> TitleValueViewHolder(
+			STAT -> StatsTitleValueViewHolder(
 				LayoutInflater.from(parent.context).inflate(
-					R.layout.row_stat,
+					R.layout.row_stats_title_value,
 					parent,
 					false
 				)
@@ -202,6 +203,21 @@ enum class RowViewType {
 		}
 	}
 
+	inner class StatsTitleValueViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView),
+		BindableHolder {
+		override fun bind(position: Int, row: RowRepresentable, adapter: RowRepresentableAdapter) {
+			itemView.rowStatsTitleValue_title.text = row.localizedTitle(itemView.context)
+			adapter.dataSource?.let {
+				itemView.rowStatsTitleValue_value.text = it.stringForRow(row, itemView.context)
+			}
+			val listener = View.OnClickListener {
+				adapter.delegate?.onRowSelected(position, row)
+			}
+			itemView.rowStatsTitleValue_container.setOnClickListener(listener)
+			itemView.rowStatsTitleValue_separator.visibility = if (row.needSeparator) View.VISIBLE else View.GONE
+		}
+	}
+
 	inner class TitleGridSessionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder {
 		override fun bind(position: Int, row: RowRepresentable, adapter: RowRepresentableAdapter) {
 			itemView.title.text = row.localizedTitle(itemView.context)
diff --git a/app/src/main/res/layout/row_stat.xml b/app/src/main/res/layout/row_stats_title_value.xml
similarity index 61%
rename from app/src/main/res/layout/row_stat.xml
rename to app/src/main/res/layout/row_stats_title_value.xml
index 593ea863..5947b5de 100644
--- a/app/src/main/res/layout/row_stat.xml
+++ b/app/src/main/res/layout/row_stats_title_value.xml
@@ -2,10 +2,10 @@
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/rowTitleValue.container"
+	android:id="@+id/rowStatsTitleValue.container"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:orientation="horizontal">
+	android:orientation="vertical">
 
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
@@ -13,31 +13,41 @@
 		android:background="?selectableItemBackground">
 
 		<androidx.appcompat.widget.AppCompatTextView
-			android:id="@+id/rowTitleValue.title"
-			style="@style/PokerAnalyticsTheme.TextView.RowTitle"
-			android:layout_width="wrap_content"
+			android:id="@+id/rowStatsTitleValue.title"
+			style="@style/PokerAnalyticsTheme.TextView.RowStatsTitle"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp"
-			android:layout_marginBottom="16dp"
-			app:layout_constraintBottom_toBottomOf="parent"
+			android:layout_marginTop="8dp"
+			android:layout_marginEnd="8dp"
+			app:layout_constraintEnd_toStartOf="@+id/nextArrow"
 			app:layout_constraintStart_toStartOf="@+id/guidelineStart"
 			app:layout_constraintTop_toTopOf="parent"
 			tools:text="Title" />
 
 		<androidx.appcompat.widget.AppCompatTextView
-				android:id="@+id/rowTitleValue.value"
-				style="@style/PokerAnalyticsTheme.TextView.RowValue"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="16dp"
-				android:ellipsize="end"
-				android:gravity="end"
-				android:maxLines="1"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
-				app:layout_constraintStart_toEndOf="@+id/rowTitleValue.title"
-				app:layout_constraintTop_toTopOf="parent"
-				tools:text="Value" app:layout_constraintHorizontal_bias="1.0"/>
+			android:id="@+id/rowStatsTitleValue.value"
+			style="@style/PokerAnalyticsTheme.TextView.RowStatsValue"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="8dp"
+			android:layout_marginBottom="8dp"
+			android:paddingTop="-8dp"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toStartOf="@+id/nextArrow"
+			app:layout_constraintStart_toStartOf="@+id/guidelineStart"
+			app:layout_constraintTop_toBottomOf="@+id/rowStatsTitleValue.title"
+			tools:text="Value" />
+
+		<ImageView
+			android:id="@+id/nextArrow"
+			android:layout_width="24dp"
+			android:layout_height="24dp"
+			android:src="@drawable/ic_arrow_right"
+			android:tint="@color/gray_light"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
+			app:layout_constraintTop_toTopOf="parent" />
+
 
 		<androidx.constraintlayout.widget.Guideline
 			android:id="@+id/guidelineStart"
@@ -56,7 +66,7 @@
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
 	<FrameLayout
-		android:id="@+id/rowTitleValue.separator"
+		android:id="@+id/rowStatsTitleValue.separator"
 		android:layout_width="match_parent"
 		android:layout_height="16dp"
 		android:visibility="gone"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dec0a790..f97d34e6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -89,12 +89,33 @@
 		<item name="android:textSize">16sp</item>
 		<item name="android:textColor">@color/white</item>
 		<item name="android:fontFamily">@font/roboto</item>
+		<item name="android:maxLines">1</item>
+		<item name="android:ellipsize">end</item>
 	</style>
 
 	<style name="PokerAnalyticsTheme.TextView.RowValue">
 		<item name="android:textSize">16sp</item>
 		<item name="android:textColor">@color/kaki_lighter</item>
 		<item name="android:fontFamily">@font/roboto</item>
+		<item name="android:maxLines">1</item>
+		<item name="android:ellipsize">end</item>
+	</style>
+
+	<style name="PokerAnalyticsTheme.TextView.RowStatsTitle">
+		<item name="android:textSize">12sp</item>
+		<item name="android:textColor">@color/white</item>
+		<item name="android:fontFamily">@font/roboto_light</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:maxLines">1</item>
+		<item name="android:ellipsize">end</item>
+	</style>
+
+	<style name="PokerAnalyticsTheme.TextView.RowStatsValue">
+		<item name="android:textSize">24sp</item>
+		<item name="android:textColor">@color/white</item>
+		<item name="android:fontFamily">@font/roboto_light</item>
+		<item name="android:maxLines">1</item>
+		<item name="android:ellipsize">end</item>
 	</style>
 
 	<!-- Bottom Sheet -->