Skip to content

Commit c9f3cbe

Browse files
feat: A11y
1 parent 11657ff commit c9f3cbe

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

course/src/main/java/org/openedx/course/presentation/home/AssignmentsHomePagerCardContent.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import androidx.compose.ui.Alignment
2626
import androidx.compose.ui.Modifier
2727
import androidx.compose.ui.draw.clip
2828
import androidx.compose.ui.res.stringResource
29+
import androidx.compose.ui.semantics.semantics
2930
import androidx.compose.ui.text.font.FontWeight
3031
import androidx.compose.ui.unit.dp
3132
import org.openedx.core.domain.model.Block
@@ -71,7 +72,9 @@ fun AssignmentsHomePagerCardContent(
7172

7273
// Progress section
7374
Row(
74-
modifier = Modifier.fillMaxWidth(),
75+
modifier = Modifier
76+
.fillMaxWidth()
77+
.semantics(mergeDescendants = true) {},
7578
verticalAlignment = Alignment.CenterVertically
7679
) {
7780
Icon(

course/src/main/java/org/openedx/course/presentation/home/CourseCompletionHomePagerCardContent.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.compose.runtime.Composable
1313
import androidx.compose.ui.Alignment
1414
import androidx.compose.ui.Modifier
1515
import androidx.compose.ui.res.stringResource
16+
import androidx.compose.ui.semantics.semantics
1617
import androidx.compose.ui.text.font.FontWeight
1718
import androidx.compose.ui.tooling.preview.Preview
1819
import androidx.compose.ui.unit.dp
@@ -58,7 +59,9 @@ fun CourseCompletionHomePagerCardContent(
5859
verticalAlignment = Alignment.CenterVertically
5960
) {
6061
Column(
61-
modifier = Modifier.weight(1f),
62+
modifier = Modifier
63+
.weight(1f)
64+
.semantics(mergeDescendants = true) {},
6265
verticalArrangement = Arrangement.spacedBy(8.dp)
6366
) {
6467
Text(

course/src/main/java/org/openedx/course/presentation/home/GradesHomePagerCardContent.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import androidx.compose.ui.Alignment
2121
import androidx.compose.ui.Modifier
2222
import androidx.compose.ui.graphics.Color
2323
import androidx.compose.ui.res.stringResource
24+
import androidx.compose.ui.semantics.semantics
2425
import androidx.compose.ui.text.font.FontWeight
2526
import androidx.compose.ui.text.style.TextOverflow
2627
import androidx.compose.ui.unit.dp
@@ -99,7 +100,9 @@ private fun GradeCard(
99100
val gradePercent = if (possible > 0) (earned.toFloat() / possible * 100).toInt() else 0
100101

101102
Card(
102-
modifier = modifier.fillMaxWidth(),
103+
modifier = modifier
104+
.fillMaxWidth()
105+
.semantics(mergeDescendants = true) {},
103106
backgroundColor = color.copy(alpha = 0.1f),
104107
shape = MaterialTheme.appShapes.material.small,
105108
elevation = 0.dp,
@@ -179,14 +182,14 @@ private fun GradeCardsGrid(
179182
rowPolicies.forEachIndexed { index, policy ->
180183
val policyIndex = assignmentPolicies.indexOf(policy)
181184
GradeCard(
185+
modifier = Modifier.weight(1f),
182186
policy = policy,
183187
progress = progress,
184188
color = if (assignmentColors.isNotEmpty()) {
185189
assignmentColors[policyIndex % assignmentColors.size]
186190
} else {
187191
MaterialTheme.appColors.primary
188192
},
189-
modifier = Modifier.weight(1f)
190193
)
191194
}
192195
// Fill remaining space if row has only 1 item

course/src/main/java/org/openedx/course/presentation/home/VideosHomePagerCardContent.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import androidx.compose.ui.Alignment
2121
import androidx.compose.ui.Modifier
2222
import androidx.compose.ui.draw.clip
2323
import androidx.compose.ui.res.stringResource
24+
import androidx.compose.ui.semantics.semantics
2425
import androidx.compose.ui.text.font.FontWeight
2526
import androidx.compose.ui.unit.dp
2627
import org.openedx.core.domain.model.Block
@@ -64,7 +65,9 @@ fun VideosHomePagerCardContent(
6465
)
6566
Spacer(modifier = Modifier.height(12.dp))
6667
Row(
67-
modifier = Modifier.fillMaxWidth(),
68+
modifier = Modifier
69+
.fillMaxWidth()
70+
.semantics(mergeDescendants = true) {},
6871
verticalAlignment = Alignment.CenterVertically
6972
) {
7073
Icon(

0 commit comments

Comments
 (0)