From 0698d956ef02b0bc7f9db176532d5c940f49ffc2 Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 2 Mar 2021 11:14:37 +0100 Subject: [PATCH] Improves filters names --- .../net/pokeranalytics/android/model/filter/QueryCondition.kt | 4 ++-- .../android/ui/modules/filter/FiltersFragment.kt | 4 ++-- 2 files changed, 4 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 1f7c1a7c..27316d15 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 @@ -211,7 +211,7 @@ sealed class QueryCondition : RowRepresentable { val prefix = this.resId?.let { context.getString(it) } ?: "" - return prefix + labelForValue(value, context) + return prefix + " " + labelForValue(value, context) } } @@ -515,7 +515,7 @@ sealed class QueryCondition : RowRepresentable { class TournamentNumberOfPlayer : ListOfInt() { override fun labelForValue(value: Int, context: Context): String { - return value.toString() + " " + context.getString(R.string.number_of_players) + return value.toString() + " " + context.getString(R.string.players).toLowerCase() } override fun entityName(context: Context): String { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt index 78bd10b1..a69109b0 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt @@ -185,8 +185,8 @@ open class FiltersFragment : RealmFragment(), RowRepresentableDelegate { chip.id = View.generateViewId() chip.tag = filter.id chip.text = filter.getDisplayName(requireContext()) - chip.chipStartPadding = 4f.px - chip.chipEndPadding = 4f.px +// chip.chipStartPadding = 4f.px +// chip.chipEndPadding = 4f.px chip.isChecked = filter.id == currentFilterId chip.setOnCloseIconClickListener {