[#603] Review: Replace modifier parameter by semantics

Orange-OpenSource · Sep 11, 2023 · ae0233b · ae0233b
1 parent 4d1a708
commit ae0233b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/src/main/java/com/orange/ods/app/ui/components/textfields/ComponentTextField.kt b/app/src/main/java/com/orange/ods/app/ui/components/textfields/ComponentTextField.kt
@@ -30,7 +30,6 @@ import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.error
-import androidx.compose.ui.semantics.semantics
 import com.orange.ods.app.R
 import com.orange.ods.app.ui.components.Variant
 import com.orange.ods.app.ui.components.utilities.ComponentCustomizationBottomSheetScaffold
@@ -219,7 +218,7 @@ private fun DisplayTypeCustomization(displayType: MutableState<TextFieldCustomiz
  OdsChoiceChip(
  text = stringResource(id = R.string.component_state_error),
  value = TextFieldCustomizationState.DisplayType.Error,
- modifier = Modifier.semantics {
+ semantics = {
  if (displayType.value == TextFieldCustomizationState.DisplayType.Error) {
  error(context.getString(R.string.component_text_field_error_message))
  }

diff --git a/lib/src/main/java/com/orange/ods/compose/component/chip/OdsChoiceChipsFlowRow.kt b/lib/src/main/java/com/orange/ods/compose/component/chip/OdsChoiceChipsFlowRow.kt
@@ -20,6 +20,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.semantics.SemanticsPropertyReceiver
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
 import com.google.accompanist.flowlayout.FlowRow
@@ -75,22 +76,23 @@ fun <T> OdsChoiceChipsFlowRow(
  * @param text Text displayed in the chip
  * @param value The chip value
  * @param enabled If set to false, the chip is no more clickable and appears as disabled. True by default.
- * @param modifier The Modifier applied on choice chip display
+ * @param semantics The semantics applied on this choice chip
  */
 class OdsChoiceChip<T>(
  val text: String,
  val value: T,
  val enabled: Boolean = true,
- val modifier: Modifier = Modifier
+ val semantics: SemanticsPropertyReceiver.() -> Unit = {}
 ) {
 
  @Composable
  fun Content(selected: Boolean, onSelectedStateChange: (selected: Boolean) -> Unit) {
  val chipStateDescription = selectionStateDescription(selected = selected)
  OdsChip(
  text = text,
- modifier = modifier.semantics {
+ modifier = Modifier.semantics {
  stateDescription = chipStateDescription
+ semantics()
  },
  selected = selected,
  onClick = { onSelectedStateChange(!selected) },