diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt index 96e87c94..97d17d46 100644 --- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt +++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt @@ -46,7 +46,7 @@ class PokerAnalyticsApplication : Application() { val realm: Realm = Realm.getDefaultInstance() // Add observer on session time frame changes this.sessions = realm.where(Session::class.java).findAll() // monitor session deletions -// this.sessions?.addChangeListener { _, changeSet -> +// this.endedSessions?.addChangeListener { _, changeSet -> /* val deletedSessions = realm.where(Session::class.java).`in`("id", changeSet.deletions.toTypedArray()).findAll() @@ -63,7 +63,7 @@ class PokerAnalyticsApplication : Application() { this.createDefaultData() if (BuildConfig.DEBUG) { -// this.createFakeSessions() // debug + this.createFakeSessions() // debug } } @@ -133,7 +133,7 @@ class PokerAnalyticsApplication : Application() { val realm = Realm.getDefaultInstance() - // Test sessions + // Test endedSessions val sessions = realm.where().findAll() if (sessions.size < 10) { for (index in 0..50) { diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Computable.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Computable.kt index 291c17ff..c47a2b7f 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Computable.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Computable.kt @@ -33,7 +33,7 @@ class SessionGroup(name: String, sessions: List, stats: List = sessions 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 30450c25..1c026762 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 @@ -115,7 +115,7 @@ open class Session : RealmObject(), SessionInterface, Savable, StaticRowRepresen // value?.let { it.notifySessionDateChange(this) } // } - // The time frame sessionGroup, which can contain multiple sessions + // The time frame sessionGroup, which can contain multiple endedSessions override var sessionSet: SessionSet? = null // the date of creation of the app diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt index eba0414b..a9d26407 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt @@ -51,7 +51,7 @@ open class SessionSet : RealmObject(), Timed { // var timeFrame: TimeFrame? = null /** - * The list of sessions associated with this set + * The list of endedSessions associated with this set */ @LinkingObjects("sessionSet") val sessions: RealmResults? = null diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt index 207bc79e..f6970a25 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt @@ -55,11 +55,11 @@ // // // Session // @LinkingObjects("timeFrame") -// private val sessions: RealmResults? = null // we should have only one session +// private val endedSessions: RealmResults? = null // we should have only one session // // @Ignore // var session: Session? = null -// get() = if (this.sessions != null && this.sessions.isEmpty()) null else this.sessions?.first() +// get() = if (this.endedSessions != null && this.endedSessions.isEmpty()) null else this.endedSessions?.first() // // // Group // @LinkingObjects("timeFrame") @@ -195,21 +195,21 @@ // var timeFrame: TimeFrame = sessionSet.timeFrame!! // tested in the query //// timeFrame.setDate(this.startDate, this.endDate) // -// val sisterSessions = sessionSet.sessions!! // shouldn't crash ever +// val sisterSessions = sessionSet.endedSessions!! // shouldn't crash ever // // // if we have only one session in the set and that it corresponds to the set -// if (sessionSet.sessions?.size == 1 && sessionSet.sessions?.first() == owner) { +// if (sessionSet.endedSessions?.size == 1 && sessionSet.endedSessions?.first() == owner) { // timeFrame.setDate(this.startDate, this.endDate) -// } else { // there are 2+ sessions to manage and possible splits +// } else { // there are 2+ endedSessions to manage and possible splits // // val endDate = this.endDate // -// // case where all sessions are over but the set is not, we might have a split, so we delete the set and save everything again +// // case where all endedSessions are over but the set is not, we might have a split, so we delete the set and save everything again // if (endDate != null && sisterSessions.all { it.timeFrame?.endDate != null } && timeFrame.endDate == null) { -// var sessions = mutableListOf(owner) -// sessionSet.sessions?.forEach { sessions.add(it) } +// var endedSessions = mutableListOf(owner) +// sessionSet.endedSessions?.forEach { endedSessions.add(it) } // sessionSet.deleteFromRealm() -// sessions.forEach { it.timeFrame?.notifySessionDateChange(it) } +// endedSessions.forEach { it.timeFrame?.notifySessionDateChange(it) } // } else { // // if (this.startDate.before(timeFrame.startDate)) { @@ -259,10 +259,10 @@ // // } // -// // get all sessions from sets -// var sessions = mutableSetOf() +// // get all endedSessions from sets +// var endedSessions = mutableSetOf() // sessionSets.forEach { set -> -// set.sessions?.asIterable()?.let { sessions.addAll(it) } +// set.endedSessions?.asIterable()?.let { endedSessions.addAll(it) } // } // // // delete all sets @@ -279,8 +279,8 @@ // // Add the session linked to this timeframe to the new sessionGroup // owner.sessionSet = set // -// // Add all orphan sessions -// sessions.forEach { it.sessionSet = set } +// // Add all orphan endedSessions +// endedSessions.forEach { it.sessionSet = set } // Timber.d("netDuration 3 = : ${set.timeFrame?.netDuration}") // // } diff --git a/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt b/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt index a8a2c624..720fdc01 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt @@ -91,7 +91,7 @@ class SessionSetManager { } } - // get all sessions from sets + // get all endedSessions from sets val sessions = mutableSetOf() sessionSets.forEach { set -> set.sessions?.asIterable()?.let { sessions.addAll(it) } @@ -108,7 +108,7 @@ class SessionSetManager { // Add the session linked to this timeframe to the new sessionGroup session.sessionSet = set - // Add all orphan sessions + // Add all orphan endedSessions sessions.forEach { it.sessionSet = set } // Timber.d("netDuration 3 = : ${set.timeFrame?.netDuration}") 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 a307e593..3397fcb3 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 @@ -67,7 +67,7 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource super.onResume() //rows.clear() - //sessions.addAll(getRealm().copyFromRealm(realmSessions)) + //endedSessions.addAll(getRealm().copyFromRealm(realmSessions)) createSessionsHeaders() } @@ -105,7 +105,7 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource } /** - * Create the sessions headers + * Create the endedSessions headers */ private fun createSessionsHeaders() { 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 a5cfe15a..0624c113 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 @@ -107,7 +107,7 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc val cgSessions = mutableListOf() val tSessions = mutableListOf() - super.sessions.forEach { session -> + super.endedSessions.forEach { session -> if (session.isCashGame()) { cgSessions.add(session) } else { @@ -116,7 +116,7 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc } val allStats: List = listOf(Stat.NETRESULT, Stat.HOURLY_RATE, Stat.AVERAGE, Stat.NUMBER_OF_SETS, Stat.AVERAGE_DURATION, Stat.DURATION) - val allSessionGroup = SessionGroup(getString(R.string.all), super.sessions, allStats) + val allSessionGroup = SessionGroup(getString(R.string.all), super.endedSessions, allStats) val cgStats: List = listOf(Stat.NETRESULT, Stat.HOURLY_RATE, Stat.NET_BB_PER_100_HANDS, Stat.HOURLY_RATE_BB, Stat.AVERAGE, Stat.STANDARD_DEVIATION_HOURLY, Stat.WIN_RATIO, Stat.NUMBER_OF_GAMES, Stat.AVERAGE_BUYIN) val cgSessionGroup = SessionGroup(getString(R.string.cash_game), cgSessions, cgStats) val tStats: List = listOf(Stat.NETRESULT, Stat.HOURLY_RATE, Stat.ROI, Stat.WIN_RATIO, Stat.NUMBER_OF_GAMES, Stat.AVERAGE_BUYIN) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/SessionObserverFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/SessionObserverFragment.kt index 0aff17c0..f974d937 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/SessionObserverFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/SessionObserverFragment.kt @@ -6,12 +6,12 @@ import net.pokeranalytics.android.model.realm.Session open class SessionObserverFragment : PokerAnalyticsFragment() { - val sessions: RealmResults + val endedSessions: RealmResults init { val realm = Realm.getDefaultInstance() - this.sessions = realm.where(Session::class.java).isNotNull("endDate").findAll() - this.sessions.addChangeListener { _, _ -> + this.endedSessions = realm.where(Session::class.java).isNotNull("endDate").findAll() + this.endedSessions.addChangeListener { _, _ -> this.sessionsChanged() } } diff --git a/app/src/main/res/layout/row_session_view.xml b/app/src/main/res/layout/row_session_view.xml index 98316b32..d6c91fb4 100644 --- a/app/src/main/res/layout/row_session_view.xml +++ b/app/src/main/res/layout/row_session_view.xml @@ -86,7 +86,6 @@ android:textAllCaps="true" android:textColor="@color/kaki_lighter" android:textSize="12sp" - android:visibility="gone" tools:text="4:21" tools:visibility="visible" />