Skip to content

PM-40497: bug: Update the plan price row announcement for accessibility #7170

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
david-livefront merged 1 commit into from
Jul 16, 2026
Merged

PM-40497: bug: Update the plan price row announcement for accessibility #7170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.hideFromAccessibility
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextAlign
Expand Down Expand Up @@ -366,22 +369,33 @@ private fun PriceRow(
rate: String,
modifier: Modifier = Modifier,
) {
val formattedContentDescription = stringResource(
id = BitwardenString.per_month_cancel_anytime_content_description,
formatArgs = arrayOf(rate),
)
Row(
horizontalArrangement = Arrangement.Center,
modifier = modifier,
modifier = modifier
.semantics(mergeDescendants = true) {
contentDescription = formattedContentDescription
},
) {
Text(
text = rate,
style = BitwardenTheme.typography.labelMedium,
color = BitwardenTheme.colorScheme.text.primary,
modifier = Modifier.alignByBaseline(),
modifier = Modifier
.semantics { hideFromAccessibility() }
.alignByBaseline(),
)
Spacer(modifier = Modifier.width(width = 4.dp))
Text(
text = stringResource(id = BitwardenString.per_month_cancel_anytime),
style = BitwardenTheme.typography.labelSmall,
color = BitwardenTheme.colorScheme.text.primary,
modifier = Modifier.alignByBaseline(),
modifier = Modifier
.semantics { hideFromAccessibility() }
.alignByBaseline(),
)
}
}
Expand Down
1 change: 1 addition & 0 deletions ui/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,6 +1277,7 @@ Do you want to switch to this account?</string>
<string name="upgrade_pending_message">Your upgrade is being processed. You’ll remain on the free plan until it’s complete. Sync now to check, or continue and it will update automatically.</string>
<string name="unlock_premium_features">Unlock more advanced features with a Premium plan.</string>
<string name="per_month_cancel_anytime">/ month · Cancel anytime</string>
<string name="per_month_cancel_anytime_content_description">%1$s per month, cancel anytime</string>
<string name="built_in_authenticator">Built-in authenticator</string>
<string name="emergency_access">Emergency access</string>
<string name="secure_file_storage">Secure file storage</string>
Expand Down
Loading