[#878] Change enabled parameter visibility in OdsComponentIcon and ad…

…d a setEnabled method
Orange-OpenSource · Mar 11, 2024 · 67f3cba · 67f3cba
1 parent 1de863a
commit 67f3cba
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/lib/src/main/java/com/orange/ods/compose/component/appbar/top/OdsTopAppBarsCommon.kt b/lib/src/main/java/com/orange/ods/compose/component/appbar/top/OdsTopAppBarsCommon.kt
@@ -102,7 +102,7 @@ object OdsTopAppBar {
     class ActionButton private constructor(
         val graphicsObject: Any,
         val contentDescription: String,
-        enabled: Boolean = true,
+        val enabled: Boolean = true,
         val onClick: () -> Unit
     ) : OdsComponentIcon<Nothing>(Nothing::class.java, graphicsObject, contentDescription, enabled, onClick) {
 
@@ -154,9 +154,6 @@ object OdsTopAppBar {
             onClick: () -> Unit
         ) : this(bitmap as Any, contentDescription, enabled, onClick)
 
-        public override var enabled: Boolean = enabled
-            protected set
-
         override val tint: Color
             @Composable
             get() = OdsTheme.colors.component.topAppBar.barContent

diff --git a/lib/src/main/java/com/orange/ods/compose/component/button/OdsIconButton.kt b/lib/src/main/java/com/orange/ods/compose/component/button/OdsIconButton.kt
@@ -118,7 +118,7 @@ object OdsIconButton {
 
         @Composable
         override fun Content(modifier: Modifier) {
-            enabled = extraParameters.enabled
+            setEnabled(extraParameters.enabled)
             super.Content(modifier)
         }
     }

diff --git a/lib/src/main/java/com/orange/ods/compose/component/button/OdsIconToggleButtonsRow.kt b/lib/src/main/java/com/orange/ods/compose/component/button/OdsIconToggleButtonsRow.kt
@@ -98,7 +98,7 @@ object OdsIconToggleButtonsRow {
         val graphicsObject: Any,
         val contentDescription: String,
         val onClick: () -> Unit,
-        enabled: Boolean = true
+        val enabled: Boolean = true
     ) : OdsComponentIcon<IconButton.ExtraParameters>(ExtraParameters::class.java, graphicsObject, contentDescription, enabled) {
 
         data class ExtraParameters internal constructor(
@@ -154,9 +154,6 @@ object OdsIconToggleButtonsRow {
             enabled: Boolean = true
         ) : this(bitmap as Any, contentDescription, onClick, enabled)
 
-        public override var enabled: Boolean = enabled
-            protected set
-
         override val tint: Color
             @Composable
             get() {

diff --git a/lib/src/main/java/com/orange/ods/compose/component/content/OdsComponentIcon.kt b/lib/src/main/java/com/orange/ods/compose/component/content/OdsComponentIcon.kt
@@ -30,14 +30,18 @@ abstract class OdsComponentIcon<T> protected constructor(
     extraParametersClass: Class<T>,
     private val graphicsObject: Any,
     private val contentDescription: String,
-    protected open var enabled: Boolean = true,
+    private var enabled: Boolean = true,
     private val onClick: (() -> Unit)? = null,
 ) : OdsComponentContent<T>(extraParametersClass) where T : OdsComponentContent.ExtraParameters {
 
     val painter: Painter? = graphicsObject as? Painter
     val imageVector: ImageVector? = graphicsObject as? ImageVector
     val bitmap: ImageBitmap? = graphicsObject as? ImageBitmap
 
+    protected fun setEnabled(enabled: Boolean) {
+        this.enabled = enabled
+    }
+
     protected open val tint: Color?
         @Composable
         get() = null

diff --git a/lib/src/main/java/com/orange/ods/compose/component/textfield/OdsTextFieldsCommon.kt b/lib/src/main/java/com/orange/ods/compose/component/textfield/OdsTextFieldsCommon.kt
@@ -112,7 +112,7 @@ object OdsTextField {
 
         @Composable
         override fun Content(modifier: Modifier) {
-            enabled = extraParameters.enabled
+            setEnabled(extraParameters.enabled)
             super.Content(modifier)
         }
     }
@@ -172,7 +172,7 @@ object OdsTextField {
 
         @Composable
         override fun Content(modifier: Modifier) {
-            enabled = extraParameters.enabled
+            setEnabled(extraParameters.enabled)
             super.Content(modifier)
         }
     }