Skip to content

Commit 15cc6fc

Browse files
committed
Use Icons.Filled.FavoriteBorder instead of R.drawable.star_on as icon resource in previews and samples
1 parent d3f5b99 commit 15cc6fc

5 files changed

Lines changed: 18 additions & 13 deletions

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ import androidx.compose.foundation.layout.padding
2828
import androidx.compose.foundation.layout.size
2929
import androidx.compose.foundation.layout.widthIn
3030
import androidx.compose.foundation.shape.RoundedCornerShape
31+
import androidx.compose.material.icons.Icons
32+
import androidx.compose.material.icons.filled.FavoriteBorder
3133
import androidx.compose.material3.CircularProgressIndicator
3234
import androidx.compose.material3.ExperimentalMaterial3Api
3335
import androidx.compose.material3.Text
@@ -682,7 +684,7 @@ internal fun PreviewOudsButton(
682684
) = OudsPreview(darkThemeEnabled = darkThemeEnabled) {
683685
with(parameter) {
684686
val label = if (hasLabel) hierarchy.name else null
685-
val icon = if (hasIcon) OudsButton.Icon(painterResource(id = android.R.drawable.star_on), "") else null
687+
val icon = if (hasIcon) OudsButton.Icon(Icons.Filled.FavoriteBorder, "") else null
686688
val content: @Composable () -> Unit = {
687689
PreviewStates<OudsButton.State>(columnCount = 2) {
688690
OudsButton(nullableIcon = icon, nullableLabel = label, onClick = {}, hierarchy = hierarchy)

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

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

1515
import androidx.compose.foundation.interaction.MutableInteractionSource
1616
import androidx.compose.foundation.isSystemInDarkTheme
17+
import androidx.compose.material.icons.Icons
18+
import androidx.compose.material.icons.filled.FavoriteBorder
1719
import androidx.compose.runtime.Composable
1820
import androidx.compose.ui.Modifier
19-
import androidx.compose.ui.res.painterResource
2021
import androidx.compose.ui.tooling.preview.PreviewLightDark
2122
import androidx.compose.ui.tooling.preview.PreviewParameter
2223
import com.orange.ouds.core.utilities.OudsPreview
@@ -118,7 +119,7 @@ private fun PreviewOudsFilterChip(@PreviewParameter(OudsFilterChipPreviewParamet
118119
internal fun PreviewOudsFilterChip(darkThemeEnabled: Boolean, parameter: OudsFilterChipPreviewParameter) = OudsPreview(darkThemeEnabled = darkThemeEnabled) {
119120
with(parameter) {
120121
val label = if (hasLabel) "Label" else null
121-
val icon = if (hasIcon) OudsChip.Icon(painterResource(id = android.R.drawable.star_on), "") else null
122+
val icon = if (hasIcon) OudsChip.Icon(Icons.Filled.FavoriteBorder, "") else null
122123
PreviewStates<OudsChip.State>(columnCount = 3) {
123124
OudsFilterChip(selected = selected, nullableIcon = icon, nullableLabel = label, onClick = {})
124125
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import androidx.compose.foundation.layout.heightIn
2323
import androidx.compose.foundation.layout.padding
2424
import androidx.compose.foundation.layout.size
2525
import androidx.compose.foundation.layout.widthIn
26+
import androidx.compose.material.icons.Icons
27+
import androidx.compose.material.icons.filled.FavoriteBorder
2628
import androidx.compose.material3.ExperimentalMaterial3Api
2729
import androidx.compose.material3.Text
2830
import androidx.compose.runtime.Composable
@@ -429,7 +431,7 @@ internal fun PreviewOudsLink(
429431
parameter: OudsLinkPreviewParameter
430432
) = OudsPreview(darkThemeEnabled = darkThemeEnabled) {
431433
with(parameter) {
432-
val icon = if (hasIcon) OudsLink.Icon(painter = painterResource(id = android.R.drawable.star_on)) else null
434+
val icon = if (hasIcon) OudsLink.Icon(Icons.Filled.FavoriteBorder) else null
433435
val linkPreview: @Composable () -> Unit = {
434436
PreviewStates<OudsLink.State>(columnCount = 3) {
435437
OudsLink(

core/src/main/java/com/orange/ouds/core/component/samples/OudsButtonSamples.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
package com.orange.ouds.core.component.samples
1414

15-
import android.R
15+
import androidx.compose.material.icons.Icons
16+
import androidx.compose.material.icons.filled.FavoriteBorder
1617
import androidx.compose.runtime.Composable
17-
import androidx.compose.ui.res.painterResource
1818
import com.orange.ouds.core.component.OudsButton
1919
import com.orange.ouds.core.component.OudsColoredBox
2020

@@ -41,7 +41,7 @@ internal fun OudsButtonTextOnlyOnColoredBackgroundSample() {
4141
internal fun OudsButtonIconOnlySample() {
4242
OudsButton(
4343
icon = OudsButton.Icon(
44-
painterResource(id = R.drawable.star_on),
44+
Icons.Filled.FavoriteBorder,
4545
"Content description"
4646
),
4747
onClick = { /* Do something! */ }
@@ -54,7 +54,7 @@ internal fun OudsButtonIconOnlyOnColoredBackgroundSample() {
5454
// The colors of this button are automatically adjusted to maximize the contrast with the colored background.
5555
OudsButton(
5656
icon = OudsButton.Icon(
57-
painterResource(id = R.drawable.star_on),
57+
Icons.Filled.FavoriteBorder,
5858
"Content description"
5959
),
6060
onClick = { /* Do something! */ }
@@ -66,7 +66,7 @@ internal fun OudsButtonIconOnlyOnColoredBackgroundSample() {
6666
internal fun OudsButtonTextAndIconSample() {
6767
OudsButton(
6868
icon = OudsButton.Icon(
69-
painterResource(id = R.drawable.star_on),
69+
Icons.Filled.FavoriteBorder,
7070
"Content description"
7171
),
7272
label = "Label",
@@ -80,7 +80,7 @@ internal fun OudsButtonTextAndIconOnColoredBackgroundSample() {
8080
// The colors of this button are automatically adjusted to maximize the contrast with the colored background.
8181
OudsButton(
8282
icon = OudsButton.Icon(
83-
painterResource(id = R.drawable.star_on),
83+
Icons.Filled.FavoriteBorder,
8484
"Content description"
8585
),
8686
label = "Label",

core/src/main/java/com/orange/ouds/core/component/samples/OudsLinkSamples.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212

1313
package com.orange.ouds.core.component.samples
1414

15-
import android.R
15+
import androidx.compose.material.icons.Icons
16+
import androidx.compose.material.icons.filled.FavoriteBorder
1617
import androidx.compose.runtime.Composable
17-
import androidx.compose.ui.res.painterResource
1818
import com.orange.ouds.core.component.OudsLink
1919

2020
@Composable
2121
internal fun OudsLinkSample() {
2222
OudsLink(
2323
label = "Link",
24-
icon = OudsLink.Icon(painterResource(id = R.drawable.star_on)),
24+
icon = OudsLink.Icon(Icons.Filled.FavoriteBorder),
2525
onClick = { /* Do something! */ },
2626
)
2727
}

0 commit comments

Comments
 (0)