compare normalized search and items to ignore accents and diacritics

Author: Jan Guegel

app/src/main/kotlin/org/fossify/filemanager/fragments/ItemsFragment.kt

@@ -377,6 +377,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
             return files
         }
 
+        val normalizedText = text.normalizeText()
         val sorting = context!!.config.getFolderSorting(path)
         FileDirItem.sorting = context!!.config.getFolderSorting(currentPath)
         val isSortingBySize = sorting and SORT_BY_SIZE != 0
@@ -386,7 +387,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
             }
 
             if (it.isDirectory) {
-                if (it.name.contains(text, true)) {
+                if (it.name.normalizeText().contains(normalizedText)) {
                     val fileDirItem = getListItemFromFile(it, isSortingBySize, HashMap(), false)
                     if (fileDirItem != null) {
                         files.add(fileDirItem)
@@ -395,7 +396,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
 
                 files.addAll(searchFiles(text, it.absolutePath))
             } else {
-                if (it.name.contains(text, true)) {
+                if (it.name.normalizeText().contains(normalizedText)) {
                     val fileDirItem = getListItemFromFile(it, isSortingBySize, HashMap(), false)
                     if (fileDirItem != null) {
                         files.add(fileDirItem)

app/src/main/kotlin/org/fossify/filemanager/fragments/MyViewPagerFragment.kt

@@ -1,6 +1,7 @@
 package org.fossify.filemanager.fragments
 
 import android.content.Context
+import android.icu.text.Normalizer2
 import android.util.AttributeSet
 import android.widget.RelativeLayout
 import org.fossify.commons.extensions.*
@@ -16,6 +17,7 @@ import org.fossify.filemanager.databinding.StorageFragmentBinding
 import org.fossify.filemanager.extensions.isPathOnRoot
 import org.fossify.filemanager.extensions.tryOpenPathIntent
 import org.fossify.filemanager.helpers.RootHelpers
+import java.util.Locale
 
 abstract class MyViewPagerFragment<BINDING : MyViewPagerFragment.InnerBinding>(context: Context, attributeSet: AttributeSet) :
     RelativeLayout(context, attributeSet) {
@@ -88,6 +90,13 @@ abstract class MyViewPagerFragment<BINDING : MyViewPagerFragment.InnerBinding>(c
         }
     }
 
+    protected fun String.normalizeText(): String {
+        val normalizer = Normalizer2.getNFDInstance()
+        return normalizer.normalize(this)
+            .replace("\\p{M}".toRegex(), "")
+            .lowercase(Locale.getDefault())
+    }
+
     abstract fun setupFragment(activity: SimpleActivity)
 
     abstract fun onResume(textColor: Int)

app/src/main/kotlin/org/fossify/filemanager/fragments/RecentsFragment.kt

@@ -242,7 +242,11 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
 
     override fun searchQueryChanged(text: String) {
         lastSearchedText = text
-        val filtered = filesIgnoringSearch.filter { it.mName.contains(text, true) }.toMutableList() as ArrayList<ListItem>
+        val normalizedText = text.normalizeText()
+        val filtered = filesIgnoringSearch.filter {
+            it.mName.normalizeText().contains(normalizedText)
+        }.toMutableList() as ArrayList<ListItem>
+
         binding.apply {
             (recentsList.adapter as? ItemsAdapter)?.updateItems(filtered, text)
             recentsPlaceholder.beVisibleIf(filtered.isEmpty())