some clean up

feature/top10
Razmig Sarkissian 7 years ago
parent f67429b678
commit 04458065d5
  1. 1
      app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
  2. 7
      app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
  3. 15
      app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt

@ -38,6 +38,7 @@ class PokerAnalyticsMigration : RealmMigration {
schema.rename("FilterElement", "FilterCondition") schema.rename("FilterElement", "FilterCondition")
schema.get("Filter")?.let { schema.get("Filter")?.let {
it.renameField("filterElements", "filterConditions") it.renameField("filterElements", "filterConditions")
it.removeField("entityType")
} }
schema.get("SessionSet")?.let { schema.get("SessionSet")?.let {
it.addField("id", String::class.java).setRequired("id", true) it.addField("id", String::class.java).setRequired("id", true)

@ -20,13 +20,6 @@ import java.util.*
*/ */
open class Filter : RealmObject() { open class Filter : RealmObject() {
private var entityType: Int? = Entity.SESSION.ordinal
private enum class Entity {
SESSION,
;
}
companion object { companion object {
// Create a new instance // Create a new instance

@ -1,30 +1,15 @@
package net.pokeranalytics.android.ui.view.rowrepresentable package net.pokeranalytics.android.ui.view.rowrepresentable
import android.content.Context
import android.text.InputType import android.text.InputType
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.filter.QueryCondition
import net.pokeranalytics.android.model.realm.FilterCondition
import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
import net.pokeranalytics.android.ui.view.RowViewType import net.pokeranalytics.android.ui.view.RowViewType
import java.text.DateFormatSymbols
import java.util.* import java.util.*
interface FilterElementRow : RowRepresentable { interface FilterElementRow : RowRepresentable {
fun contains(filterConditions: List<FilterCondition>): Boolean {
return when (this) {
is QueryCondition.StaticDataQueryCondition -> filterConditions.any {
it.intValues.contains(this.intValues.first())
}
is QueryCondition.QueryDataCondition<*>-> filterConditions.any {
it.ids.contains(this.dataObject?.id)
}
else -> true
}
}
override val resId: Int? override val resId: Int?
get() { get() {
return when (this) { return when (this) {

Loading…
Cancel
Save