Fix search in Dex Classes

Hamza417 · Dec 21, 2024 · 7fa21c7 · 7fa21c7
1 parent b7b07ad
commit 7fa21c7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/app/src/main/java/app/simple/inure/adapters/viewers/AdapterDexData.kt b/app/src/main/java/app/simple/inure/adapters/viewers/AdapterDexData.kt
@@ -1,5 +1,6 @@
 package app.simple.inure.adapters.viewers
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -92,6 +93,13 @@ class AdapterDexData(private val dexs: ArrayList<String>, val keyword: String) :
         return dexs.size
     }
 
+    @SuppressLint("NotifyDataSetChanged")
+    fun updateData(it: java.util.ArrayList<String>?) {
+        dexs.clear()
+        dexs.addAll(it!!)
+        notifyDataSetChanged()
+    }
+
     inner class Holder(itemView: View) : VerticalListViewHolder(itemView) {
         val name: CondensedDynamicRippleTextView = itemView.findViewById(R.id.adapter_resources_name)
     }

diff --git a/.../java/app/simple/inure/ui/viewers/Dexs.kt → ...app/simple/inure/ui/viewers/DexClasses.kt b/.../java/app/simple/inure/ui/viewers/Dexs.kt → ...app/simple/inure/ui/viewers/DexClasses.kt
@@ -3,6 +3,7 @@ package app.simple.inure.ui.viewers
 import android.content.SharedPreferences
 import android.content.pm.PackageInfo
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -19,7 +20,7 @@ import app.simple.inure.preferences.DexClassesPreferences
 import app.simple.inure.util.NullSafety.isNull
 import app.simple.inure.viewmodels.viewers.DexDataViewModel
 
-class Dexs : SearchBarScopedFragment() {
+class DexClasses : SearchBarScopedFragment() {
 
     private lateinit var dexDataViewModel: DexDataViewModel
     private lateinit var packageInfoFactory: PackageInfoFactory
@@ -61,11 +62,15 @@ class Dexs : SearchBarScopedFragment() {
                 }
 
                 recyclerView.adapter = adapter
+            } else {
+                (recyclerView.adapter as AdapterDexData).updateData(it)
             }
         }
 
         searchBox.doOnTextChanged { text, _, _, _ ->
+            Log.d("DexClasses", "onViewCreated: $text")
             if (searchBox.isFocused) {
+                Log.d("DexClasses", "Doin it")
                 dexDataViewModel.filterClasses(text.toString().trim())
             }
         }
@@ -92,10 +97,10 @@ class Dexs : SearchBarScopedFragment() {
     }
 
     companion object {
-        fun newInstance(packageInfo: PackageInfo): Dexs {
+        fun newInstance(packageInfo: PackageInfo): DexClasses {
             val args = Bundle()
             args.putParcelable(BundleConstants.packageInfo, packageInfo)
-            val fragment = Dexs()
+            val fragment = DexClasses()
             fragment.arguments = args
             return fragment
         }

diff --git a/app/src/main/java/app/simple/inure/viewmodels/viewers/DexDataViewModel.kt b/app/src/main/java/app/simple/inure/viewmodels/viewers/DexDataViewModel.kt
@@ -51,14 +51,16 @@ class DexDataViewModel(application: Application, private val packageInfo: Packag
     }
 
     fun filterClasses(query: String) {
-        val filteredClasses = ArrayList<String>()
+        viewModelScope.launch(Dispatchers.Default) {
+            val filteredClasses = ArrayList<String>()
 
-        for (className in classes) {
-            if (className.contains(query, true)) {
-                filteredClasses.add(className)
+            for (className in classes) {
+                if (className.lowercase().contains(query.lowercase(), true)) {
+                    filteredClasses.add(className)
+                }
             }
-        }
 
-        dexData.postValue(filteredClasses)
+            dexData.postValue(filteredClasses)
+        }
     }
 }