1berry/Droid-ify-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Show sort order on each page

Browse Source
This commit is contained in:
LooKeR 2025-06-08 18:02:29 +05:30
parent 0a54fcf097
commit d29b85544f
No known key found for this signature in database
GPG Key ID: 6B59369FDB608FB9
1 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/kotlin/com/looker/droidify/ui/tabsFragment/TabsFragment.kt
View File

@ -31,9 +31,9 @@ import com.google.android.material.shape.ShapeAppearanceModel
import com.google.android.material.tabs.TabLayoutMediator import com.google.android.material.tabs.TabLayoutMediator
import com.looker.droidify.R import com.looker.droidify.R
import com.looker.droidify.databinding.TabsToolbarBinding import com.looker.droidify.databinding.TabsToolbarBinding
import com.looker.droidify.datastore.model.supportedSortOrders
import com.looker.droidify.datastore.extension.sortOrderName import com.looker.droidify.datastore.extension.sortOrderName
import com.looker.droidify.datastore.model.SortOrder import com.looker.droidify.datastore.model.SortOrder
import com.looker.droidify.datastore.model.supportedSortOrders
import com.looker.droidify.model.ProductItem import com.looker.droidify.model.ProductItem
import com.looker.droidify.service.Connection import com.looker.droidify.service.Connection
import com.looker.droidify.service.SyncService import com.looker.droidify.service.SyncService
@ -45,8 +45,8 @@ import com.looker.droidify.utility.common.extension.getMutatedIcon
import com.looker.droidify.utility.common.extension.selectableBackground import com.looker.droidify.utility.common.extension.selectableBackground
import com.looker.droidify.utility.common.extension.systemBarsPadding import com.looker.droidify.utility.common.extension.systemBarsPadding
import com.looker.droidify.utility.common.sdkAbove import com.looker.droidify.utility.common.sdkAbove
import com.looker.droidify.utility.extension.resources.sizeScaled
import com.looker.droidify.utility.extension.mainActivity import com.looker.droidify.utility.extension.mainActivity
import com.looker.droidify.utility.extension.resources.sizeScaled
import com.looker.droidify.widget.DividerConfiguration import com.looker.droidify.widget.DividerConfiguration
import com.looker.droidify.widget.FocusSearchView import com.looker.droidify.widget.FocusSearchView
import com.looker.droidify.widget.StableRecyclerAdapter import com.looker.droidify.widget.StableRecyclerAdapter
@ -122,7 +122,7 @@ class TabsFragment : ScreenFragment() {
val source = AppListFragment.Source.entries[it.currentItem] val source = AppListFragment.Source.entries[it.currentItem]
updateUpdateNotificationBlocker(source) updateUpdateNotificationBlocker(source)
} }
} },
) )
private var sectionsAnimator: ValueAnimator? = null private var sectionsAnimator: ValueAnimator? = null
@ -161,7 +161,8 @@ class TabsFragment : ScreenFragment() {
val searchView = FocusSearchView(toolbar.context).apply { val searchView = FocusSearchView(toolbar.context).apply {
maxWidth = Int.MAX_VALUE maxWidth = Int.MAX_VALUE
queryHint = getString(stringRes.search) queryHint = getString(stringRes.search)
setOnQueryTextListener(object : SearchView.OnQueryTextListener { setOnQueryTextListener(
object : SearchView.OnQueryTextListener {
override fun onQueryTextSubmit(query: String?): Boolean { override fun onQueryTextSubmit(query: String?): Boolean {
clearFocus() clearFocus()
return true return true
@ -174,7 +175,8 @@ class TabsFragment : ScreenFragment() {
} }
return true return true
} }
}) },
)
} }
toolbar.menu.apply { toolbar.menu.apply {
@ -188,9 +190,10 @@ class TabsFragment : ScreenFragment() {
.setIcon(toolbar.context.getMutatedIcon(R.drawable.ic_search)) .setIcon(toolbar.context.getMutatedIcon(R.drawable.ic_search))
.setActionView(searchView) .setActionView(searchView)
.setShowAsActionFlags( .setShowAsActionFlags(
MenuItem.SHOW_AS_ACTION_ALWAYS or MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW MenuItem.SHOW_AS_ACTION_ALWAYS or MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW,
) )
.setOnActionExpandListener(object : MenuItem.OnActionExpandListener { .setOnActionExpandListener(
object : MenuItem.OnActionExpandListener {
override fun onMenuItemActionExpand(item: MenuItem): Boolean { override fun onMenuItemActionExpand(item: MenuItem): Boolean {
viewModel.isSearchActionItemExpanded.value = true viewModel.isSearchActionItemExpanded.value = true
return true return true
@ -200,7 +203,8 @@ class TabsFragment : ScreenFragment() {
viewModel.isSearchActionItemExpanded.value = false viewModel.isSearchActionItemExpanded.value = false
return true return true
} }
}) },
)
syncRepositoriesMenuItem = add(0, 0, 0, stringRes.sync_repositories) syncRepositoriesMenuItem = add(0, 0, 0, stringRes.sync_repositories)
.setIcon(toolbar.context.getMutatedIcon(R.drawable.ic_sync)) .setIcon(toolbar.context.getMutatedIcon(R.drawable.ic_sync))
@ -261,7 +265,7 @@ class TabsFragment : ScreenFragment() {
adapter = object : FragmentStateAdapter(this@TabsFragment) { adapter = object : FragmentStateAdapter(this@TabsFragment) {
override fun getItemCount(): Int = AppListFragment.Source.entries.size override fun getItemCount(): Int = AppListFragment.Source.entries.size
override fun createFragment(position: Int): Fragment = AppListFragment( override fun createFragment(position: Int): Fragment = AppListFragment(
AppListFragment.Source.entries[position] AppListFragment.Source.entries[position],
) )
} }
content.addView(this) content.addView(this)
@ -320,7 +324,7 @@ class TabsFragment : ScreenFragment() {
val backgroundPath = ShapeAppearanceModel.builder() val backgroundPath = ShapeAppearanceModel.builder()
.setAllCornerSizes( .setAllCornerSizes(
context?.resources?.getDimension(R.dimen.shape_large_corner) ?: 0F context?.resources?.getDimension(R.dimen.shape_large_corner) ?: 0F,
) )
.build() .build()
val sectionBackground = MaterialShapeDrawable(backgroundPath) val sectionBackground = MaterialShapeDrawable(backgroundPath)
@ -448,7 +452,7 @@ class TabsFragment : ScreenFragment() {
val viewPager = viewPager val viewPager = viewPager
viewPager?.setCurrentItem( viewPager?.setCurrentItem(
AppListFragment.Source.UPDATES.ordinal, AppListFragment.Source.UPDATES.ordinal,
allowSmooth && viewPager.isLaidOut allowSmooth && viewPager.isLaidOut,
) )
} else { } else {
needSelectUpdates = true needSelectUpdates = true
@ -460,7 +464,7 @@ class TabsFragment : ScreenFragment() {
} }
private fun updateSections( private fun updateSections(
sectionsList: List<ProductItem.Section> sectionsList: List<ProductItem.Section>,
) { ) {
sectionsAdapter?.sections = sectionsList sectionsAdapter?.sections = sectionsList
layout?.run { layout?.run {
@ -517,7 +521,7 @@ class TabsFragment : ScreenFragment() {
override fun onPageScrolled( override fun onPageScrolled(
position: Int, position: Int,
positionOffset: Float, positionOffset: Float,
positionOffsetPixels: Int positionOffsetPixels: Int,
) { ) {
val layout = layout!! val layout = layout!!
val fromSections = AppListFragment.Source.entries[position].sections val fromSections = AppListFragment.Source.entries[position].sections
@ -546,15 +550,9 @@ class TabsFragment : ScreenFragment() {
val source = AppListFragment.Source.entries[position] val source = AppListFragment.Source.entries[position]
updateUpdateNotificationBlocker(source) updateUpdateNotificationBlocker(source)
sortOrderMenu!!.first.apply { sortOrderMenu!!.first.apply {
isVisible = source.order
setShowAsActionFlags( setShowAsActionFlags(
if (!source.order || if (resources.configuration.screenWidthDp >= 300) MenuItem.SHOW_AS_ACTION_ALWAYS
resources.configuration.screenWidthDp >= 300 else 0,
) {
MenuItem.SHOW_AS_ACTION_ALWAYS
} else {
0
}
) )
} }
syncRepositoriesMenuItem!!.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS) syncRepositoriesMenuItem!!.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS)
@ -575,7 +573,7 @@ class TabsFragment : ScreenFragment() {
} }
private class SectionsAdapter( private class SectionsAdapter(
private val onClick: (ProductItem.Section) -> Unit private val onClick: (ProductItem.Section) -> Unit,
) : StableRecyclerAdapter<SectionsAdapter.ViewType, RecyclerView.ViewHolder>() { ) : StableRecyclerAdapter<SectionsAdapter.ViewType, RecyclerView.ViewHolder>() {
enum class ViewType { SECTION } enum class ViewType { SECTION }
@ -589,13 +587,13 @@ class TabsFragment : ScreenFragment() {
setPadding(16.dp, 0, 16.dp, 0) setPadding(16.dp, 0, 16.dp, 0)
layoutParams = FrameLayout.LayoutParams( layoutParams = FrameLayout.LayoutParams(
FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT,
FrameLayout.LayoutParams.MATCH_PARENT FrameLayout.LayoutParams.MATCH_PARENT,
) )
} }
with(itemView as FrameLayout) { with(itemView as FrameLayout) {
layoutParams = RecyclerView.LayoutParams( layoutParams = RecyclerView.LayoutParams(
RecyclerView.LayoutParams.MATCH_PARENT, RecyclerView.LayoutParams.MATCH_PARENT,
48.dp 48.dp,
) )
background = context.selectableBackground background = context.selectableBackground
addView(title) addView(title)
@ -612,7 +610,7 @@ class TabsFragment : ScreenFragment() {
fun configureDivider( fun configureDivider(
context: Context, context: Context,
position: Int, position: Int,
configuration: DividerConfiguration configuration: DividerConfiguration,
) { ) {
val currentSection = sections[position] val currentSection = sections[position]
val nextSection = sections.getOrNull(position + 1) val nextSection = sections.getOrNull(position + 1)
@ -623,7 +621,7 @@ class TabsFragment : ScreenFragment() {
needDivider = true, needDivider = true,
toTop = false, toTop = false,
paddingStart = padding, paddingStart = padding,
paddingEnd = padding paddingEnd = padding,
) )
} }
@ -632,7 +630,7 @@ class TabsFragment : ScreenFragment() {
needDivider = false, needDivider = false,
toTop = false, toTop = false,
paddingStart = 0, paddingStart = 0,
paddingEnd = 0 paddingEnd = 0,
) )
} }
} }
@ -647,7 +645,7 @@ class TabsFragment : ScreenFragment() {
override fun onCreateViewHolder( override fun onCreateViewHolder(
parent: ViewGroup, parent: ViewGroup,
viewType: ViewType viewType: ViewType,
): RecyclerView.ViewHolder { ): RecyclerView.ViewHolder {
return SectionViewHolder(parent.context).apply { return SectionViewHolder(parent.context).apply {
itemView.setOnClickListener { onClick(sections[absoluteAdapterPosition]) } itemView.setOnClickListener { onClick(sections[absoluteAdapterPosition]) }
@ -677,7 +675,7 @@ class TabsFragment : ScreenFragment() {
} }
holder.title.text = when (section) { holder.title.text = when (section) {
is ProductItem.Section.All -> holder.itemView.resources.getString( is ProductItem.Section.All -> holder.itemView.resources.getString(
stringRes.all_applications stringRes.all_applications,
) )
is ProductItem.Section.Category -> section.name is ProductItem.Section.Category -> section.name