From d92e2a30b3498d0b6d57197c93b188e100151f1c Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Wed, 10 Apr 2019 10:50:41 +0200 Subject: [PATCH] Clean code --- .../ui/view/rowrepresentable/FilterElementRow.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt index f3c046e6..0dd9a3fa 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt @@ -16,6 +16,8 @@ import java.util.* sealed class FilterElementRow : RowRepresentable { + // Objects + object Cash : FilterElementRow() object Tournament : FilterElementRow() object Live : FilterElementRow() @@ -29,6 +31,13 @@ sealed class FilterElementRow : RowRepresentable { object Weekday : FilterElementRow() object Weekend : FilterElementRow() + object ResultMoreThan : MoreFilterElementRow() + object ResultLessThan : LessFilterElementRow() + object DurationMoreThan : MoreTimeFilterElementRow() + object DurationLessThan : LessTimeFilterElementRow() + + // Subclasses + open class SingleValueFilterElementRow(val value: Int) : FilterElementRow() open class DataFilterElementRow(data: Manageable) : FilterElementRow() { @@ -56,6 +65,7 @@ sealed class FilterElementRow : RowRepresentable { open class MoreTimeFilterElementRow : TimeFilterElementRow() open class LessTimeFilterElementRow : TimeFilterElementRow() + // Data classes data class Blind(var sb: Double? = null, var bb: Double? = null, var code: String? = null) : FilterElementRow() data class From(var date: Date = Date()) : FilterElementRow() @@ -73,10 +83,6 @@ sealed class FilterElementRow : RowRepresentable { data class AllTournamentFeature(val tournamentFeature: Manageable) : DataFilterElementRow(tournamentFeature) data class AnyTournamentFeature(val tournamentFeature: Manageable) : DataFilterElementRow(tournamentFeature) - object ResultMoreThan : MoreFilterElementRow() - object ResultLessThan : LessFilterElementRow() - object DurationMoreThan : MoreTimeFilterElementRow() - object DurationLessThan : LessTimeFilterElementRow() lateinit var filterSectionRow: FilterSectionRow