From 118f436563bdda1e271f4394c742b1768ca6e8f3 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Thu, 28 Feb 2019 17:07:36 +0100 Subject: [PATCH 1/2] Clean files --- .../android/ui/fragment/HistoryFragment.kt | 3 --- .../pokeranalytics/android/ui/view/RowViewType.kt | 13 +++---------- 2 files changed, 3 insertions(+), 13 deletions(-) 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 ed0bffeb..2f8f8e71 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 @@ -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() oldRows.addAll(rows) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt index 0e7a146a..7ffa5c03 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt +++ b/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 { } } + + + } \ No newline at end of file From 91ddd22ccbb510074299bf611b0fe508bef37183 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Thu, 28 Feb 2019 17:32:10 +0100 Subject: [PATCH 2/2] Add PLANNED state for session --- .../android/model/extensions/SessionExtensions.kt | 3 ++- .../java/net/pokeranalytics/android/model/realm/Session.kt | 2 +- .../pokeranalytics/android/ui/fragment/SessionFragment.kt | 6 +++--- .../android/ui/view/rowrepresentable/SessionRow.kt | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) 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 -> {