Skip to content

Make search work without accents (diacritic normalization) #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IgnacioLD merged 2 commits into from
Jul 25, 2026
Merged

Make search work without accents (diacritic normalization) #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97949b9
Normalize diacritics in search so stops match without accents
IgnacioLD Jul 25, 2026
2d1ce3f
Merge branch 'master' into 1-make-search-work-without-tilde-acentos
IgnacioLD Jul 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion feature-search/src/main/kotlin/app/transitos/feature/search/SearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.glossostudio.transitos.core.repository.FavoritesRepository
import com.glossostudio.transitos.core.repository.TransitRepository
import java.text.Normalizer
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
Expand All @@ -21,6 +22,7 @@ class SearchViewModel(
) : ViewModel() {

private val _query = MutableStateFlow("")
private val normalizedNames = mutableMapOf<String, String>()
val query: StateFlow<String> = _query.asStateFlow()

val allStops: StateFlow<List<com.glossostudio.transitos.core.model.Stop>> = repository.observeStops()
Expand All @@ -34,7 +36,10 @@ class SearchViewModel(
val filteredStops: StateFlow<List<com.glossostudio.transitos.core.model.Stop>> =
combine(allStops, query) { stops, q ->
if (q.isBlank()) stops
else stops.filter { it.name.contains(q, ignoreCase = true) }
else {
val normalizedQuery = q.normalized()
stops.filter { it.name.normalized().contains(normalizedQuery, ignoreCase = true) }
}
}.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), emptyList())

fun onQueryChange(newQuery: String) {
Expand All @@ -50,4 +55,10 @@ class SearchViewModel(
}
}
}

private fun String.normalized(): String =
normalizedNames.getOrPut(this) {
Normalizer.normalize(this, Normalizer.Form.NFD)
.replace(Regex("\\p{M}"), "")
}
}
Loading