Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

search: normalize unicode strings

Browse source 
Normalize unicode strings when making searches. This allows accented
characters to be treated as typical characters/
This commit is contained in:
OxygenCobalt 2021-09-05 19:42:17 -06:00
parent dae334b1d6
commit 0433abc5cb
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
View file

@ -40,7 +40,6 @@ import org.oxycblt.auxio.music.Album
import org.oxycblt.auxio.music.Artist
import org.oxycblt.auxio.music.Genre
import org.oxycblt.auxio.music.Song
import org.oxycblt.auxio.playback.PlaybackViewModel
import org.oxycblt.auxio.ui.DisplayMode
import org.oxycblt.auxio.util.applyEdge
import org.oxycblt.auxio.util.logD

33
app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt
View file

@ -31,10 +31,10 @@ import org.oxycblt.auxio.music.Header
import org.oxycblt.auxio.music.MusicStore
import org.oxycblt.auxio.settings.SettingsManager
import org.oxycblt.auxio.ui.DisplayMode
import java.text.Normalizer
/**
* The [ViewModel] for the search functionality
* TODO: Try to find adjacent characters [e.g accented o == o]
* @author OxygenCobalt
*/
class SearchViewModel : ViewModel() {
@ -130,12 +130,41 @@ class SearchViewModel : ViewModel() {
*/
private fun List<BaseModel>.filterByOrNull(value: String): List<BaseModel>? {
val filtered = filter {
it.name.contains(value, ignoreCase = true)
it.name.normalized().contains(value.normalized(), ignoreCase = true)
}
return if (filtered.isNotEmpty()) filtered else null
}
private fun String.normalized(): String {
// This method normalizes strings so that songs with accented characters will show
// up in search even if the actual character was not inputted.
// https://stackoverflow.com/a/32030586/14143986
// Normalize with NFKD [Meaning that symbols with identical meanings will be turned into
// their letter variants].
val norm = Normalizer.normalize(this, Normalizer.Form.NFKD)
// Normalizer doesn't exactly finish the job though. We have to rebuild all the codepoints
// in the string and remove the hidden characters that were added by Normalizer.
var idx = 0
val sb = StringBuilder()
while (idx < norm.length) {
val cp = norm.codePointAt(idx)
idx += Character.charCount(cp)
when (Character.getType(cp)) {
Character.NON_SPACING_MARK.toInt(), Character.COMBINING_SPACING_MARK.toInt() ->
continue
else -> sb.appendCodePoint(cp)
}
}
return sb.toString()
}
/**
* Update the current navigation status to [isNavigating]
*/