Skip to content

fix(tag): scale functional icons and loader for a11y reasons #960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
florentmaitre merged 4 commits into from
Dec 11, 2025
Merged

fix(tag): scale functional icons and loader for a11y reasons #960

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da1f129
Scale functional icon and loader for a11y
paulinea Nov 28, 2025
0c0e8df
Scale all assets
paulinea Dec 4, 2025
bb80cd4
Review: Simplify code
paulinea Dec 11, 2025
ce513ea
Review: Remove useless size from extra parameters
paulinea Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions core/src/main/java/com/orange/ouds/core/component/OudsTag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.sizeIn
Expand All @@ -36,6 +35,7 @@ import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.hideFromAccessibility
Expand Down Expand Up @@ -154,21 +154,21 @@ fun OudsTag(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(betweenAssetAndLabelSpace(size = size), Alignment.CenterHorizontally),
) {
val contentColor = contentColor(status = status, appearance = appearance, hasLoader = hasLoader, enabled = enabled)

if (hasAsset) {
Box(
modifier = Modifier
.size(assetSize(size))
.semantics { hideFromAccessibility() }
) {
if (hasLoader) {
ProgressIndicator(status = status, appearance = appearance, size = size, progress = loader.progress, enabled = enabled)
} else {
val isBulletIcon = status.icon is OudsTagIcon.Bullet
val iconPadding = if (isBulletIcon) bulletPadding(size = size) else iconPadding(size = size)
val scale = LocalConfiguration.current.fontScale
status.icon?.Content(
modifier = Modifier.padding(all = iconPadding),
modifier = Modifier
.size(assetSize(size) * scale)
.padding(all = iconPadding),
extraParameters = OudsTagIcon.ExtraParameters(
tint = iconColor(status = status, appearance = appearance, enabled = enabled, isBulletIcon = isBulletIcon),
status = status,
Expand All @@ -180,7 +180,7 @@ fun OudsTag(
}
Text(
text = label,
color = contentColor,
color = contentColor(status = status, appearance = appearance, hasLoader = hasLoader, enabled = enabled),
style = textStyle(size)
)
}
Expand Down Expand Up @@ -352,15 +352,16 @@ private fun loaderPadding(size: OudsTagSize): Dp {

@Composable
private fun ProgressIndicator(status: OudsTagStatus, appearance: OudsTagAppearance, size: OudsTagSize, progress: Float?, enabled: Boolean) {
val scale = LocalConfiguration.current.fontScale
val modifier = Modifier
.size(assetSize(size) * scale)
.padding(all = loaderPadding(size = size))
.fillMaxSize()
.semantics { hideFromAccessibility() }
val color = contentColor(status = status, appearance = appearance, hasLoader = true, enabled = enabled)
val strokeWidth = when (size) {
OudsTagSize.Default -> 2.4.dp
OudsTagSize.Small -> 2.dp
}
} * scale
val trackColor = Color.Transparent
val strokeCap = StrokeCap.Butt
if (progress != null) {
Expand Down