Skip to content

Commit 7b0d4ca

Browse files
authored
Merge pull request libre-tube#7278 from Bnyro/master
chore: small code cleanups related to playing queue
2 parents 4efd94d + 87865c9 commit 7b0d4ca

4 files changed

Lines changed: 4 additions & 10 deletions

File tree

app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
11
package com.github.libretube.ui.adapters
22

33
import android.annotation.SuppressLint
4-
import android.content.Context
54
import android.view.LayoutInflater
65
import android.view.ViewGroup
76
import androidx.core.os.bundleOf
87
import androidx.core.view.isGone
98
import androidx.core.view.isVisible
109
import androidx.core.view.updateLayoutParams
11-
import androidx.recyclerview.widget.GridLayoutManager
1210
import androidx.recyclerview.widget.ListAdapter
13-
import androidx.recyclerview.widget.RecyclerView.LayoutManager
1411
import com.github.libretube.api.obj.StreamItem
1512
import com.github.libretube.constants.IntentData
16-
import com.github.libretube.constants.PreferenceKeys
1713
import com.github.libretube.databinding.AllCaughtUpRowBinding
1814
import com.github.libretube.databinding.TrendingRowBinding
1915
import com.github.libretube.databinding.VideoRowBinding
2016
import com.github.libretube.db.DatabaseHolder
21-
import com.github.libretube.extensions.ceilHalf
2217
import com.github.libretube.extensions.dpToPx
2318
import com.github.libretube.extensions.toID
2419
import com.github.libretube.helpers.ImageHelper
2520
import com.github.libretube.helpers.NavigationHelper
26-
import com.github.libretube.helpers.PreferenceHelper
2721
import com.github.libretube.ui.adapters.callbacks.DiffUtilItemCallback
2822
import com.github.libretube.ui.base.BaseActivity
2923
import com.github.libretube.ui.extensions.setFormattedDuration

app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class PlaylistFragment : DynamicLayoutManagerFragment(R.layout.fragment_playlist
214214
NavigationHelper.navigateVideo(
215215
requireContext(),
216216
sortedStreams.first().url,
217-
playlistId,
217+
playlistId = playlistId,
218218
keepQueue = true
219219
)
220220
}

app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,7 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
302302

303303
if (streams.isEmpty()) return
304304

305-
PlayingQueue.clear()
306-
PlayingQueue.add(*streams.toTypedArray())
305+
PlayingQueue.setStreams(streams)
307306

308307
NavigationHelper.navigateVideo(
309308
requireContext(),

app/src/main/java/com/github/libretube/util/PlayingQueue.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ object PlayingQueue {
107107
fun getStreams() = queue.toList()
108108

109109
fun setStreams(streams: List<StreamItem>) = synchronized(queue) {
110-
queue.clear()
110+
clear()
111+
111112
queue.addAll(streams)
112113
}
113114

0 commit comments

Comments
 (0)