Skip to content

Commit d08b2cb

Browse files
committed
Add PreviewFlowRow method to generalize PreviewEnumEntry
1 parent 693b202 commit d08b2cb

15 files changed

Lines changed: 101 additions & 73 deletions

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import com.orange.ouds.core.theme.value
5858
import com.orange.ouds.core.utilities.OudsPreview
5959
import com.orange.ouds.core.utilities.OudsPreviewDevice
6060
import com.orange.ouds.core.utilities.OudsPreviewableComponent
61+
import com.orange.ouds.core.utilities.PreviewFlowRow
6162
import com.orange.ouds.core.utilities.getPreviewTheme
6263
import com.orange.ouds.foundation.utilities.BasicPreviewParameterProvider
6364
import com.orange.ouds.theme.OudsThemeContract
@@ -416,25 +417,26 @@ internal fun PreviewOudsAlertMessage(
416417
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
417418
with(parameter) {
418419
val icon = if (hasIcon) OudsAlertIcon(Icons.Outlined.FavoriteBorder) else null
419-
Column {
420-
listOf(
420+
PreviewFlowRow(
421+
items = listOf(
421422
OudsAlertMessageStatus.Neutral(icon),
422423
OudsAlertMessageStatus.Accent(icon),
423424
OudsAlertMessageStatus.Negative,
424425
OudsAlertMessageStatus.Positive,
425426
OudsAlertMessageStatus.Info,
426427
OudsAlertMessageStatus.Warning
427-
).forEach { status ->
428-
OudsAlertMessage(
429-
modifier = Modifier.padding(all = 10.dp),
430-
label = "Label",
431-
status = status,
432-
description = description,
433-
onClose = onClose,
434-
actionLink = actionLink,
435-
bulletList = bulletList
436-
)
437-
}
428+
),
429+
itemName = { it::class.simpleName.orEmpty() },
430+
maxItemsInEachRow = 1
431+
) { status ->
432+
OudsAlertMessage(
433+
label = "Label",
434+
status = status,
435+
description = description,
436+
onClose = onClose,
437+
actionLink = actionLink,
438+
bulletList = bulletList
439+
)
438440
}
439441
}
440442
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ internal fun PreviewOudsButton(
784784
val label = if (hasLabel) appearance.name else null
785785
val icon = if (hasIcon) OudsButtonIcon(Icons.Filled.FavoriteBorder, "") else null
786786
val content: @Composable () -> Unit = {
787-
PreviewEnumEntries<OudsButtonState>(columnCount = 2) {
787+
PreviewEnumEntries<OudsButtonState>(maxEnumEntriesInEachRow = 2) {
788788
OudsButton(
789789
nullableIcon = icon,
790790
nullableLabel = label,
@@ -812,7 +812,7 @@ private fun PreviewOudsButtonWithRoundedCorners() = PreviewOudsButtonWithRounded
812812
internal fun PreviewOudsButtonWithRoundedCorners(theme: OudsThemeContract) =
813813
OudsPreview(theme = theme.mapSettings { it.copy(roundedCornerButtons = true) }) {
814814
val appearance = OudsButtonAppearance.Default
815-
PreviewEnumEntries<OudsButtonState>(columnCount = 2) {
815+
PreviewEnumEntries<OudsButtonState>(maxEnumEntriesInEachRow = 2) {
816816
OudsButton(
817817
nullableIcon = OudsButtonIcon(Icons.Filled.FavoriteBorder, ""),
818818
nullableLabel = appearance.name,
@@ -830,7 +830,7 @@ private fun PreviewOudsButtonWithIconBadge(@PreviewParameter(OudsButtonWithIconB
830830

831831
@Composable
832832
internal fun PreviewOudsButtonWithIconBadge(theme: OudsThemeContract, count: Int) = OudsPreview(theme = theme) {
833-
PreviewEnumEntries<OudsButtonState>(columnCount = 2) {
833+
PreviewEnumEntries<OudsButtonState>(maxEnumEntriesInEachRow = 2) {
834834
OudsButton(
835835
nullableIcon = OudsButtonIcon(Icons.Filled.FavoriteBorder, ""),
836836
nullableLabel = null,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ internal fun PreviewOudsCheckboxItem(
252252
parameter: OudsCheckboxItemPreviewParameter
253253
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
254254
with(parameter) {
255-
PreviewEnumEntries<OudsControlState>(columnCount = 1, edgeToEdge = true) {
255+
PreviewEnumEntries<OudsControlState>(maxEnumEntriesInEachRow = 1, edgeToEdge = true) {
256256
OudsTriStateCheckboxItem(
257257
state = value,
258258
label = "Label",
@@ -286,7 +286,7 @@ internal fun PreviewOudsCheckboxItemHighContrastModeEnabled(
286286
parameter: OudsCheckboxItemHighContrastModePreviewParameter
287287
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled, highContrastModeEnabled = true) {
288288
with(parameter) {
289-
PreviewEnumEntries<OudsControlState>(columnCount = 1, edgeToEdge = true) {
289+
PreviewEnumEntries<OudsControlState>(maxEnumEntriesInEachRow = 1, edgeToEdge = true) {
290290
OudsTriStateCheckboxItem(
291291
state = value,
292292
label = "Label",
@@ -320,7 +320,7 @@ private fun PreviewOudsCheckboxItemWithEdgeToEdgeDisabled() = PreviewOudsCheckbo
320320

321321
@Composable
322322
internal fun PreviewOudsCheckboxItemWithEdgeToEdgeDisabled(theme: OudsThemeContract) = OudsPreview(theme = theme) {
323-
PreviewEnumEntries<OudsControlState>(columnCount = 1) {
323+
PreviewEnumEntries<OudsControlState>(maxEnumEntriesInEachRow = 1) {
324324
OudsCheckboxItem(
325325
checked = true,
326326
label = "Label",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ internal fun PreviewOudsFilterChip(theme: OudsThemeContract, darkThemeEnabled: B
207207
with(parameter) {
208208
val label = if (hasLabel) "Label" else null
209209
val icon = if (hasIcon) OudsChipIcon(Icons.Filled.FavoriteBorder, "") else null
210-
PreviewEnumEntries<OudsChipState>(columnCount = 3) {
210+
PreviewEnumEntries<OudsChipState>(maxEnumEntriesInEachRow = 3) {
211211
OudsFilterChip(selected = selected, nullableIcon = icon, nullableLabel = label, onClick = {})
212212
}
213213
}

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ package com.orange.ouds.core.component
1414

1515
import androidx.compose.foundation.isSystemInDarkTheme
1616
import androidx.compose.foundation.layout.Arrangement
17-
import androidx.compose.foundation.layout.Column
1817
import androidx.compose.foundation.layout.Row
19-
import androidx.compose.foundation.layout.padding
2018
import androidx.compose.foundation.layout.size
2119
import androidx.compose.foundation.layout.widthIn
2220
import androidx.compose.material.icons.Icons
@@ -29,10 +27,10 @@ import androidx.compose.ui.res.painterResource
2927
import androidx.compose.ui.semantics.semantics
3028
import androidx.compose.ui.tooling.preview.PreviewLightDark
3129
import androidx.compose.ui.tooling.preview.PreviewParameter
32-
import androidx.compose.ui.unit.dp
3330
import com.orange.ouds.core.theme.OudsTheme
3431
import com.orange.ouds.core.theme.value
3532
import com.orange.ouds.core.utilities.OudsPreview
33+
import com.orange.ouds.core.utilities.PreviewFlowRow
3634
import com.orange.ouds.core.utilities.getPreviewTheme
3735
import com.orange.ouds.foundation.utilities.BasicPreviewParameterProvider
3836
import com.orange.ouds.theme.OudsThemeContract
@@ -194,21 +192,22 @@ internal fun PreviewOudsInlineAlert(
194192
label: String
195193
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
196194
val icon = OudsAlertIcon(Icons.Outlined.FavoriteBorder)
197-
Column {
198-
listOf(
195+
PreviewFlowRow(
196+
items = listOf(
199197
OudsInlineAlertStatus.Neutral(icon),
200198
OudsInlineAlertStatus.Accent(icon),
201199
OudsInlineAlertStatus.Negative,
202200
OudsInlineAlertStatus.Positive,
203201
OudsInlineAlertStatus.Info,
204202
OudsInlineAlertStatus.Warning
205-
).forEach { status ->
206-
OudsInlineAlert(
207-
modifier = Modifier.padding(all = 10.dp),
208-
label = label,
209-
status = status
210-
)
211-
}
203+
),
204+
itemName = { it::class.simpleName.orEmpty() },
205+
maxItemsInEachRow = 1
206+
) { status ->
207+
OudsInlineAlert(
208+
label = label,
209+
status = status
210+
)
212211
}
213212
}
214213

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ private fun PreviewOudsInputTag() {
241241
@Composable
242242
internal fun PreviewOudsInputTag(theme: OudsThemeContract, darkThemeEnabled: Boolean) =
243243
OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
244-
PreviewEnumEntries<OudsInputTagState>(columnCount = 3) {
244+
PreviewEnumEntries<OudsInputTagState>(maxEnumEntriesInEachRow = 3) {
245245
OudsInputTag(label = "Label", onClick = {})
246246
}
247247
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ internal fun PreviewOudsLink(
454454
with(parameter) {
455455
val icon = if (hasIcon) OudsLinkIcon(Icons.Filled.FavoriteBorder) else null
456456
val linkPreview: @Composable () -> Unit = {
457-
PreviewEnumEntries<OudsLinkState>(columnCount = 3) {
457+
PreviewEnumEntries<OudsLinkState>(maxEnumEntriesInEachRow = 3) {
458458
OudsLink(
459459
icon = icon,
460460
label = "Label",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ internal fun PreviewOudsPasswordInput(
244244
parameter: OudsPasswordInputPreviewParameter
245245
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
246246
with(parameter) {
247-
PreviewEnumEntries<OudsTextInputState>(columnCount = 1) {
247+
PreviewEnumEntries<OudsTextInputState>(maxEnumEntriesInEachRow = 1) {
248248
OudsPasswordInput(
249249
state = rememberOudsPasswordInputState(initialText),
250250
label = label,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ internal fun PreviewOudsRadioButtonItem(
213213
parameter: OudsRadioButtonItemPreviewParameter
214214
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
215215
with(parameter) {
216-
PreviewEnumEntries<OudsControlState>(columnCount = 1, edgeToEdge = true) {
216+
PreviewEnumEntries<OudsControlState>(maxEnumEntriesInEachRow = 1, edgeToEdge = true) {
217217
OudsRadioButtonItem(
218218
selected = value,
219219
label = "Label",
@@ -248,7 +248,7 @@ internal fun PreviewOudsRadioButtonItemHighContrastModeEnabled(
248248
parameter: OudsRadioButtonItemHighContrastModePreviewParameter
249249
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled, highContrastModeEnabled = true) {
250250
with(parameter) {
251-
PreviewEnumEntries<OudsControlState>(columnCount = 1, edgeToEdge = true) {
251+
PreviewEnumEntries<OudsControlState>(maxEnumEntriesInEachRow = 1, edgeToEdge = true) {
252252
OudsRadioButtonItem(
253253
selected = value,
254254
label = "Label",
@@ -284,7 +284,7 @@ private fun PreviewOudsRadioButtonItemWithEdgeToEdgeDisabled() = PreviewOudsRadi
284284

285285
@Composable
286286
internal fun PreviewOudsRadioButtonItemWithEdgeToEdgeDisabled(theme: OudsThemeContract) = OudsPreview(theme = theme) {
287-
PreviewEnumEntries<OudsControlState>(columnCount = 1) {
287+
PreviewEnumEntries<OudsControlState>(maxEnumEntriesInEachRow = 1) {
288288
OudsRadioButtonItem(
289289
selected = true,
290290
label = "Label",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ internal fun PreviewOudsSuggestionChip(
200200
with(parameter) {
201201
val label = if (hasLabel) "Label" else null
202202
val icon = if (hasIcon) OudsChipIcon(Icons.Filled.FavoriteBorder, "") else null
203-
PreviewEnumEntries<OudsChipState>(columnCount = 3) {
203+
PreviewEnumEntries<OudsChipState>(maxEnumEntriesInEachRow = 3) {
204204
OudsSuggestionChip(nullableIcon = icon, nullableLabel = label, onClick = {})
205205
}
206206
}

0 commit comments

Comments
 (0)