Add PLANNED state for session

feature/top10
Aurelien Hubert 7 years ago
parent 72a35056ee
commit 91ddd22ccb
  1. 3
      app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
  3. 6
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
  4. 4
      app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.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) {

@ -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

@ -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 -> {

@ -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 -> {

Loading…
Cancel
Save