lottie/example: updated lottieviewer example.

Change-Id: I97e30598090f16e4370f1d08dc94315789d82a3d

diff --git a/example/layout.edc b/example/layout.edc
deleted file mode 100644 (file)
index cbc0694..0000000
--- a/example/layout.edc
+++ /dev/null
@@ -1,31 +0,0 @@
-collections {
-   group { name: "layout";
-      parts {
-         rect { "bg";
-            desc { state: "default" 0.0;
-               color: 255 255 255 255;
-            }
-         }
-         spacer { "lottie_base";
-            desc { state: "default" 0.0;
-               rel2.relative: 1.0 0.7;
-            }
-         }
-         swallow { "lottie";
-            desc { state: "default" 0.0;
-               rel1.to: "lottie_base";
-               rel1.relative: 0.5 0.5;
-               rel2.to: "lottie_base";
-               rel2.relative: 0.5 0.5;
-            }
-         }
-         swallow { "slider";
-            desc { state: "default" 0.0;
-               rel1.relative: 0.0 0.7;
-               rel1.offset: 20 20;
-               rel2.offset: -20 -20;
-            }
-         }
-      }
-   }
-}

diff --git a/example/lottieviewer.cpp b/example/lottieviewer.cpp
index 2f46b4766982cc4f46f13f96a76fa0e8ab098a06..6a01b27c4fcfae81cc6572000625c92c62247779 100644 (file)
--- a/example/lottieviewer.cpp
+++ b/example/lottieviewer.cpp
@@ -10,6 +10,7 @@ _win_del_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
     LottieView *view = (LottieView *)data;
     delete view;
+    elm_exit();
 }
 
 static void
@@ -40,11 +41,13 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
    layout = elm_layout_add(win);
    evas_object_show(layout);
    evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_layout_file_set(layout, "layout.edj", "layout");
+   std::string edjPath = DEMO_DIR;
+   edjPath +="layout.edj";
+   elm_layout_file_set(layout, edjPath.c_str(), "layout");
    elm_win_resize_object_add(win, layout);
 
    std::string filePath = DEMO_DIR;
-   filePath +="data.json";
+   filePath +="insta_camera.json";
 
    LottieView *view = new LottieView(evas_object_evas_get(win), renderMode);
    view->setFilePath(filePath.c_str());

diff --git a/example/resource/layout.edc b/example/resource/layout.edc
new file mode 100644 (file)
index 0000000..cbc0694
--- /dev/null
+++ b/example/resource/layout.edc
@@ -0,0 +1,31 @@
+collections {
+   group { name: "layout";
+      parts {
+         rect { "bg";
+            desc { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         spacer { "lottie_base";
+            desc { state: "default" 0.0;
+               rel2.relative: 1.0 0.7;
+            }
+         }
+         swallow { "lottie";
+            desc { state: "default" 0.0;
+               rel1.to: "lottie_base";
+               rel1.relative: 0.5 0.5;
+               rel2.to: "lottie_base";
+               rel2.relative: 0.5 0.5;
+            }
+         }
+         swallow { "slider";
+            desc { state: "default" 0.0;
+               rel1.relative: 0.0 0.7;
+               rel1.offset: 20 20;
+               rel2.offset: -20 -20;
+            }
+         }
+      }
+   }
+}

diff --git a/example/resource/layout.edj b/example/resource/layout.edj
new file mode 100644 (file)
index 0000000..a8f567d
Binary files /dev/null and b/example/resource/layout.edj differ