feat!: add OudsIcon to homogenize the component icons

app/src/main/java/com/orange/ouds/app/ui/BottomBar.kt

@@ -42,9 +42,9 @@ import com.orange.ouds.app.R
 import com.orange.ouds.app.ui.utilities.LocalThemeDrawableResources
 import com.orange.ouds.app.ui.utilities.ThemeDrawableResourceProvider
 import com.orange.ouds.app.ui.utilities.composable.AppPreview
+import com.orange.ouds.core.component.OudsIcon
 import com.orange.ouds.core.component.OudsNavigationBar
 import com.orange.ouds.core.component.OudsNavigationBarItem
-import com.orange.ouds.core.component.OudsNavigationBarItemIcon
 import com.orange.ouds.core.theme.OudsTheme
 
 @Composable
@@ -60,7 +60,7 @@ fun BottomBar(currentRoute: String, navigateToRoute: (String) -> Unit, modifier:
                 items = BottomBarItem.entries.map { item ->
                     OudsNavigationBarItem(
                         selected = currentRoute == item.route,
-                        icon = OudsNavigationBarItemIcon(painter = painterResource(item.iconResourceProvider.getResource(LocalThemeDrawableResources.current))),
+                        icon = OudsIcon(painter = painterResource(item.iconResourceProvider.getResource(LocalThemeDrawableResources.current))),
                         label = stringResource(item.titleRes),
                         onClick = { navigateToRoute(item.route) }
                     )

app/src/main/java/com/orange/ouds/app/ui/components/ComponentCode.kt

@@ -57,6 +57,7 @@ inline fun <reified T> FunctionCall.Builder.iconArgument(
     constructorCallArgument<T>(name) {
         painterArgument(if (tinted) resId else R.drawable.ic_untinted_square)
         contentDescriptionResId?.let { contentDescriptionArgument(it) }
+        // TODO: Remove generic type
         if (!tinted) tintedArgument(tinted)
     }
 }

app/src/main/java/com/orange/ouds/app/ui/components/ComponentIllustrations.kt

@@ -54,15 +54,14 @@ import com.orange.ouds.core.component.OudsCircularProgressIndicator
 import com.orange.ouds.core.component.OudsColoredBox
 import com.orange.ouds.core.component.OudsFilterChip
 import com.orange.ouds.core.component.OudsFloatingActionButton
-import com.orange.ouds.core.component.OudsFloatingActionButtonIcon
 import com.orange.ouds.core.component.OudsHorizontalDivider
+import com.orange.ouds.core.component.OudsIcon
 import com.orange.ouds.core.component.OudsLink
 import com.orange.ouds.core.component.OudsLinkIndicator
 import com.orange.ouds.core.component.OudsListItem
 import com.orange.ouds.core.component.OudsListItemLeading
 import com.orange.ouds.core.component.OudsNavigationBar
 import com.orange.ouds.core.component.OudsNavigationBarItem
-import com.orange.ouds.core.component.OudsNavigationBarItemIcon
 import com.orange.ouds.core.component.OudsPasswordInput
 import com.orange.ouds.core.component.OudsPinCodeInput
 import com.orange.ouds.core.component.OudsPinCodeInputLength
@@ -186,10 +185,7 @@ fun DividerIllustration() = ComponentIllustration {
 @Composable
 fun FloatingActionButtonIllustration() = ComponentIllustration {
     OudsFloatingActionButton(
-        icon = OudsFloatingActionButtonIcon(
-            painter = painterResource(LocalThemeDrawableResources.current.tipsAndTricks),
-            contentDescription = ""
-        ),
+        icon = OudsIcon(painter = painterResource(LocalThemeDrawableResources.current.tipsAndTricks)),
         onClick = {}
     )
 }
@@ -221,7 +217,7 @@ fun NavigationBarIllustration() = ComponentIllustration {
         OudsNavigationBarItem(
             selected = index == 0,
             onClick = {},
-            icon = OudsNavigationBarItemIcon(painter = painterResource(LocalThemeDrawableResources.current.tipsAndTricks)),
+            icon = OudsIcon(painter = painterResource(LocalThemeDrawableResources.current.tipsAndTricks)),
             label = stringResource(R.string.app_components_common_label_label)
         )
     }

app/src/main/java/com/orange/ouds/app/ui/components/alert/AlertMessageDemoScreen.kt

@@ -40,11 +40,11 @@ import com.orange.ouds.app.ui.utilities.composable.CustomizationTextInput
 import com.orange.ouds.app.ui.utilities.composable.DemoScreen
 import com.orange.ouds.app.ui.utilities.nestedName
 import com.orange.ouds.app.ui.utilities.rememberUntintedIconPainter
-import com.orange.ouds.core.component.OudsAlertIcon
 import com.orange.ouds.core.component.OudsAlertMessage
 import com.orange.ouds.core.component.OudsAlertMessageActionLink
 import com.orange.ouds.core.component.OudsAlertMessageActionLinkPosition
 import com.orange.ouds.core.component.OudsAlertMessageStatus
+import com.orange.ouds.core.component.OudsIcon
 import com.orange.ouds.core.component.common.text.OudsAnnotatedAlertMessageBulletListLabel
 import com.orange.ouds.core.component.common.text.OudsAnnotatedAlertMessageDescription
 import com.orange.ouds.core.component.common.text.buildOudsAnnotatedAlertMessageBulletListLabel
@@ -175,8 +175,8 @@ private fun AlertMessageDemoContent(state: AlertMessageDemoState) {
     with(state) {
         val alertIcon = when (icon) {
             AlertMessageDemoState.Icon.None -> null
-            AlertMessageDemoState.Icon.Tinted -> OudsAlertIcon(painter = painterResource(LocalThemeDrawableResources.current.tipsAndTricks), tinted = true)
-            AlertMessageDemoState.Icon.Untinted -> OudsAlertIcon(painter = rememberUntintedIconPainter(), tinted = false)
+            AlertMessageDemoState.Icon.Tinted -> OudsIcon(painter = painterResource(LocalThemeDrawableResources.current.tipsAndTricks), tinted = true)
+            AlertMessageDemoState.Icon.Untinted -> OudsIcon(painter = rememberUntintedIconPainter(), tinted = false)
         }
         val alertMessageStatus = when (status) {
             is OudsAlertMessageStatus.Accent -> OudsAlertMessageStatus.Accent(alertIcon)
@@ -243,7 +243,7 @@ private fun Code.Builder.alertMessageDemoCodeSnippet(state: AlertMessageDemoStat
                 is OudsAlertMessageStatus.Neutral -> {
                     functionCallArgument(statusParameterName, status::class.java.nestedName) {
                         if (icon != AlertMessageDemoState.Icon.None) {
-                            iconArgument<OudsAlertIcon>("icon", themeDrawableResources.tipsAndTricks, tinted = icon == AlertMessageDemoState.Icon.Tinted)
+                            iconArgument<OudsIcon>("icon", themeDrawableResources.tipsAndTricks, tinted = icon == AlertMessageDemoState.Icon.Tinted)
                         }
                     }
                 }

app/src/main/java/com/orange/ouds/app/ui/components/alert/InlineAlertDemoScreen.kt

@@ -37,7 +37,7 @@ import com.orange.ouds.app.ui.utilities.composable.CustomizationTextInput
 import com.orange.ouds.app.ui.utilities.composable.DemoScreen
 import com.orange.ouds.app.ui.utilities.nestedName
 import com.orange.ouds.app.ui.utilities.rememberUntintedIconPainter
-import com.orange.ouds.core.component.OudsAlertIcon
+import com.orange.ouds.core.component.OudsIcon
 import com.orange.ouds.core.component.OudsInlineAlert
 import com.orange.ouds.core.component.OudsInlineAlertStatus
 import com.orange.ouds.foundation.extensions.orElse
@@ -65,8 +65,8 @@ private fun InlineAlertDemoBottomSheetContent(state: InlineAlertDemoState) {
             // Fixes a bug where calling sealedSubclasses returns an empty list in Compose previews
             // See https://issuetracker.google.com/issues/240601093
             listOf(
-                OudsInlineAlertStatus.Accent(OudsAlertIcon.Default),
-                OudsInlineAlertStatus.Neutral(OudsAlertIcon.Default),
+                OudsInlineAlertStatus.Accent(OudsIcon.Default),
+                OudsInlineAlertStatus.Neutral(OudsIcon.Default),
                 OudsInlineAlertStatus.Positive,
                 OudsInlineAlertStatus.Info,
                 OudsInlineAlertStatus.Warning,
@@ -76,8 +76,8 @@ private fun InlineAlertDemoBottomSheetContent(state: InlineAlertDemoState) {
             OudsInlineAlertStatus::class.sealedSubclasses.mapNotNull { kClass ->
                 tryOrNull {
                     when (kClass) {
-                        OudsInlineAlertStatus.Neutral::class -> OudsInlineAlertStatus.Neutral(OudsAlertIcon.Default)
-                        OudsInlineAlertStatus.Accent::class -> OudsInlineAlertStatus.Accent(OudsAlertIcon.Default)
+                        OudsInlineAlertStatus.Neutral::class -> OudsInlineAlertStatus.Neutral(OudsIcon.Default)
+                        OudsInlineAlertStatus.Accent::class -> OudsInlineAlertStatus.Accent(OudsIcon.Default)
                         else -> kClass.objectInstance
                     }
                 }
@@ -121,8 +121,8 @@ private fun InlineAlertDemoBottomSheetContent(state: InlineAlertDemoState) {
 private fun InlineAlertDemoContent(state: InlineAlertDemoState) {
     with(state) {
         val alertIcon = when (icon) {
-            InlineAlertDemoState.Icon.Tinted -> OudsAlertIcon(painter = painterResource(LocalThemeDrawableResources.current.tipsAndTricks), tinted = true)
-            InlineAlertDemoState.Icon.Untinted -> OudsAlertIcon(painter = rememberUntintedIconPainter(), tinted = false)
+            InlineAlertDemoState.Icon.Tinted -> OudsIcon(painter = painterResource(LocalThemeDrawableResources.current.tipsAndTricks), tinted = true)
+            InlineAlertDemoState.Icon.Untinted -> OudsIcon(painter = rememberUntintedIconPainter(), tinted = false)
         }
         OudsInlineAlert(
             label = label,
@@ -146,7 +146,7 @@ private fun Code.Builder.inlineAlertDemoCodeSnippet(state: InlineAlertDemoState,
                 is OudsInlineAlertStatus.Accent,
                 is OudsInlineAlertStatus.Neutral -> {
                     functionCallArgument(statusParameterName, status::class.java.nestedName) {
-                        iconArgument<OudsAlertIcon>("icon", themeDrawableResources.tipsAndTricks, tinted = icon == InlineAlertDemoState.Icon.Tinted)
+                        iconArgument<OudsIcon>("icon", themeDrawableResources.tipsAndTricks, tinted = icon == InlineAlertDemoState.Icon.Tinted)
                     }
                 }
                 OudsInlineAlertStatus.Info,

app/src/main/java/com/orange/ouds/app/ui/components/alert/InlineAlertDemoState.kt

@@ -21,7 +21,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
 import com.orange.ouds.app.R
-import com.orange.ouds.core.component.OudsAlertIcon
+import com.orange.ouds.core.component.OudsIcon
 import com.orange.ouds.core.component.OudsInlineAlertDefaults
 import com.orange.ouds.core.component.OudsInlineAlertStatus
 
@@ -67,8 +67,8 @@ class InlineAlertDemoState(
             restore = { list: List<Any?> ->
                 val statusClassName = list[1] as String
                 val status = when (val kClass = Class.forName(statusClassName).kotlin) {
-                    OudsInlineAlertStatus.Neutral::class -> OudsInlineAlertStatus.Neutral(OudsAlertIcon.Default)
-                    OudsInlineAlertStatus.Accent::class -> OudsInlineAlertStatus.Accent(OudsAlertIcon.Default)
+                    OudsInlineAlertStatus.Neutral::class -> OudsInlineAlertStatus.Neutral(OudsIcon.Default)
+                    OudsInlineAlertStatus.Accent::class -> OudsInlineAlertStatus.Accent(OudsIcon.Default)
                     else -> kClass.objectInstance as OudsInlineAlertStatus
                 }
 

app/src/main/java/com/orange/ouds/app/ui/components/badge/BadgeDemoScreen.kt

@@ -46,9 +46,9 @@ import com.orange.ouds.app.ui.utilities.composable.DemoScreen
 import com.orange.ouds.app.ui.utilities.nestedName
 import com.orange.ouds.app.ui.utilities.rememberUntintedIconPainter
 import com.orange.ouds.core.component.OudsBadge
-import com.orange.ouds.core.component.OudsBadgeIcon
 import com.orange.ouds.core.component.OudsBadgeSize
 import com.orange.ouds.core.component.OudsBadgeStatus
+import com.orange.ouds.core.component.OudsIcon
 import com.orange.ouds.core.component.OudsIconBadgeStatus
 import com.orange.ouds.foundation.extensions.orElse
 import com.orange.ouds.foundation.extensions.toSentenceCase
@@ -192,7 +192,7 @@ private fun Code.Builder.badgeDemoCodeSnippet(state: BadgeDemoState, badgeWithIc
                     is OudsIconBadgeStatus.Neutral,
                     is OudsIconBadgeStatus.Accent -> {
                         functionCallArgument(statusParameterName, badgeWithIconStatus::class.java.nestedName) {
-                            iconArgument<OudsBadgeIcon>("icon", themeDrawableResources.tipsAndTricks, tinted = icon == BadgeDemoState.Icon.Tinted)
+                            iconArgument<OudsIcon>("icon", themeDrawableResources.tipsAndTricks, tinted = icon == BadgeDemoState.Icon.Tinted)
                         }
                     }
                     OudsIconBadgeStatus.Positive,
@@ -216,8 +216,8 @@ private fun Code.Builder.badgeDemoCodeSnippet(state: BadgeDemoState, badgeWithIc
 private fun getBadgeWithIconStatus(state: BadgeDemoState): OudsIconBadgeStatus {
     with(state) {
         val badgeIcon = when (icon) {
-            BadgeDemoState.Icon.Tinted -> OudsBadgeIcon(painter = painterResource(id = LocalThemeDrawableResources.current.tipsAndTricks), tinted = true)
-            BadgeDemoState.Icon.Untinted -> OudsBadgeIcon(painter = rememberUntintedIconPainter(), tinted = false)
+            BadgeDemoState.Icon.Tinted -> OudsIcon(painter = painterResource(id = LocalThemeDrawableResources.current.tipsAndTricks), tinted = true)
+            BadgeDemoState.Icon.Untinted -> OudsIcon(painter = rememberUntintedIconPainter(), tinted = false)
         }
         return when (status) {
             OudsBadgeStatus.Neutral -> OudsIconBadgeStatus.Neutral(badgeIcon)

app/src/main/java/com/orange/ouds/app/ui/components/button/ButtonDemoScreen.kt

@@ -35,8 +35,8 @@ import com.orange.ouds.app.ui.utilities.composable.DemoScreen
 import com.orange.ouds.app.ui.utilities.rememberUntintedIconPainter
 import com.orange.ouds.core.component.OudsButton
 import com.orange.ouds.core.component.OudsButtonAppearance
-import com.orange.ouds.core.component.OudsButtonIcon
-import com.orange.ouds.core.component.OudsButtonLoader
+import com.orange.ouds.core.component.OudsIcon
+import com.orange.ouds.core.component.OudsLoader
 import com.orange.ouds.core.component.OudsSmallButton
 import com.orange.ouds.foundation.ExperimentalOudsApi
 import com.orange.ouds.theme.OudsVersion
@@ -122,12 +122,12 @@ private fun ButtonDemoContent(state: ButtonDemoState) {
             ButtonDemoState.Icon.Tinted -> painterResource(id = LocalThemeDrawableResources.current.tipsAndTricks)
             ButtonDemoState.Icon.Untinted -> rememberUntintedIconPainter()
         }
-        val buttonIcon = OudsButtonIcon(
+        val buttonIcon = OudsIcon(
             painter = painter,
             contentDescription = stringResource(id = R.string.app_components_common_icon_a11y),
             tinted = icon == ButtonDemoState.Icon.Tinted
         )
-        val loader = if (hasLoader) OudsButtonLoader(null) else null
+        val loader = if (hasLoader) OudsLoader(null) else null
 
         when (size) {
             ButtonDemoState.Size.Default -> when (layout) {
@@ -191,7 +191,7 @@ private fun Code.Builder.buttonDemoCodeSnippet(state: ButtonDemoState, themeDraw
             }
             functionCall(functionName) {
                 if (layout in listOf(ButtonDemoState.Layout.IconOnly, ButtonDemoState.Layout.TextAndIcon)) {
-                    iconArgument<OudsButtonIcon>(
+                    iconArgument<OudsIcon>(
                         "icon",
                         themeDrawableResources.tipsAndTricks,
                         R.string.app_components_common_icon_a11y,
@@ -204,7 +204,7 @@ private fun Code.Builder.buttonDemoCodeSnippet(state: ButtonDemoState, themeDraw
                 onClickArgument()
                 enabledArgument(enabled)
                 if (hasLoader) {
-                    constructorCallArgument<OudsButtonLoader>("loader") {
+                    constructorCallArgument<OudsLoader>("loader") {
                         typedArgument("progress", null)
                     }
                 }

app/src/main/java/com/orange/ouds/app/ui/components/button/NavigationButtonDemoScreen.kt

@@ -27,11 +27,11 @@ import com.orange.ouds.app.ui.utilities.composable.CustomizationFilterChips
 import com.orange.ouds.app.ui.utilities.composable.CustomizationSwitchItem
 import com.orange.ouds.app.ui.utilities.composable.CustomizationTextInput
 import com.orange.ouds.app.ui.utilities.composable.DemoScreen
-import com.orange.ouds.core.component.OudsButtonLoader
+import com.orange.ouds.core.component.OudsLoader
 import com.orange.ouds.core.component.OudsNavigationButton
 import com.orange.ouds.core.component.OudsNavigationButtonAppearance
-import com.orange.ouds.core.component.OudsNavigationButtonChevron
 import com.orange.ouds.core.component.OudsNavigationButtonDefaults
+import com.orange.ouds.core.component.OudsNavigationButtonIndicator
 import com.orange.ouds.theme.OudsVersion
 
 @Composable
@@ -64,10 +64,10 @@ private fun NavigationButtonDemoBottomSheetContent(state: NavigationButtonDemoSt
         )
         CustomizationFilterChips(
             applyTopPadding = true,
-            label = stringResource(R.string.app_components_button_navigationButton_chevron_tech),
-            chipLabels = OudsNavigationButtonChevron.entries.map { it.name },
-            selectedChipIndex = OudsNavigationButtonChevron.entries.indexOf(chevron),
-            onSelectionChange = { index -> chevron = OudsNavigationButtonChevron.entries[index] }
+            label = stringResource(R.string.app_components_button_navigationButton_indicator_tech),
+            chipLabels = OudsNavigationButtonIndicator.entries.map { it.name },
+            selectedChipIndex = OudsNavigationButtonIndicator.entries.indexOf(indicator),
+            onSelectionChange = { index -> indicator = OudsNavigationButtonIndicator.entries[index] }
         )
         CustomizationFilterChips(
             applyTopPadding = true,
@@ -94,10 +94,10 @@ private fun NavigationButtonDemoBottomSheetContent(state: NavigationButtonDemoSt
 @Composable
 private fun NavigationButtonDemoContent(state: NavigationButtonDemoState) {
     with(state) {
-        val loader = if (hasLoader) OudsButtonLoader(null) else null
+        val loader = if (hasLoader) OudsLoader(null) else null
         OudsNavigationButton(
             label = label,
-            chevron = chevron,
+            indicator = indicator,
             onClick = {},
             enabled = enabled,
             loader = loader,
@@ -111,11 +111,11 @@ private fun Code.Builder.navigationButtonDemoCodeSnippet(state: NavigationButton
         coloredBoxCall(onColoredBox) {
             functionCall("OudsNavigationButton") {
                 label?.let { labelArgument(label) }
-                typedArgument("chevron", chevron)
+                typedArgument("indicator", indicator)
                 onClickArgument()
                 if (!enabled) enabledArgument(enabled)
                 if (hasLoader) {
-                    constructorCallArgument<OudsButtonLoader>("loader") {
+                    constructorCallArgument<OudsLoader>("loader") {
                         typedArgument("progress", null)
                     }
                 }