From a8d3e850217992acc5ae2b6305b9df368bfc9521 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Wed, 3 Apr 2019 15:03:40 +0200
Subject: [PATCH] Refactoring and cleanup

---
 .../net/pokeranalytics/android/model/realm/Session.kt     | 5 ++---
 .../net/pokeranalytics/android/ui/view/SessionRowView.kt  | 8 ++++++--
 2 files changed, 8 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 a7f1809b..bf104448 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
@@ -486,7 +486,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 	 * Return the game title
 	 * Example: NL Holdem
 	 */
-	fun getGameTitle(): String {
+	fun getFormattedGame(): String {
 		var gameTitle = ""
 		limit?.let {
 			if (it >= 0 && it < Limit.values().size) {
@@ -523,7 +523,6 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 			SessionSetManager.removeFromTimeline(this)
 
 			// cleanup unnecessary related objects
-//			set.deleteFromRealm()
 			this.result?.deleteFromRealm()
 			this.computableResults?.deleteAllFromRealm()
 
@@ -622,7 +621,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 			SessionRow.CASHED_OUT, SessionRow.PRIZE, SessionRow.NET_RESULT -> this.result?.cashout?.toCurrency(CurrencyUtils.getCurrency(bankroll)) ?: NULL_TEXT
 			SessionRow.COMMENT -> if (this.comment.isNotEmpty()) this.comment else NULL_TEXT
 			SessionRow.END_DATE -> this.endDate?.shortDateTime() ?: NULL_TEXT
-			SessionRow.GAME -> getGameTitle()
+			SessionRow.GAME -> getFormattedGame()
 			SessionRow.INITIAL_BUY_IN -> tournamentEntryFee?.toCurrency(CurrencyUtils.getCurrency(bankroll)) ?: NULL_TEXT
 			SessionRow.LOCATION -> location?.name ?: NULL_TEXT
 			SessionRow.PLAYERS -> tournamentNumberOfPlayers?.toString() ?: NULL_TEXT
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 072b6276..6cef22f9 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
@@ -11,6 +11,7 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.ComputedStat
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.model.TableSize
+import net.pokeranalytics.android.model.TournamentType
 import net.pokeranalytics.android.model.extensions.SessionState
 import net.pokeranalytics.android.model.extensions.getState
 import net.pokeranalytics.android.model.realm.Session
@@ -73,7 +74,10 @@ class SessionRowView : FrameLayout {
 			session.tournamentName?.let {
 				parameters.add(it.name)
 			} ?: run {
-				parameters.add(session.getGameTitle())
+				parameters.add(session.getFormattedGame())
+				session.tournamentType?.let { type ->
+					parameters.add(TournamentType.values()[type].localizedTitle(context))
+				}
 			}
 
 			if (parameters.size == 0) {
@@ -84,7 +88,7 @@ class SessionRowView : FrameLayout {
 				parameters.add(session.getBlinds())
 			}
 			session.game?.let {
-				parameters.add(session.getGameTitle())
+				parameters.add(session.getFormattedGame())
 			}
 
 			if (parameters.size == 0) {