Updated demo following Slider move to the public API

Change-Id: I33bbf86c1ae35d8b55f4b5c3d8d83d27503c2ecc
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>

diff --git a/examples/image-view/image-view-example.cpp b/examples/image-view/image-view-example.cpp
index af3f16c..89bd8d6 100644 (file)
--- a/examples/image-view/image-view-example.cpp
+++ b/examples/image-view/image-view-example.cpp
@@ -18,7 +18,6 @@
 #include "shared/view.h"
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/controls/slider/slider.h>
 
 using namespace Dali;
 

diff --git a/resources/scripts/slider-test-style.json b/resources/scripts/slider-test-style.json
index 84bc1c5..c906566 100644 (file)
--- a/resources/scripts/slider-test-style.json
+++ b/resources/scripts/slider-test-style.json
@@ -32,8 +32,7 @@
       "showPopup": true,
       "showValue": true,
       "valuePrecision": 2,
-      "value": 0.0,
-      "popupTextColor": [0.0, 1.0, 1.0, 1.0]
+      "value": 0.0
     }
   }
 }

diff --git a/resources/scripts/slider.json b/resources/scripts/slider.json
index 28ef9d5..d02bcae 100644 (file)
--- a/resources/scripts/slider.json
+++ b/resources/scripts/slider.json
@@ -73,10 +73,12 @@
     "showValue": true,
     "valuePrecision": 0,
     "value": 50.0,
-    "popupTextColor": [1, 0, 0, 1],
-    "hitRegion": [0, 48],
-    "backingRegion": [0, 10],
-    "handleRegion": [48, 48]
+    "trackVisual": {
+      "size": [0, 10]
+    },
+    "handleVisual": {
+      "size": [48, 48]
+    }
   }, {
     "type": "Slider",
     "parentOrigin": "TOP_CENTER",
@@ -88,12 +90,17 @@
     "showValue": true,
     "valuePrescision": 0,
     "value": 100.0,
-    "hitRegion": [0, 48],
-    "backingRegion": [0, 30],
-    "handleRegion": [48, 48],
-    "backingImageName": "{DEMO_IMAGE_DIR}button-up-14.9.png",
-    "handleImageName": "{DEMO_IMAGE_DIR}blocks-ball.png",
-    "progressImageName": "{DEMO_IMAGE_DIR}button-down.9.png"
+    "trackVisual": {
+      "url": "{DEMO_IMAGE_DIR}button-up-14.9.png",
+      "size": [0, 30]
+    },
+    "handleVisual": {
+      "url": "{DEMO_IMAGE_DIR}blocks-ball.png",
+      "size": [48, 48]
+    },
+    "progressVisual": {
+      "url": "{DEMO_IMAGE_DIR}button-down.9.png"
+    }
   }, {
     "type": "Slider",
     "parentOrigin": "TOP_CENTER",
@@ -105,10 +112,12 @@
     "showValue": true,
     "valuePrecision": 0,
     "value": 50.0,
-    "hitRegion": [0, 48],
-    "backingRegion": [0, 10],
-    "handleRegion": [48, 48],
-    "enabled": false
+    "trackVisual": {
+      "size": [0, 10]
+    },
+    "handleVisual": {
+      "size": [48, 48]
+    }
   }, {
     "type": "Slider",
     "parentOrigin": "TOP_CENTER",
@@ -120,10 +129,12 @@
     "showValue": true,
     "valuePrecision": 0,
     "value": 50.0,
-    "hitRegion": [0, 48],
-    "backingRegion": [0, 10],
-    "handleRegion": [48, 48],
-    "enabled": false,
-    "disableColor": [1, 0, 0, 1]
+    "trackVisual": {
+      "size": [0, 10]
+    },
+    "handleVisual": {
+      "size": [48, 48]
+    },
+    "disabledColor": [1, 0, 0, 1]
   }]
 }