Skip to content

[Rally] Content description, tabs, and grouping views #400

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
merged 4 commits into from
Feb 17, 2021
Merged

[Rally] Content description, tabs, and grouping views #400

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
881c128
[Rally] Specify content description and role of tabs
JolandaVerhoef Feb 16, 2021
b3bc011
[Rally] Group elements at a higher granularity
JolandaVerhoef Feb 16, 2021
68bfcfe
Merge branch 'dev_beta01' into jv/rally_a11y
JolandaVerhoef Feb 17, 2021
2dd3282
[Rally] Add comment explaining use of mergeDescendants
JolandaVerhoef Feb 17, 2021
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
Next Next commit
[Rally] Specify content description and role of tabs
  • Loading branch information
@JolandaVerhoef
JolandaVerhoef committed Feb 16, 2021
commit 881c1280ccf7d5e27205abb0b9b7fadf4772130c
7 changes: 5 additions & 2 deletions Rally/app/src/main/java/com/example/compose/rally/ui/components/TopAppBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.clearAndSetSemantics
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.example.compose.rally.RallyScreen
Expand Down Expand Up @@ -96,6 +98,7 @@ private fun RallyTab(
.selectable(
selected = selected,
onClick = onSelected,
role = Role.Tab,
interactionSource = remember { MutableInteractionSource() },
indication = rememberRipple(
bounded = false,
Expand All @@ -104,10 +107,10 @@ private fun RallyTab(
)
)
) {
Icon(imageVector = icon, contentDescription = null, tint = tabTintColor)
Icon(imageVector = icon, contentDescription = text, tint = tabTintColor)
if (selected) {
Spacer(Modifier.width(12.dp))
Text(text, color = tabTintColor)
Text(text, color = tabTintColor, modifier = Modifier.clearAndSetSemantics {})
}
}
}
Expand Down