diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt index 20f8a01c1..a804b0ff3 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt @@ -269,6 +269,7 @@ class SubscriptionFragment : BaseStateFragment() { feedGroupsCarousel = FeedGroupCarouselItem(requireContext(), carouselAdapter) feedGroupsSortMenuItem = HeaderWithMenuItem( getString(R.string.feed_groups_header_title), + R.drawable.ic_list, R.drawable.ic_sort, menuItemOnClickListener = ::openReorderDialog ) diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt index 79a272178..cb312b023 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt @@ -11,8 +11,10 @@ import org.schabi.newpipe.databinding.HeaderWithMenuItemBinding class HeaderWithMenuItem( val title: String, @DrawableRes val itemIcon: Int = 0, + @DrawableRes val itemIconListView: Int = 0, var showMenuItem: Boolean = true, private val onClickListener: (() -> Unit)? = null, + private val onClickListenerListView: (() -> Unit)? = null, private val menuItemOnClickListener: (() -> Unit)? = null ) : BindableItem() { companion object { @@ -32,11 +34,15 @@ class HeaderWithMenuItem( override fun bind(viewBinding: HeaderWithMenuItemBinding, position: Int) { viewBinding.headerTitle.text = title - viewBinding.headerMenuItem.setImageResource(itemIcon) + viewBinding.headerMenuItem2.setImageResource(itemIcon) + viewBinding.headerMenuItem.setImageResource(itemIconListView) val listener = onClickListener?.let { OnClickListener { onClickListener.invoke() } } viewBinding.root.setOnClickListener(listener) + val listenerListView = onClickListenerListView?.let { OnClickListener { onClickListenerListView.invoke() } } + viewBinding.root.setOnClickListener(listenerListView) + val menuItemListener = menuItemOnClickListener?.let { OnClickListener { menuItemOnClickListener.invoke() } } viewBinding.headerMenuItem.setOnClickListener(menuItemListener) updateMenuItemVisibility(viewBinding) diff --git a/app/src/main/res/layout/header_with_menu_item.xml b/app/src/main/res/layout/header_with_menu_item.xml index fcf888ed5..170c40098 100644 --- a/app/src/main/res/layout/header_with_menu_item.xml +++ b/app/src/main/res/layout/header_with_menu_item.xml @@ -22,6 +22,14 @@ android:textStyle="bold" tools:text="Header" /> + +