Working on filters UI

feature/top10
Aurelien Hubert 7 years ago
parent c1f71bf4ec
commit 932d41cc0b
  1. 10
      app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt
  2. 7
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
  3. 20
      app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterRow.kt
  4. 3
      app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSubcategoryRow.kt

@ -16,12 +16,14 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
import net.pokeranalytics.android.ui.helpers.DateTimePickerManager
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowViewType
import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow
import net.pokeranalytics.android.ui.view.rowrepresentable.FilterRow
import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSubcategoryRow
import timber.log.Timber
import java.util.*
open class FilterDetailsFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, RowRepresentableDelegate {
@ -104,8 +106,14 @@ open class FilterDetailsFragment : PokerAnalyticsFragment(), RowRepresentableDat
}
rowRepresentableAdapter.refreshRow(row)
Timber.d("Row: $row")
when (row) {
FilterRow.FROM -> BottomSheetFragment.create(fragmentManager, row, this, null)
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)
}
}
}

@ -86,12 +86,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate {
val data = currentSession.editDescriptors(row)
when (row) {
SessionRow.START_DATE -> DateTimePickerManager.create(
requireContext(),
row,
this,
currentSession.startDate
)
SessionRow.START_DATE -> DateTimePickerManager.create(requireContext(),row,this,currentSession.startDate)
SessionRow.END_DATE -> DateTimePickerManager.create(
requireContext(),
row,

@ -1,7 +1,9 @@
package net.pokeranalytics.android.ui.view.rowrepresentable
import android.text.InputType
import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
import net.pokeranalytics.android.ui.view.RowViewType
enum class FilterRow : RowRepresentable {
@ -73,7 +75,6 @@ enum class FilterRow : RowRepresentable {
}
}
override fun subcategoryRow(): FilterSubcategoryRow? {
return when (this) {
CASH_GAME, TOURNAMENT -> FilterSubcategoryRow.TOURNAMENT_TYPE
@ -86,4 +87,21 @@ enum class FilterRow : RowRepresentable {
}
}
override fun editingDescriptors(map: Map<String, Any?>): ArrayList<RowRepresentableEditDescriptor>? {
when (this) {
PAST_DAYS -> {
val defaultValue: String? by map
val data = arrayListOf<RowRepresentableEditDescriptor>()
data.add(
RowRepresentableEditDescriptor(
defaultValue,
inputType = InputType.TYPE_CLASS_NUMBER
)
)
}
}
return super.editingDescriptors(map)
}
}

@ -165,8 +165,7 @@ enum class FilterSubcategoryRow : RowRepresentable {
)
)
FIXED_DATE -> {
rows.add(CustomizableRowRepresentable(customViewType = RowViewType.TITLE_VALUE_CHECK, resId = FilterRow.FROM.resId, isSelectable = true, value = "20/03/2019"))
rows.add(CustomizableRowRepresentable(customViewType = RowViewType.TITLE_VALUE_CHECK, resId = FilterRow.TO.resId, isSelectable = true, value = "20/03/2019"))
rows.addAll(arrayListOf(FilterRow.FROM, FilterRow.TO))
}
DURATION -> rows.addAll(arrayListOf(FilterRow.PAST_DAYS))
YEAR -> {

Loading…
Cancel
Save