From 77c8e65be76b9d8ef5ad1f39ac1e51bcaf8ca635 Mon Sep 17 00:00:00 2001
From: Rene Luria <rene.luria@infomaniak.com>
Date: Thu, 6 Aug 2026 17:44:30 +0200
Subject: [PATCH] fix: address final review findings

- Suppress 'Tous' option for Compte chip (account is required)
- Fix BadgedBox: wrap Joueurs text inside content lambda
- EventCard: left-only color stripe instead of full border
- AndroidManifest: 'MyIceK' -> 'MyIce'
---
 composeApp/src/androidMain/AndroidManifest.xml  |  2 +-
 .../ch/parano/myicek/ui/components/EventCard.kt | 14 ++++++++++----
 .../parano/myicek/ui/components/FilterChips.kt  | 17 ++++++++++-------
 .../myicek/ui/screens/EventDetailScreen.kt      |  6 +-----
 .../parano/myicek/ui/screens/ScheduleScreen.kt  |  1 +
 5 files changed, 23 insertions(+), 17 deletions(-)

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 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:label="MyIceK"
+        android:label="MyIce"
         android:icon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:enableOnBackInvokedCallback="true"
diff --git a/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/components/EventCard.kt b/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/components/EventCard.kt
index 6354701..949c961 100644
--- a/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/components/EventCard.kt
+++ b/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/components/EventCard.kt
@@ -17,11 +17,13 @@
 
 package ch.parano.myicek.ui.components
 
-import androidx.compose.foundation.border
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -63,10 +65,14 @@ fun EventCard(
         elevation = CardDefaults.cardElevation(defaultElevation = 1.dp),
     ) {
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .border(width = 4.dp, color = stripeColor),
+            modifier = Modifier.fillMaxWidth(),
         ) {
+            Box(
+                modifier = Modifier
+                    .width(4.dp)
+                    .fillMaxHeight()
+                    .background(stripeColor),
+            )
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
diff --git a/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/components/FilterChips.kt b/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/components/FilterChips.kt
index 64a0971..4c09117 100644
--- a/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/components/FilterChips.kt
+++ b/composeApp/src/commonMain/kotlin/ch/parano/myicek/ui/components/FilterChips.kt
@@ -73,6 +73,7 @@ fun FilterAssistChip(
     options: List<String>,
     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",