diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml index bcc3b3c..72e2439 100644 --- a/composeApp/src/androidMain/AndroidManifest.xml +++ b/composeApp/src/androidMain/AndroidManifest.xml @@ -4,7 +4,7 @@ , onSelect: (String?) -> Unit, modifier: Modifier = Modifier, + showAllOption: Boolean = true, ) { var expanded by remember { mutableStateOf(false) } val displayValue = selectedValue ?: "Tous" @@ -100,13 +101,15 @@ fun FilterAssistChip( expanded = expanded, onDismissRequest = { expanded = false }, ) { - DropdownMenuItem( - text = { Text("Tous") }, - onClick = { - onSelect(null) - expanded = false - }, - ) + if (showAllOption) { + DropdownMenuItem( + text = { Text("Tous") }, + onClick = { + onSelect(null) + expanded = false + }, + ) + } options.forEach { option -> DropdownMenuItem( text = { Text(option) }, diff --git a/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/screens/EventDetailScreen.kt b/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/screens/EventDetailScreen.kt index 31521c6..0965719 100644 --- a/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/screens/EventDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/screens/EventDetailScreen.kt @@ -174,15 +174,11 @@ fun EventDetailScreen( if (hasPlayers) { item { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(Dimens.sm), - ) { + BadgedBox(badge = { Badge { Text("${players.size}") } }) { Text( text = "Joueurs", style = MaterialTheme.typography.titleMedium, ) - BadgedBox(badge = { Badge { Text("${players.size}") } }) {} } } item { diff --git a/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/screens/ScheduleScreen.kt b/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/screens/ScheduleScreen.kt index 5526883..42adaee 100644 --- a/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/screens/ScheduleScreen.kt +++ b/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/screens/ScheduleScreen.kt @@ -143,6 +143,7 @@ fun ScheduleScreen( if (account != null) scheduleViewModel.setAccount(account.name) }, modifier = Modifier.weight(1f), + showAllOption = false, ) FilterAssistChip( label = "Âge",