diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/CollatorBasedComparator.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/CollatorBasedComparator.kt index 74febf15..c10bf323 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/CollatorBasedComparator.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/CollatorBasedComparator.kt @@ -7,7 +7,7 @@ import java.text.Collator * * Adapted from AlphanumericComparator to support numerical collation. */ -class CollatorBasedComparator: Comparator { +class CollatorBasedComparator : Comparator { override fun compare(string1: String, string2: String): Int { val collator = getCollator() @@ -64,10 +64,12 @@ class CollatorBasedComparator: Comparator { chunk.append(c) current++ } + return chunk.toString() } private fun isDigit(ch: Char) = ch in '0'..'9' + private fun coerceResult(compareToResult: Int) = compareToResult.coerceIn(-1, 1) private fun getCollator(): Collator { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/NotesDao.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/NotesDao.kt index 987fba5f..f8686434 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/NotesDao.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/NotesDao.kt @@ -5,7 +5,7 @@ import com.simplemobiletools.notes.pro.models.Note @Dao interface NotesDao { - @Query("SELECT * FROM notes ORDER BY title COLLATE NOCASE ASC") + @Query("SELECT * FROM notes ORDER BY title COLLATE UNICODE ASC ") fun getNotes(): List @Query("SELECT * FROM notes WHERE id = :id")