Merge pull request #1394 from dimagi/copy_of_rc/field-shading

Copy of rc/field shading
dimagi · Jan 5, 2024 · eaf846c · eaf846c
2 parents 544393c + 8d8d056
commit eaf846c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/src/main/java/org/commcare/suite/model/DetailField.java b/src/main/java/org/commcare/suite/model/DetailField.java
@@ -50,6 +50,7 @@ public class DetailField implements Externalizable {
     private EndpointAction endpointAction;
 
     private boolean showBorder;
+    private boolean showShading;
 
     /**
      * Optional hint which provides a hint for whether rich media should be
@@ -210,6 +211,7 @@ public void readExternal(DataInputStream in, PrototypeFactory pf) throws IOExcep
         cssID = ExtUtil.nullIfEmpty(ExtUtil.readString(in));
         endpointAction = (EndpointAction)ExtUtil.read(in, new ExtWrapNullable(EndpointAction.class), pf);
         showBorder = ExtUtil.readBool(in);
+        showShading = ExtUtil.readBool(in);
     }
 
     @Override
@@ -241,6 +243,7 @@ public void writeExternal(DataOutputStream out) throws IOException {
         ExtUtil.writeString(out, ExtUtil.emptyIfNull(cssID));
         ExtUtil.write(out, new ExtWrapNullable(endpointAction));
         ExtUtil.writeBool(out, showBorder);
+        ExtUtil.writeBool(out, showShading);
     }
 
     public int getGridX() {
@@ -284,6 +287,10 @@ public boolean getShowBorder() {
         return showBorder;
     }
 
+    public boolean getShowShading() {
+        return showShading;
+    }
+
     public static class Builder {
         final DetailField field;
 
@@ -410,5 +417,7 @@ public void setEndpointAction(EndpointAction endpointAction) {
         public void setShowBorder(boolean showBorder) {
             field.showBorder = showBorder;
         }
+
+        public void setShowShading(boolean showShading) { field.showShading = showShading; }
     }
 }
diff --git a/src/main/java/org/commcare/suite/model/Style.java b/src/main/java/org/commcare/suite/model/Style.java
@@ -12,6 +12,7 @@ public class Style {
     private String verticalAlign;
 
     private boolean showBorder;
+    private boolean showShading;
 
     public Style(){}
 
@@ -38,6 +39,7 @@ public Style(DetailField detail){
         verticalAlign = detail.getVerticalAlign();
         horizontalAlign = detail.getHorizontalAlign();
         showBorder = detail.getShowBorder();
+        showShading = detail.getShowShading();
     }
 
     enum DisplayFormat {
@@ -125,4 +127,8 @@ public String getVerticalAlign() {
     public boolean getShowBorder() {
         return showBorder;
     }
+
+    public boolean getShowShading() {
+        return showShading;
+    }
 }
diff --git a/src/main/java/org/commcare/xml/StyleParser.java b/src/main/java/org/commcare/xml/StyleParser.java
@@ -43,6 +43,9 @@ public Integer parse() throws InvalidStructureException, IOException, XmlPullPar
         String showBorder = parser.getAttributeValue(null, "show-border");
         builder.setShowBorder(Boolean.parseBoolean(showBorder));
 
+        String showShading = parser.getAttributeValue(null, "show-shading");
+        builder.setShowShading(Boolean.parseBoolean(showShading));
+
         parser.nextTag();
 
         return Integer.valueOf(1);

diff --git a/src/test/java/org/commcare/backend/suite/model/test/AppStructureTests.java b/src/test/java/org/commcare/backend/suite/model/test/AppStructureTests.java
@@ -234,6 +234,13 @@ public void testDetailWithBorder() {
         assertTrue(field1.getShowBorder());
     }
 
+    @Test
+    public void testDetailWithShading() {
+        Detail detail = mApp.getSession().getPlatform().getDetail("m0_case_short");
+        DetailField field1 = detail.getFields()[0];
+        assertTrue(field1.getShowShading());
+    }
+
     @Test
     public void testDefaultEndpointRelevancy_shouldBeTrue() {
         Endpoint endpoint = mApp.getSession().getPlatform().getEndpoint("endpoint_with_no_relevancy");

diff --git a/src/test/resources/app_structure/suite.xml b/src/test/resources/app_structure/suite.xml
@@ -62,7 +62,7 @@
       </field>
     </lookup>
     <field>
-      <style horz-align="left" vert-align="center" font-size="small" show-border="true">
+      <style horz-align="left" vert-align="center" font-size="small" show-border="true" show-shading="true">
         <grid grid-height="2" grid-width="3" grid-x="3" grid-y="5"/>
       </style>
       <header>