From fbaf8c869e0c2a8cc60a895fc06af3a102bbd182 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Mon, 10 Jun 2019 13:00:44 +0200 Subject: [PATCH] Filter: fix issue with place holder --- .../bottomsheet/BottomSheetDoubleEditTextFragment.kt | 4 ++-- .../android/ui/view/rowrepresentable/FilterElementRow.kt | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt index 814ff646..14adf917 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt @@ -71,8 +71,8 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() { editText2.inputType = data[1].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES if (valueHasPlaceholder) { - editText1.hint = values[0] - editText2.hint = values[1] + if (values[0].isNotBlank()) { editText1.hint = values[0] } + if (values[1].isNotBlank()) { editText2.hint = values[1] } } else { editText1.setText(values[0]) editText2.setText(values[1]) 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 3e8b783e..9829f9ee 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 @@ -22,8 +22,13 @@ interface FilterElementRow : RowRepresentable { } is QueryCondition.ListOfValues<*> -> { val valueAsString: String? by map + val hint = when (this.operator) { + QueryCondition.Operator.MORE, QueryCondition.Operator.LESS -> this.filterSectionRow.resId + else -> this.resId + } + arrayListOf( - RowRepresentableEditDescriptor(valueAsString, this.resId, inputType = InputType.TYPE_CLASS_NUMBER) + RowRepresentableEditDescriptor(valueAsString, hint, inputType = InputType.TYPE_CLASS_NUMBER) ) } else -> super.editingDescriptors(map)