From e916b064fe2075e01d911d34dc680e27259bdcbf Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Wed, 10 Apr 2019 17:42:12 +0200 Subject: [PATCH] Clean code --- .../view/rowrepresentable/FilterSectionRow.kt | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt index 71f4dd54..1c2006be 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt @@ -62,8 +62,20 @@ enum class FilterSectionRow(override val resId: Int?) : RowRepresentable { val data = arrayListOf().apply { this.addAll( when (this@FilterSectionRow) { + + // General CASH_TOURNAMENT -> arrayListOf(Cash, Tournament) LIVE_ONLINE -> arrayListOf(Live, Online) + GAME -> { + val games = arrayListOf() + val realm = Realm.getDefaultInstance() + LiveData.GAME.items(realm).forEach { + val game = Game(it as net.pokeranalytics.android.model.realm.Game) + games.add(game) + } + realm.close() + games + } LIMIT_TYPE -> { val limits = arrayListOf() net.pokeranalytics.android.model.Limit.values().forEach { @@ -83,8 +95,8 @@ enum class FilterSectionRow(override val resId: Int?) : RowRepresentable { realm.close() tableSizes } - TOURNAMENT_NAME -> arrayListOf() - TOURNAMENT_FEATURE -> arrayListOf() + + // Date DYNAMIC_DATE -> arrayListOf( Today, Yesterday, @@ -127,17 +139,14 @@ enum class FilterSectionRow(override val resId: Int?) : RowRepresentable { months } - GAME -> { - val games = arrayListOf() - val realm = Realm.getDefaultInstance() - LiveData.GAME.items(realm).forEach { - val game = Game(it as net.pokeranalytics.android.model.realm.Game) - games.add(game) - } - realm.close() - games - } + // Duration + SESSION_DURATION -> arrayListOf(DurationMoreThan as FilterElementRow, DurationLessThan as FilterElementRow) + RANGE -> arrayListOf(From, To) + // Sessions + SESSIONS -> arrayListOf(LastGames(0), LastSessions(0)) + + // Cash BLINDS -> { // TODO: Improve the way we get the blinds distinctly @@ -164,26 +173,22 @@ enum class FilterSectionRow(override val resId: Int?) : RowRepresentable { } CASH_RE_BUY_COUNT -> arrayListOf(ReBuyMoreThan as FilterElementRow, ReBuyLessThan as FilterElementRow) - LOCATION -> arrayListOf() - BANKROLL -> arrayListOf() - - MULTI_TABLING -> arrayListOf() - - BUY_IN -> arrayListOf() - - COMPLETION_PERCENTAGE -> arrayListOf() - NUMBER_OF_PLAYERS -> arrayListOf() + // Tournament TOURNAMENT_TYPE -> arrayListOf() - PLAYERS_COUNT -> arrayListOf() + COMPLETION_PERCENTAGE -> arrayListOf() PLACE -> arrayListOf() + PLAYERS_COUNT -> arrayListOf() TOURNAMENT_RE_BUY_COUNT -> arrayListOf() + BUY_IN -> arrayListOf() - MULTI_PLAYER -> arrayListOf() - SESSION_DURATION -> arrayListOf(DurationMoreThan as FilterElementRow, DurationLessThan as FilterElementRow) - RANGE -> arrayListOf(From, To) - - SESSIONS -> arrayListOf(LastGames(0), LastSessions(0)) + TOURNAMENT_NAME -> arrayListOf() + TOURNAMENT_FEATURE -> arrayListOf() + LOCATION -> arrayListOf() + BANKROLL -> arrayListOf() + MULTI_TABLING -> arrayListOf() + NUMBER_OF_PLAYERS -> arrayListOf() + MULTI_PLAYER -> arrayListOf() VALUE -> arrayListOf()