Skip to content

teams: smoother resources inline list adapting (fixes #11709) #11628

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
dogi merged 3 commits into from
Mar 4, 2026
Merged

teams: smoother resources inline list adapting (fixes #11709) #11628

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b21cf8b
Refactor InlineResourceAdapter to ListAdapter
dogi Mar 2, 2026
c9aca1e
Update version code and name in build.gradle
dogi Mar 4, 2026
71470bc
Merge branch 'master' into refactor-inline-resource-adapter-422258920…
dogi Mar 4, 2026
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
5 changes: 3 additions & 2 deletions app/src/main/java/org/ole/planet/myplanet/ui/courses/CourseStepFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,14 @@ class CourseStepFragment : BaseContainerFragment(), ImageCaptureCallback {
fragmentCourseStepBinding.tvResourcesHeader.visibility = View.VISIBLE
fragmentCourseStepBinding.rvInlineResources.visibility = View.VISIBLE

inlineResourceAdapter = InlineResourceAdapter(resources) { library ->
inlineResourceAdapter = InlineResourceAdapter { library ->
openResource(library)
}
fragmentCourseStepBinding.rvInlineResources.apply {
layoutManager = LinearLayoutManager(requireContext())
adapter = inlineResourceAdapter
}
inlineResourceAdapter?.submitList(resources)
}

private fun autoDownloadResources() {
Expand Down Expand Up @@ -214,7 +215,7 @@ class CourseStepFragment : BaseContainerFragment(), ImageCaptureCallback {
viewLifecycleOwner.lifecycleScope.launch {
val updatedResources = resourcesRepository.getAllStepResources(stepId)
resources = updatedResources
inlineResourceAdapter?.updateResources(updatedResources)
inlineResourceAdapter?.submitList(updatedResources)
fragmentCourseStepBinding.resourceDownloadProgress.visibility = View.GONE
}
}
Expand Down
27 changes: 18 additions & 9 deletions app/src/main/java/org/ole/planet/myplanet/ui/courses/InlineResourceAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.graphics.createBitmap
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.engine.DiskCacheStrategy
Expand All @@ -24,12 +26,25 @@ import org.ole.planet.myplanet.utils.UrlUtils
import org.ole.planet.myplanet.utils.Utilities

class InlineResourceAdapter(
private var resources: List<RealmMyLibrary>,
private val onResourceClick: (RealmMyLibrary) -> Unit
) : RecyclerView.Adapter<InlineResourceAdapter.ViewHolder>() {
) : ListAdapter<RealmMyLibrary, InlineResourceAdapter.ViewHolder>(ResourceDiffCallback()) {

class ViewHolder(val binding: ItemInlineResourceBinding) : RecyclerView.ViewHolder(binding.root)

class ResourceDiffCallback : DiffUtil.ItemCallback<RealmMyLibrary>() {
override fun areItemsTheSame(oldItem: RealmMyLibrary, newItem: RealmMyLibrary): Boolean {
return oldItem.id == newItem.id
}

override fun areContentsTheSame(oldItem: RealmMyLibrary, newItem: RealmMyLibrary): Boolean {
return oldItem._rev == newItem._rev &&
Copy link

@qltysh qltysh bot Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Complex binary expression [qlty:boolean-logic]

oldItem.downloadedRev == newItem.downloadedRev &&
oldItem.resourceLocalAddress == newItem.resourceLocalAddress &&
oldItem.title == newItem.title &&
oldItem.isResourceOffline() == newItem.isResourceOffline()
}
}

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val binding = ItemInlineResourceBinding.inflate(
LayoutInflater.from(parent.context), parent, false
Expand All @@ -38,7 +53,7 @@ class InlineResourceAdapter(
}

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val resource = resources[position]
val resource = getItem(position)
val context = holder.itemView.context
val binding = holder.binding

Expand Down Expand Up @@ -199,10 +214,4 @@ class InlineResourceAdapter(
}
}

override fun getItemCount(): Int = resources.size

fun updateResources(newResources: List<RealmMyLibrary>) {
resources = newResources
notifyDataSetChanged()
}
}