Skip to content

Add more accessibility support. #14134

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add more accessibility support. #14134

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
3 changes: 2 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,8 @@ private fun BioRow(
size = 36.dp,
colors = IconButtons.iconButtonColors(
containerColor = SignalTheme.colors.colorSurface4
)
),
contentDescription = stringResource(R.string.ManageProfileFragment_link_setting_text)
) {
Icon(
painter = painterResource(R.drawable.symbol_qrcode_24),
Expand Down
9 changes: 6 additions & 3 deletions ...ughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,20 @@ private fun ButtonBar(
enabled = linkState is UsernameLinkState.Present,
onClick = onLinkClicked,
iconResId = R.drawable.symbol_link_24,
labelResId = R.string.UsernameLinkSettings_link_button_label
labelResId = R.string.UsernameLinkSettings_link_button_label,
contentDescriptionId = R.string.UsernameLinkSettings_link_button_label
)
Buttons.ActionButton(
onClick = onShareClicked,
iconResId = R.drawable.symbol_share_android_24,
labelResId = R.string.UsernameLinkSettings_share_button_label
labelResId = R.string.UsernameLinkSettings_share_button_label,
contentDescriptionId = R.string.UsernameLinkSettings_share_button_label
)
Buttons.ActionButton(
onClick = onColorClicked,
iconResId = R.drawable.symbol_color_24,
labelResId = R.string.UsernameLinkSettings_color_button_label
labelResId = R.string.UsernameLinkSettings_color_button_label,
contentDescriptionId = R.string.UsernameLinkSettings_color_button_label
)
}
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ object StoriesLandingItem {
avatarView.displayProfileAvatar(model.data.storyRecipient)
badgeView.setBadgeFromRecipient(model.data.storyRecipient)
}
badgeView.isClickable = false

val record = model.data.primaryStory.messageRecord as MmsMessageRecord

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/edit_profile_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/ic_arrow_left_24"
app:navigationContentDescription="@string/DSLSettingsToolbar__navigate_up"
app:title="@string/CreateProfileActivity__profile"
app:titleTextAppearance="@style/Signal.Text.TitleLarge" />

Expand Down
5 changes: 4 additions & 1 deletion core-ui/src/main/java/org/signal/core/ui/compose/Buttons.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ object Buttons {
@DrawableRes iconResId: Int,
@StringRes labelResId: Int,
modifier: Modifier = Modifier,
@StringRes contentDescriptionId: Int? = null,
enabled: Boolean = true
) {
ActionButton(
Expand All @@ -193,7 +194,9 @@ object Buttons {
) {
Image(
painter = painterResource(iconResId),
contentDescription = null,
contentDescription = contentDescriptionId?.let {
stringResource(it)
},
modifier = Modifier.padding(16.dp),
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSecondaryContainer)
)
Expand Down
8 changes: 8 additions & 0 deletions core-ui/src/main/java/org/signal/core/ui/compose/IconButtons.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import org.signal.core.ui.compose.copied.androidx.compose.material3.IconButtonColors
Expand Down Expand Up @@ -74,6 +76,7 @@ object IconButtons {
shape: Shape = CircleShape,
enabled: Boolean = true,
colors: IconButtonColors = iconButtonColors(),
contentDescription: String?= null,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
content: @Composable () -> Unit
) {
Expand All @@ -83,6 +86,11 @@ object IconButtons {
.size(size)
.clip(shape)
.background(color = colors.containerColor(enabled).value)
.semantics {
contentDescription?.let {
this.contentDescription = it
}
}
.clickable(
onClick = onClick,
enabled = enabled,
Expand Down