Merge pull request #144 from craveytrain/fix-android-xml-format-value

Moves value from from attribute
salesforce-ux · Jun 4, 2018 · 9b9306a · 9b9306a
2 parents 55b8ca3 + 79a8c34
commit 9b9306a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/lib/__tests__/__snapshots__/formats.js.snap b/lib/__tests__/__snapshots__/formats.js.snap
@@ -3,11 +3,11 @@
 exports[`android.xml 1`] = `
 "<?xml version=\\"1.0\\" encoding=\\"UTF-8\\"?>
 <resources>
-  <property name=\\"TOKEN_COLOR\\" category=\\"background-color\\" value=\\"#bada55\\"/>
-  <property name=\\"TOKEN_SIZE\\" category=\\"spacing\\" value=\\"20px\\"/>
-  <property name=\\"TOKEN_STRING\\" category=\\"test\\" value=\\"/assets/images\\"/>
-  <property name=\\"TOKEN_NUMBER\\" category=\\"test\\" value=\\"2\\"/>
-  <property name=\\"TOKEN_QUOTES\\" category=\\"test\\" value=\\"&apos;Salesforce Sans&apos;, &quot;Helvetica Neue&quot;, sans-serif\\"/>
+  <property name=\\"TOKEN_COLOR\\" category=\\"background-color\\">#bada55</property>
+  <property name=\\"TOKEN_SIZE\\" category=\\"spacing\\">20px</property>
+  <property name=\\"TOKEN_STRING\\" category=\\"test\\">/assets/images</property>
+  <property name=\\"TOKEN_NUMBER\\" category=\\"test\\">2</property>
+  <property name=\\"TOKEN_QUOTES\\" category=\\"test\\">&apos;Salesforce Sans&apos;, &quot;Helvetica Neue&quot;, sans-serif</property>
 </resources>"
 `;
 

diff --git a/lib/formats/android.xml.js b/lib/formats/android.xml.js
@@ -17,17 +17,21 @@ module.exports = def => {
               return "property";
           }
         })();
+
         return {
-          [key]: {
-            _attr: {
-              name: _.toUpper(prop.get("name")),
-              category: prop.get("category"),
-              value: prop.get("value")
-            }
-          }
+          [key]: [
+            {
+              _attr: {
+                name: _.toUpper(prop.get("name")),
+                category: prop.get("category")
+              }
+            },
+            prop.get("value")
+          ]
         };
       })
       .toJS()
   };
+
   return xml(o, { indent: "  ", declaration: true });
 };