Review: Fix list item rounded corners

Author: paulinea

core/src/main/java/com/orange/ouds/core/component/OudsListItem.kt

@@ -261,7 +261,7 @@ internal fun OudsListItem(
     }
 
     with(OudsTheme.components.listItem) {
-        val borderRadius = if (card && LocalThemeSettings.current.roundedCornerCardItems == true) border.radius.rounded else border.radius.default
+        val borderRadius = borderRadius(card = card, focused = state == OudsListItemState.Focused)
         val shape = shape(cornerRadius = borderRadius)
 
         val clickableModifier = if (onClick != null) {
@@ -437,6 +437,16 @@ private fun Modifier.border(state: OudsListItemState, decoration: OudsListItemDe
     }
 }
 
+@Composable
+private fun borderRadius(card: Boolean, focused: Boolean) = with(OudsTheme.components.listItem) {
+    when {
+        card && LocalThemeSettings.current.roundedCornerCardItems == true -> border.radius.rounded
+        card -> border.radius.default
+        focused -> border.radius.default
+        else -> 0.dp
+    }
+}
+
 @Composable
 private fun shape(cornerRadius: Dp) = RoundedCornerShape(cornerRadius)