From 94d7447e40fc7c30208233db49b57b91ed9b7632 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Thu, 21 Mar 2019 15:22:02 +0100 Subject: [PATCH] fix typo --- .../net/pokeranalytics/android/model/filter/DateFilterable.kt | 2 +- .../pokeranalytics/android/model/filter/SessionFilterable.kt | 2 +- .../android/model/filter/interfaces/ValueFilterable.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/DateFilterable.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/DateFilterable.kt index b2cad68a..3693d10c 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/DateFilterable.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/DateFilterable.kt @@ -27,7 +27,7 @@ enum class DateFilterable : Filterable { override var valueMap : Map? = null - override val filterValuesExceptedKeys : Array? + override val filterValuesExpectedKeys : Array? get() { return when (this) { STARTED_FROM_DATE, STARTED_TO_DATE, ENDED_FROM_DATE, ENDED_TO_DATE -> arrayOf("date") diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/SessionFilterable.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/SessionFilterable.kt index 7d84e62f..a4520966 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/SessionFilterable.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/SessionFilterable.kt @@ -67,7 +67,7 @@ enum class SessionFilterable(private var fieldName:String? = null, private var s override var valueMap : Map? = null - override val filterValuesExceptedKeys : Array? + override val filterValuesExpectedKeys : Array? get() { this.subType?.let { return when (it) { diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/interfaces/ValueFilterable.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/interfaces/ValueFilterable.kt index 451b2c30..729cee60 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/interfaces/ValueFilterable.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/interfaces/ValueFilterable.kt @@ -8,7 +8,7 @@ interface ValueFilterable { var filterValues : Map? get() { - this.filterValuesExceptedKeys?.let { valueMapExceptedKeys -> + this.filterValuesExpectedKeys?.let { valueMapExceptedKeys -> valueMap?.let { map -> var missingKeys = map.keys.filter { !valueMapExceptedKeys.contains(it) } if (map.keys.size == valueMapExceptedKeys.size && missingKeys.isNotEmpty()) { @@ -24,5 +24,5 @@ interface ValueFilterable { valueMap = value } - val filterValuesExceptedKeys : Array? + val filterValuesExpectedKeys : Array? } \ No newline at end of file