Skip to content

Commit ac2d874

Browse files
committed
Review: Rename outlineBorderModifier in contentModifier
1 parent b61ea8d commit ac2d874

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

core/src/main/java/com/orange/ouds/core/component/OudsControlItem.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ internal fun OudsControlItem(
7373
checkedContentSelectionStatus: String,
7474
backgroundColor: Color,
7575
modifier: Modifier = Modifier,
76-
outlineBorderModifier: Modifier = Modifier,
76+
contentModifier: Modifier = Modifier,
7777
extraLabel: String? = null,
7878
handleHighContrastMode: Boolean = false
7979
) {
@@ -127,7 +127,7 @@ internal fun OudsControlItem(
127127
.heightIn(min = controlItemTokens.sizeMinHeight.dp)
128128
.widthIn(min = controlItemTokens.sizeMinWidth.dp, max = controlItemTokens.sizeMaxWidth.dp)
129129
.background(color = backgroundColor, shape = shape)
130-
.then(outlineBorderModifier)
130+
.then(contentModifier)
131131
.outerBorder(state = state, shape = shape, handleHighContrastMode = handleHighContrastMode),
132132
contentAlignment = Alignment.BottomCenter
133133
) {

core/src/main/java/com/orange/ouds/core/component/OudsRadioButtonItem.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import androidx.compose.foundation.border
1616
import androidx.compose.foundation.interaction.Interaction
1717
import androidx.compose.foundation.interaction.MutableInteractionSource
1818
import androidx.compose.foundation.isSystemInDarkTheme
19-
import androidx.compose.foundation.layout.padding
2019
import androidx.compose.foundation.selection.selectable
2120
import androidx.compose.material.icons.Icons
2221
import androidx.compose.material.icons.filled.Call
@@ -113,7 +112,7 @@ fun OudsRadioButtonItem(
113112
Modifier
114113
}
115114

116-
val hasVisibleOutline = outlined && (state == OudsControlState.Focused ||outlineBorderColor(state = state, selected = selected, error = error) != null)
115+
val hasVisibleOutline = outlined && (state == OudsControlState.Focused || outlineBorderColor(state = state, selected = selected, error = error) != null)
117116

118117
OudsControlItem(
119118
state = state,
@@ -140,7 +139,7 @@ fun OudsRadioButtonItem(
140139
modifier = modifier
141140
.then(selectableModifier)
142141
.semantics(mergeDescendants = true) {},
143-
outlineBorderModifier = Modifier.border(outlined = outlined, selected = selected, error = error, state = state),
142+
contentModifier = Modifier.border(outlined = outlined, selected = selected, error = error, state = state),
144143
handleHighContrastMode = true
145144
)
146145
}

0 commit comments

Comments
 (0)