recloudstream/cloudstream
2
2
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases Wiki Activity

Replace notifyDataSetChanged() with notifyItemRangeChanged() in setList(), use requireActivity().onBackPressedDispatcher.onBackPressed()

Browse source
This commit is contained in:
MhmdIbrahim1 2023-02-19 03:07:13 +02:00
parent c06d13e786
commit 171b5b721e
3 changed files with 42 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt
View file

@ -18,6 +18,7 @@ import com.lagradost.cloudstream3.utils.VideoDownloadManager
import kotlinx.android.synthetic.main.fragment_child_downloads.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import kotlin.math.min
class DownloadChildFragment : Fragment() {
companion object {
@ -39,6 +40,7 @@ class DownloadChildFragment : Fragment() {
return inflater.inflate(R.layout.fragment_child_downloads, container, false)
}
private fun updateList(folder: String) = main {
context?.let { ctx ->
val data = withContext(Dispatchers.IO) { ctx.getKeys(folder) }
@ -50,16 +52,38 @@ class DownloadChildFragment : Fragment() {
?: return@mapNotNull null
VisualDownloadChildCached(info.fileLength, info.totalBytes, it)
}
}.sortedBy { it.data.episode + (it.data.season?: 0)*100000 }
}.sortedBy { it.data.episode + (it.data.season ?: 0) * 100000 }
if (eps.isEmpty()) {
activity?.onBackPressed()
requireActivity().onBackPressedDispatcher.onBackPressed()
return@main
}
(download_child_list?.adapter as DownloadChildAdapter? ?: return@main).cardList = eps
download_child_list?.adapter?.notifyDataSetChanged()
val adapter = download_child_list?.adapter as DownloadChildAdapter? ?: return@main
val oldSize = adapter.cardList.size
adapter.cardList = eps
adapter.notifyItemRangeChanged(0, min(oldSize,eps.size))
}
}
// private fun updateList(folder: String) = main {
// context?.let { ctx ->
// val data = withContext(Dispatchers.IO) { ctx.getKeys(folder) }
// val eps = withContext(Dispatchers.IO) {
// data.mapNotNull { key ->
// context?.getKey<VideoDownloadHelper.DownloadEpisodeCached>(key)
// }.mapNotNull {
// val info = VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(ctx, it.id)
// ?: return@mapNotNull null
// VisualDownloadChildCached(info.fileLength, info.totalBytes, it)
// }
// }.sortedBy { it.data.episode + (it.data.season?: 0)*100000 }
// if (eps.isEmpty()) {
// activity?.onBackPressed()
// return@main
// }
//
// (download_child_list?.adapter as DownloadChildAdapter? ?: return@main).cardList = eps
// download_child_list?.adapter?.notifyDataSetChanged()
// }
// }
private var downloadDeleteEventListener: ((Int) -> Unit)? = null
@ -69,7 +93,7 @@ class DownloadChildFragment : Fragment() {
val folder = arguments?.getString("folder")
val name = arguments?.getString("name")
if (folder == null) {
activity?.onBackPressed() // TODO FIX
requireActivity().onBackPressedDispatcher.onBackPressed()
return
}
context?.fixPaddingStatusbar(download_child_root)
@ -77,7 +101,7 @@ class DownloadChildFragment : Fragment() {
download_child_toolbar.title = name
download_child_toolbar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
download_child_toolbar.setNavigationOnClickListener {
activity?.onBackPressed()
requireActivity().onBackPressedDispatcher.onBackPressed()
}
val adapter: RecyclerView.Adapter<RecyclerView.ViewHolder> =

14
app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
View file

@ -24,7 +24,6 @@ import com.lagradost.cloudstream3.mvvm.observe
import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
import com.lagradost.cloudstream3.ui.player.LinkGenerator
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
import com.lagradost.cloudstream3.utils.AppUtils.loadResult
import com.lagradost.cloudstream3.utils.Coroutines.main
import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
@ -58,10 +57,19 @@ class DownloadFragment : Fragment() {
this.layoutParams = param
}
// private fun setList(list: List<VisualDownloadHeaderCached>) {
// main {
// (download_list?.adapter as DownloadHeaderAdapter?)?.cardList = list
// download_list?.adapter?.notifyDataSetChanged()
// }
// }
private fun setList(list: List<VisualDownloadHeaderCached>) {
main {
(download_list?.adapter as DownloadHeaderAdapter?)?.cardList = list
download_list?.adapter?.notifyDataSetChanged()
val adapter = download_list?.adapter as DownloadHeaderAdapter?
if (adapter != null) {
adapter.cardList = list
adapter.notifyItemRangeChanged(0, list.size)
}
}
}

1
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
View file

@ -112,7 +112,6 @@ class SettingsPlayer : PreferenceFragmentCompat() {
}
return@setOnPreferenceClickListener true
}
getPref(R.string.player_pref_key)?.setOnPreferenceClickListener {
val prefNames = resources.getStringArray(R.array.player_pref_names)
val prefValues = resources.getIntArray(R.array.player_pref_values)