From b81d3af288857d10e1da29118f044e69d3a4fefe Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Mon, 25 Feb 2019 11:26:22 +0100
Subject: [PATCH 1/7] Update style

---
 app/src/main/res/values/styles.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index aa5feb46..0d5387bc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -101,6 +101,14 @@
 	</style>
 
 	<!-- Session Row -->
+	<style name="PokerAnalyticsTheme.TextView.SessionHeader">
+		<item name="android:textColor">@color/kaki_medium</item>
+		<item name="android:maxLines">1</item>
+		<item name="android:ellipsize">end</item>
+		<item name="android:fontFamily">@font/roboto_bold</item>
+		<item name="android:textSize">16sp</item>
+	</style>
+
 	<style name="PokerAnalyticsTheme.TextView.SessionRow">
 		<item name="android:textColor">@color/white</item>
 		<item name="android:maxLines">1</item>
@@ -154,6 +162,17 @@
 	</style>
 
 	<!-- Button -->
+	<style name="PokerAnalyticsTheme.Button" parent="Widget.MaterialComponents.Button">
+		<item name="iconPadding">0dp</item>
+		<item name="iconTint">@color/black</item>
+		<item name="android:letterSpacing">-0.02</item>
+		<item name="android:fontFamily">@font/roboto_medium</item>
+		<item name="android:textColor">@color/black</item>
+		<item name="android:paddingStart">4dp</item>
+		<item name="android:paddingEnd">8dp</item>
+		<item name="android:textSize">12sp</item>
+	</style>
+
 	<style name="PokerAnalyticsTheme.Button.Borderless" parent="Widget.MaterialComponents.Button">
 		<item name="android:background">?selectableItemBackgroundBorderless</item>
 		<item name="android:textColor">@color/green</item>

From 0d8e72f5f980bee4b0b72fecc2494af7d494ae3a Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Mon, 25 Feb 2019 11:26:38 +0100
Subject: [PATCH 2/7] Add new extensions

---
 .../pokeranalytics/android/util/Extensions.kt | 50 +++++++++++++++++--
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/util/Extensions.kt b/app/src/main/java/net/pokeranalytics/android/util/Extensions.kt
index 1e8c5ab1..cb74c703 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/Extensions.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/Extensions.kt
@@ -35,19 +35,54 @@ fun Double.toCurrency(): String {
 	return "$ ${formatter.format(this)}"
 }
 
+// Calendar
+
+// Return if the calendar dates are in the same month
+fun Calendar.isSameMonth(calendar: Calendar): Boolean {
+	return calendar.get(Calendar.YEAR) == this.get(Calendar.YEAR) &&
+			calendar.get(Calendar.MONTH) == this.get(Calendar.MONTH)
+}
+// Return if the calendar dates are in the same day
+fun Calendar.isSameDay(calendar: Calendar): Boolean {
+	return calendar.get(Calendar.YEAR) == this.get(Calendar.YEAR) &&
+			calendar.get(Calendar.MONTH) == this.get(Calendar.MONTH) &&
+			calendar.get(Calendar.DAY_OF_MONTH) == this.get(Calendar.DAY_OF_MONTH)
+}
+
 
 // Date
 
 // Return a short string of the date
-fun Date.short(): String {
+fun Date.shortDate(): String {
+	return DateFormat.getDateInstance(DateFormat.SHORT).format(this)
+}
+// Return a short string of the date
+fun Date.mediumDate(): String {
+	return DateFormat.getDateInstance(DateFormat.MEDIUM).format(this)
+}
+// Return a long string of the date
+fun Date.longDate(): String {
+	return DateFormat.getDateInstance(DateFormat.LONG).format(this)
+}
+// Return a short string of the date
+fun Date.fullDate(): String {
+	return DateFormat.getDateInstance(DateFormat.FULL).format(this)
+}
+
+// Return a short string of the date & time
+fun Date.shortDateTime(): String {
 	return DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(this)
 }
-// Return a medium string of the date
-fun Date.medium(): String {
+// Return a medium string of the date & time
+fun Date.mediumDateTime(): String {
 	return DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM).format(this)
 }
-// Return the full string of the date
-fun Date.full(): String {
+// Return a long string of the date & time
+fun Date.longDateTime(): String {
+	return DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG).format(this)
+}
+// Return the full string of the date & time
+fun Date.fullDateTime(): String {
 	return DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(this)
 }
 // Return the day number of the date
@@ -58,6 +93,11 @@ fun Date.getDayNumber() : String {
 fun Date.getShortDayName() : String {
 	return SimpleDateFormat("EE", Locale.getDefault()).format(this)
 }
+// Return the month & year of the date
+fun Date.getMonthAndYear(): String {
+	return SimpleDateFormat("MMMM YYYY", Locale.getDefault()).format(this)
+}
+
 // Return the duration between two dates
 fun Date.getDuration(context: Context, toDate: Date) : String {
 	val difference = (toDate.time - this.time).toInt()

From f3c792d2a1c57e1c78df49a41c1c3f139e946329 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Mon, 25 Feb 2019 11:29:37 +0100
Subject: [PATCH 3/7] Add header management for RowRepresentable

---
 .../pokeranalytics/android/calculus/Stat.kt   |   2 +
 .../net/pokeranalytics/android/model/Limit.kt |   3 +
 .../pokeranalytics/android/model/TableSize.kt |   3 +
 .../android/model/realm/Bankroll.kt           | 169 +++++++++---------
 .../android/model/realm/Game.kt               |   7 +-
 .../android/model/realm/Location.kt           |  12 +-
 .../android/model/realm/Session.kt            |  14 +-
 .../android/model/realm/TournamentFeature.kt  |  98 +++++-----
 .../android/model/realm/TransactionType.kt    | 136 +++++++-------
 .../android/ui/view/RowRepresentable.kt       |  21 +++
 10 files changed, 258 insertions(+), 207 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
index 680f1060..78a0b126 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
@@ -73,6 +73,8 @@ enum class Stat : RowRepresentable {
         }
 
     override val viewType: Int = RowViewType.TITLE_VALUE.ordinal
+    override var displayHeader: Boolean = false
+    override var headerValues: ArrayList<String> = ArrayList()
 }
 
 /**
diff --git a/app/src/main/java/net/pokeranalytics/android/model/Limit.kt b/app/src/main/java/net/pokeranalytics/android/model/Limit.kt
index 95121954..3a907b02 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/Limit.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/Limit.kt
@@ -36,6 +36,9 @@ enum class Limit : RowRepresentable {
 	override fun getDisplayName(): String {
 		return this.longName
 	}
+
+	override var displayHeader: Boolean = false
+	override var headerValues: ArrayList<String> = ArrayList()
 }
 
 /*
diff --git a/app/src/main/java/net/pokeranalytics/android/model/TableSize.kt b/app/src/main/java/net/pokeranalytics/android/model/TableSize.kt
index d13797c5..df445b25 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/TableSize.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/TableSize.kt
@@ -33,4 +33,7 @@ class TableSize(var numberOfPlayer: Int) : RowRepresentable {
 
 	override val viewType: Int
 		get() = RowViewType.TITLE_GRID.ordinal
+
+	override var displayHeader: Boolean = false
+	override var headerValues: ArrayList<String> = ArrayList()
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
index 964144ed..779e6379 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
@@ -3,94 +3,99 @@ package net.pokeranalytics.android.model.realm
 import android.text.InputType
 import io.realm.RealmList
 import io.realm.RealmObject
+import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
-import net.pokeranalytics.android.ui.view.RowEditableDescriptor
 import net.pokeranalytics.android.ui.view.*
 import java.util.*
 import kotlin.collections.ArrayList
 
 open class Bankroll(name: String = "") : RealmObject(), Savable,
-    RowRepresentableDataSource,
-    RowEditable, RowRepresentable {
-
-    companion object {
-        fun newInstance() : Bankroll {
-            var bankroll: Bankroll = Bankroll()
-            return bankroll
-        }
-    }
-
-    @PrimaryKey
-    var id = UUID.randomUUID().toString()
-
-    // the name of the bankroll
-    var name: String = name
-
-    // Indicates whether the bankroll is live or online
-    var live: Boolean = true
-
-    // The list of transactions of the bankroll
-    var transactions: RealmList<Transaction> = RealmList()
-
-    // The currency of the bankroll
-    var currency: Currency? = null
-
-    // @todo rate management
-
-    override fun getDisplayName(): String {
-        return this.name
-    }
-
-    override fun uniqueIdentifier(): String {
-        return this.id
-    }
-
-    override fun adapterRows(): ArrayList<RowRepresentable> {
-        val rows = ArrayList<RowRepresentable>()
-        rows.add(SimpleRow.NAME)
-        rows.addAll(BankrollRow.values())
-        return rows
-    }
-
-    override fun stringForRow(row: RowRepresentable): String {
-        return when (row) {
-            SimpleRow.NAME -> this.name
-            BankrollRow.LIVE -> if (this.live) "live" else "online"
-            BankrollRow.CURRENCY -> this.currency?.code?: ""
-            else -> return super.stringForRow(row)
-        }
-    }
-
-    override fun boolForRow(row: RowRepresentable): Boolean {
-        when (row) {
-            BankrollRow.LIVE -> return true
-            else -> return super.boolForRow(row)
-        }
-    }
-
-    override fun rowEditableDescriptors(row: RowRepresentable): ArrayList<RowEditableDescriptor> {
-        val data = java.util.ArrayList<RowEditableDescriptor>()
-        when (row) {
-            SimpleRow.NAME -> data.add(
-                RowEditableDescriptor(
-                    this.name,
-                    SimpleRow.NAME.resId,
-                    InputType.TYPE_CLASS_TEXT
-                )
-            )
-        }
-        return data
-    }
-
-    override fun updateValue(value: Any?, row: RowRepresentable) {
-        when (row) {
-            SimpleRow.NAME -> this.name = value as String? ?: ""
-        }
-    }
-
-    override fun isValidForSave(): Boolean {
-        return this.name.isNotEmpty()
-    }
+	RowRepresentableDataSource,
+	RowEditable, RowRepresentable {
+
+	companion object {
+		fun newInstance(): Bankroll {
+			var bankroll: Bankroll = Bankroll()
+			return bankroll
+		}
+	}
+
+	@PrimaryKey
+	var id = UUID.randomUUID().toString()
+
+	// the name of the bankroll
+	var name: String = name
+
+	// Indicates whether the bankroll is live or online
+	var live: Boolean = true
+
+	// The list of transactions of the bankroll
+	var transactions: RealmList<Transaction> = RealmList()
+
+	// The currency of the bankroll
+	var currency: Currency? = null
+
+	// @todo rate management
+
+	override fun getDisplayName(): String {
+		return this.name
+	}
+
+	override fun uniqueIdentifier(): String {
+		return this.id
+	}
+
+	override fun adapterRows(): ArrayList<RowRepresentable> {
+		val rows = ArrayList<RowRepresentable>()
+		rows.add(SimpleRow.NAME)
+		rows.addAll(BankrollRow.values())
+		return rows
+	}
+
+	override fun stringForRow(row: RowRepresentable): String {
+		return when (row) {
+			SimpleRow.NAME -> this.name
+			BankrollRow.LIVE -> if (this.live) "live" else "online"
+			BankrollRow.CURRENCY -> this.currency?.code ?: ""
+			else -> return super.stringForRow(row)
+		}
+	}
+
+	override fun boolForRow(row: RowRepresentable): Boolean {
+		when (row) {
+			BankrollRow.LIVE -> return true
+			else -> return super.boolForRow(row)
+		}
+	}
+
+	override fun rowEditableDescriptors(row: RowRepresentable): ArrayList<RowEditableDescriptor> {
+		val data = java.util.ArrayList<RowEditableDescriptor>()
+		when (row) {
+			SimpleRow.NAME -> data.add(
+				RowEditableDescriptor(
+					this.name,
+					SimpleRow.NAME.resId,
+					InputType.TYPE_CLASS_TEXT
+				)
+			)
+		}
+		return data
+	}
+
+	override fun updateValue(value: Any?, row: RowRepresentable) {
+		when (row) {
+			SimpleRow.NAME -> this.name = value as String? ?: ""
+		}
+	}
+
+	override fun isValidForSave(): Boolean {
+		return this.name.isNotEmpty()
+	}
+
+	@Ignore
+	override var displayHeader: Boolean = false
+	@Ignore
+	override var headerValues: ArrayList<String> = ArrayList()
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
index 2bf0fa53..c5ac2579 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
@@ -2,10 +2,10 @@ package net.pokeranalytics.android.model.realm
 
 import android.text.InputType
 import io.realm.RealmObject
+import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
-import net.pokeranalytics.android.ui.view.RowEditableDescriptor
 import net.pokeranalytics.android.ui.view.*
 import java.util.*
 
@@ -75,4 +75,9 @@ open class Game : RealmObject(), Savable, RowRepresentableDataSource, RowEditabl
     override fun isValidForSave(): Boolean {
         return this.name.isNotEmpty()
     }
+
+    @Ignore
+    override var displayHeader: Boolean = false
+    @Ignore
+    override var headerValues: ArrayList<String> = ArrayList()
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
index 7e4f49a0..0e07dcea 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
@@ -2,14 +2,11 @@ package net.pokeranalytics.android.model.realm
 
 import android.text.InputType
 import io.realm.RealmObject
+import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
-import net.pokeranalytics.android.ui.view.RowEditableDescriptor
-import net.pokeranalytics.android.ui.view.RowEditable
-import net.pokeranalytics.android.ui.view.LocationRow
-import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.SimpleRow
+import net.pokeranalytics.android.ui.view.*
 import java.util.*
 
 
@@ -72,4 +69,9 @@ open class Location : RealmObject(), Savable, RowRepresentableDataSource, RowEdi
     override fun isValidForSave(): Boolean {
         return this.name.isNotEmpty()
     }
+
+    @Ignore
+    override var displayHeader: Boolean = false
+    @Ignore
+    override var headerValues: ArrayList<String> = ArrayList()
 }
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 966c8c67..84fa41f0 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
@@ -14,13 +14,13 @@ import net.pokeranalytics.android.model.extensions.SessionState
 import net.pokeranalytics.android.model.extensions.getState
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
-import net.pokeranalytics.android.ui.view.RowEditableDescriptor
 import net.pokeranalytics.android.ui.view.RowEditable
+import net.pokeranalytics.android.ui.view.RowEditableDescriptor
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.SessionRow
 import net.pokeranalytics.android.util.getDuration
 import net.pokeranalytics.android.util.round
-import net.pokeranalytics.android.util.short
+import net.pokeranalytics.android.util.shortDateTime
 import net.pokeranalytics.android.util.toCurrency
 import timber.log.Timber
 import java.util.*
@@ -97,6 +97,12 @@ open class Session : RealmObject(), SessionInterface, Savable,
 	// The features of the tournament, like Knockout, Shootout, Turbo...
 	var tournamentFeatures: RealmList<TournamentFeature> = RealmList()
 
+	@Ignore
+	override var displayHeader: Boolean = false
+
+	@Ignore
+	override var headerValues: ArrayList<String> = ArrayList()
+
 	/**
 	 * Start a session
 	 */
@@ -279,8 +285,8 @@ open class Session : RealmObject(), SessionInterface, Savable,
 			SessionRow.LOCATION -> location?.name ?: "--"
 			SessionRow.BANKROLL -> bankroll?.name ?: "--"
 			SessionRow.TABLE_SIZE -> tableSize?.toString() ?: "--"
-			SessionRow.START_DATE -> if (timeFrame != null) timeFrame?.startDate?.short() ?: "--" else "--"
-			SessionRow.END_DATE -> if (timeFrame != null) timeFrame?.endDate?.short() ?: "--" 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 "--"
 			else -> "--"
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
index 4b36646f..9a7001b7 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
@@ -2,68 +2,70 @@ package net.pokeranalytics.android.model.realm
 
 import android.text.InputType
 import io.realm.RealmObject
+import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
-import net.pokeranalytics.android.ui.view.RowEditableDescriptor
-import net.pokeranalytics.android.ui.view.RowEditable
-import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.SimpleRow
-import net.pokeranalytics.android.ui.view.TournamentFeatureRow
+import net.pokeranalytics.android.ui.view.*
 import java.util.*
 
 open class TournamentFeature : RealmObject(), Savable, RowRepresentableDataSource, RowEditable, RowRepresentable {
 
-    @PrimaryKey
-    var id = UUID.randomUUID().toString()
+	@PrimaryKey
+	var id = UUID.randomUUID().toString()
 
-    // The name of the feature
-    var name: String = ""
+	// The name of the feature
+	var name: String = ""
 
-    override fun getDisplayName(): String {
-        return this.name
-    }
+	override fun getDisplayName(): String {
+		return this.name
+	}
 
-    override fun uniqueIdentifier(): String {
-        return this.id
-    }
+	override fun uniqueIdentifier(): String {
+		return this.id
+	}
 
-    override fun adapterRows(): ArrayList<RowRepresentable> {
-        val rows = ArrayList<RowRepresentable>()
-        rows.add(SimpleRow.NAME)
-        rows.addAll(TournamentFeatureRow.values())
-        return rows
-    }
+	override fun adapterRows(): ArrayList<RowRepresentable> {
+		val rows = ArrayList<RowRepresentable>()
+		rows.add(SimpleRow.NAME)
+		rows.addAll(TournamentFeatureRow.values())
+		return rows
+	}
 
-    override fun stringForRow(row: RowRepresentable): String {
-        return when (row) {
-            SimpleRow.NAME -> this.name
-            else -> return super.stringForRow(row)
-        }
-    }
+	override fun stringForRow(row: RowRepresentable): String {
+		return when (row) {
+			SimpleRow.NAME -> this.name
+			else -> return super.stringForRow(row)
+		}
+	}
 
 
-    override fun rowEditableDescriptors(row: RowRepresentable): ArrayList<RowEditableDescriptor> {
-        val data = java.util.ArrayList<RowEditableDescriptor>()
-        when (row) {
-            SimpleRow.NAME -> data.add(
-                RowEditableDescriptor(
-                    this.name,
-                    SimpleRow.NAME.resId,
-                    InputType.TYPE_CLASS_TEXT
-                )
-            )
-        }
-        return data
-    }
+	override fun rowEditableDescriptors(row: RowRepresentable): ArrayList<RowEditableDescriptor> {
+		val data = java.util.ArrayList<RowEditableDescriptor>()
+		when (row) {
+			SimpleRow.NAME -> data.add(
+				RowEditableDescriptor(
+					this.name,
+					SimpleRow.NAME.resId,
+					InputType.TYPE_CLASS_TEXT
+				)
+			)
+		}
+		return data
+	}
 
-    override fun updateValue(value: Any?, row: RowRepresentable) {
-        when (row) {
-            SimpleRow.NAME -> this.name = value as String? ?: ""
-        }
-    }
+	override fun updateValue(value: Any?, row: RowRepresentable) {
+		when (row) {
+			SimpleRow.NAME -> this.name = value as String? ?: ""
+		}
+	}
 
-    override fun isValidForSave(): Boolean {
-        return this.name.isNotEmpty()
-    }
+	override fun isValidForSave(): Boolean {
+		return this.name.isNotEmpty()
+	}
+
+	@Ignore
+	override var displayHeader: Boolean = false
+	@Ignore
+	override var headerValues: ArrayList<String> = ArrayList()
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
index 0d1130c7..a6b92d33 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
@@ -2,82 +2,84 @@ package net.pokeranalytics.android.model.realm
 
 import android.text.InputType
 import io.realm.RealmObject
+import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
-import net.pokeranalytics.android.ui.view.RowEditableDescriptor
-import net.pokeranalytics.android.ui.view.RowEditable
-import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.SimpleRow
-import net.pokeranalytics.android.ui.view.TransactionTypeRow
+import net.pokeranalytics.android.ui.view.*
 import java.util.*
 
 
 open class TransactionType : RealmObject(), Savable, RowRepresentableDataSource, RowEditable, RowRepresentable {
 
-    @PrimaryKey
-    var id = UUID.randomUUID().toString()
-
-    // The name of the transaction type
-    var name: String = ""
-
-    // Whether or not the amount is added, or subtracted to the bankroll total
-    var additive: Boolean = false
-
-    // Whether or not the type can be deleted by the user
-    var lock: Boolean = false
-
-    // The predefined kind, if necessary, like: Withdrawal, deposit, or tips
-    var kind: Int? = null
-
-    override fun getDisplayName(): String {
-        return this.name
-    }
-
-    override fun uniqueIdentifier(): String {
-        return this.id
-    }
-
-    override fun adapterRows(): ArrayList<RowRepresentable> {
-        val rows = ArrayList<RowRepresentable>()
-        rows.add(SimpleRow.NAME)
-        rows.addAll(TransactionTypeRow.values())
-        return rows
-    }
-
-    override fun stringForRow(row: RowRepresentable): String {
-        return when (row) {
-            SimpleRow.NAME -> this.name
-            else -> return super.stringForRow(row)
-        }
-    }
-
-    override fun rowEditableDescriptors(row: RowRepresentable): ArrayList<RowEditableDescriptor> {
-        val data = java.util.ArrayList<RowEditableDescriptor>()
-        when (row) {
-            SimpleRow.NAME -> data.add(
-                RowEditableDescriptor(
-                    this.name,
-                    SimpleRow.NAME.resId,
-                    InputType.TYPE_CLASS_TEXT
-                )
-            )
-        }
-        return data
-    }
-
-    override fun updateValue(value: Any?, row: RowRepresentable) {
-        when (row) {
-            SimpleRow.NAME -> this.name = value as String? ?: ""
-        }
-    }
-
-    override fun isValidForSave(): Boolean {
-        return this.name.isNotEmpty()
-    }
+	@PrimaryKey
+	var id = UUID.randomUUID().toString()
+
+	// The name of the transaction type
+	var name: String = ""
+
+	// Whether or not the amount is added, or subtracted to the bankroll total
+	var additive: Boolean = false
+
+	// Whether or not the type can be deleted by the user
+	var lock: Boolean = false
+
+	// The predefined kind, if necessary, like: Withdrawal, deposit, or tips
+	var kind: Int? = null
+
+	override fun getDisplayName(): String {
+		return this.name
+	}
+
+	override fun uniqueIdentifier(): String {
+		return this.id
+	}
+
+	override fun adapterRows(): ArrayList<RowRepresentable> {
+		val rows = ArrayList<RowRepresentable>()
+		rows.add(SimpleRow.NAME)
+		rows.addAll(TransactionTypeRow.values())
+		return rows
+	}
+
+	override fun stringForRow(row: RowRepresentable): String {
+		return when (row) {
+			SimpleRow.NAME -> this.name
+			else -> return super.stringForRow(row)
+		}
+	}
+
+	override fun rowEditableDescriptors(row: RowRepresentable): ArrayList<RowEditableDescriptor> {
+		val data = java.util.ArrayList<RowEditableDescriptor>()
+		when (row) {
+			SimpleRow.NAME -> data.add(
+				RowEditableDescriptor(
+					this.name,
+					SimpleRow.NAME.resId,
+					InputType.TYPE_CLASS_TEXT
+				)
+			)
+		}
+		return data
+	}
+
+	override fun updateValue(value: Any?, row: RowRepresentable) {
+		when (row) {
+			SimpleRow.NAME -> this.name = value as String? ?: ""
+		}
+	}
+
+	override fun isValidForSave(): Boolean {
+		return this.name.isNotEmpty()
+	}
+
+	@Ignore
+	override var displayHeader: Boolean = false
+	@Ignore
+	override var headerValues: ArrayList<String> = ArrayList()
 }
 
 enum class TransactionKind {
-    WITHDRAWAL,
-    DEPOSIT
+	WITHDRAWAL,
+	DEPOSIT
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt
index 81c00890..0d0cfb0a 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt
@@ -69,6 +69,10 @@ interface Displayable: Localizable {
 		get() {
 			return false
 		}
+
+	var displayHeader: Boolean
+	var headerValues: ArrayList<String>
+
 }
 
 enum class SessionRow : RowRepresentable {
@@ -179,6 +183,9 @@ enum class SessionRow : RowRepresentable {
 				else -> BottomSheetType.NONE
 			}
 		}
+
+	override var displayHeader: Boolean = false
+	override var headerValues: ArrayList<String> = ArrayList()
 }
 
 enum class SimpleRow : RowRepresentable {
@@ -187,6 +194,8 @@ enum class SimpleRow : RowRepresentable {
 	override val resId: Int? = R.string.name
 	override val viewType: Int = RowViewType.TITLE_VALUE.ordinal
 	override val bottomSheetType: BottomSheetType = BottomSheetType.EDIT_TEXT
+	override var displayHeader: Boolean = false
+	override var headerValues: ArrayList<String> = ArrayList()
 }
 
 enum class BankrollRow : RowRepresentable {
@@ -215,6 +224,9 @@ enum class BankrollRow : RowRepresentable {
 				CURRENCY -> BottomSheetType.LIST
 			}
 		}
+
+	override var displayHeader: Boolean = false
+	override var headerValues: ArrayList<String> = ArrayList()
 }
 
 enum class GameRow : RowRepresentable {
@@ -240,6 +252,9 @@ enum class GameRow : RowRepresentable {
 				SHORT_NAME -> BottomSheetType.EDIT_TEXT
 			}
 		}
+
+	override var displayHeader: Boolean = false
+	override var headerValues: ArrayList<String> = ArrayList()
 }
 
 enum class LocationRow : RowRepresentable {
@@ -265,6 +280,9 @@ enum class LocationRow : RowRepresentable {
 				LOCATION_STATUS -> BottomSheetType.NONE
 			}
 		}
+
+	override var displayHeader: Boolean = false
+	override var headerValues: ArrayList<String> = ArrayList()
 }
 
 enum class TransactionTypeRow : RowRepresentable {
@@ -301,4 +319,7 @@ enum class SettingRow : RowRepresentable {
 				TRANSACTION_TYPE -> LiveData.TRANSACTION_TYPE
 			}
 		}
+
+	override var displayHeader: Boolean = false
+	override var headerValues: ArrayList<String> = ArrayList()
 }
\ No newline at end of file

From 910675ba27d4c7942b87a6f9acd4412b18917c72 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Mon, 25 Feb 2019 11:29:52 +0100
Subject: [PATCH 4/7] Add fake data to test UI

---
 .../android/PokerAnalyticsApplication.kt      | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
index a9b1286f..318a8459 100644
--- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
+++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
@@ -5,8 +5,11 @@ import io.realm.Realm
 import io.realm.RealmConfiguration
 import io.realm.RealmResults
 import io.realm.kotlin.where
+import net.pokeranalytics.android.model.Limit
 import net.pokeranalytics.android.model.realm.Game
+import net.pokeranalytics.android.model.realm.Result
 import net.pokeranalytics.android.model.realm.Session
+import net.pokeranalytics.android.model.realm.TimeFrame
 import net.pokeranalytics.android.util.PokerAnalyticsLogs
 import timber.log.Timber
 import java.util.*
@@ -86,6 +89,53 @@ class PokerAnalyticsApplication : Application() {
 			}
 		}
 
+		if (BuildConfig.DEBUG) {
+			val sessions = realm.where<Session>().findAll()
+			if (sessions.size < 10) {
+				for (index in 0..50) {
+
+					realm.executeTransaction {
+						val session = Session()
+						session.id = UUID.randomUUID().toString()
+
+						val calendar = Calendar.getInstance()
+						calendar.set(
+							(2017..2018).random(),
+							(0..11).random(),
+							(0..28).random(),
+							(0..23).random(),
+							(0..59).random()
+						)
+
+						val startDate = calendar.time
+						calendar.add(Calendar.HOUR_OF_DAY, (2..12).random())
+						calendar.add(Calendar.MINUTE, (0..59).random())
+						val endDate = calendar.time
+
+						val timeFrame = TimeFrame()
+						timeFrame.setDate(startDate, endDate)
+						session.timeFrame = timeFrame
+						session.creationDate = startDate
+
+						session.limit = Limit.values().random().ordinal
+						session.game = realm.where<Game>().findAll().random()
+
+						val result = Result()
+						result.buyin = arrayListOf(100, 200, 300, 500, 1000, 2000).random().toDouble()
+						result.netResult = arrayListOf(
+							-2500.0, -2000.0, -1500.0, -1000.0, -500.0, 200.0, 1000.0, 1500.0,
+							2500.0
+						).random()
+						session.result = result
+
+						realm.copyToRealmOrUpdate(session)
+					}
+				}
+			}
+		}
+
+		realm.close()
+
 	}
 
 }
\ No newline at end of file

From 30254db040d6145f9af7141486902768fc845664 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Mon, 25 Feb 2019 11:30:08 +0100
Subject: [PATCH 5/7] Improve Sessions history UI

---
 .../android/ui/fragment/HistoryFragment.kt    | 59 +++++++++++++++----
 .../android/ui/view/RowViewType.kt            | 13 +++-
 .../android/ui/view/SessionRowView.kt         |  6 ++
 app/src/main/res/layout/fragment_history.xml  | 47 ++++++++++++++-
 .../main/res/layout/row_history_session.xml   | 28 ++++++---
 app/src/main/res/layout/row_session_view.xml  |  2 +-
 6 files changed, 130 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
index 1eef93e2..2ee7bd10 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.realm.RealmResults
 import io.realm.Sort
@@ -20,6 +19,11 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
+import net.pokeranalytics.android.util.getMonthAndYear
+import net.pokeranalytics.android.util.isSameDay
+import net.pokeranalytics.android.util.isSameMonth
+import net.pokeranalytics.android.util.longDate
+import java.util.*
 
 class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource,
 	RowRepresentableDelegate {
@@ -35,6 +39,7 @@ class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource,
 
 	private lateinit var historyAdapter: RowRepresentableAdapter
 	private lateinit var realmSessions: RealmResults<Session>
+	private val sessions: ArrayList<Session> = ArrayList()
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		return inflater.inflate(R.layout.fragment_history, container, false)
@@ -54,6 +59,10 @@ class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource,
 	override fun onResume() {
 		super.onResume()
 		historyAdapter.notifyDataSetChanged()
+
+		sessions.clear()
+		sessions.addAll(getRealm().copyFromRealm(realmSessions))
+		createSessionsHeaders()
 	}
 
 	/**
@@ -61,7 +70,7 @@ class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource,
 	 */
 	private fun initUI() {
 
-		newSession.setOnClickListener {
+		newCashGame.setOnClickListener {
 			SessionActivity.newInstance(requireContext(), false)
 		}
 
@@ -69,13 +78,6 @@ class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource,
 			SessionActivity.newInstance(requireContext(), true)
 		}
 
-		newHand.setOnClickListener {
-			Toast.makeText(requireContext(), "Open new hand", Toast.LENGTH_SHORT).show()
-		}
-		newTransaction.setOnClickListener {
-			Toast.makeText(requireContext(), "Open new transaction", Toast.LENGTH_SHORT).show()
-		}
-
 	}
 
 	/**
@@ -83,9 +85,12 @@ class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource,
 	 */
 	private fun initData() {
 		realmSessions = getRealm().where<Session>().findAll().sort("timeFrame.startDate", Sort.DESCENDING)
+
 		val viewManager = LinearLayoutManager(requireContext())
 		historyAdapter = RowRepresentableAdapter(this, this)
 
+		createSessionsHeaders()
+
 		recyclerView.apply {
 			setHasFixedSize(true)
 			layoutManager = viewManager
@@ -93,12 +98,42 @@ class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource,
 		}
 	}
 
+	/**
+	 * Create the sessions headers
+	 */
+	private fun createSessionsHeaders() {
+
+		val groupedByDay = false
+
+		val calendar = Calendar.getInstance()
+		val currentCalendar = Calendar.getInstance()
+
+		for ((index, session) in sessions.withIndex()) {
+			currentCalendar.time = session.creationDate
+			if (groupedByDay) {
+				if (!calendar.isSameDay(currentCalendar) || index == 0) {
+					calendar.time = currentCalendar.time
+					session.displayHeader = true
+					session.headerValues = arrayListOf(session.creationDate.longDate(), "$ 123")
+				}
+			} else {
+				if (!calendar.isSameMonth(currentCalendar) || index == 0) {
+					calendar.time = currentCalendar.time
+					session.displayHeader = true
+					session.headerValues = arrayListOf(session.creationDate.getMonthAndYear(), "$ 123")
+				}
+			}
+		}
+
+	}
+
+
 	override fun rowRepresentableForPosition(position: Int): RowRepresentable {
-		return this.realmSessions[position] as RowRepresentable
+		return this.sessions[position]
 	}
 
 	override fun numberOfRows(): Int {
-		return this.realmSessions.size
+		return this.sessions.size
 	}
 
 	override fun viewTypeForPosition(position: Int): Int {
@@ -106,7 +141,7 @@ class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource,
 	}
 
 	override fun indexForRow(row: RowRepresentable): Int {
-		return this.realmSessions.indexOf(row)
+		return this.sessions.indexOf(row)
 	}
 
 	override fun onRowSelected(row: RowRepresentable) {
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 9cb810a3..27b1acf6 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
@@ -3,6 +3,7 @@ package net.pokeranalytics.android.ui.view
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.row_bottom_sheet_grid_title.view.*
 import kotlinx.android.synthetic.main.row_bottom_sheet_title.view.*
@@ -45,8 +46,16 @@ enum class RowViewType {
 	inner class RowSessionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView),
 		BindableHolder {
 		override fun bind(row: RowRepresentable, rowRepresentableDataSource: RowRepresentableDataSource?, listener: View.OnClickListener, actionListener: View.OnClickListener?) {
-				itemView.sessionRow.setData(row as Session)
-				itemView.sessionRow.setOnClickListener(listener)
+
+			if (row.displayHeader) {
+				itemView.sessionHeader.isVisible = true
+				itemView.sessionHeader.text = row.headerValues.firstOrNull() ?: ""
+			} else {
+				itemView.sessionHeader.isVisible = false
+			}
+
+			itemView.sessionRow.setData(row as Session)
+			itemView.sessionRow.setOnClickListener(listener)
 		}
 	}
 
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 b286df75..30a0b39a 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
@@ -5,12 +5,14 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
 import kotlinx.android.synthetic.main.row_session_view.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.util.getDayNumber
 import net.pokeranalytics.android.util.getShortDayName
 import net.pokeranalytics.android.util.toCurrency
+import timber.log.Timber
 
 
 class SessionRowView : FrameLayout {
@@ -60,6 +62,10 @@ class SessionRowView : FrameLayout {
 		rowHistorySession.gameInfo.text = session.getDuration(context)
 		rowHistorySession.gameResult.text = session.result?.netResult?.toCurrency() ?: "$0"
 
+		val result = session.result?.netResult ?: 0.0
+		val resultColor = if (result >= 0.0) R.color.green else R.color.red
+		rowHistorySession.gameResult.setTextColor(ContextCompat.getColor(context, resultColor))
+
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
index 3408c3e6..7af3b04a 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -7,6 +7,8 @@
 	android:layout_height="match_parent"
 	tools:context=".ui.activity.HomeActivity">
 
+
+	<!--
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/newSession"
 		android:layout_width="48dp"
@@ -17,6 +19,7 @@
 		android:elevation="4dp"
 		android:scaleType="fitCenter"
 		android:src="@drawable/add_cash_game"
+		android:visibility="gone"
 		app:layout_constraintEnd_toStartOf="@+id/newTournament"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintStart_toStartOf="parent"
@@ -31,6 +34,7 @@
 		android:elevation="4dp"
 		android:scaleType="fitCenter"
 		android:src="@drawable/add_tournoi"
+		android:visibility="gone"
 		app:layout_constraintEnd_toStartOf="@+id/newHand"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintStart_toEndOf="@+id/newSession"
@@ -45,6 +49,7 @@
 		android:elevation="4dp"
 		android:scaleType="fitCenter"
 		android:src="@drawable/add_hand"
+		android:visibility="gone"
 		app:layout_constraintEnd_toStartOf="@+id/newTransaction"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintStart_toEndOf="@+id/newTournament"
@@ -60,20 +65,58 @@
 		android:elevation="4dp"
 		android:scaleType="fitCenter"
 		android:src="@drawable/add_transaction"
+		android:visibility="gone"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintStart_toEndOf="@+id/newHand"
 		app:layout_constraintTop_toTopOf="@+id/newSession" />
 
+	-->
+
+	<com.google.android.material.button.MaterialButton
+		android:id="@+id/newCashGame"
+		style="@style/PokerAnalyticsTheme.Button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:text="@string/new_cash_game"
+		app:icon="@drawable/add_cash_game"
+		app:iconSize="32dp"
+		app:layout_constraintEnd_toStartOf="@+id/newTournament"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintHorizontal_chainStyle="spread"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
+
+
+	<com.google.android.material.button.MaterialButton
+		android:id="@+id/newTournament"
+		style="@style/PokerAnalyticsTheme.Button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="16dp"
+		android:text="@string/new_tournament"
+		app:icon="@drawable/add_tournoi"
+		app:iconSize="32dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toEndOf="@+id/newCashGame"
+		app:layout_constraintTop_toTopOf="parent" />
+
+
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
-		android:layout_marginTop="16dp"
+		android:layout_marginTop="8dp"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/newHand"
+		app:layout_constraintTop_toBottomOf="@+id/newCashGame"
 		tools:listitem="@layout/row_history_session" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_history_session.xml b/app/src/main/res/layout/row_history_session.xml
index c4c27304..fdefc67b 100644
--- a/app/src/main/res/layout/row_history_session.xml
+++ b/app/src/main/res/layout/row_history_session.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<androidx.appcompat.widget.AppCompatTextView
+		android:id="@+id/sessionHeader"
+		style="@style/PokerAnalyticsTheme.TextView.SessionHeader"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="16dp"
+		android:visibility="gone"
+		tools:text="Header"
+		tools:visibility="visible" />
 
 	<net.pokeranalytics.android.ui.view.SessionRowView
-			android:id="@+id/sessionRow"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" />
+		android:id="@+id/sessionRow"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content" />
 
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_session_view.xml b/app/src/main/res/layout/row_session_view.xml
index ff4b18a8..61515f4b 100644
--- a/app/src/main/res/layout/row_session_view.xml
+++ b/app/src/main/res/layout/row_session_view.xml
@@ -40,7 +40,7 @@
 		style="@style/PokerAnalyticsTheme.TextView.SessionRow.Title"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
+		android:layout_marginStart="8dp"
 		android:layout_marginTop="8dp"
 		android:layout_marginEnd="8dp"
 		app:layout_constraintBottom_toTopOf="@+id/gameInfo"

From 462e54a8e9aaa9f79a92872027797d597be4833b Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Mon, 25 Feb 2019 14:26:28 +0100
Subject: [PATCH 6/7] Improve session UI

---
 .../main/java/net/pokeranalytics/android/util/Extensions.kt   | 4 ++--
 app/src/main/res/layout/fragment_history.xml                  | 1 -
 app/src/main/res/layout/fragment_session.xml                  | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/util/Extensions.kt b/app/src/main/java/net/pokeranalytics/android/util/Extensions.kt
index cb74c703..9037f16a 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/Extensions.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/Extensions.kt
@@ -91,11 +91,11 @@ fun Date.getDayNumber() : String {
 }
 // Return the 3 first letters of the date's day
 fun Date.getShortDayName() : String {
-	return SimpleDateFormat("EE", Locale.getDefault()).format(this)
+	return SimpleDateFormat("EE", Locale.getDefault()).format(this).substring(0, 3)
 }
 // Return the month & year of the date
 fun Date.getMonthAndYear(): String {
-	return SimpleDateFormat("MMMM YYYY", Locale.getDefault()).format(this)
+	return SimpleDateFormat("MMMM YYYY", Locale.getDefault()).format(this).capitalize()
 }
 
 // Return the duration between two dates
diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
index 7af3b04a..c5b1fb98 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -7,7 +7,6 @@
 	android:layout_height="match_parent"
 	tools:context=".ui.activity.HomeActivity">
 
-
 	<!--
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/newSession"
diff --git a/app/src/main/res/layout/fragment_session.xml b/app/src/main/res/layout/fragment_session.xml
index 6da823a1..ac2b1e00 100644
--- a/app/src/main/res/layout/fragment_session.xml
+++ b/app/src/main/res/layout/fragment_session.xml
@@ -159,6 +159,7 @@
 		android:layout_gravity="bottom|center"
 		android:layout_marginBottom="28dp"
 		android:elevation="16dp"
-		android:src="@drawable/ic_outline_play" />
+		android:src="@drawable/ic_outline_play"
+		android:tint="@color/black" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

From 42d97a367215e25407d84f017f512583c5611ed2 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Mon, 25 Feb 2019 14:33:45 +0100
Subject: [PATCH 7/7] Merge

---
 .../java/net/pokeranalytics/android/model/realm/Bankroll.kt  | 5 ++++-
 .../java/net/pokeranalytics/android/model/realm/Session.kt   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
index a1fbc3f6..ac5ad146 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
@@ -3,11 +3,14 @@ package net.pokeranalytics.android.model.realm
 import android.text.InputType
 import io.realm.RealmList
 import io.realm.RealmObject
+import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.view.BankrollRow
+import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
-import net.pokeranalytics.android.ui.view.*
+import net.pokeranalytics.android.ui.view.SimpleRow
 import java.util.*
 import kotlin.collections.ArrayList
 
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 f2b915c9..bde9ee18 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
@@ -14,12 +14,12 @@ import net.pokeranalytics.android.model.extensions.SessionState
 import net.pokeranalytics.android.model.extensions.getState
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
-import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.RowRepresentable
+import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.SessionRow
 import net.pokeranalytics.android.util.getDuration
 import net.pokeranalytics.android.util.round
-import net.pokeranalytics.android.util.short
+import net.pokeranalytics.android.util.shortDateTime
 import net.pokeranalytics.android.util.toCurrency
 import timber.log.Timber
 import java.util.*