resources: smoother mylibrary search (fixes #5086) (#5087)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Jan 22, 2025 · aacacd4 · aacacd4
1 parent da5c5f1
commit aacacd4
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2228
-        versionName "0.22.28"
+        versionCode 2229
+        versionName "0.22.29"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.kt b/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.kt
@@ -177,25 +177,31 @@ abstract class BaseRecyclerFragment<LI> : BaseRecyclerParentFragment<Any?>(), On
     }
 
     private fun <LI : RealmModel> getData(s: String, c: Class<LI>): List<LI> {
+        if (s.isEmpty()) return mRealm.where(c).findAll()
+
         val queryParts = s.split(" ").filterNot { it.isEmpty() }
-        return if (s.contains(" ")) {
+        val fieldName = if (c == RealmMyLibrary::class.java) "title" else "courseTitle"
+
+        return if (queryParts.size > 1) {
             val data: RealmResults<LI> = mRealm.where(c).findAll()
             data.filter { item ->
                 searchAndMatch(item, c, queryParts)
             }
         } else {
-            mRealm.where(c).contains(if (c == RealmMyLibrary::class.java) "title" else "courseTitle", s, Case.INSENSITIVE).findAll()
+            mRealm.where(c)
+                .contains(fieldName, s, Case.INSENSITIVE)
+                .findAll()
         }
     }
 
     private fun <LI : RealmModel> searchAndMatch(item: LI, c: Class<out RealmModel>, queryParts: List<String>): Boolean {
-        val title = if (c.isAssignableFrom(RealmMyLibrary::class.java)) {
-            (item as RealmMyLibrary).title
-        } else {
-            (item as RealmMyCourse).courseTitle
-        }
+        val title = when {
+            c.isAssignableFrom(RealmMyLibrary::class.java) -> (item as RealmMyLibrary).title
+            else -> (item as RealmMyCourse).courseTitle
+        }?.lowercase(Locale.getDefault()) ?: return false
+
         return queryParts.all { queryPart ->
-            title?.lowercase(Locale.getDefault())?.contains(queryPart.lowercase(Locale.getDefault())) == true
+            title.contains(queryPart.lowercase(Locale.getDefault()))
         }
     }
 
@@ -206,14 +212,22 @@ abstract class BaseRecyclerFragment<LI> : BaseRecyclerParentFragment<Any?>(), On
         } else {
             getOurLibrary(model?.id, list)
         }
-        if (tags.isEmpty()) {
-            return list
-        }
-        val libraries = mutableListOf<RealmMyLibrary>()
-        for (library in list) {
-            filter(tags, library, libraries)
+
+        val libraries = if (tags.isNotEmpty()) {
+            val filteredLibraries = mutableListOf<RealmMyLibrary>()
+            for (library in list) {
+                filter(tags, library, filteredLibraries)
+            }
+            filteredLibraries
+        } else {
+            list
         }
-        return libraries
+
+        return libraries.sortedWith(compareBy<RealmMyLibrary> { library ->
+            !library.title?.lowercase()?.startsWith(s.lowercase())!! ?: true
+        }.thenBy { library ->
+            library.title?.lowercase() ?: ""
+        })
     }
 
     fun filterCourseByTag(s: String, tags: List<RealmTag>): List<RealmMyCourse> {