Skip to content

Update Groupie library to 2.9.0 #7150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
litetex merged 1 commit into from
Sep 30, 2021
Merged

Update Groupie library to 2.9.0 #7150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ ext {
icepickVersion = '3.2.0'
exoPlayerVersion = '2.12.3'
googleAutoServiceVersion = '1.0'
groupieVersion = '2.8.1'
groupieVersion = '2.9.0'
markwonVersion = '4.6.2'

leakCanaryVersion = '2.5'
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package org.schabi.newpipe.info_list

import android.util.Log
import com.xwray.groupie.GroupAdapter
import com.xwray.groupie.GroupieViewHolder
import com.xwray.groupie.GroupieAdapter
import org.schabi.newpipe.extractor.stream.StreamInfo
import kotlin.math.max

Expand All @@ -11,7 +10,7 @@ import kotlin.math.max
*/
class StreamSegmentAdapter(
private val listener: StreamSegmentListener
) : GroupAdapter<GroupieViewHolder>() {
) : GroupieAdapter() {

var currentIndex: Int = 0
private set
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ import androidx.core.view.isVisible
import androidx.lifecycle.ViewModelProvider
import androidx.preference.PreferenceManager
import androidx.recyclerview.widget.GridLayoutManager
import com.xwray.groupie.GroupAdapter
import com.xwray.groupie.GroupieViewHolder
import com.xwray.groupie.GroupieAdapter
import com.xwray.groupie.Item
import com.xwray.groupie.OnItemClickListener
import com.xwray.groupie.OnItemLongClickListener
Expand Down Expand Up @@ -91,7 +90,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
private var groupName = ""
private var oldestSubscriptionUpdate: OffsetDateTime? = null

private lateinit var groupAdapter: GroupAdapter<GroupieViewHolder>
private lateinit var groupAdapter: GroupieAdapter
@State @JvmField var showPlayedItems: Boolean = true

private var onSettingsChangeListener: SharedPreferences.OnSharedPreferenceChangeListener? = null
Expand Down Expand Up @@ -131,7 +130,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
viewModel = ViewModelProvider(this, factory).get(FeedViewModel::class.java)
viewModel.stateLiveData.observe(viewLifecycleOwner, { it?.let(::handleResult) })

groupAdapter = GroupAdapter<GroupieViewHolder>().apply {
groupAdapter = GroupieAdapter().apply {
setOnItemClickListener(listenerStreamItem)
setOnItemLongClickListener(listenerStreamItem)
}
Expand Down
9 changes: 4 additions & 5 deletions app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.xwray.groupie.GroupAdapter
import com.xwray.groupie.GroupieViewHolder
import com.xwray.groupie.GroupieAdapter
import com.xwray.groupie.OnItemClickListener
import com.xwray.groupie.Section
import icepick.Icepick
Expand Down Expand Up @@ -78,7 +77,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {

private val subscriptionMainSection = Section()
private val subscriptionEmptyFooter = Section()
private lateinit var subscriptionGroupAdapter: GroupAdapter<GroupieViewHolder>
private lateinit var subscriptionGroupAdapter: GroupieAdapter

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down Expand Up @@ -153,7 +152,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
}
}

subscriptionGroupAdapter = GroupAdapter<GroupieViewHolder>().apply {
subscriptionGroupAdapter = GroupieAdapter().apply {
add(subscriptionMainSection)
add(subscriptionEmptyFooter)
spanCount = 4
Expand Down Expand Up @@ -379,7 +378,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
}

private fun setupIconPicker() {
val groupAdapter = GroupAdapter<GroupieViewHolder>()
val groupAdapter = GroupieAdapter()
groupAdapter.addAll(FeedGroupIcon.values().map { PickerIconItem(it) })

feedGroupCreateBinding.iconSelector.apply {
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.ItemTouchHelper.SimpleCallback
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.xwray.groupie.GroupAdapter
import com.xwray.groupie.GroupieViewHolder
import com.xwray.groupie.GroupieAdapter
import com.xwray.groupie.TouchCallback
import icepick.Icepick
import icepick.State
Expand All @@ -38,7 +37,7 @@ class FeedGroupReorderDialog : DialogFragment() {
@State
@JvmField
var groupOrderedIdList = ArrayList<Long>()
private val groupAdapter = GroupAdapter<GroupieViewHolder>()
private val groupAdapter = GroupieAdapter()
private val itemTouchHelper = ItemTouchHelper(getItemTouchCallback())

override fun onCreate(savedInstanceState: Bundle?) {
Expand Down