Skip to content

Commit 63e4d12

Browse files
authored
Merge pull request #1536 from dimagi/em/clickable-icons-alt-text
Alt text for icons
2 parents 1eaac28 + 4d161d1 commit 63e4d12

File tree

5 files changed

+24
-1
lines changed

5 files changed

+24
-1
lines changed

Diff for: src/main/java/org/commcare/formplayer/beans/menus/EntityBean.java

+9
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class EntityBean {
1010
private Object[] data;
1111

1212
private String groupKey;
13+
private String[] altText;
1314

1415
public EntityBean() {
1516
}
@@ -42,6 +43,14 @@ public void setGroupKey(String groupKey) {
4243
this.groupKey = groupKey;
4344
}
4445

46+
public String[] getAltText() {
47+
return altText;
48+
}
49+
50+
public void setAltText(String[] altText) {
51+
this.altText = altText;
52+
}
53+
4554
@Override
4655
public String toString() {
4756
return "EntityBean with id=" + id + ", data=" + Arrays.toString(data);

Diff for: src/main/java/org/commcare/formplayer/beans/menus/EntityDetailResponse.java

+10
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public class EntityDetailResponse {
3333
private EntityBean[] entities;
3434
protected Style[] styles;
3535
protected String[] headers;
36+
protected String[] altText;
3637
protected String title;
3738
protected boolean isUseNodeset;
3839

@@ -53,6 +54,7 @@ public EntityDetailResponse(EntityDetailSubscreen entityScreen, String title) {
5354
this.headers = entityScreen.getHeaders();
5455
this.styles = entityScreen.getStyles();
5556
this.tiles = processCaseTiles(entityScreen.getDetail());
57+
this.altText = entityScreen.getAltText();
5658
}
5759

5860
private static Object[] processDetails(Object[] data) {
@@ -173,6 +175,14 @@ public void setTitle(String title) {
173175
this.title = title;
174176
}
175177

178+
public String[] getAltText() {
179+
return altText;
180+
}
181+
182+
public void setAltText(String[] altText) {
183+
this.altText = altText;
184+
}
185+
176186
public boolean isUsesCaseTiles() {
177187
return usesCaseTiles;
178188
}

Diff for: src/main/java/org/commcare/formplayer/beans/menus/EntityListResponse.java

+1
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ private static EntityBean toEntityBean(Entity<TreeReference> entity,
245245
}
246246
entityBean.setData(data);
247247
entityBean.setGroupKey(entity.getGroupKey());
248+
entityBean.setAltText(entity.getAltText());
248249
return entityBean;
249250
}
250251

Diff for: src/test/java/org/commcare/formplayer/tests/CaseListLazyLoadingTests.kt

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import org.commcare.formplayer.junit.*
88
import org.commcare.formplayer.junit.Installer.Companion.getInstallReference
99
import org.commcare.formplayer.junit.request.SessionNavigationRequest
1010
import org.commcare.formplayer.utils.TestContext
11+
import org.junit.jupiter.api.Assertions.assertArrayEquals
1112
import org.junit.jupiter.api.Assertions.assertEquals
1213
import org.junit.jupiter.api.Test
1314
import org.junit.jupiter.api.extension.ExtendWith
@@ -55,6 +56,7 @@ class CaseListLazyLoadingTests {
5556
assertEquals(singleEntity.data[0], "Batman Begins")
5657
assertEquals(singleEntity.data[1], "Batman Begins")
5758
assertEquals(singleEntity.groupKey, "Batman Begins")
59+
assertArrayEquals(singleEntity.altText, arrayOfNulls<String>(singleEntity.data.size))
5860

5961
response = navigate(selections, EntityListResponse::class.java, 1, 3)
6062
entitites = response.entities
@@ -64,6 +66,7 @@ class CaseListLazyLoadingTests {
6466
assertEquals(singleEntity.data[0], "Rudolph")
6567
assertEquals(singleEntity.data[1], "Rudolph")
6668
assertEquals(singleEntity.groupKey, "Rudolph")
69+
assertArrayEquals(singleEntity.altText, arrayOfNulls<String>(singleEntity.data.size))
6770
}
6871

6972
private fun <T : BaseResponseBean> navigate(

0 commit comments

Comments
 (0)