[#613] Fix code implementation for buttons, use new API

Orange-OpenSource · Aug 18, 2023 · 7b17e83 · 7b17e83
1 parent f4713e3
commit 7b17e83
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/app/src/main/java/com/orange/ods/app/ui/components/buttons/ButtonsContained.kt b/app/src/main/java/com/orange/ods/app/ui/components/buttons/ButtonsContained.kt
@@ -86,7 +86,11 @@ fun ButtonsContained(customizationState: ButtonCustomizationState) {
                     parameters = {
                         simple("style", buttonStyle.value.fullName)
                         if (hasFullScreenWidth) fillMaxWidth()
-                        if (hasLeadingIcon) icon()
+                        if (hasLeadingIcon) {
+                            classInstance("icon", OdsButtonIcon::class.java) {
+                                painter()
+                            }
+                        }
                         if (!isEnabled) enabled(false)
                     }
                 )

diff --git a/app/src/main/java/com/orange/ods/app/ui/components/buttons/ButtonsOutlined.kt b/app/src/main/java/com/orange/ods/app/ui/components/buttons/ButtonsOutlined.kt
@@ -62,7 +62,11 @@ fun ButtonsOutlined(customizationState: ButtonCustomizationState) {
                     exhaustiveParameters = false,
                     parameters = {
                         if (hasFullScreenWidth) fillMaxWidth()
-                        if (hasLeadingIcon) icon()
+                        if (hasLeadingIcon) {
+                            classInstance("icon", OdsButtonIcon::class.java) {
+                                painter()
+                            }
+                        }
                         if (!isEnabled) enabled(false)
                     })
             }

diff --git a/app/src/main/java/com/orange/ods/app/ui/components/buttons/ButtonsText.kt b/app/src/main/java/com/orange/ods/app/ui/components/buttons/ButtonsText.kt
@@ -81,7 +81,11 @@ fun ButtonsText(customizationState: ButtonCustomizationState) {
                     parameters = {
                         simple("style", textButtonStyle.value.fullName)
                         if (hasFullScreenWidth) fillMaxWidth()
-                        if (hasLeadingIcon) icon()
+                        if (hasLeadingIcon) {
+                            classInstance("icon", OdsButtonIcon::class.java) {
+                                painter()
+                            }
+                        }
                         if (!isEnabled) enabled(false)
                     }
                 )