From 689cdd844a7fc834c07a86c4b5d7b57f7aad3654 Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 22 Feb 2021 16:23:02 +0100 Subject: [PATCH] Fixes an issue where the Game and Location reports showed bad legend --- .../android/model/filter/QueryCondition.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt index 2f32142d..1f7c1a7c 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt @@ -164,6 +164,10 @@ sealed class QueryCondition : RowRepresentable { return this.getDisplayName(context, this.listOfValues) } + override fun getDisplayName(context: Context): String { + return getDisplayName(context, this.listOfValues) + } + private fun getDisplayName(context: Context, values: List): String { val prefix = this.resId?.let { context.getString(it) + " " @@ -176,10 +180,6 @@ sealed class QueryCondition : RowRepresentable { } } - override fun getDisplayName(context: Context): String { - return getDisplayName(context, this.listOfValues) - } - override fun compareTo(other: ListOfValues): Int { return listOfValues.sorted().first().compareTo(other.listOfValues.sorted().first()) } @@ -248,6 +248,7 @@ sealed class QueryCondition : RowRepresentable { abstract class ListOfString : ListOfValues() { override var operator: Operator = Operator.ANY override var listOfValues = mutableListOf() + override fun labelForValue(value: String, context: Context): String { return value } @@ -309,6 +310,10 @@ sealed class QueryCondition : RowRepresentable { return completeLabel } + override fun getDisplayNameWithValues(context: Context): String { + return this.getDisplayName(context) + } + open fun entityName(realm: Realm, context: Context): String { return entityName(context) }