Merge pull request #751 from Orange-OpenSource/use-content-method-mod…

…ifier-parameter Use modifier parameter in Content methods
Orange-OpenSource · Dec 15, 2023 · 43231af · 43231af
2 parents ea05033 + 4ea3866
commit 43231af
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/app/src/main/java/com/orange/ods/app/ui/AppBarActions.kt b/app/src/main/java/com/orange/ods/app/ui/AppBarActions.kt
@@ -62,7 +62,7 @@ fun getSearchFieldAction(onTextChange: (TextFieldValue) -> Unit): OdsComponentCo
  value = LocalAppBarManager.current.searchedText,
  onValueChange = onTextChange,
  placeholder = stringResource(id = R.string.search_text_field_hint),
- modifier = Modifier
+ modifier = modifier
  .fillMaxWidth()
  .focusRequester(focusRequester)
  )

diff --git a/lib/src/main/java/com/orange/ods/compose/component/listitem/OdsListItem.kt b/lib/src/main/java/com/orange/ods/compose/component/listitem/OdsListItem.kt
@@ -334,7 +334,7 @@ object OdsListItem {
  @Composable
  override fun Content(modifier: Modifier) {
  Column(modifier = modifier.fillMaxHeight(), verticalArrangement = Arrangement.Center) {
- super.Content(modifier = modifier)
+ super.Content(modifier = Modifier)
  }
  }
  }

diff --git a/lib/src/main/java/com/orange/ods/compose/component/menu/OdsDropdownMenu.kt b/lib/src/main/java/com/orange/ods/compose/component/menu/OdsDropdownMenu.kt
@@ -162,6 +162,7 @@ object OdsDropdownMenu {
  @Composable
  override fun Content(modifier: Modifier) {
  DropdownMenuItem(
+ modifier = modifier,
  onClick = {
  onClick()
  extraParameters.onDismissRequest()

diff --git a/lib/src/main/java/com/orange/ods/compose/component/navigationdrawer/OdsModalDrawer.kt b/lib/src/main/java/com/orange/ods/compose/component/navigationdrawer/OdsModalDrawer.kt
@@ -125,7 +125,7 @@ object OdsModalDrawer {
  data class SectionHeader(private val label: String) : Item, OdsComponentContent<Item.ExtraParameters>() {
  @Composable
  override fun Content(modifier: Modifier) {
- Column {
+ Column(modifier = modifier) {
  OdsDivider()
  OdsTextBody2(
  modifier = Modifier.padding(top = dimensionResource(id = R.dimen.spacing_m), start = dimensionResource(id = R.dimen.spacing_m)),
@@ -140,7 +140,7 @@ object OdsModalDrawer {
  */
  data object Divider : Item, OdsComponentContent<Item.ExtraParameters>() {
  @Composable
- override fun Content(modifier: Modifier) = OdsDivider()
+ override fun Content(modifier: Modifier) = OdsDivider(modifier = modifier)
  }
 
  /**
@@ -164,7 +164,7 @@ object OdsModalDrawer {
  text = text,
  textColor = if (selected) OdsTheme.colors.primaryVariant else OdsTheme.colors.onSurface,
  textStyle = if (selected) OdsTheme.typography.subtitle2 else OdsTheme.typography.subtitle2.copy(fontWeight = FontWeight.Bold),
- modifier = Modifier
+ modifier = modifier
  .selectable(selected = selected, onClick = { onClick(this@ListItem) })
  .let {
  if (selected) it.background(OdsTheme.colors.primaryVariant.copy(alpha = SelectedItemOpacity)) else it
@@ -227,7 +227,7 @@ object OdsModalDrawer {
  OdsHeaderText(title = title, subtitle = subtitle, color = OdsTheme.colors.onSurface)
  }
 
- else -> OdsHeaderText(title = title, subtitle = subtitle, color = OdsTheme.colors.onSurface)
+ else -> OdsHeaderText(modifier = modifier, title = title, subtitle = subtitle, color = OdsTheme.colors.onSurface)
  }
  }
 
@@ -310,9 +310,9 @@ private object OdsModalDrawerListItemRippleTheme : RippleTheme {
 }
 
 @Composable
-private fun OdsHeaderText(title: String, subtitle: String?, color: Color) {
+private fun OdsHeaderText(title: String, subtitle: String?, color: Color, modifier: Modifier = Modifier) {
  Column(
- modifier = Modifier.padding(all = dimensionResource(id = R.dimen.spacing_m)),
+ modifier = modifier.padding(all = dimensionResource(id = R.dimen.spacing_m)),
  verticalArrangement = Arrangement.Center
  ) {
  Text(text = title, color = color, style = OdsTheme.typography.h6)

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
@@ -52,7 +52,7 @@ object OdsTextField {
  @Composable
  override fun Content(modifier: Modifier) {
  OdsTextCaption(
- modifier = Modifier
+ modifier = modifier
  .padding(top = dimensionResource(id = R.dimen.spacing_xs), end = dimensionResource(id = R.dimen.spacing_m)),
  text = "$characterCount/$maxCharacterCount",
  enabled = enabled
@@ -118,7 +118,7 @@ object OdsTextField {
  @Composable
  override fun Content(modifier: Modifier) {
  Text(
- modifier = Modifier.padding(end = dimensionResource(id = R.dimen.spacing_s)),
+ modifier = modifier.padding(end = dimensionResource(id = R.dimen.spacing_s)),
  text = text,
  style = OdsTheme.typography.subtitle1,
  color = OdsTextFieldDefaults.trailingTextColor(extraParameters.isTextFieldEmpty, extraParameters.enabled)
@@ -171,7 +171,7 @@ internal class OdsExposedDropdownMenuTrailing(val expanded: Boolean) : OdsTextFi
  @Composable
  override fun Content(modifier: Modifier) {
  val degrees = if (expanded && extraParameters.enabled) 180f else 0f
- Box(modifier = Modifier.rotate(degrees)) {
+ Box(modifier = modifier.rotate(degrees)) {
  OdsTextFieldIcon(
  painter = rememberVectorPainter(image = Icons.Filled.ArrowDropDown),
  contentDescription = null,