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 278ece74..cc59bdca 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 @@ -5,6 +5,7 @@ import java.util.* enum class SessionState { PENDING, + PLANNED, STARTED, PAUSED, FINISHED, @@ -25,7 +26,7 @@ fun Session.getState(): SessionState { timeFrame?.let {sessionTimeFrame -> timeFrame?.startDate?.let {startDate -> if (startDate > Date()) { - return SessionState.PENDING + return SessionState.PLANNED } else if (endDate != null) { return SessionState.FINISHED } else if (sessionTimeFrame.paused) { 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 142b13fd..7ad31c24 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 @@ -137,7 +137,7 @@ open class Session : RealmObject(), SessionInterface, Savable, fun startOrContinue() { realm.executeTransaction { when (getState()) { - SessionState.PENDING -> { + SessionState.PENDING, SessionState.PLANNED -> { val sessionTimeFrame = this.timeFrame ?: realm.createObject(TimeFrame::class.java) sessionTimeFrame.setDate(Date(), null) this.timeFrame = sessionTimeFrame diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt index 573a1e34..9433711d 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt @@ -149,7 +149,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott handler.removeCallbacksAndMessages(null) when (currentSession.getState()) { - SessionState.PENDING -> { + SessionState.PENDING, SessionState.PLANNED -> { state.setTextColor(ContextCompat.getColor(requireContext(), R.color.white)) sessionMenu?.findItem(R.id.restart)?.isVisible = false floatingActionButton.setImageResource(R.drawable.ic_outline_play) @@ -194,7 +194,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott */ private fun updateMenuUI() { when (currentSession.getState()) { - SessionState.PENDING -> { + SessionState.PENDING, SessionState.PLANNED -> { sessionMenu?.findItem(R.id.restart)?.isVisible = false sessionMenu?.findItem(R.id.stop)?.isVisible = false } @@ -233,7 +233,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott */ private fun manageSessionState() { when (currentSession.getState()) { - SessionState.PENDING, SessionState.PAUSED -> { + SessionState.PENDING, SessionState.PLANNED, SessionState.PAUSED -> { currentSession.startOrContinue() } SessionState.STARTED -> { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt index 6a9b70b8..f4d8c5be 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt @@ -38,7 +38,7 @@ enum class SessionRow : RowRepresentable { when (type) { Session.Type.TOURNAMENT.ordinal -> { return when (sessionState) { - SessionState.PENDING -> { + SessionState.PENDING, SessionState.PLANNED -> { arrayListOf( GAME, INITIAL_BUY_IN, LOCATION, BANKROLL, TABLE_SIZE, TOURNAMENT_TYPE, START_DATE, END_DATE @@ -56,7 +56,7 @@ enum class SessionRow : RowRepresentable { } Session.Type.CASH_GAME.ordinal -> { return when (sessionState) { - SessionState.PENDING -> { + SessionState.PENDING, SessionState.PLANNED -> { arrayListOf(GAME, BLINDS, LOCATION, BANKROLL, TABLE_SIZE, START_DATE, END_DATE) } SessionState.STARTED, SessionState.PAUSED, SessionState.FINISHED -> {