diff --git a/app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt b/app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt index b0717ff1..278ece74 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt @@ -3,11 +3,6 @@ package net.pokeranalytics.android.model.extensions import net.pokeranalytics.android.model.realm.Session import java.util.* -enum class SessionType { - CASHGAME, - TOURNAMENT -} - enum class SessionState { PENDING, STARTED, 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 41951a67..5af300a9 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 @@ -48,6 +48,8 @@ open class Bankroll(name: String = "") : RealmObject(), Savable, return this.id } + // Row Representable Datasource + override fun adapterRows(): ArrayList { val rows = ArrayList() rows.add(SimpleRow.NAME) 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 1595e143..34be3cc8 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 @@ -27,6 +27,11 @@ import kotlin.collections.ArrayList open class Session : RealmObject(), SessionInterface, Savable, RowRepresentableDataSource, RowRepresentable { + enum class Type { + CASH_GAME, + TOURNAMENT + } + companion object { // Type: cash game = 0, tournament = 1 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt index 7a0ea91e..c188f4b3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt @@ -13,7 +13,6 @@ import net.pokeranalytics.android.calculus.Calculator import net.pokeranalytics.android.calculus.ComputedResults import net.pokeranalytics.android.calculus.SessionGroup import net.pokeranalytics.android.model.StatRepresentable -import net.pokeranalytics.android.model.extensions.SessionType import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource @@ -85,7 +84,7 @@ class StatsFragment : PokerAnalyticsFragment(), RowRepresentableDataSource { val tSessions = mutableListOf() allSessions.forEach { session -> - if (session.type == SessionType.CASHGAME.ordinal) { + if (session.type == Session.Type.CASH_GAME.ordinal) { cgSessions.add(session) } else { tSessions.add(session)