Skip to content

Commit cf04450

Browse files
authored
Merge pull request libre-tube#7452 from Bnyro/master
chore: use ListAdapter#currentList instead of manual items impl
2 parents eb59ed6 + 346799f commit cf04450

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ class DownloadsAdapter(
4141
private val downloadTab: DownloadTab,
4242
private val toggleDownload: (DownloadWithItems) -> Boolean
4343
) : ListAdapter<DownloadWithItems, DownloadsViewHolder>(DiffUtilItemCallback()) {
44-
val items get() = (0 until itemCount).map { getItem(it) }
45-
4644
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DownloadsViewHolder {
4745
val binding = VideoRowBinding.inflate(
4846
LayoutInflater.from(parent.context),
@@ -183,7 +181,7 @@ class DownloadsAdapter(
183181
}
184182

185183
fun deleteAllDownloads(onlyDeleteWatched: Boolean) {
186-
val (toDelete, toKeep) = items.partition {
184+
val (toDelete, toKeep) = currentList.partition {
187185
!onlyDeleteWatched || runBlocking(Dispatchers.IO) {
188186
DatabaseHelper.isVideoWatched(it.download.videoId, it.download.duration ?: 0)
189187
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import androidx.core.content.ContextCompat
1414
import androidx.core.os.bundleOf
1515
import androidx.core.view.isGone
1616
import androidx.core.view.isVisible
17-
import androidx.core.view.marginBottom
1817
import androidx.core.view.updateLayoutParams
1918
import androidx.fragment.app.Fragment
2019
import androidx.fragment.app.activityViewModels
@@ -47,7 +46,6 @@ import com.github.libretube.ui.adapters.DownloadsAdapter
4746
import com.github.libretube.ui.base.DynamicLayoutManagerFragment
4847
import com.github.libretube.ui.extensions.setupFragmentAnimation
4948
import com.github.libretube.ui.models.CommonPlayerViewModel
50-
import com.github.libretube.ui.models.PlayerViewModel
5149
import com.github.libretube.ui.sheets.BaseBottomSheet
5250
import com.github.libretube.ui.viewholders.DownloadsViewHolder
5351
import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -312,7 +310,7 @@ class DownloadsFragmentPage : DynamicLayoutManagerFragment(R.layout.fragment_dow
312310
}
313311

314312
fun updateProgress(id: Int, status: DownloadStatus) {
315-
val index = adapter.items.indexOfFirst {
313+
val index = adapter.currentList.indexOfFirst {
316314
it.downloadItems.any { item -> item.id == id }
317315
}
318316
val view =

0 commit comments

Comments
 (0)