Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Avoid creating a new Collator and apply same decomposition across codebase.

Browse source
This commit is contained in:
Benoit Marty 2025-11-18 17:17:26 +01:00
parent d799fa3b5a
commit a50844c0e6
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt
View file

@ -49,6 +49,10 @@ class EditDefaultNotificationSettingPresenter(
fun create(oneToOne: Boolean): EditDefaultNotificationSettingPresenter fun create(oneToOne: Boolean): EditDefaultNotificationSettingPresenter
} }
private val collator = Collator.getInstance().apply {
decomposition = Collator.CANONICAL_DECOMPOSITION
}
@Composable @Composable
override fun present(): EditDefaultNotificationSettingState { override fun present(): EditDefaultNotificationSettingState {
var displayMentionsOnlyDisclaimer by remember { mutableStateOf(false) } var displayMentionsOnlyDisclaimer by remember { mutableStateOf(false) }
@ -139,7 +143,7 @@ class EditDefaultNotificationSettingPresenter(
} }
// locale sensitive sorting // locale sensitive sorting
.sortedWith( .sortedWith(
compareBy(Collator.getInstance()) { roomSummary -> compareBy(collator) { roomSummary ->
// Collator does not handle null values, so we provide a fallback // Collator does not handle null values, so we provide a fallback
roomSummary.name ?: roomSummary.roomId.value roomSummary.name ?: roomSummary.roomId.value
} }