courses: smoother list adapting (fixes #10023)

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 4280
-        versionName = "0.42.80"
+        versionCode = 4281
+        versionName = "0.42.81"
         ndkVersion = '26.3.11579264'
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.kt

@@ -164,8 +164,14 @@ abstract class BaseRecyclerFragment<LI> : BaseRecyclerParentFragment<Any?>(), On
 
             isAddInProgress = false
             setJoinInProgress(false)
-            recyclerView.adapter = getAdapter()
-            showNoData(tvMessage, getAdapter().itemCount, "")
+
+            if (!mRealm.isClosed) {
+                mRealm.refresh()
+            }
+
+            val newAdapter = getAdapter()
+            recyclerView.adapter = newAdapter
+            showNoData(tvMessage, newAdapter.itemCount, "")
 
             result.exceptionOrNull()?.let { throw it }
 

app/src/main/java/org/ole/planet/myplanet/ui/courses/CoursesFragment.kt

@@ -20,10 +20,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.snackbar.Snackbar
-import com.google.gson.JsonObject
 import dagger.hilt.android.AndroidEntryPoint
-import java.util.Calendar
-import java.util.UUID
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -41,9 +38,7 @@ import org.ole.planet.myplanet.callback.TagClickListener
 import org.ole.planet.myplanet.model.RealmCourseProgress.Companion.getCourseProgress
 import org.ole.planet.myplanet.model.RealmMyCourse
 import org.ole.planet.myplanet.model.RealmRating.Companion.getRatings
-import org.ole.planet.myplanet.model.RealmSearchActivity
 import org.ole.planet.myplanet.model.RealmTag
-import org.ole.planet.myplanet.model.RealmTag.Companion.getTagsArray
 import org.ole.planet.myplanet.model.RealmUserModel
 import org.ole.planet.myplanet.repository.TagsRepository
 import org.ole.planet.myplanet.service.UserProfileDbHandler
@@ -53,7 +48,6 @@ import org.ole.planet.myplanet.ui.resources.CollectionsFragment
 import org.ole.planet.myplanet.ui.sync.RealtimeSyncHelper
 import org.ole.planet.myplanet.ui.sync.RealtimeSyncMixin
 import org.ole.planet.myplanet.utilities.DialogUtils
-import org.ole.planet.myplanet.utilities.JsonUtils
 import org.ole.planet.myplanet.utilities.KeyboardUtils.setupUI
 import org.ole.planet.myplanet.utilities.NavigationHelper
 import org.ole.planet.myplanet.utilities.SharedPrefManager
@@ -222,14 +216,19 @@ class CoursesFragment : BaseRecyclerFragment<RealmMyCourse?>(), OnCourseItemSele
     }
 
     override fun getAdapter(): RecyclerView.Adapter<*> {
-        adapterCourses = CoursesAdapter(
-            requireActivity(),
-            emptyList(),
-            HashMap<String?, JsonObject>(),
-            userModel,
-            tagsRepository
-        )
-        adapterCourses.setProgressMap(HashMap<String?, JsonObject>())
+        val allCourses: List<RealmMyCourse?> = getList(RealmMyCourse::class.java).filterIsInstance<RealmMyCourse?>().filter { !it?.courseTitle.isNullOrBlank() }
+
+        val courseList = if (isMyCourseLib) {
+            allCourses.filter { it?.isMyCourse == true }
+        } else {
+            allCourses.sortedWith(compareBy({ it?.isMyCourse }, { it?.courseTitle }))
+        }
+
+        val map = getRatings(mRealm, "course", model?.id)
+        val progressMap = getCourseProgress(mRealm, model?.id)
+
+        adapterCourses = CoursesAdapter(requireActivity(), courseList, map, userModel, tagsRepository)
+        adapterCourses.setProgressMap(progressMap)
         adapterCourses.setListener(this@CoursesFragment)
         adapterCourses.setRatingChangeListener(this@CoursesFragment)
         return adapterCourses
@@ -377,10 +376,6 @@ class CoursesFragment : BaseRecyclerFragment<RealmMyCourse?>(), OnCourseItemSele
             if ((selectedItems?.size ?: 0) > 0) {
                 confirmation = createAlertDialog()
                 confirmation.show()
-                addToMyList()
-                selectedItems?.clear()
-                tvAddToLib.isEnabled = false
-                checkList()
             }
         }
         etSearch = requireView().findViewById(R.id.et_search)
@@ -545,12 +540,9 @@ class CoursesFragment : BaseRecyclerFragment<RealmMyCourse?>(), OnCourseItemSele
             }
             .setNegativeButton(R.string.ok) { dialog: DialogInterface, _: Int ->
                 dialog.cancel()
-                clearAllSelections()
-                loadDataAsync()
             }
             .setOnDismissListener {
-                clearAllSelections()
-                loadDataAsync()
+                addToMyList()
             }
 
         return builder.create()

app/src/main/java/org/ole/planet/myplanet/ui/resources/ResourcesFragment.kt

@@ -265,10 +265,6 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
             if ((selectedItems?.size ?: 0) > 0) {
                 confirmation = createAlertDialog()
                 confirmation?.show()
-                addToMyList()
-                selectedItems?.clear()
-                tvAddToLib.isEnabled = false
-                checkList()
             }
         }
     }
@@ -402,12 +398,9 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
             }
         builder.setNegativeButton(getString(R.string.ok)) { dialog: DialogInterface, _: Int ->
             dialog.cancel()
-            val newFragment = ResourcesFragment()
-            recreateFragment(newFragment)
         }
-        builder.setOnDismissListener{
-            val newFragment = ResourcesFragment()
-            recreateFragment(newFragment)
+        builder.setOnDismissListener {
+            addToMyList()
         }
         return builder.create()
     }