New filter sheet draft implementation
parent
64dc646fc5
commit
6c07abec56
GPG Key ID:
676DEE768C17A9D7
@ -1,59 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.filter.ui
|
|
||||||
|
|
||||||
import android.os.Build
|
|
||||||
import android.os.Bundle
|
|
||||||
import android.view.LayoutInflater
|
|
||||||
import android.view.View
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import androidx.fragment.app.FragmentManager
|
|
||||||
import androidx.recyclerview.widget.AsyncListDiffer
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
|
||||||
import org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetBehavior
|
|
||||||
import org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetCallback
|
|
||||||
import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.observe
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.showDistinct
|
|
||||||
import org.koitharu.kotatsu.databinding.SheetFilterBinding
|
|
||||||
import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
|
|
||||||
import org.koitharu.kotatsu.list.ui.model.ListModel
|
|
||||||
|
|
||||||
class FilterSheetFragment :
|
|
||||||
BaseAdaptiveSheet<SheetFilterBinding>(),
|
|
||||||
AdaptiveSheetCallback,
|
|
||||||
AsyncListDiffer.ListListener<ListModel> {
|
|
||||||
|
|
||||||
override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): SheetFilterBinding {
|
|
||||||
return SheetFilterBinding.inflate(inflater, container, false)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onViewBindingCreated(binding: SheetFilterBinding, savedInstanceState: Bundle?) {
|
|
||||||
super.onViewBindingCreated(binding, savedInstanceState)
|
|
||||||
val filter = (requireActivity() as FilterOwner).filter
|
|
||||||
addSheetCallback(this)
|
|
||||||
val adapter = FilterAdapter(filter, this)
|
|
||||||
binding.recyclerView.adapter = adapter
|
|
||||||
filter.filterItems.observe(viewLifecycleOwner, adapter)
|
|
||||||
binding.recyclerView.addItemDecoration(TypedListSpacingDecoration(binding.root.context, true))
|
|
||||||
|
|
||||||
if (dialog == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
|
||||||
binding.recyclerView.scrollIndicators = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onCurrentListChanged(previousList: MutableList<ListModel>, currentList: MutableList<ListModel>) {
|
|
||||||
if (currentList.size > previousList.size && view != null) {
|
|
||||||
(requireViewBinding().recyclerView.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(0, 0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onStateChanged(sheet: View, newState: Int) {
|
|
||||||
viewBinding?.recyclerView?.isFastScrollerEnabled = newState == AdaptiveSheetBehavior.STATE_EXPANDED
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
|
|
||||||
private const val TAG = "FilterBottomSheet"
|
|
||||||
|
|
||||||
fun show(fm: FragmentManager) = FilterSheetFragment().showDistinct(fm, TAG)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,15 +1,18 @@
|
|||||||
package org.koitharu.kotatsu.filter.ui
|
package org.koitharu.kotatsu.filter.ui
|
||||||
|
|
||||||
import org.koitharu.kotatsu.filter.ui.model.FilterItem
|
|
||||||
import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
|
import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaState
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaTag
|
||||||
|
import org.koitharu.kotatsu.parsers.model.SortOrder
|
||||||
|
import java.util.Locale
|
||||||
|
|
||||||
interface OnFilterChangedListener : ListHeaderClickListener {
|
interface OnFilterChangedListener : ListHeaderClickListener {
|
||||||
|
|
||||||
fun onSortItemClick(item: FilterItem.Sort)
|
fun setSortOrder(value: SortOrder)
|
||||||
|
|
||||||
fun onTagItemClick(item: FilterItem.Tag, isFromChip: Boolean)
|
fun setLanguage(value: Locale?)
|
||||||
|
|
||||||
fun onStateItemClick(item: FilterItem.State)
|
fun setTag(value: MangaTag, addOrRemove: Boolean)
|
||||||
|
|
||||||
fun onLanguageItemClick(item: FilterItem.Language)
|
fun setState(value: MangaState, addOrRemove: Boolean)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,11 @@
|
|||||||
|
package org.koitharu.kotatsu.filter.ui.model
|
||||||
|
|
||||||
|
data class FilterProperty<T>(
|
||||||
|
val availableItems: List<T>,
|
||||||
|
val selectedItems: Set<T>,
|
||||||
|
val isLoading: Boolean,
|
||||||
|
val error: Throwable?,
|
||||||
|
) {
|
||||||
|
|
||||||
|
fun isEmpty(): Boolean = availableItems.isEmpty()
|
||||||
|
}
|
||||||
@ -0,0 +1,180 @@
|
|||||||
|
package org.koitharu.kotatsu.filter.ui.sheet
|
||||||
|
|
||||||
|
import android.os.Build
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import android.widget.AdapterView
|
||||||
|
import android.widget.ArrayAdapter
|
||||||
|
import androidx.core.view.isGone
|
||||||
|
import androidx.fragment.app.FragmentManager
|
||||||
|
import com.google.android.material.chip.Chip
|
||||||
|
import org.koitharu.kotatsu.R
|
||||||
|
import org.koitharu.kotatsu.core.model.titleResId
|
||||||
|
import org.koitharu.kotatsu.core.ui.model.titleRes
|
||||||
|
import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
|
||||||
|
import org.koitharu.kotatsu.core.ui.widgets.ChipsView
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.observe
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.showDistinct
|
||||||
|
import org.koitharu.kotatsu.databinding.SheetFilter2Binding
|
||||||
|
import org.koitharu.kotatsu.filter.ui.FilterOwner
|
||||||
|
import org.koitharu.kotatsu.filter.ui.model.FilterProperty
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaState
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaTag
|
||||||
|
import org.koitharu.kotatsu.parsers.model.SortOrder
|
||||||
|
import org.koitharu.kotatsu.parsers.util.toTitleCase
|
||||||
|
import java.util.Locale
|
||||||
|
import com.google.android.material.R as materialR
|
||||||
|
|
||||||
|
class FilterSheetFragment :
|
||||||
|
BaseAdaptiveSheet<SheetFilter2Binding>(), AdapterView.OnItemSelectedListener, ChipsView.OnChipClickListener,
|
||||||
|
ChipsView.OnChipCloseClickListener {
|
||||||
|
|
||||||
|
override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): SheetFilter2Binding {
|
||||||
|
return SheetFilter2Binding.inflate(inflater, container, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onViewBindingCreated(binding: SheetFilter2Binding, savedInstanceState: Bundle?) {
|
||||||
|
super.onViewBindingCreated(binding, savedInstanceState)
|
||||||
|
if (dialog == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||||
|
binding.scrollView.scrollIndicators = 0
|
||||||
|
}
|
||||||
|
val filter = requireFilter()
|
||||||
|
filter.filterSortOrder.observe(viewLifecycleOwner, this::onSortOrderChanged)
|
||||||
|
filter.filterLocale.observe(viewLifecycleOwner, this::onLocaleChanged)
|
||||||
|
filter.filterTags.observe(viewLifecycleOwner, this::onTagsChanged)
|
||||||
|
filter.filterState.observe(viewLifecycleOwner, this::onStateChanged)
|
||||||
|
|
||||||
|
binding.spinnerLocale.onItemSelectedListener = this
|
||||||
|
binding.spinnerOrder.onItemSelectedListener = this
|
||||||
|
binding.chipsState.onChipClickListener = this
|
||||||
|
binding.chipsGenres.onChipClickListener = this
|
||||||
|
binding.chipsGenres.onChipCloseClickListener = this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
|
||||||
|
val filter = requireFilter()
|
||||||
|
when (parent.id) {
|
||||||
|
R.id.spinner_order -> filter.setSortOrder(filter.filterSortOrder.value.availableItems[position])
|
||||||
|
R.id.spinner_locale -> filter.setLanguage(filter.filterLocale.value.availableItems[position])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onNothingSelected(parent: AdapterView<*>?) = Unit
|
||||||
|
|
||||||
|
override fun onChipClick(chip: Chip, data: Any?) {
|
||||||
|
val filter = requireFilter()
|
||||||
|
when (data) {
|
||||||
|
is MangaState -> filter.setState(data, chip.isChecked)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onChipCloseClick(chip: Chip, data: Any?) {
|
||||||
|
val tag = data as? MangaTag ?: return
|
||||||
|
requireFilter().setTag(tag, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onSortOrderChanged(value: FilterProperty<SortOrder>) {
|
||||||
|
val b = viewBinding ?: return
|
||||||
|
b.textViewOrderTitle.isGone = value.isEmpty()
|
||||||
|
b.cardOrder.isGone = value.isEmpty()
|
||||||
|
if (value.isEmpty()) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
val selected = value.selectedItems.single()
|
||||||
|
b.spinnerOrder.adapter = ArrayAdapter(
|
||||||
|
b.spinnerOrder.context,
|
||||||
|
android.R.layout.simple_spinner_dropdown_item,
|
||||||
|
android.R.id.text1,
|
||||||
|
value.availableItems.map { b.spinnerOrder.context.getString(it.titleRes) },
|
||||||
|
)
|
||||||
|
val selectedIndex = value.availableItems.indexOf(selected)
|
||||||
|
if (selectedIndex >= 0) {
|
||||||
|
b.spinnerOrder.setSelection(selectedIndex, false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onLocaleChanged(value: FilterProperty<Locale?>) {
|
||||||
|
val b = viewBinding ?: return
|
||||||
|
b.textViewLocaleTitle.isGone = value.isEmpty()
|
||||||
|
b.cardLocale.isGone = value.isEmpty()
|
||||||
|
if (value.isEmpty()) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
val selected = value.selectedItems.singleOrNull()
|
||||||
|
b.spinnerLocale.adapter = ArrayAdapter(
|
||||||
|
b.spinnerLocale.context,
|
||||||
|
android.R.layout.simple_spinner_dropdown_item,
|
||||||
|
android.R.id.text1,
|
||||||
|
value.availableItems.map {
|
||||||
|
it?.getDisplayLanguage(it)?.toTitleCase(it)
|
||||||
|
?: b.spinnerLocale.context.getString(R.string.various_languages)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
val selectedIndex = value.availableItems.indexOf(selected)
|
||||||
|
if (selectedIndex >= 0) {
|
||||||
|
b.spinnerLocale.setSelection(selectedIndex, false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onTagsChanged(value: FilterProperty<MangaTag>) {
|
||||||
|
val b = viewBinding ?: return
|
||||||
|
b.textViewGenresTitle.isGone = value.isEmpty()
|
||||||
|
b.chipsGenres.isGone = value.isEmpty()
|
||||||
|
if (value.isEmpty()) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
val chips = ArrayList<ChipsView.ChipModel>(value.selectedItems.size + 1)
|
||||||
|
value.selectedItems.mapTo(chips) { tag ->
|
||||||
|
ChipsView.ChipModel(
|
||||||
|
tint = 0,
|
||||||
|
title = tag.title,
|
||||||
|
icon = 0,
|
||||||
|
isCheckable = false,
|
||||||
|
isChecked = false,
|
||||||
|
data = tag,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
chips.add(
|
||||||
|
ChipsView.ChipModel(
|
||||||
|
tint = 0,
|
||||||
|
title = getString(R.string.more),
|
||||||
|
icon = materialR.drawable.abc_ic_menu_overflow_material,
|
||||||
|
isCheckable = false,
|
||||||
|
isChecked = false,
|
||||||
|
data = null,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
b.chipsGenres.setChips(chips)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onStateChanged(value: FilterProperty<MangaState>) {
|
||||||
|
val b = viewBinding ?: return
|
||||||
|
b.textViewStateTitle.isGone = value.isEmpty()
|
||||||
|
b.chipsState.isGone = value.isEmpty()
|
||||||
|
if (value.isEmpty()) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
val chips = value.availableItems.map { state ->
|
||||||
|
ChipsView.ChipModel(
|
||||||
|
tint = 0,
|
||||||
|
title = getString(state.titleResId),
|
||||||
|
icon = 0,
|
||||||
|
isCheckable = true,
|
||||||
|
isChecked = state in value.selectedItems,
|
||||||
|
data = state,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
b.chipsState.setChips(chips)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun requireFilter() = (requireActivity() as FilterOwner).filter
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
|
||||||
|
private const val TAG = "FilterSheet"
|
||||||
|
|
||||||
|
fun show(fm: FragmentManager) = FilterSheetFragment().showDistinct(fm, TAG)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,143 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetHeaderBar
|
||||||
|
android:id="@+id/headerBar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:title="@string/filter" />
|
||||||
|
|
||||||
|
<androidx.core.widget.NestedScrollView
|
||||||
|
android:id="@+id/scrollView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:scrollIndicators="top">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:paddingBottom="@dimen/margin_normal">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_order_title"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="@dimen/margin_normal"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:text="@string/sort_order"
|
||||||
|
android:textAppearance="?textAppearanceTitleSmall"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
|
android:id="@+id/card_order"
|
||||||
|
style="?materialCardViewOutlinedStyle"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="16dp"
|
||||||
|
android:layout_marginTop="@dimen/margin_normal"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:cardBackgroundColor="?m3ColorBackground"
|
||||||
|
app:shapeAppearance="?shapeAppearanceCornerMedium"
|
||||||
|
app:strokeColor="@color/m3_button_outline_color_selector"
|
||||||
|
app:strokeWidth="@dimen/m3_comp_outlined_button_outline_width"
|
||||||
|
tools:visibility="visible">
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/spinner_order"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:minHeight="?listPreferredItemHeightSmall" />
|
||||||
|
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_locale_title"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="@dimen/margin_normal"
|
||||||
|
android:layout_marginTop="@dimen/margin_normal"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:text="@string/language"
|
||||||
|
android:textAppearance="?textAppearanceTitleSmall"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
|
android:id="@+id/card_locale"
|
||||||
|
style="?materialCardViewOutlinedStyle"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="16dp"
|
||||||
|
android:layout_marginTop="@dimen/margin_normal"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:cardBackgroundColor="?m3ColorBackground"
|
||||||
|
app:shapeAppearance="?shapeAppearanceCornerMedium"
|
||||||
|
app:strokeColor="@color/m3_button_outline_color_selector"
|
||||||
|
app:strokeWidth="@dimen/m3_comp_outlined_button_outline_width"
|
||||||
|
tools:visibility="visible">
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/spinner_locale"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:minHeight="?listPreferredItemHeightSmall" />
|
||||||
|
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_genres_title"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="@dimen/margin_normal"
|
||||||
|
android:layout_marginTop="@dimen/margin_normal"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:text="@string/genres"
|
||||||
|
android:textAppearance="?textAppearanceTitleSmall"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
<org.koitharu.kotatsu.core.ui.widgets.ChipsView
|
||||||
|
android:id="@+id/chips_genres"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/margin_normal"
|
||||||
|
android:paddingHorizontal="@dimen/margin_normal"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:chipSpacingHorizontal="6dp"
|
||||||
|
app:chipSpacingVertical="6dp"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_state_title"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="@dimen/margin_normal"
|
||||||
|
android:layout_marginTop="@dimen/margin_normal"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:text="@string/state"
|
||||||
|
android:textAppearance="?textAppearanceTitleSmall"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
<org.koitharu.kotatsu.core.ui.widgets.ChipsView
|
||||||
|
android:id="@+id/chips_state"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/margin_normal"
|
||||||
|
android:paddingHorizontal="@dimen/margin_normal"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:chipSpacingHorizontal="6dp"
|
||||||
|
app:chipSpacingVertical="6dp"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
</androidx.core.widget.NestedScrollView>
|
||||||
|
</LinearLayout>
|
||||||
Loading…
Reference in New Issue