Merge branch 'master' of gitlab.com:stax-river/poker-analytics

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

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

app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt

@@ -28,7 +28,6 @@ import net.pokeranalytics.android.util.getMonthAndYear
 import net.pokeranalytics.android.util.isSameDay
 import net.pokeranalytics.android.util.isSameMonth
 import net.pokeranalytics.android.util.longDate
-import timber.log.Timber
 import java.util.*
 
 class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, RowRepresentableDelegate {
@@ -106,8 +105,6 @@ class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, Ro
 	 */
 	private fun createSessionsHeaders() {
 
-		Timber.d("createSessionsHeaders")
-
 		val oldRows = ArrayList<RowRepresentable>()
 		oldRows.addAll(rows)
 

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

app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt

@@ -321,16 +321,6 @@ enum class RowViewType {
 
 		override fun bind(position: Int, row: RowRepresentable, adapter: RowRepresentableAdapter) {
 
-			//TODO: Header
-			/*
-			if (row.displayHeader) {
-				itemView.sessionHeader.isVisible = true
-				itemView.sessionHeader.text = row.headerValues.firstOrNull() ?: ""
-			} else {
-				itemView.sessionHeader.isVisible = false
-			}
-			*/
-
 			itemView.sessionRow.setData(row as Session)
 			val listener = View.OnClickListener {
 				adapter.delegate?.onRowSelected(position, row)
@@ -340,4 +330,7 @@ enum class RowViewType {
 		}
 	}
 
+
+
+
 }

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