From 8dd74bf99e570c00167d017d5792b84f5bdcccb8 Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 2 Oct 2020 16:30:47 +0200 Subject: [PATCH] Improves most used filters layout + better hints --- .../bottomsheet/BottomSheetDoubleEditTextFragment.kt | 2 +- .../bottomsheet/BottomSheetEditTextFragment.kt | 2 +- .../components/bottomsheet/BottomSheetFragment.kt | 2 +- .../bottomsheet/BottomSheetNumericTextFragment.kt | 2 +- .../android/ui/modules/filter/FilterDetailsFragment.kt | 10 +++++++--- .../android/ui/modules/filter/FiltersFragment.kt | 4 ++-- .../android/ui/viewmodel/BottomSheetViewModel.kt | 2 +- app/src/main/res/layout/fragment_filters.xml | 7 ++----- 8 files changed, 16 insertions(+), 15 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 52f83615..bb110a7e 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 @@ -61,7 +61,7 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() { data[1].hintResId?.let { editText2.hint = getString(it) } editText2.inputType = data[1].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES - if (this.model.valueAsPlaceholder) { + if (this.model.valueAsHint) { this.model.stringValue?.let { if (it.isNotBlank()) { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt index cf69a603..51dab886 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt @@ -42,7 +42,7 @@ class BottomSheetEditTextFragment : BottomSheetFragment() { this.model.stringValue = it?.toString() } data[0].defaultValue?.let { - if (this.model.valueAsPlaceholder) { + if (this.model.valueAsHint) { this.model.stringValue = it.toString() editText.hint = it.toString() } else { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt index 678f4f73..03ad3792 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt @@ -138,7 +138,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { this.model.isClearable = configuration.isClearable ?: true this.model.currentCurrency = configuration.currentCurrency this.model.isDeletable = configuration.isDeletable ?: false - this.model.valueAsPlaceholder = configuration.valueHasPlaceholder ?: false + this.model.valueAsHint = configuration.valueHasPlaceholder ?: false this.model.alternativeLabels = configuration.alternativeLabels this.delegate = configuration.delegate diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt index 18174292..94fc9f7b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt @@ -58,7 +58,7 @@ class BottomSheetNumericTextFragment : BottomSheetFragment() { it.toString() } - if (this.model.valueAsPlaceholder) { + if (this.model.valueAsHint) { // this.viewModel.doubleValue = it.toString().toDoubleOrNull() editText.hint = valueString } else { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt index 276fcc97..3707b84b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt @@ -120,15 +120,19 @@ open class FilterDetailsFragment : RealmFragment(), RowRepresentableDelegate { onlyTime = condition.showTime ) is QueryCondition.Duration -> { - val hours = (condition.minutes / 60).toString() - val minutes = (condition.minutes % 60).toString() + var hours: String? = null + var minutes: String? = null + if (condition.minutes > 0) { + hours = (condition.minutes / 60).toString() + minutes = (condition.minutes % 60).toString() + } val data = row.editingDescriptors(mapOf("hours" to hours, "minutes" to minutes)) showBottomSheet(row, this, data, true) } is QueryCondition.SingleValue<*>, is QueryCondition.ListOfValues<*> -> { val valueAsString = (row as FilterItemRow).singleValue?.toString() val data = row.editingDescriptors(mapOf("valueAsString" to valueAsString)) - showBottomSheet(row, this, data, true, valueHasPlaceholder = true) + showBottomSheet(row, this, data, true) } else -> { } } 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 d440f8d8..6b8a6378 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 @@ -171,8 +171,8 @@ open class FiltersFragment : RealmFragment(), RowRepresentableDelegate { chip.id = View.generateViewId() chip.tag = filter.id chip.text = filter.getDisplayName(requireContext()) - chip.chipStartPadding = 8f.px - chip.chipEndPadding = 8f.px + chip.chipStartPadding = 4f.px + chip.chipEndPadding = 4f.px chip.isChecked = filter.id == currentFilterId chip.setOnCloseIconClickListener { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt index d59c2ff1..9e96380e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt @@ -27,7 +27,7 @@ class BottomSheetViewModel(var row: RowRepresentable) : ViewModel() { // lateinit var row: RowRepresentable var currentCurrency: Currency? = null - var valueAsPlaceholder: Boolean = false + var valueAsHint: Boolean = false var isClearable: Boolean = true var isDeletable: Boolean = false var rowRepresentableEditDescriptors: List? = null diff --git a/app/src/main/res/layout/fragment_filters.xml b/app/src/main/res/layout/fragment_filters.xml index eefc23af..4fe5cd4f 100644 --- a/app/src/main/res/layout/fragment_filters.xml +++ b/app/src/main/res/layout/fragment_filters.xml @@ -46,7 +46,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/colorPrimary" - android:elevation="4dp" android:padding="8dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -57,10 +56,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginEnd="8dp" - app:chipSpacing="8dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/moreFilters" + app:layout_constraintBottom_toTopOf="@+id/moreFilters" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:singleSelection="true" />