Skip to content

Commit 1e9e9af

Browse files
author
Jan Guegel
committed
use normalizeString() from commons libs
Signed-off-by: Jan Guegel <[email protected]>
1 parent eb496a1 commit 1e9e9af

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
377377
return files
378378
}
379379

380-
val normalizedText = text.normalizeText()
380+
val normalizedText = text.normalizeString()
381381
val sorting = context!!.config.getFolderSorting(path)
382382
FileDirItem.sorting = context!!.config.getFolderSorting(currentPath)
383383
val isSortingBySize = sorting and SORT_BY_SIZE != 0
@@ -387,7 +387,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
387387
}
388388

389389
if (it.isDirectory) {
390-
if (it.name.normalizeText().contains(normalizedText)) {
390+
if (it.name.normalizeString().contains(normalizedText)) {
391391
val fileDirItem = getListItemFromFile(it, isSortingBySize, HashMap(), false)
392392
if (fileDirItem != null) {
393393
files.add(fileDirItem)
@@ -396,7 +396,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
396396

397397
files.addAll(searchFiles(text, it.absolutePath))
398398
} else {
399-
if (it.name.normalizeText().contains(normalizedText)) {
399+
if (it.name.normalizeString().contains(normalizedText)) {
400400
val fileDirItem = getListItemFromFile(it, isSortingBySize, HashMap(), false)
401401
if (fileDirItem != null) {
402402
files.add(fileDirItem)

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.fossify.filemanager.fragments
22

33
import android.content.Context
4-
import android.icu.text.Normalizer2
54
import android.util.AttributeSet
65
import android.widget.RelativeLayout
76
import org.fossify.commons.extensions.*
@@ -17,7 +16,6 @@ import org.fossify.filemanager.databinding.StorageFragmentBinding
1716
import org.fossify.filemanager.extensions.isPathOnRoot
1817
import org.fossify.filemanager.extensions.tryOpenPathIntent
1918
import org.fossify.filemanager.helpers.RootHelpers
20-
import java.util.Locale
2119

2220
abstract class MyViewPagerFragment<BINDING : MyViewPagerFragment.InnerBinding>(context: Context, attributeSet: AttributeSet) :
2321
RelativeLayout(context, attributeSet) {
@@ -90,13 +88,6 @@ abstract class MyViewPagerFragment<BINDING : MyViewPagerFragment.InnerBinding>(c
9088
}
9189
}
9290

93-
protected fun String.normalizeText(): String {
94-
val normalizer = Normalizer2.getNFDInstance()
95-
return normalizer.normalize(this)
96-
.replace("\\p{M}".toRegex(), "")
97-
.lowercase(Locale.getDefault())
98-
}
99-
10091
abstract fun setupFragment(activity: SimpleActivity)
10192

10293
abstract fun onResume(textColor: Int)

0 commit comments

Comments
 (0)