Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Fully working toggle button that change between vertical and horizontal view

This commit is contained in:
Samuel Wu 2022-10-25 10:54:27 +11:00
parent 082d7a3f18
commit ed68e3bd46
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
View File

@ -45,7 +45,7 @@ import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialog
import org.schabi.newpipe.local.subscription.item.ChannelItem import org.schabi.newpipe.local.subscription.item.ChannelItem
import org.schabi.newpipe.local.subscription.item.EmptyPlaceholderItem import org.schabi.newpipe.local.subscription.item.EmptyPlaceholderItem
import org.schabi.newpipe.local.subscription.item.FeedGroupAddItem import org.schabi.newpipe.local.subscription.item.FeedGroupAddItem
import org.schabi.newpipe.local.subscription.item.FeedGroupAddItemVertical import org.schabi.newpipe.local.subscription.item.FeedGroupAddVerticalItem
import org.schabi.newpipe.local.subscription.item.FeedGroupCardItem import org.schabi.newpipe.local.subscription.item.FeedGroupCardItem
import org.schabi.newpipe.local.subscription.item.FeedGroupCardVerticalItem import org.schabi.newpipe.local.subscription.item.FeedGroupCardVerticalItem
import org.schabi.newpipe.local.subscription.item.FeedGroupCarouselItem import org.schabi.newpipe.local.subscription.item.FeedGroupCarouselItem
@ -78,10 +78,12 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
private val groupAdapter = GroupAdapter<GroupieViewHolder<FeedItemCarouselBinding>>() private val groupAdapter = GroupAdapter<GroupieViewHolder<FeedItemCarouselBinding>>()
private val feedGroupsSection = Section() private val feedGroupsSection = Section()
private val feedGroupsVerticalSection = Section()
private var feedGroupsCarousel: FeedGroupCarouselItem? = null private var feedGroupsCarousel: FeedGroupCarouselItem? = null
private var feedGroupsVerticalCarousel: FeedGroupCarouselItem? = null
private lateinit var feedGroupsSortMenuItem: HeaderWithMenuItem private lateinit var feedGroupsSortMenuItem: HeaderWithMenuItem
private val subscriptionsSection = Section() private val subscriptionsSection = Section()
private var listView: Boolean = false private var defaultListView: Boolean = true
private val requestExportLauncher = private val requestExportLauncher =
registerForActivityResult(StartActivityForResult(), this::requestExportResult) registerForActivityResult(StartActivityForResult(), this::requestExportResult)
@ -255,7 +257,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
// //////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////
private fun setupInitialLayout() { private fun setupInitialLayout() {
listView = false defaultListView = true
Section().apply { Section().apply {
val carouselAdapter = GroupAdapter<GroupieViewHolder<FeedItemCarouselBinding>>() val carouselAdapter = GroupAdapter<GroupieViewHolder<FeedItemCarouselBinding>>()
@ -302,16 +304,17 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
listOf(subscriptionsSection) listOf(subscriptionsSection)
) )
) )
view?.let { initViews(it, savedInstanceState = Bundle()) }
} }
private fun changeLayout() { private fun changeLayout() {
listView = true defaultListView = false
Section().apply { Section().apply {
val carouselAdapter = GroupAdapter<GroupieViewHolder<FeedItemCarouselBinding>>() val carouselAdapter = GroupAdapter<GroupieViewHolder<FeedItemCarouselBinding>>()
carouselAdapter.add(FeedGroupCardVerticalItem(-1, getString(R.string.all), FeedGroupIcon.RSS)) carouselAdapter.add(FeedGroupCardVerticalItem(-1, getString(R.string.all), FeedGroupIcon.RSS))
carouselAdapter.add(feedGroupsSection) carouselAdapter.add(feedGroupsVerticalSection)
carouselAdapter.add(FeedGroupAddItemVertical()) carouselAdapter.add(FeedGroupAddVerticalItem())
carouselAdapter.setOnItemClickListener { item, _ -> carouselAdapter.setOnItemClickListener { item, _ ->
listenerFeedVerticalGroups.selected(item) listenerFeedVerticalGroups.selected(item)
@ -325,7 +328,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
listenerFeedVerticalGroups.held(item) listenerFeedVerticalGroups.held(item)
return@setOnItemLongClickListener true return@setOnItemLongClickListener true
} }
feedGroupsCarousel = FeedGroupCarouselItem(requireContext(), carouselAdapter, RecyclerView.VERTICAL) feedGroupsVerticalCarousel = FeedGroupCarouselItem(requireContext(), carouselAdapter, RecyclerView.VERTICAL)
feedGroupsSortMenuItem = HeaderWithMenuItem( feedGroupsSortMenuItem = HeaderWithMenuItem(
getString(R.string.feed_groups_header_title), getString(R.string.feed_groups_header_title),
@ -334,7 +337,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
listViewOnClickListener = ::setupInitialLayout, listViewOnClickListener = ::setupInitialLayout,
menuItemOnClickListener = ::openReorderDialog menuItemOnClickListener = ::openReorderDialog
) )
add(Section(feedGroupsSortMenuItem, listOf(feedGroupsCarousel))) add(Section(feedGroupsSortMenuItem, listOf(feedGroupsVerticalCarousel)))
groupAdapter.clear() groupAdapter.clear()
groupAdapter.add(this) groupAdapter.add(this)
} }
@ -349,6 +352,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
listOf(subscriptionsSection) listOf(subscriptionsSection)
) )
) )
view?.let { initViews(it, savedInstanceState = Bundle()) }
} }
override fun initViews(rootView: View, savedInstanceState: Bundle?) { override fun initViews(rootView: View, savedInstanceState: Bundle?) {
@ -427,7 +431,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
override fun selected(selectedItem: Item<*>?) { override fun selected(selectedItem: Item<*>?) {
when (selectedItem) { when (selectedItem) {
is FeedGroupCardVerticalItem -> NavigationHelper.openFeedFragment(fm, selectedItem.groupId, selectedItem.name) is FeedGroupCardVerticalItem -> NavigationHelper.openFeedFragment(fm, selectedItem.groupId, selectedItem.name)
is FeedGroupAddItemVertical -> FeedGroupDialog.newInstance().show(fm, null) is FeedGroupAddVerticalItem -> FeedGroupDialog.newInstance().show(fm, null)
} }
} }
@ -480,7 +484,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
} }
private fun handleFeedGroups(groups: List<Group>) { private fun handleFeedGroups(groups: List<Group>) {
if (!listView) { if (defaultListView) {
feedGroupsSection.update(groups) feedGroupsSection.update(groups)
if (feedGroupsListState != null) { if (feedGroupsListState != null) {
@ -494,11 +498,11 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
} }
private fun handleFeedGroupsVertical(groups: List<Group>) { private fun handleFeedGroupsVertical(groups: List<Group>) {
if (listView) { if (!defaultListView) {
feedGroupsSection.update(groups) feedGroupsVerticalSection.update(groups)
if (feedGroupsListVerticalState != null) { if (feedGroupsListVerticalState != null) {
feedGroupsCarousel?.onRestoreInstanceState(feedGroupsListVerticalState) feedGroupsVerticalCarousel?.onRestoreInstanceState(feedGroupsListVerticalState)
feedGroupsListVerticalState = null feedGroupsListVerticalState = null
} }

2
app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupAddItemVertical.kt → app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupAddVerticalItem.kt
View File

@ -5,7 +5,7 @@ import com.xwray.groupie.viewbinding.BindableItem
import org.schabi.newpipe.R import org.schabi.newpipe.R
import org.schabi.newpipe.databinding.FeedGroupAddNewItemVerticalBinding import org.schabi.newpipe.databinding.FeedGroupAddNewItemVerticalBinding
class FeedGroupAddItemVertical : BindableItem<FeedGroupAddNewItemVerticalBinding>() { class FeedGroupAddVerticalItem : BindableItem<FeedGroupAddNewItemVerticalBinding>() {
override fun getLayout(): Int = R.layout.feed_group_add_new_item_vertical override fun getLayout(): Int = R.layout.feed_group_add_new_item_vertical
override fun bind(viewBinding: FeedGroupAddNewItemVerticalBinding, position: Int) {} override fun bind(viewBinding: FeedGroupAddNewItemVerticalBinding, position: Int) {}
override fun initializeViewBinding(view: View) = FeedGroupAddNewItemVerticalBinding.bind(view) override fun initializeViewBinding(view: View) = FeedGroupAddNewItemVerticalBinding.bind(view)