Skip to content

Commit 5776327

Browse files
florentmaitreflorentmaitre
committed
Use PreviewPaddingDefault instead of hardcoded value and remove several preview paddings
1 parent 0378d47 commit 5776327

160 files changed

Lines changed: 44 additions & 41 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ private fun PreviewOudsAlertMessageWithRichText() {
544544
internal fun PreviewOudsAlertMessageWithRichText(
545545
theme: OudsThemeContract,
546546
darkThemeEnabled: Boolean
547-
) = OudsPreview(modifier = Modifier.padding(all = 10.dp), theme = theme, darkThemeEnabled = darkThemeEnabled) {
547+
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
548548
val description = buildOudsAnnotatedAlertMessageDescription {
549549
append("Here is a description that contains a ")
550550
withStrong { append("strong") }

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

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import androidx.compose.ui.semantics.semantics
3030
import androidx.compose.ui.state.ToggleableState
3131
import androidx.compose.ui.tooling.preview.Preview
3232
import androidx.compose.ui.tooling.preview.PreviewParameter
33-
import androidx.compose.ui.unit.dp
3433
import com.orange.ouds.core.component.common.OudsError
3534
import com.orange.ouds.core.extensions.collectInteractionStateAsState
3635
import com.orange.ouds.core.utilities.LoremIpsumText
@@ -39,6 +38,7 @@ import com.orange.ouds.core.utilities.OudsPreviewDevice
3938
import com.orange.ouds.core.utilities.OudsPreviewLightDark
4039
import com.orange.ouds.core.utilities.OudsPreviewableComponent
4140
import com.orange.ouds.core.utilities.PreviewEnumEntries
41+
import com.orange.ouds.core.utilities.PreviewPaddingDefault
4242
import com.orange.ouds.core.utilities.buildPreviewAnnotatedErrorMessage
4343
import com.orange.ouds.core.utilities.getPreviewTheme
4444
import com.orange.ouds.theme.OudsThemeContract
@@ -341,6 +341,22 @@ internal fun PreviewOudsCheckboxItemConstrainedMaxWidth(@PreviewParameter(OudsCo
341341
PreviewOudsCheckboxItemConstrainedMaxWidth(theme = getPreviewTheme(), constrainedMaxWidth = constrainedMaxWidth)
342342
}
343343

344+
@Composable
345+
internal fun PreviewOudsCheckboxItemConstrainedMaxWidth(
346+
theme: OudsThemeContract,
347+
constrainedMaxWidth: Boolean
348+
) = OudsPreview(modifier = Modifier.padding(all = PreviewPaddingDefault), theme = theme) {
349+
OudsCheckboxItem(
350+
checked = true,
351+
label = "Label",
352+
onCheckedChange = {},
353+
icon = OudsControlItemIcon(imageVector = Icons.Filled.Call),
354+
constrainedMaxWidth = constrainedMaxWidth,
355+
edgeToEdge = false,
356+
divider = true
357+
)
358+
}
359+
344360
@OudsPreviewLightDark
345361
@Composable
346362
@Suppress("PreviewShouldNotBeCalledRecursively")
@@ -354,7 +370,6 @@ internal fun PreviewOudsCheckboxItemWithRichText(
354370
darkThemeEnabled: Boolean
355371
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
356372
OudsCheckboxItem(
357-
modifier = Modifier.padding(all = 10.dp),
358373
checked = true,
359374
label = "Label",
360375
onCheckedChange = {},
@@ -363,20 +378,6 @@ internal fun PreviewOudsCheckboxItemWithRichText(
363378
)
364379
}
365380

366-
@Composable
367-
internal fun PreviewOudsCheckboxItemConstrainedMaxWidth(theme: OudsThemeContract, constrainedMaxWidth: Boolean) = OudsPreview(theme = theme) {
368-
OudsCheckboxItem(
369-
modifier = Modifier.padding(all = 10.dp),
370-
checked = true,
371-
label = "Label",
372-
onCheckedChange = {},
373-
icon = OudsControlItemIcon(imageVector = Icons.Filled.Call),
374-
constrainedMaxWidth = constrainedMaxWidth,
375-
edgeToEdge = false,
376-
divider = true
377-
)
378-
}
379-
380381
internal typealias OudsCheckboxItemPreviewParameter = OudsControlItemPreviewParameter<ToggleableState, Nothing>
381382

382383
internal class OudsCheckboxItemPreviewParameterProvider :

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
1717
import androidx.compose.foundation.interaction.Interaction
1818
import androidx.compose.foundation.interaction.MutableInteractionSource
1919
import androidx.compose.foundation.isSystemInDarkTheme
20-
import androidx.compose.foundation.layout.padding
2120
import androidx.compose.foundation.text.BasicSecureTextField
2221
import androidx.compose.foundation.text.KeyboardOptions
2322
import androidx.compose.foundation.text.input.InputTransformation
@@ -35,7 +34,6 @@ import androidx.compose.ui.text.input.KeyboardType
3534
import androidx.compose.ui.tooling.preview.Preview
3635
import androidx.compose.ui.tooling.preview.PreviewParameter
3736
import androidx.compose.ui.unit.Density
38-
import androidx.compose.ui.unit.dp
3937
import com.orange.ouds.core.R
4038
import com.orange.ouds.core.component.common.OudsError
4139
import com.orange.ouds.core.component.common.text.OudsAnnotatedHelperText
@@ -412,7 +410,7 @@ internal fun PreviewOudsPasswordInputWithRichText(
412410
theme: OudsThemeContract,
413411
darkThemeEnabled: Boolean,
414412
error: Boolean
415-
) = OudsPreview(modifier = Modifier.padding(all = 10.dp), theme = theme, darkThemeEnabled = darkThemeEnabled) {
413+
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
416414
OudsPasswordInput(
417415
state = rememberOudsPasswordInputState(""),
418416
label = "Password",

‎core/src/main/java/com/orange/ouds/core/component/OudsPinCodeInput.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ import com.orange.ouds.core.theme.currentWindowWidth
7474
import com.orange.ouds.core.theme.value
7575
import com.orange.ouds.core.utilities.OudsPreview
7676
import com.orange.ouds.core.utilities.OudsPreviewLightDark
77+
import com.orange.ouds.core.utilities.PreviewPaddingDefault
7778
import com.orange.ouds.core.utilities.buildPreviewAnnotatedErrorMessage
7879
import com.orange.ouds.core.utilities.buildPreviewAnnotatedHelperText
7980
import com.orange.ouds.core.utilities.getPreviewTheme
@@ -476,7 +477,7 @@ internal fun PreviewOudsPinCodeInput(
476477
theme: OudsThemeContract,
477478
darkThemeEnabled: Boolean,
478479
parameter: OudsPinCodeInputPreviewParameter
479-
) = OudsPreview(modifier = Modifier.padding(all = 16.dp), theme = theme, darkThemeEnabled = darkThemeEnabled) {
480+
) = OudsPreview(modifier = Modifier.padding(all = PreviewPaddingDefault), theme = theme, darkThemeEnabled = darkThemeEnabled) {
480481
with(parameter) {
481482
OudsPinCodeInput(
482483
value = value,
@@ -500,7 +501,7 @@ private fun PreviewOudsPinCodeInputWithRoundedCorners(@PreviewParameter(OudsPinC
500501
internal fun PreviewOudsPinCodeInputWithRoundedCorners(
501502
theme: OudsThemeContract,
502503
outlined: Boolean
503-
) = OudsPreview(modifier = Modifier.padding(all = 16.dp), theme = theme.mapSettings { it.copy(roundedCornerTextInputs = true) }) {
504+
) = OudsPreview(modifier = Modifier.padding(all = PreviewPaddingDefault), theme = theme.mapSettings { it.copy(roundedCornerTextInputs = true) }) {
504505
OudsPinCodeInput(
505506
value = "12",
506507
onValueChange = {},
@@ -521,7 +522,7 @@ internal fun PreviewOudsPinCodeInputWithRichText(
521522
theme: OudsThemeContract,
522523
darkThemeEnabled: Boolean,
523524
error: Boolean
524-
) = OudsPreview(modifier = Modifier.padding(all = 10.dp), theme = theme, darkThemeEnabled = darkThemeEnabled) {
525+
) = OudsPreview(modifier = Modifier.padding(all = PreviewPaddingDefault), theme = theme, darkThemeEnabled = darkThemeEnabled) {
525526
OudsPinCodeInput(
526527
value = "12",
527528
onValueChange = {},

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import androidx.compose.ui.semantics.Role
3131
import androidx.compose.ui.semantics.semantics
3232
import androidx.compose.ui.tooling.preview.Preview
3333
import androidx.compose.ui.tooling.preview.PreviewParameter
34-
import androidx.compose.ui.unit.dp
3534
import com.orange.ouds.core.component.common.OudsError
3635
import com.orange.ouds.core.extensions.collectInteractionStateAsState
3736
import com.orange.ouds.core.theme.OudsTheme
@@ -42,6 +41,7 @@ import com.orange.ouds.core.utilities.OudsPreviewDevice
4241
import com.orange.ouds.core.utilities.OudsPreviewLightDark
4342
import com.orange.ouds.core.utilities.OudsPreviewableComponent
4443
import com.orange.ouds.core.utilities.PreviewEnumEntries
44+
import com.orange.ouds.core.utilities.PreviewPaddingDefault
4545
import com.orange.ouds.core.utilities.buildPreviewAnnotatedErrorMessage
4646
import com.orange.ouds.core.utilities.getPreviewTheme
4747
import com.orange.ouds.theme.OudsThemeContract
@@ -307,9 +307,11 @@ internal fun PreviewOudsRadioButtonItemConstrainedMaxWidth(@PreviewParameter(Oud
307307
}
308308

309309
@Composable
310-
internal fun PreviewOudsRadioButtonItemConstrainedMaxWidth(theme: OudsThemeContract, constrainedMaxWidth: Boolean) = OudsPreview(theme = theme) {
310+
internal fun PreviewOudsRadioButtonItemConstrainedMaxWidth(
311+
theme: OudsThemeContract,
312+
constrainedMaxWidth: Boolean
313+
) = OudsPreview(modifier = Modifier.padding(all = PreviewPaddingDefault), theme = theme) {
311314
OudsRadioButtonItem(
312-
modifier = Modifier.padding(all = 10.dp),
313315
selected = false,
314316
label = "Label",
315317
onClick = {},
@@ -334,7 +336,6 @@ internal fun PreviewOudsRadioButtonItemWithRichText(
334336
darkThemeEnabled: Boolean
335337
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
336338
OudsRadioButtonItem(
337-
modifier = Modifier.padding(all = 10.dp),
338339
selected = true,
339340
label = "Label",
340341
onClick = {},

‎core/src/main/java/com/orange/ouds/core/component/OudsSwitchItem.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import androidx.compose.ui.semantics.Role
2929
import androidx.compose.ui.semantics.semantics
3030
import androidx.compose.ui.tooling.preview.Preview
3131
import androidx.compose.ui.tooling.preview.PreviewParameter
32-
import androidx.compose.ui.unit.dp
3332
import com.orange.ouds.core.component.common.OudsError
3433
import com.orange.ouds.core.extensions.collectInteractionStateAsState
3534
import com.orange.ouds.core.utilities.LoremIpsumText
@@ -38,6 +37,7 @@ import com.orange.ouds.core.utilities.OudsPreviewDevice
3837
import com.orange.ouds.core.utilities.OudsPreviewLightDark
3938
import com.orange.ouds.core.utilities.OudsPreviewableComponent
4039
import com.orange.ouds.core.utilities.PreviewEnumEntries
40+
import com.orange.ouds.core.utilities.PreviewPaddingDefault
4141
import com.orange.ouds.core.utilities.buildPreviewAnnotatedErrorMessage
4242
import com.orange.ouds.core.utilities.getPreviewTheme
4343
import com.orange.ouds.theme.OudsThemeContract
@@ -224,9 +224,11 @@ internal fun PreviewOudsSwitchItemConstrainedMaxWidth(@PreviewParameter(OudsCont
224224
}
225225

226226
@Composable
227-
internal fun PreviewOudsSwitchItemConstrainedMaxWidth(theme: OudsThemeContract, constrainedMaxWidth: Boolean) = OudsPreview(theme = theme) {
227+
internal fun PreviewOudsSwitchItemConstrainedMaxWidth(
228+
theme: OudsThemeContract,
229+
constrainedMaxWidth: Boolean
230+
) = OudsPreview(modifier = Modifier.padding(all = PreviewPaddingDefault), theme = theme) {
228231
OudsSwitchItem(
229-
modifier = Modifier.padding(all = 10.dp),
230232
checked = true,
231233
label = "Label",
232234
onCheckedChange = {},
@@ -250,7 +252,6 @@ internal fun PreviewOudsSwitchItemWithRichText(
250252
darkThemeEnabled: Boolean
251253
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
252254
OudsSwitchItem(
253-
modifier = Modifier.padding(all = 10.dp),
254255
checked = true,
255256
label = "Label",
256257
onCheckedChange = {},

‎core/src/main/java/com/orange/ouds/core/component/OudsTextArea.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ import com.orange.ouds.core.utilities.OudsPreviewDevice
7878
import com.orange.ouds.core.utilities.OudsPreviewLightDark
7979
import com.orange.ouds.core.utilities.OudsPreviewableComponent
8080
import com.orange.ouds.core.utilities.PreviewEnumEntries
81+
import com.orange.ouds.core.utilities.PreviewPaddingDefault
8182
import com.orange.ouds.core.utilities.buildPreviewAnnotatedErrorMessage
8283
import com.orange.ouds.core.utilities.buildPreviewAnnotatedHelperText
8384
import com.orange.ouds.core.utilities.getPreviewTheme
@@ -1109,7 +1110,7 @@ internal fun PreviewOudsTextAreaConstrainedMaxWidth(@PreviewParameter(OudsTextAr
11091110
internal fun PreviewOudsTextAreaConstrainedMaxWidth(
11101111
theme: OudsThemeContract,
11111112
constrainedMaxWidth: Boolean
1112-
) = OudsPreview(modifier = Modifier.padding(all = 10.dp), theme = theme) {
1113+
) = OudsPreview(modifier = Modifier.padding(all = PreviewPaddingDefault), theme = theme) {
11131114
OudsTextArea(
11141115
textFieldState = rememberTextFieldState(),
11151116
label = "Label",
@@ -1128,7 +1129,7 @@ private fun PreviewOudsTextAreaMultiLineValue(@PreviewParameter(OudsTextAreaMult
11281129
internal fun PreviewOudsTextAreaMultiLineValue(
11291130
theme: OudsThemeContract,
11301131
lineCount: Int
1131-
) = OudsPreview(modifier = Modifier.padding(all = 10.dp), theme = theme) {
1132+
) = OudsPreview(modifier = Modifier.padding(all = PreviewPaddingDefault), theme = theme) {
11321133
OudsTextArea(
11331134
textFieldState = rememberTextFieldState(List(lineCount) { "Line ${it + 1}" }.joinToString("\n")),
11341135
label = "$lineCount lines",
@@ -1148,7 +1149,7 @@ internal fun PreviewOudsTextAreaWithRichText(
11481149
theme: OudsThemeContract,
11491150
darkThemeEnabled: Boolean,
11501151
error: Boolean
1151-
) = OudsPreview(modifier = Modifier.padding(all = 10.dp), theme = theme, darkThemeEnabled = darkThemeEnabled) {
1152+
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
11521153
OudsTextArea(
11531154
textFieldState = rememberTextFieldState(),
11541155
label = "Label",

‎core/src/main/java/com/orange/ouds/core/component/OudsTextInput.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ import com.orange.ouds.core.utilities.OudsPreviewDevice
9191
import com.orange.ouds.core.utilities.OudsPreviewLightDark
9292
import com.orange.ouds.core.utilities.OudsPreviewableComponent
9393
import com.orange.ouds.core.utilities.PreviewEnumEntries
94+
import com.orange.ouds.core.utilities.PreviewPaddingDefault
9495
import com.orange.ouds.core.utilities.buildPreviewAnnotatedErrorMessage
9596
import com.orange.ouds.core.utilities.buildPreviewAnnotatedHelperText
9697
import com.orange.ouds.core.utilities.getPreviewEnumEntry
@@ -1588,18 +1589,17 @@ internal fun PreviewOudsTextInputWithRoundedCorners(theme: OudsThemeContract) =
15881589
private fun PreviewOudsTextInputWithLongLabels() = PreviewOudsTextInputWithLongLabels(theme = getPreviewTheme())
15891590

15901591
@Composable
1591-
internal fun PreviewOudsTextInputWithLongLabels(theme: OudsThemeContract) = OudsPreview(theme = theme) {
1592+
internal fun PreviewOudsTextInputWithLongLabels(
1593+
theme: OudsThemeContract
1594+
) = OudsPreview(modifier = Modifier.padding(all = PreviewPaddingDefault), theme = theme) {
15921595
val labels = listOf("Two lines\nlabel", "Three\nlines\nlabel")
1593-
val modifier = Modifier.padding(all = 10.dp)
1594-
Column {
1596+
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
15951597
labels.forEach { label ->
15961598
OudsTextInput(
1597-
modifier = modifier,
15981599
textFieldState = rememberTextFieldState(),
15991600
label = label,
16001601
)
16011602
OudsTextInput(
1602-
modifier = modifier,
16031603
textFieldState = rememberTextFieldState("text"),
16041604
label = label,
16051605
)
@@ -1618,7 +1618,7 @@ internal fun PreviewOudsTextInputConstrainedMaxWidth(@PreviewParameter(OudsTextI
16181618
internal fun PreviewOudsTextInputConstrainedMaxWidth(
16191619
theme: OudsThemeContract,
16201620
constrainedMaxWidth: Boolean
1621-
) = OudsPreview(modifier = Modifier.padding(all = 10.dp), theme = theme) {
1621+
) = OudsPreview(modifier = Modifier.padding(all = PreviewPaddingDefault), theme = theme) {
16221622
OudsTextInput(
16231623
textFieldState = rememberTextFieldState(),
16241624
label = "Label",
@@ -1639,7 +1639,7 @@ internal fun PreviewOudsTextInputWithRichText(
16391639
theme: OudsThemeContract,
16401640
darkThemeEnabled: Boolean,
16411641
error: Boolean
1642-
) = OudsPreview(modifier = Modifier.padding(all = 10.dp), theme = theme, darkThemeEnabled = darkThemeEnabled) {
1642+
) = OudsPreview(theme = theme, darkThemeEnabled = darkThemeEnabled) {
16431643
OudsTextInput(
16441644
textFieldState = rememberTextFieldState(),
16451645
label = "Label",

‎theme-orange-compact/src/test/snapshots/images/com.orange.ouds.core.test_OudsAlertMessageTest$WithRichText_takeDarkThemeSnapshot.png‎

-2.88 KB

‎theme-orange-compact/src/test/snapshots/images/com.orange.ouds.core.test_OudsAlertMessageTest$WithRichText_takeLightThemeSnapshot.png‎

-2.37 KB

0 commit comments

Comments
 (0)