Rename start/pause/stop/restart

feature/top10
Aurelien Hubert 7 years ago
parent 7b40862bbb
commit f69e564eee
  1. 10
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
  2. 8
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt

@ -132,9 +132,9 @@ open class Session : RealmObject(), SessionInterface, Savable,
} }
/** /**
* Start a session * Start or continue a session
*/ */
fun startSession() { fun startOrContinue() {
realm.executeTransaction { realm.executeTransaction {
when (getState()) { when (getState()) {
SessionState.PENDING -> { SessionState.PENDING -> {
@ -155,7 +155,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
/** /**
* Pause a session * Pause a session
*/ */
fun pauseSession() { fun pause() {
realm.executeTransaction { realm.executeTransaction {
when (getState()) { when (getState()) {
SessionState.STARTED -> { SessionState.STARTED -> {
@ -169,7 +169,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
/** /**
* Stop a session * Stop a session
*/ */
fun stopSession() { fun stop() {
realm.executeTransaction { realm.executeTransaction {
when (getState()) { when (getState()) {
SessionState.STARTED, SessionState.PAUSED -> { SessionState.STARTED, SessionState.PAUSED -> {
@ -185,7 +185,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
/** /**
* Restart a session * Restart a session
*/ */
fun restartSession() { fun restart() {
realm.executeTransaction { realm.executeTransaction {
this.timeFrame?.paused = false this.timeFrame?.paused = false
this.timeFrame?.pauseDate = null this.timeFrame?.pauseDate = null

@ -234,10 +234,10 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
private fun manageSessionState() { private fun manageSessionState() {
when (currentSession.getState()) { when (currentSession.getState()) {
SessionState.PENDING, SessionState.PAUSED -> { SessionState.PENDING, SessionState.PAUSED -> {
currentSession.startSession() currentSession.startOrContinue()
} }
SessionState.STARTED -> { SessionState.STARTED -> {
currentSession.pauseSession() currentSession.pause()
} }
else -> { else -> {
} }
@ -249,7 +249,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
* Stop the current session * Stop the current session
*/ */
private fun stopSession() { private fun stopSession() {
currentSession.stopSession() currentSession.stop()
updateSessionUI() updateSessionUI()
} }
@ -257,7 +257,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
* Restart timer * Restart timer
*/ */
private fun restartTimer() { private fun restartTimer() {
currentSession.restartSession() currentSession.restart()
updateSessionUI() updateSessionUI()
} }

Loading…
Cancel
Save