From 83226b7175155d04374d3e165602690451e66ae7 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Tue, 9 Apr 2019 11:06:51 +0200 Subject: [PATCH] Clean code --- .../main/java/net/pokeranalytics/android/model/realm/Filter.kt | 1 - .../net/pokeranalytics/android/model/realm/FilterCondition.kt | 1 - .../android/ui/view/rowrepresentable/FilterElementRow.kt | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt index ef122bb5..9ccaa0a0 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt @@ -1,6 +1,5 @@ package net.pokeranalytics.android.model.realm -import com.google.android.libraries.places.internal.it import io.realm.* import io.realm.annotations.PrimaryKey import io.realm.kotlin.where diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt index 7c41ae8b..be7aa78c 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt @@ -4,7 +4,6 @@ import io.realm.RealmList import io.realm.RealmObject import net.pokeranalytics.android.exceptions.PokerAnalyticsException import net.pokeranalytics.android.model.filter.QueryCondition -import net.pokeranalytics.android.model.filter.QueryType import net.pokeranalytics.android.ui.view.rowrepresentable.FilterElementRow import net.pokeranalytics.android.ui.view.rowrepresentable.FilterElementRow.* import java.util.* 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 a319e16c..b3ece087 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 @@ -109,7 +109,7 @@ sealed class FilterElementRow : RowRepresentable { is DataFilterElementRow -> filterConditions.any { it.ids.contains(this.id) } - is StaticDataFilterElementRow ->filterElements.any { + is StaticDataFilterElementRow -> filterConditions.any { it.ids.contains(this.id) } else -> true