From fd286c4b69cdeafe08129d7b4418714dce36dd6f Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Wed, 20 Mar 2019 14:59:28 +0100 Subject: [PATCH] Update filters row management --- .../ui/fragment/FilterDetailsFragment.kt | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt index 41a06aa0..95cb10c4 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt @@ -102,19 +102,21 @@ open class FilterDetailsFragment : PokerAnalyticsFragment(), RowRepresentableDat } } - selectedRows.add(row) - } - rowRepresentableAdapter.refreshRow(row) - - Timber.d("Row: $row") - when (row) { - FilterRow.FROM -> DateTimePickerManager.create(requireContext(), row, this, Date()) - FilterRow.TO -> DateTimePickerManager.create(requireContext(), row, this, Date()) - FilterRow.PAST_DAYS -> { - val data = row.editingDescriptors(mapOf("defaultValue" to "")) - BottomSheetFragment.create(fragmentManager, row, this, data, null) + Timber.d("Row: $row") + when (row) { + FilterRow.FROM -> DateTimePickerManager.create(requireContext(), row, this, Date(), onlyDate = true) + FilterRow.TO -> DateTimePickerManager.create(requireContext(), row, this, Date(), onlyDate = true) + FilterRow.PAST_DAYS -> { + val data = row.editingDescriptors(mapOf("defaultValue" to "")) + BottomSheetFragment.create(fragmentManager, row, this, data, null) + } + else -> { + selectedRows.add(row) + } } + } + rowRepresentableAdapter.refreshRow(row) } @@ -124,6 +126,8 @@ open class FilterDetailsFragment : PokerAnalyticsFragment(), RowRepresentableDat override fun onRowValueChanged(value: Any?, row: RowRepresentable) { super.onRowValueChanged(value, row) + selectedRows.add(row) + rowRepresentableAdapter.refreshRow(row) } override fun adapterRows(): List? {