mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 08:30:44 +00:00
Use GROUP_ALL_ID instead of hardcoded -1
This commit is contained in:
parent
3cef7f3201
commit
2f6cb87bba
@ -27,7 +27,7 @@ import com.xwray.groupie.viewbinding.GroupieViewHolder
|
||||
import icepick.State
|
||||
import io.reactivex.rxjava3.disposables.CompositeDisposable
|
||||
import org.schabi.newpipe.R
|
||||
import org.schabi.newpipe.database.feed.model.FeedGroupEntity
|
||||
import org.schabi.newpipe.database.feed.model.FeedGroupEntity.Companion.GROUP_ALL_ID
|
||||
import org.schabi.newpipe.databinding.DialogTitleBinding
|
||||
import org.schabi.newpipe.databinding.FeedItemCarouselBinding
|
||||
import org.schabi.newpipe.databinding.FragmentSubscriptionBinding
|
||||
@ -276,14 +276,8 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
|
||||
}
|
||||
}
|
||||
carouselAdapter.setOnItemLongClickListener { item, _ ->
|
||||
if ((
|
||||
item is FeedGroupCardItem &&
|
||||
item.groupId == FeedGroupEntity.GROUP_ALL_ID
|
||||
) ||
|
||||
(
|
||||
item is FeedGroupCardGridItem &&
|
||||
item.groupId == FeedGroupEntity.GROUP_ALL_ID
|
||||
)
|
||||
if ((item is FeedGroupCardItem && item.groupId == GROUP_ALL_ID) ||
|
||||
(item is FeedGroupCardGridItem && item.groupId == GROUP_ALL_ID)
|
||||
) {
|
||||
return@setOnItemLongClickListener false
|
||||
}
|
||||
@ -437,10 +431,10 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
|
||||
clear()
|
||||
if (listViewMode) {
|
||||
add(FeedGroupAddNewItem())
|
||||
add(FeedGroupCardItem(-1, getString(R.string.all), FeedGroupIcon.RSS))
|
||||
add(FeedGroupCardItem(GROUP_ALL_ID, getString(R.string.all), FeedGroupIcon.RSS))
|
||||
} else {
|
||||
add(FeedGroupAddNewGridItem())
|
||||
add(FeedGroupCardGridItem(-1, getString(R.string.all), FeedGroupIcon.RSS))
|
||||
add(FeedGroupCardGridItem(GROUP_ALL_ID, getString(R.string.all), FeedGroupIcon.RSS))
|
||||
}
|
||||
addAll(groups)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user