Use new touch signal & image-view URL specified as a string

Change-Id: Ied59238560a6e49f4ed60b437a0225cf07e425ea

diff --git a/resources/scripts/animation.json b/resources/scripts/animation.json
index f2bb9a3..bff6d83 100644 (file)
--- a/resources/scripts/animation.json
+++ b/resources/scripts/animation.json
@@ -92,7 +92,7 @@
     "size": [200, 200, 1],
     "orientation": [0, 0, 30],
     "signals": [{
-      "name": "touched",
+      "name": "touch",
       "action": "play",
       "animation": "animate"
     }]
@@ -106,7 +106,7 @@
     "position": [-150, -50, 0],
     "text": "or me",
     "signals": [{
-      "name": "touched",
+      "name": "touch",
       "action": "play",
       "animation": "pathAnimation"
     }]
@@ -119,14 +119,12 @@
   }, {
     "name": "image",
     "type": "ImageView",
-    "image": {
-      "url": "{DEMO_IMAGE_DIR}gallery-large-21.jpg"
-    },
+    "image": "{DEMO_IMAGE_DIR}gallery-large-21.jpg",
     "relayoutEnabled": false,
     "position": [0, 200, 0],
     "size": [200, 200, 1],
     "signals": [{
-      "name": "touched",
+      "name": "touch",
       "action": "play",
       "animation": "rotate"
     }],

diff --git a/resources/scripts/table-view.json b/resources/scripts/table-view.json
index 482719c..1fe03a7 100644 (file)
--- a/resources/scripts/table-view.json
+++ b/resources/scripts/table-view.json
@@ -65,9 +65,7 @@
           "name":"gallery1",
           "type":"ImageView",
           "heightResizePolicy":"FILL_TO_PARENT",
-          "image": {
-            "url": "{DEMO_IMAGE_DIR}gallery-small-1.jpg"
-          },
+          "image": "{DEMO_IMAGE_DIR}gallery-small-1.jpg",
           "properties": { // properties registered dynamically
             "cellIndex": [0,0], // property to specify the top-left cell this child occupies
             "rowSpan":4, // property to specify how many rows this child occupies, if not set, default value is 1
@@ -77,9 +75,7 @@
           "name":"gallery2",
           "type":"ImageView",
           "heightResizePolicy":"FILL_TO_PARENT",
-          "image": {
-            "url": "{DEMO_IMAGE_DIR}gallery-small-2.jpg"
-          },
+          "image": "{DEMO_IMAGE_DIR}gallery-small-2.jpg",
           "properties": { // properties registered dynamically
             "cellIndex": [0,1],
             "cellHorizontalAlignment": "right" // property to specify how to align horizontally inside the cells, if not set, default value is 'left'
@@ -87,9 +83,7 @@
         },{
           "name":"gallery3",
           "type":"ImageView",
-          "image": {
-            "url": "{DEMO_IMAGE_DIR}gallery-small-3.jpg"
-          },
+          "image": "{DEMO_IMAGE_DIR}gallery-small-3.jpg",
           "properties": {
             "cellIndex":[1,1],
             "rowSpan":3,
@@ -100,9 +94,7 @@
           "name":"gallery4",
           "type":"ImageView",
           "widthResizePolicy":"FILL_TO_PARENT",
-          "image": {
-            "url": "{DEMO_IMAGE_DIR}gallery-small-4.jpg"
-          },
+          "image": "{DEMO_IMAGE_DIR}gallery-small-4.jpg",
           "properties": {
             "cellIndex":[2,2]
           }
@@ -111,9 +103,7 @@
           "type":"ImageView",
           "widthResizePolicy":"FILL_TO_PARENT",
           "heightResizePolicy":"FILL_TO_PARENT",
-          "image": {
-            "url": "{DEMO_IMAGE_DIR}gallery-small-5.jpg"
-          },
+          "image": "{DEMO_IMAGE_DIR}gallery-small-5.jpg",
           "properties": {
             "cellIndex":[3,2],
             "columnSpan": 2