diff options
| author | Jin Yoon <jinny.yoon@samsung.com> | 2015-08-12 01:22:05 +0900 |
|---|---|---|
| committer | Jin Yoon <jinny.yoon@samsung.com> | 2015-08-12 01:22:05 +0900 |
| commit | 3183eb159a2d7e782f592c7f26ee5a7b4a163468 (patch) | |
| tree | 9066ce3be524824dc97dde5358439a2dc90bae67 | |
| parent | 598df99f7946d0a78428cea81b865b61f8670b2b (diff) | |
| download | adventure-3183eb159a2d7e782f592c7f26ee5a7b4a163468.tar.gz adventure-3183eb159a2d7e782f592c7f26ee5a7b4a163468.tar.bz2 adventure-3183eb159a2d7e782f592c7f26ee5a7b4a163468.zip | |
Version : 150811
| -rwxr-xr-x | .cproject | 14 | ||||
| -rw-r--r-- | .rds_delta | 2 | ||||
| -rw-r--r-- | .sdk_delta.info | bin | 54656 -> 55445 bytes | |||
| -rw-r--r-- | .sign/.manifest.tmp | 35 | ||||
| -rw-r--r-- | .sign/author-signature.xml | 76 | ||||
| -rw-r--r-- | .sign/signature1.xml | 78 | ||||
| -rwxr-xr-x | chun/momentic/Makefile | 30 | ||||
| -rw-r--r-- | chun/momentic/img/add_btn.png | bin | 2143 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/img/city0.png | bin | 2983 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/img/city01.png | bin | 2999 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/img/next_btn.png | bin | 5639 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/img/orange.png | bin | 3116 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/img/pink small.png | bin | 2908 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/img/pink.png | bin | 3119 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/img/searching list.png | bin | 3572 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/img/searchlist.png | bin | 3572 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/img/world_map.png | bin | 31288 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/main.c | 105 | ||||
| -rw-r--r-- | chun/momentic/main.o | bin | 10252 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/map.c | 139 | ||||
| -rwxr-xr-x | chun/momentic/map.h | 25 | ||||
| -rw-r--r-- | chun/momentic/map.o | bin | 14332 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/momentic | bin | 27816 -> 0 bytes | |||
| -rwxr-xr-x | chun/momentic/momentic.edc | 556 | ||||
| -rw-r--r-- | chun/momentic/momentic.edj | bin | 61655 -> 0 bytes | |||
| -rw-r--r-- | inc/item.h | 5 | ||||
| -rw-r--r-- | inc/map.h | 1 | ||||
| -rw-r--r-- | res/edje/city.edc | 171 | ||||
| -rw-r--r-- | res/edje/entry.edc | 23 | ||||
| -rw-r--r-- | res/edje/images/1.png | bin | 0 -> 53350 bytes | |||
| -rw-r--r-- | res/edje/images/2.png | bin | 0 -> 47349 bytes | |||
| -rw-r--r-- | res/edje/images/3.png | bin | 0 -> 50660 bytes | |||
| -rw-r--r-- | res/edje/images/4.png | bin | 0 -> 57970 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | res/edje/images/Daynight layer.png (renamed from chun/momentic/img/Daynight layer.png) | bin | 7978 -> 7978 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | res/edje/images/button.png (renamed from chun/momentic/img/city2.png) | bin | 2894 -> 3306 bytes | |||
| -rw-r--r-- | res/edje/images/city1.png | bin | 2881 -> 2894 bytes | |||
| -rw-r--r-- | res/edje/images/city2.png | bin | 2894 -> 2881 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | res/edje/images/city3.png (renamed from chun/momentic/img/city1.png) | bin | 2881 -> 2882 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | res/edje/images/city4.png (renamed from chun/momentic/img/city21.png) | bin | 2855 -> 2880 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | res/edje/images/cityh.png (renamed from chun/momentic/img/city11.png) | bin | 2855 -> 2855 bytes | |||
| -rwxr-xr-x | res/edje/images/drawer_bg.png (renamed from chun/momentic/img/orange small.png) | bin | 2909 -> 4687 bytes | |||
| -rw-r--r-- | res/edje/images/drawer_btn.png | bin | 0 -> 424 bytes | |||
| -rwxr-xr-x | res/edje/item.edc | 108 | ||||
| -rwxr-xr-x | res/edje/map.edc | 39 | ||||
| -rw-r--r-- | res/edje/momentic.edc | 420 | ||||
| -rw-r--r-- | src/item.c | 171 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/main_view.c | 41 | ||||
| -rw-r--r-- | src/map.c | 70 | ||||
| -rwxr-xr-x | tizen-manifest.xml | 2 |
50 files changed, 957 insertions, 1156 deletions
@@ -234,17 +234,17 @@ </option> </tool> </fileInfo> - <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.995894341" name="item.edc" rcbsApplicability="disable" resourcePath="res/edje/item.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1964376477"> - <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1964376477" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924"> - <option id="sbi.gnu.edc.compiler.option.misc.id.110524609" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> + <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.553476469" name="city.edc" rcbsApplicability="disable" resourcePath="res/edje/city.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1662275044"> + <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1662275044" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924"> + <option id="sbi.gnu.edc.compiler.option.misc.id.738754799" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje/images""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/res/edje/images""/> </option> </tool> </fileInfo> - <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.358789494" name="map.edc" rcbsApplicability="disable" resourcePath="res/edje/map.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1099652705"> - <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1099652705" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924"> - <option id="sbi.gnu.edc.compiler.option.misc.id.1560519824" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> + <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.995894341" name="item.edc" rcbsApplicability="disable" resourcePath="res/edje/item.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1964376477"> + <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1964376477" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924"> + <option id="sbi.gnu.edc.compiler.option.misc.id.110524609" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje/images""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/res/edje/images""/> </option> @@ -252,7 +252,7 @@ </fileInfo> <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.1872796124" name="momentic.edc" rcbsApplicability="disable" resourcePath="res/edje/momentic.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1833965224"> <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1833965224" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924"> - <option id="sbi.gnu.edc.compiler.option.misc.id.572250589" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> + <option id="sbi.gnu.edc.compiler.option.misc.id.572250589" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje/images""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/res/edje/images""/> </option> @@ -1,8 +1,6 @@ #delete -res/edje/.item.edc.swp #add #modify author-signature.xml signature1.xml bin/adventure -res/edje/item.edj diff --git a/.sdk_delta.info b/.sdk_delta.info Binary files differindex 6e65589..68535bf 100644 --- a/.sdk_delta.info +++ b/.sdk_delta.info diff --git a/.sign/.manifest.tmp b/.sign/.manifest.tmp index dc4a7ca..bf01e1a 100644 --- a/.sign/.manifest.tmp +++ b/.sign/.manifest.tmp @@ -1,19 +1,27 @@ -bin/adventure__DEL__hjrZ9hKxN//TFpt2IuVJsjyTs6C3faZ5+KgAysqrZbY= res/edje/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8= res/edje/conf.h__DEL__HDwI7mqDpPI19iIn/JiJt3RUD1ZfOpDXpMVbCjVPL9A= -res/edje/entry.edj__DEL__rVp9xRys8q23H4SAGSY0fU6qD7QKrQWXbtC0zAaWo5Q= +res/edje/images/1.png__DEL__QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4= +res/edje/images/2.png__DEL__Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g= +res/edje/images/3.png__DEL__Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec= +res/edje/images/4.png__DEL__j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A= +res/edje/images/Daynight layer.png__DEL__vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs= res/edje/images/add.png__DEL__R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8= res/edje/images/add_btn.png__DEL__naQj2XAiAb8UgXrZ2fDkhrs8G1cyx8i1AsAT5HbbP5Q= res/edje/images/add_button.png__DEL__qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA= res/edje/images/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8= +res/edje/images/button.png__DEL__V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io= res/edje/images/city0.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8= res/edje/images/city01.png__DEL__UoH8TFJrnH1ihgulgKa7Rtih9QrrI6yYpooMF9Scf1o= -res/edje/images/city1.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw= +res/edje/images/city1.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU= res/edje/images/city11.png__DEL__Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U= -res/edje/images/city2.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU= +res/edje/images/city2.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw= res/edje/images/city21.png__DEL__Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U= +res/edje/images/city3.png__DEL__QFR/EwMN5zgxCefVYa3Oqdl0fngb11aF8JwgugzMN38= +res/edje/images/city4.png__DEL__CXjfWyF7hePzPw1/dR7PM0ShEfmwu/UmqCKwztpZBAo= +res/edje/images/cityh.png__DEL__Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U= res/edje/images/curser.png__DEL__k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc= res/edje/images/delete_button.png__DEL__M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc= +res/edje/images/drawer_btn.png__DEL__Wx+tI67e8fHbXkh7cz2Nisj5Yf2ZOREFsCQl2a3h8/E= res/edje/images/floting_next_button.png__DEL__Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0= res/edje/images/line.png__DEL__mC2lw0XczhZ41ZKBKt5ft3YcObs+IGDudh0xfkOJwQE= res/edje/images/map_background.png__DEL__fidI2puLNy+2OtfFScQOt4BhzflQJ2EU87bersaQZPM= @@ -37,12 +45,6 @@ res/edje/images/searching_list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkR res/edje/images/searchlist.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM= res/edje/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU= res/edje/images/하단 버튼.png__DEL__V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io= -res/edje/item.edj__DEL__HG+I/Y+Mgeh80NxsPXo2uggk1QBn6VWRUVAtb8mDu8Q= -res/edje/main.edj__DEL__tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g= -res/edje/main_view.edj__DEL__yFLkgzPFVGDDbzN1D3f049Wp5QsSUEYj2wkJwvpawW0= -res/edje/map.edj__DEL__UXAXof+qIgT8nIlkBr2FlorpXygjAv+uZYUDPoHodLk= -res/edje/momentic.edj__DEL__aR+zagc8OmzQtc4+FDj57NecOuAHiQqyiz/n6k7lfsI= -res/edje/ui_manager.edj__DEL__uE2PyHTnHOBJ0FD0PtaMrNq9s6UYZX/ggAwF5amY0yA= res/images/1.png__DEL__QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4= res/images/2.png__DEL__Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g= res/images/3.png__DEL__Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec= @@ -83,5 +85,14 @@ res/images/searchlist.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM= res/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU= res/images/하단 버튼.png__DEL__V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io= shared/res/adventure.png__DEL__iF8SZahyLw7IqsH3SgtZ9umag2CVi5Kk0ie4yoUr9t0= -tizen-manifest.xml__DEL__Yqjrp1NnUuO8yN5E0COzisOuxQ6Rf1IK71K8FAFHPr8= -author-signature.xml__DEL__BTI+Obi8GtziCVvRkieiQZFUEuWr89kp29N3Iw8tQfY= +tizen-manifest.xml__DEL__dk/JApvYPhj82qG80QuCOliR5wHHxZQCrfIT60ygLXA= +author-signature.xml__DEL__NFX+CLkInahVE1z38Y6Hf4Esj9zNVQYg1Ay2HZXiFXs= +res/edje/entry.edj__DEL__m3clWc5op/4b5I+HlkZ4z1QvAg/IXMoMihnzE27XP84= +res/edje/item.edj__DEL__SHme/D3j0p6Szwwn90KLkvlkTr8r2n3iPXGs3AndTmA= +res/edje/main.edj__DEL__tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g= +res/edje/main_view.edj__DEL__yFLkgzPFVGDDbzN1D3f049Wp5QsSUEYj2wkJwvpawW0= +res/edje/ui_manager.edj__DEL__uE2PyHTnHOBJ0FD0PtaMrNq9s6UYZX/ggAwF5amY0yA= +res/edje/images/drawer_bg.png__DEL__e3TPw0++i47zLwoD+fz6h121KG/8X3O5J90A3FRD0So= +res/edje/momentic.edj__DEL__QNgs+EAO8TVeNCss32eB/micwszPJ5BzTPxyLOhwc6k= +res/edje/city.edj__DEL__1/Vj7IvAumyAIOoLZv+VzQ6E4y7vgcdNxZwBw7RhdOA= +bin/adventure__DEL__RBkqEgvTZT9tqgxWdzAiJJ0eNUZ3vCKMg0c39Rz+Qss= diff --git a/.sign/author-signature.xml b/.sign/author-signature.xml index 9b9e331..55621c2 100644 --- a/.sign/author-signature.xml +++ b/.sign/author-signature.xml @@ -4,19 +4,43 @@ <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod> <Reference URI="bin%2Fadventure"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>hjrZ9hKxN//TFpt2IuVJsjyTs6C3faZ5+KgAysqrZbY=</DigestValue> +<DigestValue>RBkqEgvTZT9tqgxWdzAiJJ0eNUZ3vCKMg0c39Rz+Qss=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fbtn.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue> </Reference> +<Reference URI="res%2Fedje%2Fcity.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>1/Vj7IvAumyAIOoLZv+VzQ6E4y7vgcdNxZwBw7RhdOA=</DigestValue> +</Reference> <Reference URI="res%2Fedje%2Fconf.h"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>HDwI7mqDpPI19iIn/JiJt3RUD1ZfOpDXpMVbCjVPL9A=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fentry.edj"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>rVp9xRys8q23H4SAGSY0fU6qD7QKrQWXbtC0zAaWo5Q=</DigestValue> +<DigestValue>m3clWc5op/4b5I+HlkZ4z1QvAg/IXMoMihnzE27XP84=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2F1.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2F2.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2F3.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2F4.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2FDaynight%20layer.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fimages%2Fadd.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -34,6 +58,10 @@ <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue> </Reference> +<Reference URI="res%2Fedje%2Fimages%2Fbutton.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=</DigestValue> +</Reference> <Reference URI="res%2Fedje%2Fimages%2Fcity0.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue> @@ -44,7 +72,7 @@ </Reference> <Reference URI="res%2Fedje%2Fimages%2Fcity1.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue> +<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fimages%2Fcity11.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -52,12 +80,24 @@ </Reference> <Reference URI="res%2Fedje%2Fimages%2Fcity2.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue> +<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fimages%2Fcity21.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue> </Reference> +<Reference URI="res%2Fedje%2Fimages%2Fcity3.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>QFR/EwMN5zgxCefVYa3Oqdl0fngb11aF8JwgugzMN38=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2Fcity4.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>CXjfWyF7hePzPw1/dR7PM0ShEfmwu/UmqCKwztpZBAo=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2Fcityh.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue> +</Reference> <Reference URI="res%2Fedje%2Fimages%2Fcurser.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc=</DigestValue> @@ -66,6 +106,14 @@ <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=</DigestValue> </Reference> +<Reference URI="res%2Fedje%2Fimages%2Fdrawer_bg.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>e3TPw0++i47zLwoD+fz6h121KG/8X3O5J90A3FRD0So=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2Fdrawer_btn.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Wx+tI67e8fHbXkh7cz2Nisj5Yf2ZOREFsCQl2a3h8/E=</DigestValue> +</Reference> <Reference URI="res%2Fedje%2Fimages%2Ffloting_next_button.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0=</DigestValue> @@ -160,7 +208,7 @@ </Reference> <Reference URI="res%2Fedje%2Fitem.edj"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>HG+I/Y+Mgeh80NxsPXo2uggk1QBn6VWRUVAtb8mDu8Q=</DigestValue> +<DigestValue>SHme/D3j0p6Szwwn90KLkvlkTr8r2n3iPXGs3AndTmA=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fmain.edj"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -170,13 +218,9 @@ <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>yFLkgzPFVGDDbzN1D3f049Wp5QsSUEYj2wkJwvpawW0=</DigestValue> </Reference> -<Reference URI="res%2Fedje%2Fmap.edj"> -<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>UXAXof+qIgT8nIlkBr2FlorpXygjAv+uZYUDPoHodLk=</DigestValue> -</Reference> <Reference URI="res%2Fedje%2Fmomentic.edj"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>aR+zagc8OmzQtc4+FDj57NecOuAHiQqyiz/n6k7lfsI=</DigestValue> +<DigestValue>QNgs+EAO8TVeNCss32eB/micwszPJ5BzTPxyLOhwc6k=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fui_manager.edj"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -344,7 +388,7 @@ </Reference> <Reference URI="tizen-manifest.xml"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>Yqjrp1NnUuO8yN5E0COzisOuxQ6Rf1IK71K8FAFHPr8=</DigestValue> +<DigestValue>dk/JApvYPhj82qG80QuCOliR5wHHxZQCrfIT60ygLXA=</DigestValue> </Reference> <Reference URI="#prop"> <Transforms> @@ -355,11 +399,11 @@ </Reference> </SignedInfo> <SignatureValue> -kni2MoPv7PFgWCh7qFycXiox94PrRHAoRUXCO2PQZURdSy/Ujppje25sAF+0uIRb8cAjTBplQCsI -GUP/gxG8CCEFqmOUcDgCa0UZERUo5ueY1Fjw5kifrBsmq/Vsjukpwk8tZynX+bf6h6B/Xrkp16pI -SyfZ9yko1imY4S7RCtC2p2ZQnjf7WnHMEH8zuZK63WLKac2E+FR9Ef62VzhvPr7F1u5hVnNMSKPv -/9MTov8DNYU5yLI96CZGodWUx+xBx7PxOSbarFcz+Fb0vV9xiO2h3lbPTMB2/exEZstyeABxocSi -S0NOIwo8K8FisAJwcXXdPV8wlMvmwAo9KOc5EQ== +a4pw7oyxpCSuCn+gnDtk3YRAIBZ8hF6v7Q/s1AykSrRpXJCZLU9xpJT5yjyEvwsZFKROpcB93Rcu +kSzhNRPVfDyadNm2runLnqBQ4cMtPSYWAFv5SIeHtQr7xhnjJkcVkjzP5P92xZj1EdGi/HL8+lST +GOpjEEbsWAo1HY7SI465o/MtfPI40Wm7YWhUzXjXlKPZSn8W7ivDSnfIoR9YvAwOjFn0//2Jlcz+ +K+v6Vb+md/StD0NXvcRuL8gx5s89Fn9PiAiUFZCgtXiRVOquDv3kukwTNjzX9xig5anXifPeRGMo +8WMrfgdJqNbBRk4HPC01esBhXBLjWMl0r+qWng== </SignatureValue> <KeyInfo> <X509Data> diff --git a/.sign/signature1.xml b/.sign/signature1.xml index 58a19c3..707325d 100644 --- a/.sign/signature1.xml +++ b/.sign/signature1.xml @@ -4,23 +4,47 @@ <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod> <Reference URI="author-signature.xml"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>BTI+Obi8GtziCVvRkieiQZFUEuWr89kp29N3Iw8tQfY=</DigestValue> +<DigestValue>NFX+CLkInahVE1z38Y6Hf4Esj9zNVQYg1Ay2HZXiFXs=</DigestValue> </Reference> <Reference URI="bin%2Fadventure"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>hjrZ9hKxN//TFpt2IuVJsjyTs6C3faZ5+KgAysqrZbY=</DigestValue> +<DigestValue>RBkqEgvTZT9tqgxWdzAiJJ0eNUZ3vCKMg0c39Rz+Qss=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fbtn.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue> </Reference> +<Reference URI="res%2Fedje%2Fcity.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>1/Vj7IvAumyAIOoLZv+VzQ6E4y7vgcdNxZwBw7RhdOA=</DigestValue> +</Reference> <Reference URI="res%2Fedje%2Fconf.h"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>HDwI7mqDpPI19iIn/JiJt3RUD1ZfOpDXpMVbCjVPL9A=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fentry.edj"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>rVp9xRys8q23H4SAGSY0fU6qD7QKrQWXbtC0zAaWo5Q=</DigestValue> +<DigestValue>m3clWc5op/4b5I+HlkZ4z1QvAg/IXMoMihnzE27XP84=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2F1.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2F2.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2F3.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2F4.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2FDaynight%20layer.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fimages%2Fadd.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -38,6 +62,10 @@ <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue> </Reference> +<Reference URI="res%2Fedje%2Fimages%2Fbutton.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=</DigestValue> +</Reference> <Reference URI="res%2Fedje%2Fimages%2Fcity0.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue> @@ -48,7 +76,7 @@ </Reference> <Reference URI="res%2Fedje%2Fimages%2Fcity1.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue> +<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fimages%2Fcity11.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -56,12 +84,24 @@ </Reference> <Reference URI="res%2Fedje%2Fimages%2Fcity2.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue> +<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fimages%2Fcity21.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue> </Reference> +<Reference URI="res%2Fedje%2Fimages%2Fcity3.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>QFR/EwMN5zgxCefVYa3Oqdl0fngb11aF8JwgugzMN38=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2Fcity4.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>CXjfWyF7hePzPw1/dR7PM0ShEfmwu/UmqCKwztpZBAo=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2Fcityh.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue> +</Reference> <Reference URI="res%2Fedje%2Fimages%2Fcurser.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc=</DigestValue> @@ -70,6 +110,14 @@ <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=</DigestValue> </Reference> +<Reference URI="res%2Fedje%2Fimages%2Fdrawer_bg.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>e3TPw0++i47zLwoD+fz6h121KG/8X3O5J90A3FRD0So=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2Fdrawer_btn.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Wx+tI67e8fHbXkh7cz2Nisj5Yf2ZOREFsCQl2a3h8/E=</DigestValue> +</Reference> <Reference URI="res%2Fedje%2Fimages%2Ffloting_next_button.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0=</DigestValue> @@ -164,7 +212,7 @@ </Reference> <Reference URI="res%2Fedje%2Fitem.edj"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>HG+I/Y+Mgeh80NxsPXo2uggk1QBn6VWRUVAtb8mDu8Q=</DigestValue> +<DigestValue>SHme/D3j0p6Szwwn90KLkvlkTr8r2n3iPXGs3AndTmA=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fmain.edj"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -174,13 +222,9 @@ <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>yFLkgzPFVGDDbzN1D3f049Wp5QsSUEYj2wkJwvpawW0=</DigestValue> </Reference> -<Reference URI="res%2Fedje%2Fmap.edj"> -<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>UXAXof+qIgT8nIlkBr2FlorpXygjAv+uZYUDPoHodLk=</DigestValue> -</Reference> <Reference URI="res%2Fedje%2Fmomentic.edj"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>aR+zagc8OmzQtc4+FDj57NecOuAHiQqyiz/n6k7lfsI=</DigestValue> +<DigestValue>QNgs+EAO8TVeNCss32eB/micwszPJ5BzTPxyLOhwc6k=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fui_manager.edj"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -348,7 +392,7 @@ </Reference> <Reference URI="tizen-manifest.xml"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>Yqjrp1NnUuO8yN5E0COzisOuxQ6Rf1IK71K8FAFHPr8=</DigestValue> +<DigestValue>dk/JApvYPhj82qG80QuCOliR5wHHxZQCrfIT60ygLXA=</DigestValue> </Reference> <Reference URI="#prop"> <Transforms> @@ -359,11 +403,11 @@ </Reference> </SignedInfo> <SignatureValue> -F+xuy38D9bn8Sh8Q/R8YrGtO9anvpDCGt9m0RbRxW/BpakPIuJV93j2uT7v+sgndokxphU/v/8Z4 -ezh5gYu36AAN8DoWunynkDym7N4ujbIQ/W259pb31w6iNW5i5mnw9nHUrGxBhDAgETFvqqBfrAiB -TLojJkoZ/moNScowJxWzHCUgchKAn67h36WM2gvyNZW7q81mqI7/9y+/teb05mJms90FiuJgMI1E -vAZTVZxYzlwk53VEjAvmFHuI5q37+fKb7mFPOY1OvkcmPTPKuteJysTKv4lyl0DSirOxSZMP2Cys -MoXpY/9o0GN0/w3KwEWixdyDpNI/d9Ue41LWdA== +PhzcfXwg4z4mP1GlpetKTNmP+2YfWlOYgHpbgCaDDKC9q76IgjG/9Ap0YpSm0UdsQ8qJSM7kr9V3 +vPzOYTWWs12mc8aSGDq5opLhGtOP1HoAEw3PlLPVz9xpEP6a30N09+2DGkVhykSB9kPgR3GmuAlr +ZUPALTv5RYemlrrR2kkMli3DySF7o3L+VCGvs3/4c472uXldyqOb5BDcBBuyC5hivfnbW8ogZrxQ +N1Kxbd+N2l7NFGWQqBQAHSJ4+9OH0/dXK5xtTqI14tdkSkRZ4z7hvX+skGfKGpPHJHSzW99FuPrR +7uwoFmqFSFA70W/EakzGtiS2D8ferFFTqnTemQ== </SignatureValue> <KeyInfo> <X509Data> diff --git a/chun/momentic/Makefile b/chun/momentic/Makefile deleted file mode 100755 index fd781e3..0000000 --- a/chun/momentic/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -OBJECTS=main.o map.o -BINARY=momentic -DIRNAME=momentic - -PREFIX=/usr/local -BINDIR=$(PREFIX)/bin - -CC = gcc - -CFLAGS = `pkg-config --cflags elementary evas` -CFLAGS += -g -LDFLAGS = `pkg-config --libs elementary evas` - -all: $(OBJECTS) $(BINARY) - -%.o : %.c - @echo " Compilation of $(@D)/$(<F)" - @$(CC) -c $(CFLAGS) $< -o $@ - -$(BINARY): $(OBJECTS) - @echo " Linking $(@F)" - @$(CC) -o $(BINARY) $(OBJECTS) $(LDFLAGS) - -install: $(BINARY) - @echo "installation of $(BINARY)" - @mkdir -p $(BINDIR) - @install -m 0755 $(BINARY) $(BINDIR) - -clean: - @rm -f *.o *~ $(BINARY) diff --git a/chun/momentic/img/add_btn.png b/chun/momentic/img/add_btn.png Binary files differdeleted file mode 100644 index 8cbec44..0000000 --- a/chun/momentic/img/add_btn.png +++ /dev/null diff --git a/chun/momentic/img/city0.png b/chun/momentic/img/city0.png Binary files differdeleted file mode 100755 index b70f2c3..0000000 --- a/chun/momentic/img/city0.png +++ /dev/null diff --git a/chun/momentic/img/city01.png b/chun/momentic/img/city01.png Binary files differdeleted file mode 100755 index ee8bfa7..0000000 --- a/chun/momentic/img/city01.png +++ /dev/null diff --git a/chun/momentic/img/next_btn.png b/chun/momentic/img/next_btn.png Binary files differdeleted file mode 100755 index 4c8f687..0000000 --- a/chun/momentic/img/next_btn.png +++ /dev/null diff --git a/chun/momentic/img/orange.png b/chun/momentic/img/orange.png Binary files differdeleted file mode 100755 index 251b230..0000000 --- a/chun/momentic/img/orange.png +++ /dev/null diff --git a/chun/momentic/img/pink small.png b/chun/momentic/img/pink small.png Binary files differdeleted file mode 100755 index 9ef57b2..0000000 --- a/chun/momentic/img/pink small.png +++ /dev/null diff --git a/chun/momentic/img/pink.png b/chun/momentic/img/pink.png Binary files differdeleted file mode 100755 index f0eb889..0000000 --- a/chun/momentic/img/pink.png +++ /dev/null diff --git a/chun/momentic/img/searching list.png b/chun/momentic/img/searching list.png Binary files differdeleted file mode 100755 index bf751b8..0000000 --- a/chun/momentic/img/searching list.png +++ /dev/null diff --git a/chun/momentic/img/searchlist.png b/chun/momentic/img/searchlist.png Binary files differdeleted file mode 100755 index bf751b8..0000000 --- a/chun/momentic/img/searchlist.png +++ /dev/null diff --git a/chun/momentic/img/world_map.png b/chun/momentic/img/world_map.png Binary files differdeleted file mode 100755 index 3f50872..0000000 --- a/chun/momentic/img/world_map.png +++ /dev/null diff --git a/chun/momentic/main.c b/chun/momentic/main.c deleted file mode 100755 index 37d28fd..0000000 --- a/chun/momentic/main.c +++ /dev/null @@ -1,105 +0,0 @@ -#include <Elementary.h> -#include <Eio.h> - -#include "map.h" - -#define SCRN_W 480 -#define SCRN_H 800 - -Eio_Monitor *monitor = NULL; - -static Eina_Bool -anim_cb(void *data) -{ - if (!elm_layout_file_set(data, "momentic.edj", "main")) - return ECORE_CALLBACK_PASS_ON; - - eio_monitor_del(monitor); - eio_monitor_add("momentic.edj"); - - return ECORE_CALLBACK_DONE; -} - -static Eina_Bool -file_modified_cb(void *data, int type, void *event) -{ - Eio_Monitor_Event *ev = event; - ecore_animator_add(anim_cb, data); - return ECORE_CALLBACK_DONE; -} - -static void -clicked_cb(void *data, Evas_Object *obj, void *event_info) -{ - city_s ci = { 0, 0, 0, 0, 371, 139 }; - add_city_to_map(0, &ci); - city_s ci2 = { 0, 0, 0, 0, 384, 141 }; - add_city_to_map(1, &ci2); - city_s ci3 = { 0, 0, 0, 0, 312, 153 }; - add_city_to_map(2, &ci3); -} - -int -elm_main(int argc, char **argv) -{ - //elm_config_scale_set(1.8); - //elm_app_base_scale_set(1.8); - elm_config_accel_preference_set("3d"); - elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - - //Window - Evas_Object *win = elm_win_util_standard_add("Momentic", "Momentic"); - elm_win_autodel_set(win, EINA_TRUE); - - //Layout - Evas_Object *main_layout = create_momentic_layout(win); - evas_object_show(main_layout); - elm_win_resize_object_add(win, main_layout); - - Evas_Object *btn; - - //Add Button - btn = elm_image_add(main_layout); - elm_image_file_set(btn, "img/add_btn.png", NULL); - elm_object_part_content_set(main_layout, "add_btn", btn); - - //Next Button - btn = elm_image_add(main_layout); - elm_image_file_set(btn, "img/next_btn.png", NULL); - elm_object_part_content_set(main_layout, "next_btn", btn); - - //City List - btn = elm_button_add(main_layout); - elm_object_text_set(btn, "City List"); - elm_object_part_content_set(main_layout, "city_list", btn); - evas_object_smart_callback_add(btn, "clicked", clicked_cb, 0); - - //Best Time - btn = elm_button_add(main_layout); - elm_object_text_set(btn, "Best Time"); - elm_object_part_content_set(main_layout, "best_time", btn); - - //Save Group Button - btn = elm_button_add(main_layout); - elm_object_text_set(btn, "Save as Group"); - elm_object_part_content_set(main_layout, "save_group_btn", btn); - - //New Event Button - btn = elm_button_add(main_layout); - elm_object_text_set(btn, "Set as new event"); - elm_object_part_content_set(main_layout, "new_event_btn", btn); - - evas_object_resize(win, SCRN_W, SCRN_H); - evas_object_show(win); - - //eio - monitor = eio_monitor_add("momentic.edj"); - ecore_event_handler_add(EIO_MONITOR_FILE_MODIFIED, - file_modified_cb, main_layout); - - elm_run(); - elm_shutdown(); - - return 0; -} -ELM_MAIN() diff --git a/chun/momentic/main.o b/chun/momentic/main.o Binary files differdeleted file mode 100644 index 1cdc206..0000000 --- a/chun/momentic/main.o +++ /dev/null diff --git a/chun/momentic/map.c b/chun/momentic/map.c deleted file mode 100755 index 0f1e369..0000000 --- a/chun/momentic/map.c +++ /dev/null @@ -1,139 +0,0 @@ -#include <Elementary.h> -#include "map.h" - -#define CITY_MAX 3 -#define WORLD_W 443 -#define WORLD_H 259 - -static Evas_Object *main_layout = NULL; -static Evas_Object *map_layout = NULL; -static city_data_s city[CITY_MAX] = {{{0, 0, 0, 0, 0, 0}, NULL}, - {{0, 0, 0, 0, 0, 0}, NULL}, - {{0, 0, 0, 0, 0, 0}, NULL}}; - -static void -map_geom_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - Evas_Coord x, y, w, h; - evas_object_geometry_get(obj, &x, &y, &w, &h); - - int idx; - for (idx = 0; CITY_MAX > idx; idx++) - { - if (!city[idx].obj) continue; - evas_object_move(city[idx].obj, - (x + city[idx].ci.x) - (city[idx].w / 2), - (y + city[idx].ci.y) - (city[idx].h / 2)); - } -} - -static void -map_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - int idx; - for (idx = 0; CITY_MAX > idx; idx++) - { - evas_object_del(city[idx].obj); - city[idx].obj = NULL; - } -} - -Evas_Object * -create_momentic_layout(Evas_Object *parent) -{ - //Main Layout - main_layout = elm_layout_add(parent); - elm_layout_file_set(main_layout, "momentic.edj", "main"); - evas_object_size_hint_weight_set(main_layout, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - - //Map - map_layout = elm_layout_add(main_layout); - elm_layout_file_set(map_layout, "momentic.edj", "map"); - evas_object_event_callback_add(map_layout, EVAS_CALLBACK_RESIZE, map_geom_cb, NULL); - evas_object_event_callback_add(map_layout, EVAS_CALLBACK_MOVE, map_geom_cb, NULL); - evas_object_event_callback_add(map_layout, EVAS_CALLBACK_DEL, map_del_cb, NULL); - elm_object_part_content_set(main_layout, "map", map_layout); - - return main_layout; -} - -Eina_Bool -add_city_to_map(int idx, city_s *ci) -{ - if (idx >= CITY_MAX) return EINA_FALSE; - if (0 > idx) return EINA_FALSE; - if (city[idx].obj) return EINA_FALSE; - - Evas_Coord x, y; - evas_object_geometry_get(map_layout, &x, &y, NULL, NULL); - - char buf[256]; - snprintf(buf, sizeof(buf), "city%d", idx); - city[idx].obj = elm_layout_add(map_layout); - elm_layout_file_set(city[idx].obj, "momentic.edj", buf); - evas_object_smart_member_add(city[idx].obj, map_layout); - evas_object_show(city[idx].obj); - - Evas_Object *edje = elm_layout_edje_get(city[idx].obj); - city[idx].w = atoi(edje_object_data_get(edje, "width")); - city[idx].h = atoi(edje_object_data_get(edje, "height")); - memcpy(&city[idx].ci, ci, sizeof(city_s)); - - evas_object_resize(city[idx].obj, city[idx].w, city[idx].h); - evas_object_move(city[idx].obj, - ci->x + x - (city[idx].w / 2), - ci->y + y - (city[idx].h / 2)); - - Elm_Transit *trans; - - //Effect 1 - trans = elm_transit_add(); - elm_transit_object_add(trans, city[idx].obj); - elm_transit_effect_zoom_add(trans, 3.0, 1.0); - elm_transit_effect_color_add(trans, 0, 0, 0, 0, 255, 255, 255, 255); - elm_transit_tween_mode_set(trans, ELM_TRANSIT_TWEEN_MODE_DECELERATE); - elm_transit_duration_set(trans, 0.35); - elm_transit_go(trans); - - //Effect 2 - Evas_Object *effect = - (Evas_Object *) edje_object_part_object_get(edje, "effect"); - evas_object_render_op_set(effect, EVAS_RENDER_ADD); - trans = elm_transit_add(); - elm_transit_object_add(trans, effect); - elm_transit_effect_color_add(trans, 0, 0, 0, 0, 127, 127, 127, 127); - elm_transit_duration_set(trans, 0.75); - elm_transit_repeat_times_set(trans, -1); - elm_transit_auto_reverse_set(trans, EINA_TRUE); - elm_transit_go(trans); - - return EINA_TRUE; -} - -static void -trans_del_cb(void *data, Elm_Transit *trans) -{ - int idx = (int) data; - evas_object_del(city[idx].obj); - city[idx].obj = NULL; -} - -Eina_Bool -remove_city_from_map(int idx) -{ - if (idx >= CITY_MAX) return EINA_FALSE; - if (0 > idx) return EINA_FALSE; - if (!city[idx].obj) return EINA_FALSE; - - Elm_Transit *trans = elm_transit_add(); - elm_transit_object_add(trans, city[idx].obj); - elm_transit_effect_zoom_add(trans, 1.0, 2.0); - elm_transit_effect_color_add(trans, 255, 255, 255, 255, 0, 0, 0, 0); - elm_transit_tween_mode_set(trans, ELM_TRANSIT_TWEEN_MODE_DECELERATE); - elm_transit_duration_set(trans, 0.35); - elm_transit_del_cb_set(trans, trans_del_cb, (void *)idx); - elm_transit_go(trans); - - return EINA_TRUE; -} diff --git a/chun/momentic/map.h b/chun/momentic/map.h deleted file mode 100755 index 9fb6e4d..0000000 --- a/chun/momentic/map.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef MOMENT_MAP -#define MOMENT_MAP - -typedef struct _city_info_s { - int id; - float timezone; - char *name; - char *nation; - int x; - int y; -} city_s; - -typedef struct _city_data_s { - city_s ci; - Evas_Object *obj; - int w, h; -} city_data_s; - - - -Evas_Object * create_map(Evas_Object *parent); -Eina_Bool add_city_to_map(int idx, city_s *ci); -Eina_Bool remove_city_from_map(int idx); - -#endif diff --git a/chun/momentic/map.o b/chun/momentic/map.o Binary files differdeleted file mode 100644 index f6cf64c..0000000 --- a/chun/momentic/map.o +++ /dev/null diff --git a/chun/momentic/momentic b/chun/momentic/momentic Binary files differdeleted file mode 100755 index fe21c50..0000000 --- a/chun/momentic/momentic +++ /dev/null diff --git a/chun/momentic/momentic.edc b/chun/momentic/momentic.edc deleted file mode 100755 index 830f455..0000000 --- a/chun/momentic/momentic.edc +++ /dev/null @@ -1,556 +0,0 @@ -collections { - //base_scale: 1.8; - styles { - style { "text_style"; - base: "font=Tizen font_size=18 text_class=entry color=#646261 valign=0.5 align=center"; - } - } - images { - image: "world_map.png" COMP; - image: "searchlist.png" COMP; - image: "city0.png" COMP; - image: "city01.png" COMP; - image: "city1.png" COMP; - image: "city11.png" COMP; - image: "city2.png" COMP; - image: "city21.png" COMP; - } - group { name: "city0"; - data.item: "width" "14"; - data.item: "height" "12"; - parts { - part { name: "city"; - type: IMAGE; - scale: 1; - description { state: "default"; - image.normal: "city0.png"; - aspect_preference: BOTH; - aspect: 1 1; - min: 14 12; - max: 14 12; - fixed: 1 1; - } - } - part { name: "effect"; - type: IMAGE; - description { state: "default"; - image.normal: "city01.png"; - aspect_preference: BOTH; - aspect: 1 1; - rel1.to: "city"; - rel2.to: "city"; - } - } - } - } - group { "city1"; - data.item: "width" "10"; - data.item: "height" "10"; - parts { - part { name: "city"; - type: IMAGE; - scale: 1; - description { state: "default"; - image.normal: "city1.png"; - aspect_preference: BOTH; - aspect: 1 1; - min: 10 10; - max: 10 10; - fixed: 1 1; - } - } - image { name: "effect"; - description { state: "default"; - image.normal: "city11.png"; - aspect_preference: BOTH; - aspect: 1 1; - rel1.to: "city"; - rel2.to: "city"; - } - } - } - } - group { "city2"; - data.item: "width" "10"; - data.item: "height" "10"; - parts { - part { name: "city"; - type: IMAGE; - scale: 1; - description { state: "default"; - image.normal: "city2.png"; - aspect_preference: BOTH; - aspect: 1 1; - min: 10 10; - max: 10 10; - fixed: 1 1; - } - } - image { name: "effect"; - description { state: "default"; - image.normal: "city21.png"; - aspect_preference: BOTH; - aspect: 1 1; - rel1.to: "city"; - rel2.to: "city"; - } - } - } - } - group { "map"; - parts { - part { name: "map"; - type: IMAGE; - scale:1 ; - description { state: "default"; - image.normal: "world_map.png"; - fixed: 1 1; - min: 443 259; - max: 443 259; - } - } - } - } - group { "main"; -//common - parts { - part { name: "base"; - type: RECT; - description { state: "default"; - } - } - part { name: "map_base"; - type: RECT; - description { state: "default"; - rel2.relative: 1 0.51; - color: 246 243 243 255; - } - description { state: "next"; - inherit: "default"; - rel2.relative: 1 0.45; - } - } - part { name: "map"; - type: SWALLOW; - scale:1 ; - description { state: "default"; - rel1.to: "map_base"; - rel2.to: "map_base"; - rel1.relative: 0.0 0.27; - rel2.relative: 1.0 0.90; - fixed: 1 1; - } - description { state: "next"; - inherit: "default"; - rel1.relative: 0.0 0.10; - rel2.relative: 1.0 0.90; - } - } - part { name: "city_list"; - type: SWALLOW; - scale: 1; - description { state: "default"; - rel1.to: "map_base"; - rel1.relative: 0.0 1.0; - } - description { state: "next"; - inherit: "default"; - rel2.relative: 1.0 0.75; - } - } -// Init - part { name: "add_dim"; - type: RECT; - description { state: "default"; - rel1.to: "map_base"; - rel2.to: "map_base"; - color: 0 0 0 50; - } - description { state: "next"; - inherit: "default"; - color: 0 0 0 0; - } - } - part { name: "add_btn_clipper"; - type: RECT; - description { state: "default"; - color: 255 255 255 0; - } - description { state: "visible"; - color: 255 255 255 255; - } - description { state: "next"; - color: 255 255 255 0; - } - } - part { name: "add_btn"; - type: SWALLOW; - scale: 1; - clip_to: "add_btn_clipper"; - description { state: "default"; - rel1.to: "map_base"; - rel2.to: "map_base"; - rel1.relative: 0.5 0.4; - rel2.relative: 0.5 0.4; - align: 0.5 0.5; - min: 54 54; - fixed: 1 1; - color: 255 255 255 255; - } - description { state: "visible"; - inherit: "default"; - rel1.relative: 0.5 0.35; - rel2.relative: 0.5 0.35; - color: 255 255 255 255; - } - description { state: "next"; - inherit: "visible"; - min: 84 84; - color: 255 255 255 0; - } - } - part { name: "add_description"; - type: TEXTBLOCK; - scale: 1; - description { state: "default"; - rel1.to: "map_base"; - rel2.to: "map_base"; - rel1.relative: 0.0 0.5; - rel2.relative: 1.0 0.5; - fixed: 1 1; - align: 0 0; - text { - text: "<b>Add cities,<br>To find best time for your chat."; - style: "text_style"; - min: 0 1; - } - color: 255 255 255 0; - } - description { state: "visible"; - inherit: "default"; - rel1.relative: 0.0 0.45; - rel2.relative: 1.0 0.45; - color: 255 255 255 255; - } - description { state: "next"; - inherit: "visible"; - color: 255 255 255 0; - } - } - part { name: "add_description2"; - type: TEXTBLOCK; - scale: 1; - description { state: "default"; - rel1.relative: 0 0.6; - fixed: 1 1; - text { - text: "<b>After you add cities,<br>they will be shown here."; - style: "text_style"; - min: 0 1; - } - color: 255 255 255 255; - } - description { state: "hide"; - inherit: "default"; - color: 255 255 255 0; - } - } -// page 1 - part { name: "searchlist"; - type: IMAGE; - scale: 1; - description { state: "default"; - rel1.relative: 0.03 0.015; - rel2.relative: 0.97 0.015; - align: 0.5 0; - fixed: 1 1; - image.normal: "searchlist.png"; - image.border: 10 10 10 10; - image.border_scale: 1; - } - description { state: "visible"; - inherit: "default"; - rel2.to: "map"; - rel2.relative: 0.97 0.5; - } - } - part { name: "searchbar"; - type: RECT; - scale: 1; - description { state: "default"; - rel1.relative: 0.03 0.015; - rel2.relative: 0.97 0.015; - min: 0 35; - align: 0.5 0; - fixed: 1 1; - color: 255 255 255 0; - } - description { state: "visible"; - inherit: "default"; - color: 255 255 255 255; - } - } - part { name: "next_btn_clipper"; - type: RECT; - description { state: "default"; - color: 255 255 255 0; - } - description { state: "visible"; - color: 255 255 255 255; - } - description { state: "next"; - color: 255 255 255 0; - } - } - part { name: "next_btn"; - type: SWALLOW; - scale: 1; - clip_to: "next_btn_clipper"; - description { state: "default"; - rel1.to: "map"; - rel2.to: "map"; - rel1.relative: 0.85 0.8; - rel2.relative: 0.85 0.8; - min: 54 54; - fixed: 1 1; - color: 255 255 255 0; - align: 0.5 0.5; - } - description { state: "visible"; - inherit: "default"; - rel1.relative: 0.9 0.8; - rel2.relative: 0.9 0.8; - color: 255 255 255 255; - } - description { state: "next"; - inherit: "visible"; - min: 84 84; - color: 255 255 255 0; - } - } -//page 2 - part { name: "best_time"; - type: SWALLOW; - scale: 1; - description { state: "default"; - rel1.to: "city_list"; - rel1.relative: 0 1; - rel2.to: "city_list"; - rel2.relative: 1 1; - min: 0 100; - fixed: 1 1; - align: 0.5 0; - } - } - part { name: "bottom_part"; - type: SPACER; - scale: 1; - description { state: "default"; - rel1.to: "best_time"; - rel1.relative: 0 1; - rel2.relative: 1 1; - } - description { state:"next"; - inherit: "default"; - } - } - part { name: "save_dim"; - type: RECT; - description{ state: "default"; - color: 0 0 0 0; - visible: 0; - } - description{ state:"next"; - color: 0 0 0 126; - visible: 1; - } - } - part { name: "save_group_btn"; - type: SWALLOW; - scale: 1; - description { state: "default"; - rel1.to: "bottom_part"; - rel2.to: "bottom_part"; - rel1.relative: 0.25 0.5; - rel2.relative: 0.25 0.5; - fixed: 1 1; - min: 150 50; - align: 0.5 0.5; - } - } - part { name: "new_event_btn"; - type: SWALLOW; - scale: 1; - description { state: "default"; - rel1.to: "bottom_part"; - rel2.to: "bottom_part"; - rel1.relative: 0.75 0.5; - rel2.relative: 0.75 0.5; - fixed: 1 1; - min: 150 50; - align: 0.5 0.5; - } - } - } - programs { - -//sequence begin - program { name: "start"; - signal: "load"; - action: STATE_SET "visible"; - target: "add_btn"; - target: "add_btn_clipper"; - target: "add_description"; - transition: DECELERATE 1; - } - program { name: "page1"; - signal: "momentic,state,page1"; - script { - run_program(PROGRAM:"go_page1a"); - } - } - program { name: "page2"; - signal: "momentic,state,page2"; - script { - run_program(PROGRAM:"hide_search"); - run_program(PROGRAM:"go_page2a"); - } - } -//sequence end - - -//page 1 begin - program { name: "go_page1a"; - action: STATE_SET "next"; - target: "add_btn"; - target: "add_btn_clipper"; - target: "add_description"; - target: "add_dim"; - transition: DECELERATE 0.25; - after: "go_page1b"; - } - program { name: "go_page1b"; - action: STATE_SET "visible"; - target: "searchbar"; - } -//page 1 end - - -//search bar begin - program { name: "show_searchbar"; - signal: "momentic,state,searchbar,show"; - action: STATE_SET "visible"; - target: "searchbar"; - transition: DECELERATE 0.25; - } - program { name: "hide_searchbar"; - signal: "momentic,state,searchbar,hide"; - action: STATE_SET "default"; - target: "searchbar"; - transition: DECELERATE 0.25; - } - program { name: "show_searchlist"; - signal: "momentic,state,searchlist,show"; - action: STATE_SET "visible"; - target: "searchlist"; - transition: DECELERATE 0.5; - } - program { name: "hide_searchlist"; - signal: "momentic,state,searchlist,hide"; - action: STATE_SET "default"; - target: "searchlist"; - transition: DECELERATE 0.5; - } - program { name: "hide_search"; - signal: "momentic,state,searchlist,hide"; - action: STATE_SET "default"; - target: "searchlist"; - transition: DECELERATE 0.5; - after: "hide_searchbar"; - } -//search bar end - - program { name: "show_add_description2"; - signal: "momentic,state,add_description,show"; - action: STATE_SET "default"; - target: "add_description2"; - transition: DECELERATE 0.25; - } - program { name: "hide_add_description2"; - signal: "momentic,state,add_description,hide"; - action: STATE_SET "hide"; - target: "add_description2"; - transition: DECELERATE 0.25; - } - - -//page 2 begin - program { name: "go_page2a"; - action: STATE_SET "next"; - target: "next_btn"; - target: "next_btn_clipper"; - transition: DECELERATE 0.25; - after: "go_page2b"; - } - program { name: "go_page2b"; - action: STATE_SET "next"; - target: "map_base"; - target: "map"; - target: "city_list"; - target: "bottom_part"; - transition: DECELERATE 0.75; - } -//page 2 end - - -//next button begin - program { name: "next_btn_show"; - signal: "momentic,state,next_btn,show"; - action: STATE_SET "visible"; - target: "next_btn"; - target: "next_btn_clipper"; - transition: DECELERATE 0.75; - } - program { name: "next_btn_hide"; - signal: "momentic,state,next_btn,hide"; - action: STATE_SET "default"; - target: "next_btn"; - transition: DECELERATE 0.75; - } -//next button end - - -//test begin - program { name: "add_btn_clicked"; - signal: "mouse,clicked,1"; - source: "add_btn"; - script { - run_program(PROGRAM:"page1"); - } - } - program { name: "searchbar_clicked"; - signal: "mouse,clicked,1"; - source: "searchbar"; - script { - run_program(PROGRAM:"show_searchlist"); - } - } - program { name: "add_description2_clicked"; - signal: "mouse,clicked,1"; - source: "add_description2"; - script { - run_program(PROGRAM:"hide_add_description2"); - run_program(PROGRAM:"next_btn_show"); - } - } - program { name: "next_btn_clicked"; - signal: "mouse,clicked,1"; - source: "next_btn"; - script { - run_program(PROGRAM:"page2"); - } - } -//test end - } - } -} diff --git a/chun/momentic/momentic.edj b/chun/momentic/momentic.edj Binary files differdeleted file mode 100644 index a14e02d..0000000 --- a/chun/momentic/momentic.edj +++ /dev/null @@ -22,7 +22,7 @@ typedef struct _result_info_s result_info_s; extern Evas_Object *item_create_typing(Evas_Object *parent, int city, main_view_s *main_view_info); extern void item_destroy_typing(Evas_Object *item); -extern Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color); +extern Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color, main_view_s *main_view_info); extern void item_destroy_selecting(Evas_Object *item); extern Evas_Object *item_create_result(Evas_Object *parent, int city, int color, int start, int end, struct tm *global_time); @@ -31,4 +31,7 @@ extern void item_destroy_result(Evas_Object *item); extern Evas_Object *item_create_group(Evas_Object *parent, const char *title, main_view_s *main_view_info); extern void item_destroy_group(Evas_Object *item); +extern Evas_Object *item_create_padding(Evas_Object *parent); +extern void item_destroy_padding(Evas_Object *item); + #endif /* __MOMENTIC_ITEM_H__ */ @@ -12,5 +12,6 @@ typedef struct _city_data_s { Evas_Object *create_momentic_layout(Evas_Object *parent, const char *full_path); Eina_Bool add_city_to_map(int idx, city_s *ci); Eina_Bool remove_city_from_map(int idx); +void button_effect(Evas_Object *btn); #endif diff --git a/res/edje/city.edc b/res/edje/city.edc new file mode 100644 index 0000000..b2cc5e9 --- /dev/null +++ b/res/edje/city.edc @@ -0,0 +1,171 @@ +collections { + base_scale: 1.8; + images { + image: "city0.png" COMP; + image: "city01.png" COMP; + image: "city1.png" COMP; + image: "city2.png" COMP; + image: "city3.png" COMP; + image: "city4.png" COMP; + image: "cityh.png" COMP; + } + group { name: "city0"; + data.item: "width" "14"; + data.item: "height" "12"; + parts { + part { name: "city"; + type: IMAGE; + scale: 1; + description { state: "default"; + image.normal: "city0.png"; + aspect_preference: BOTH; + aspect: 1 1; + min: 14 12; + max: 14 12; + fixed: 1 1; + } + } + part { name: "effect"; + type: IMAGE; + description { state: "default"; + image.normal: "city01.png"; + aspect_preference: BOTH; + aspect: 1 1; + rel1.to: "city"; + rel2.to: "city"; + rel1.offset: -3 -3; + rel2.offset: 2 2; + } + } + } + } + group { + name: "city1"; + data.item: "width" "10"; + data.item: "height" "10"; + parts { + part { name: "city"; + type: IMAGE; + scale: 1; + description { state: "default"; + image.normal: "city1.png"; + aspect_preference: BOTH; + aspect: 1 1; + min: 10 10; + max: 10 10; + fixed: 1 1; + } + } + part { name: "effect"; + type: IMAGE; + description { state: "default"; + image.normal: "cityh.png"; + aspect_preference: BOTH; + aspect: 1 1; + rel1.to: "city"; + rel2.to: "city"; + rel1.offset: -3 -3; + rel2.offset: 2 2; + } + } + } + } + group { name: "city2"; + data.item: "width" "10"; + data.item: "height" "10"; + parts { + part { name: "city"; + type: IMAGE; + scale: 1; + description { state: "default"; + image.normal: "city2.png"; + aspect_preference: BOTH; + aspect: 1 1; + min: 10 10; + max: 10 10; + fixed: 1 1; + } + } + part { name: "effect"; + type: IMAGE; + description { state: "default"; + image.normal: "cityh.png"; + aspect_preference: BOTH; + aspect: 1 1; + rel1.to: "city"; + rel2.to: "city"; + rel1.offset: -3 -3; + rel2.offset: 2 2; + } + } + } + } + group { name: "city3"; + data.item: "width" "10"; + data.item: "height" "10"; + parts { + part { + name: "city"; + type: IMAGE; + scale: 1; + description { + state: "default"; + image.normal: "city3.png"; + aspect_preference: BOTH; + aspect: 1 1; + min: 10 10; + max: 10 10; + fixed: 1 1; + } + } + part { + name: "effect"; + type: IMAGE; + description { + state: "default"; + image.normal: "cityh.png"; + aspect_preference: BOTH; + aspect: 1 1; + rel1.to: "city"; + rel2.to: "city"; + rel1.offset: -3 -3; + rel2.offset: 2 2; + } + } + } + } + group { name: "city4"; + data.item: "width" "10"; + data.item: "height" "10"; + parts { + part { + name: "city"; + type: IMAGE; + scale: 1; + description { + state: "default"; + image.normal: "city4.png"; + aspect_preference: BOTH; + aspect: 1 1; + min: 10 10; + max: 10 10; + fixed: 1 1; + } + } + part { + name: "effect"; + type: IMAGE; + description { + state: "default"; + image.normal: "cityh.png"; + aspect_preference: BOTH; + aspect: 1 1; + rel1.to: "city"; + rel2.to: "city"; + rel1.offset: -3 -3; + rel2.offset: 2 2; + } + } + } + } +}
\ No newline at end of file diff --git a/res/edje/entry.edc b/res/edje/entry.edc index cc42d9a..0883ddb 100644 --- a/res/edje/entry.edc +++ b/res/edje/entry.edc @@ -15,11 +15,8 @@ collections { type: SPACER; description { state: "default" 0.0; - rel1 { relative: 0.5 0.5; } - rel2 { relative: 0.5 0.5; } align: 0.5 0.5; min: ENTRY_WIDTH ENTRY_HEIGHT; - fixed: 1 1; } } part { @@ -28,20 +25,34 @@ collections { description { state: "default" 0.0; rel1 { relative: 0.0 0.0; to: "bg"; } - rel2 { relative: 1.0 1.0; to: "bg"; } + rel2 { relative: 1.0 1.0; to: "bg"; offset: -1 -2; } image { normal: "searching_bar.png"; + border: 5 5 15 15; + border_scale: 1; } visible: 1; } } part { + name: "entry_clipper"; + type: RECT; + description { + rel1 { relative: 0.0 0.0; to: "bg_img"; } + rel2 { relative: 0.0 1.0; to_x: "delete_event"; to_y: "bg_img"; } + align: 0.0 0.0; + fixed: 1 1; + visible: 1; + } + } + part { name: "entry"; type: SWALLOW; + clip_to: "entry_clipper"; description { - rel1 { relative: 0.05 0.1; to: "bg_img"; } + rel1 { relative: 0.05 0.0; to: "bg_img"; } rel2 { relative: 0.0 1.0; to_x: "delete_event"; to_y: "bg_img"; } - align: 0.5 0.5; + align: 0.0 0.0; fixed: 1 1; visible: 1; } diff --git a/res/edje/images/1.png b/res/edje/images/1.png Binary files differnew file mode 100644 index 0000000..599c171 --- /dev/null +++ b/res/edje/images/1.png diff --git a/res/edje/images/2.png b/res/edje/images/2.png Binary files differnew file mode 100644 index 0000000..c1f1a93 --- /dev/null +++ b/res/edje/images/2.png diff --git a/res/edje/images/3.png b/res/edje/images/3.png Binary files differnew file mode 100644 index 0000000..7edb6aa --- /dev/null +++ b/res/edje/images/3.png diff --git a/res/edje/images/4.png b/res/edje/images/4.png Binary files differnew file mode 100644 index 0000000..72508de --- /dev/null +++ b/res/edje/images/4.png diff --git a/chun/momentic/img/Daynight layer.png b/res/edje/images/Daynight layer.png Binary files differindex 394033c..394033c 100755..100644 --- a/chun/momentic/img/Daynight layer.png +++ b/res/edje/images/Daynight layer.png diff --git a/chun/momentic/img/city2.png b/res/edje/images/button.png Binary files differindex 404c3d8..51d8fa5 100755..100644 --- a/chun/momentic/img/city2.png +++ b/res/edje/images/button.png diff --git a/res/edje/images/city1.png b/res/edje/images/city1.png Binary files differindex cb5e3bc..404c3d8 100644 --- a/res/edje/images/city1.png +++ b/res/edje/images/city1.png diff --git a/res/edje/images/city2.png b/res/edje/images/city2.png Binary files differindex 404c3d8..cb5e3bc 100644 --- a/res/edje/images/city2.png +++ b/res/edje/images/city2.png diff --git a/chun/momentic/img/city1.png b/res/edje/images/city3.png Binary files differindex cb5e3bc..2e861dc 100755..100644 --- a/chun/momentic/img/city1.png +++ b/res/edje/images/city3.png diff --git a/chun/momentic/img/city21.png b/res/edje/images/city4.png Binary files differindex 025770a..e43eca7 100755..100644 --- a/chun/momentic/img/city21.png +++ b/res/edje/images/city4.png diff --git a/chun/momentic/img/city11.png b/res/edje/images/cityh.png Binary files differindex 025770a..025770a 100755..100644 --- a/chun/momentic/img/city11.png +++ b/res/edje/images/cityh.png diff --git a/chun/momentic/img/orange small.png b/res/edje/images/drawer_bg.png Binary files differindex 241a680..d23ff07 100755 --- a/chun/momentic/img/orange small.png +++ b/res/edje/images/drawer_bg.png diff --git a/res/edje/images/drawer_btn.png b/res/edje/images/drawer_btn.png Binary files differnew file mode 100644 index 0000000..dc63717 --- /dev/null +++ b/res/edje/images/drawer_btn.png diff --git a/res/edje/item.edc b/res/edje/item.edc index fc1e08b..3966bef 100755 --- a/res/edje/item.edc +++ b/res/edje/item.edc @@ -1,5 +1,6 @@ #define ITEM_TYPING_WIDTH 442 #define ITEM_TYPING_HEIGHT 50 +#define ITEM_TYPING_HEIGHT_SMALL 30 #define ITEM_SELECTING_WIDTH 480 #define ITEM_SELECTING_HEIGHT 75 @@ -10,6 +11,9 @@ #define ITEM_GROUP_WIDTH 442 #define ITEM_GROUP_HEIGHT 50 +#define ITEM_PADDING_WIDTH 442 +#define ITEM_PADDING_HEIGHT 30 + images { image: "my_status_small.png" COMP; image: "other_location_blue_small.png" COMP; @@ -26,11 +30,18 @@ collections { name: "bg"; type: RECT; description { + state: "default" 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 1.0; } min: ITEM_TYPING_WIDTH ITEM_TYPING_HEIGHT; - color: 247 208 143 200; - visible: 1; + //color: 247 208 143 200; + visible: 0; + } + description { + state: "small" 0.0; + inherit: "default" 0.0; + min: ITEM_TYPING_WIDTH ITEM_TYPING_HEIGHT_SMALL; + max: ITEM_TYPING_WIDTH ITEM_TYPING_HEIGHT_SMALL; } } part { @@ -44,7 +55,7 @@ collections { rel2 { relative: 1.0 1.0; to: "city_event"; } color: 255 255 255 255; text { - text: "Hong kong"; + text: ""; font: "Tizen:style=LIGHT"; text_class: "tizen"; min: 0 1; @@ -69,16 +80,31 @@ collections { state: "default" 0.0; rel1 { relative: 20/ITEM_TYPING_WIDTH 0.0; to: "bg"; } rel2 { relative: 400/ITEM_TYPING_WIDTH 1.0; to: "bg"; } - align: 0.5 0.5; - min: ITEM_TYPING_HEIGHT ITEM_TYPING_HEIGHT; - fixed: 1 1; color: 0 0 0 0; visible: 1; } + description { + state: "disable" 0.0; + inherit: "default" 0.0; + visible: 0; + } } } //parts programs { program { + signal: "disable"; + source: "item"; + action: STATE_SET "disable" 0.0; + target: "city_event"; + } + program { + signal: "enable"; + source: "item"; + action: STATE_SET "default" 0.0; + target: "city_event"; + } + + program { signal: "mouse,down,1"; source: "city_event"; action: SIGNAL_EMIT "down" "item"; @@ -110,6 +136,7 @@ collections { name: "bg"; type: RECT; description { + state: "default" 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 1.0; } min: ITEM_SELECTING_WIDTH ITEM_SELECTING_HEIGHT; @@ -173,8 +200,8 @@ collections { scale: 1; description { state: "default" 0.0; - rel1 { relative: 73/ITEM_SELECTING_WIDTH 0.45; to: "bg"; } - rel2 { relative: 400/ITEM_SELECTING_WIDTH 0.45; to: "bg"; } + rel1 { relative: 73/ITEM_SELECTING_WIDTH 0.5; to: "bg"; } + rel2 { relative: 400/ITEM_SELECTING_WIDTH 0.5; to: "bg"; } color: 197 191 181 255; text { text: "Seoul, Korea"; @@ -195,8 +222,8 @@ collections { scale: 1; description { state: "default" 0.0; - rel1 { relative: 73/ITEM_SELECTING_WIDTH 0.55; to: "bg"; } - rel2 { relative: 400/ITEM_SELECTING_WIDTH 0.55; to: "bg"; } + rel1 { relative: 73/ITEM_SELECTING_WIDTH 0.48; to: "bg"; } + rel2 { relative: 400/ITEM_SELECTING_WIDTH 0.52; to: "bg"; } color: 221 218 213 255; text { text: "GMT + 8"; @@ -211,6 +238,21 @@ collections { } } part { + name: "bottom_line"; + type: RECT; + scale: 0; + description { + state: "default" 0.0; + rel1 { relative: 0.0 1.0; } + rel2 { relative: 1.0 1.0; } + min: 0 1; + align: 0.5 1.0; + fixed: 0 1; + color: 197 191 181 255; + visible: 1; + } + } + part { name: "delete"; type: IMAGE; scale: 1; @@ -235,7 +277,7 @@ collections { } part { name: "delete_event"; - type: RECT; + type: SWALLOW; mouse_events: 1; scale: 1; description { @@ -245,7 +287,6 @@ collections { align: 0.5 0.5; min: ITEM_SELECTING_HEIGHT ITEM_SELECTING_HEIGHT; fixed: 1 1; - color: 0 0 0 0; visible: 1; } } @@ -275,29 +316,6 @@ collections { action: STATE_SET "4" 0.0; target: "mark"; } - - program { - signal: "mouse,down,1"; - source: "delete_event"; - action: SIGNAL_EMIT "delete,down" "item"; - after: "delete,down,after"; - } - program { - name: "delete,down,after"; - action: STATE_SET "press" 0.0; - target: "delete"; - } - program { - signal: "mouse,up,1"; - source: "delete_event"; - action: SIGNAL_EMIT "delete,up" "item"; - after: "delete,up,after"; - } - program { - name: "delete,up,after"; - action: STATE_SET "default" 0.0; - target: "delete"; - } } } @@ -308,6 +326,7 @@ collections { name: "bg"; type: RECT; description { + state: "default" 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 1.0; } min: ITEM_RESULT_WIDTH ITEM_RESULT_HEIGHT; @@ -412,6 +431,7 @@ collections { name: "graph_base"; type: RECT; description { + state: "default" 0.0; rel1 { relative: 0.1 0.75; to: "bg"; } rel2 { relative: 0.9 0.75; to: "bg";} min: 0 10; @@ -429,6 +449,7 @@ collections { name: "bg"; type: RECT; description { + state: "default" 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 1.0; } min: ITEM_GROUP_WIDTH ITEM_GROUP_HEIGHT; @@ -506,5 +527,22 @@ collections { } } + group { + name: "item_padding"; + parts { + part { + name: "bg"; + type: RECT; + description { + state: "default" 0.0; + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 1.0; } + min: ITEM_PADDING_WIDTH ITEM_PADDING_HEIGHT; + color: 0 0 0 0; + visible: 1; + } + } + } //parts + } } //collections diff --git a/res/edje/map.edc b/res/edje/map.edc deleted file mode 100755 index 033f5f8..0000000 --- a/res/edje/map.edc +++ /dev/null @@ -1,39 +0,0 @@ -images { - image: "world_map.png" COMP; -} - -collections { - base_scale: 1.8; - group { - name: "main"; - parts { - part { - name: "bg"; - type: SPACER; - description { - state: "default" 0.0; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - } - } - part { - name: "map_img"; - type: IMAGE; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.5 0.5; to: "bg"; } - rel2 { relative: 0.5 0.5; to: "bg"; } - align: 0.5 0.5; - image { - normal: "world_map.png"; - } - min: 443 259; - visible: 1; - } - } - } - } -} diff --git a/res/edje/momentic.edc b/res/edje/momentic.edc index 3d797f1..eaae012 100644 --- a/res/edje/momentic.edc +++ b/res/edje/momentic.edc @@ -8,97 +8,7 @@ collections { images { image: "world_map.png" COMP; image: "searchlist.png" COMP; - image: "city0.png" COMP; - image: "city01.png" COMP; - image: "city1.png" COMP; - image: "city11.png" COMP; - image: "city2.png" COMP; - image: "city21.png" COMP; - } - group { name: "city0"; - data.item: "width" "14"; - data.item: "height" "12"; - parts { - part { name: "city"; - type: IMAGE; - scale: 1; - description { state: "default"; - image.normal: "city0.png"; - aspect_preference: BOTH; - aspect: 1 1; - min: 14 12; - max: 14 12; - fixed: 1 1; - } - } - part { name: "effect"; - type: IMAGE; - description { state: "default"; - image.normal: "city01.png"; - aspect_preference: BOTH; - aspect: 1 1; - rel1.to: "city"; - rel2.to: "city"; - } - } - } - } - group { - name: "city1"; - data.item: "width" "10"; - data.item: "height" "10"; - parts { - part { name: "city"; - type: IMAGE; - scale: 1; - description { state: "default"; - image.normal: "city1.png"; - aspect_preference: BOTH; - aspect: 1 1; - min: 10 10; - max: 10 10; - fixed: 1 1; - } - } - part { name: "effect"; - type: IMAGE; - description { state: "default"; - image.normal: "city11.png"; - aspect_preference: BOTH; - aspect: 1 1; - rel1.to: "city"; - rel2.to: "city"; - } - } - } - } - group { name: "city2"; - data.item: "width" "10"; - data.item: "height" "10"; - parts { - part { name: "city"; - type: IMAGE; - scale: 1; - description { state: "default"; - image.normal: "city2.png"; - aspect_preference: BOTH; - aspect: 1 1; - min: 10 10; - max: 10 10; - fixed: 1 1; - } - } - part { name: "effect"; - type: IMAGE; - description { state: "default"; - image.normal: "city21.png"; - aspect_preference: BOTH; - aspect: 1 1; - rel1.to: "city"; - rel2.to: "city"; - } - } - } + image: "drawer_btn.png" COMP; } group { name: "map"; parts { @@ -115,6 +25,10 @@ collections { } } group { name: "main"; + script { + public drawer_activate = 0; + public page_state = 0; + } //common parts { part { name: "base"; @@ -158,17 +72,9 @@ collections { } description { state: "next"; inherit: "default"; - rel2.relative: 1.0 0.75; + visible: 0; } } - part { name: "result_list"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - rel1.to: "city_list"; - rel2.to: "city_list"; - } - } // Init part { name: "add_dim"; type: RECT; @@ -251,6 +157,7 @@ collections { part { name: "add_description2"; type: TEXTBLOCK; scale: 1; + mouse_events: 0; description { state: "default"; rel1.relative: 0 0.6; fixed: 1 1; @@ -266,18 +173,106 @@ collections { color: 255 255 255 0; } } + part { name: "drawer_dim"; + type: RECT; + description { state: "default"; + color: 0 0 0 0; + visible: 0; + } + description { state: "visible"; + inherit: "default"; + } + description { state: "activated"; + color: 0 0 0 75; + visible: 1; + } + } + part { name: "drawer_bg"; + type: RECT; + scale: 1; + description { state: "default"; + rel1.relative: -0.68 0; + rel2.relative: 0 1; + color: 255 200 0 210; + } + description { state: "visible"; + inherit: "default"; + } + description { state: "activated"; + inherit: "default"; + rel1.relative: 0 0; + rel2.relative: 0.68 1; + } + } + part { name: "drawer_content"; + type: SWALLOW; + scale: 1; + description { state: "default"; + rel1.to: "drawer_bg"; + rel2.to: "drawer_bg"; + rel1.relative: 0.05 0.01; + rel2.relative: 0.85 0.99; + } + } + part { name: "drawer_btn"; + type: IMAGE; + scale: 1; + description { state: "default"; + rel1.relative: 0 0.01; + rel2.relative: 0 0.01; + align: 1 0; + min: 35 35; + fixed: 1 1; + image.normal: "drawer_btn.png"; + } + description { state: "visible"; + inherit: "default"; + align: 0 0; + map { + on: 1; + rotation.y: 0; + } + color: 255 200 0 210; + } + description { state: "activated"; + inherit: "visible"; + rel1.relative: 0.6 0.01; + rel2.relative: 0.6 0.01; + map { + on: 1; + rotation.z: 180; + } + color: 255 255 255 255; + } + description { state: "next"; + inherit: "default"; + } + } + part { name: "drawer_btn_event"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.to: "drawer_btn"; + rel2.to: "drawer_btn"; + fixed: 1 1; + min: 60 60; + align: 1 0; + color: 0 0 0 0; + } + } // page 1 - part { name: "searchlist_bg"; + part { name: "searchlist_bg"; type: IMAGE; scale: 1; description { state: "default"; - rel1.relative: 0.03 0.015; - rel2.relative: 0.97 0.015; + rel1.to: "searchbar"; + rel1.relative: 0.0 0.5; + rel2.to_x: "searchbar"; + rel2.relative: 1.0 0.015; + rel2.offset: -2 -1; align: 0.5 0; fixed: 1 1; image.normal: "searchlist.png"; - image.border: 10 10 10 10; - image.border_scale: 1; } description { state: "visible"; inherit: "default"; @@ -315,8 +310,14 @@ collections { clip_to: "searchbar_clipper"; description { state: "default"; rel1.to: "searchbar_clipper"; - rel2.to: "searchbar_clipper"; + rel2.to: "searchbar_clipper"; + visible: 0; } + description { state: "next"; + rel1.to: "searchbar_clipper"; + rel2.to: "searchbar_clipper"; + visible: 1; + } } part { name: "next_btn_clipper"; type: RECT; @@ -357,24 +358,26 @@ collections { } } //page 2 - part { name: "best_time"; + part { name: "result_list"; type: SWALLOW; scale: 1; - description { state: "default"; + description { + state: "default" 0.0; rel1.to: "city_list"; - rel1.relative: 0 1; rel2.to: "city_list"; - rel2.relative: 1 1; - min: 0 100; - fixed: 1 1; - align: 0.5 0; + visible: 0; + } + description { state: "next"; + inherit: "default"; + rel2.relative: 1.0 0.8; + visible: 1; } } part { name: "bottom_part"; type: SPACER; scale: 1; description { state: "default"; - rel1.to: "best_time"; + rel1.to: "result_list"; rel1.relative: 0 1; rel2.relative: 1 1; } @@ -382,13 +385,13 @@ collections { inherit: "default"; } } - part { name: "save_dim"; + part { name: "save_group_bg"; type: RECT; description{ state: "default"; color: 0 0 0 0; visible: 0; } - description{ state:"next"; + description{ state:"activated"; color: 0 0 0 126; visible: 1; } @@ -405,6 +408,13 @@ collections { min: 150 50; align: 0.5 0.5; } + description { state: "activated"; + rel1.relative: 0.5 0.5; + rel2.relative: 0.5 0.5; + min: 350 350; + fixed: 1 1; + align: 0.5 0.5; + } } part { name: "new_event_btn"; type: SWALLOW; @@ -416,7 +426,7 @@ collections { rel2.relative: 0.75 0.5; fixed: 1 1; min: 150 50; - align: 0.5 0.5; + align: 0.5 0; } } } @@ -429,12 +439,14 @@ collections { target: "add_btn"; target: "add_btn_clipper"; target: "add_description"; + target: "drawer_btn"; transition: DECELERATE 1; } program { name: "page1"; signal: "momentic,state,page1"; script { run_program(PROGRAM:"go_page1a"); + set_int(page_state, -1); } } program { name: "page2"; @@ -442,9 +454,101 @@ collections { script { run_program(PROGRAM:"hide_search"); run_program(PROGRAM:"go_page2a"); + set_int(page_state, -1); + } + } + program { name: "page_back"; + signal: "momentic,state,page,back"; + script { + if (get_int(drawer_activate)) { + run_program(PROGRAM:"drawer_hide"); + } else { + if (get_int(page_state) == 3) { + //page2_back + set_int(page_state, -1); + } else if (get_int(page_state) == 2) { + run_program(PROGRAM:"page_back_1a"); + run_program(PROGRAM:"page_back_1d"); + set_int(page_state, -1); + } else if (get_int(page_state) == 1) { + run_program(PROGRAM:"page_back_0a"); + run_program(PROGRAM:"page_back_0d"); + run_program(PROGRAM:"hide_searchlist"); + run_program(PROGRAM:"show_add_description2"); + run_program(PROGRAM:"next_btn_hide"); + set_int(page_state, -1); + } + } } } //sequence end + +//page 1 back begin + program { name: "page_back_1a"; + action: STATE_SET "default" 0.0; + target: "result_list"; + target: "map_base"; + target: "map"; + target: "city_list"; + target: "bottom_part"; + transition: DECELERATE 0.75; + after: "page_back_1b"; + } + program { name: "page_back_1b"; + action: STATE_SET "visible" 0.0; + target: "next_btn"; + target: "next_btn_clipper"; + target: "searchbar_clipper"; + transition: DECELERATE 0.25; + after: "page_back_1c"; + } + program { name: "page_back_1c"; + script { + set_int(page_state, 1); + } + } + program { name: "page_back_1d"; + action: STATE_SET "next" 0.0; + target: "searchbar"; + } +//page 1 back end + +//page 0 back begin + program { name: "page_back_0a"; + action: STATE_SET "default" 0.0; + target: "add_btn"; + target: "add_btn_clipper"; + target: "add_description"; + target: "drawer_btn"; + after: "page_back_0b"; + } + program { name: "page_back_0b"; + action: STATE_SET "visible" 0.0; + target: "add_btn"; + target: "add_btn_clipper"; + target: "add_description"; + target: "drawer_btn"; + transition: DECELERATE 1; + after: "page_back_0c"; + } + program { name: "page_back_0c"; + action: STATE_SET "default" 0.0; + target: "searchbar"; + } + program { name: "page_back_0d"; + action: STATE_SET "default" 0.0; + target: "add_dim"; + target: "searchbar_clipper"; + transition: DECELERATE 0.5; + after: "page_back_0e"; + } + program { name: "page_back_0e"; + script { + set_int(page_state, 0); + } + } +//page 0 back end + //page 1 begin @@ -454,13 +558,25 @@ collections { target: "add_btn_clipper"; target: "add_description"; target: "add_dim"; + target: "searchbar"; + target: "drawer_btn"; transition: DECELERATE 0.25; after: "go_page1b"; } program { name: "go_page1b"; action: STATE_SET "visible" 0.0; target: "searchbar_clipper"; + after: "go_page1c"; + } + program { name: "go_page1c"; + action: SIGNAL_EMIT "momentic,page1,done" ""; + after: "go_page1d"; } + program { name: "go_page1d"; + script { + set_int(page_state, 1); + } + } //page 1 end @@ -501,6 +617,8 @@ collections { } //search bar end + +//description2 begin program { name: "show_add_description2"; signal: "momentic,state,add_description,show"; action: STATE_SET "default" 0.0; @@ -513,6 +631,7 @@ collections { target: "add_description2"; transition: DECELERATE 0.25; } +//description2 end //page 2 begin @@ -528,9 +647,16 @@ collections { target: "map_base"; target: "map"; target: "city_list"; + target: "result_list"; target: "bottom_part"; transition: DECELERATE 0.75; + after: "go_page2c"; } + program { name: "go_page2c"; + script { + set_int(page_state, 2); + } + } //page 2 end @@ -546,10 +672,70 @@ collections { signal: "momentic,state,next_btn,hide"; action: STATE_SET "default" 0.0; target: "next_btn"; + target: "next_btn_clipper"; transition: DECELERATE 0.75; } //next button end + +//drawer begin + program { name: "drawer_show"; + signal: "momentic,state,drawer,show"; + action: STATE_SET "activated" 0.0; + target: "drawer_btn"; + target: "drawer_dim"; + target: "drawer_bg"; + transition: DECELERATE 0.5; + } + program { name: "drawer_hide"; + signal: "momentic,state,drawer,hide"; + action: STATE_SET "visible" 0.0; + target: "drawer_btn"; + target: "drawer_dim"; + target: "drawer_bg"; + transition: DECELERATE 0.5; + } + program { name: "drawer_clicked"; + signal: "mouse,clicked,1"; + source: "drawer_btn_event"; + script { + if (get_int(drawer_activate) == 0) { + set_int(drawer_activate, 1); + run_program(PROGRAM:"drawer_show"); + } else { + set_int(drawer_activate, 0); + run_program(PROGRAM:"drawer_hide"); + } + } + } + program { name: "drawer_clicked2"; + signal: "mouse,clicked,1"; + source: "drawer_dim"; + script { + set_int(drawer_activate, 0); + run_program(PROGRAM:"drawer_hide"); + } + } +//drawer end + + + +//save group begin + program { name: "save_group_activate"; + signal: "momentic,state,save_group,activate"; + action: STATE_SET "activated" 0.0; + target: "save_group_btn"; + target: "save_group_bg"; + transition: DECELERATE 0.5; + } + program { name: "save_group_deactivate"; + signal: "momentic,state,save_group,deactivate"; + action: STATE_SET "default" 0.0; + target: "save_group_btn"; + target: "save_group_bg"; + transition: DECELERATE 0.5; + } +//save group end } } } @@ -13,11 +13,16 @@ #include "main_view.h" #include "scroller.h" #include "popup.h" +#include "map.h" #define _EDJ(o) elm_layout_edje_get(o) +#define MAX_CITY 5 + const char *const DATA_KEY_CITY = "city"; +const char *const DATA_KEY_MAIN_VIEW_INFO = "mvi"; const char *const ITEM_EDJE = "item.edj"; +static int color_index[MAX_CITY] = { 0, 0, 0, 0, 0 }; void _text_set_here_time(Evas_Object *item, const char *part) { @@ -40,7 +45,7 @@ void _text_set_here_time(Evas_Object *item, const char *part) /* Timezone Asia/Seoul - */ + */ if (local_time->tm_gmtoff >= 0) snprintf(time_result, sizeof(time_result), "%s, +%ld", timezone_str, local_time->tm_gmtoff / 3600); else @@ -79,28 +84,27 @@ static void _item_typing_up_cb(void *data, Evas_Object *obj, const char *emissio return; count = scroller_count_item(main_view_info->city_list); - if (count >= MAXIMUM_SELECTED_CITY) { + if (count + 1 > MAXIMUM_SELECTED_CITY) { Evas_Object *popup = NULL; _D("Cities selected are limited."); popup = popup_create_text(main_view_info->main_view, "Maximum number of cities reached"); - elm_object_part_content_set(main_view_info->main_view, "popup", popup); + ret_if(!popup); return; - } else if (count > 0) { - elm_object_signal_emit(main_view_info->main_view, "momentic,state,add_description,hide", ""); - } else { - /* We need to move this to the item_selecting */ - elm_object_signal_emit(main_view_info->main_view, "momentic,state,add_description,show", ""); - } - - if (count > 1) { - elm_object_signal_emit(main_view_info->main_view, "momentic,state,next_btn,show", ""); } city = (int) evas_object_data_get(item, DATA_KEY_CITY); - selecting_item = item_create_selecting(main_view_info->city_list, city, 0); + selecting_item = item_create_selecting(main_view_info->city_list, city, 0, main_view_info); ret_if(!selecting_item); - scroller_append_item(main_view_info->city_list, selecting_item); + count++; + + if (count > 1) { + elm_object_signal_emit(main_view_info->main_view, "momentic,state,add_description,hide", ""); + elm_object_signal_emit(main_view_info->main_view, "momentic,state,next_btn,show", ""); + } else { + elm_object_signal_emit(main_view_info->main_view, "momentic,state,add_description,show", ""); + elm_object_signal_emit(main_view_info->main_view, "momentic,state,next_btn,hide", ""); + } } Evas_Object *item_create_typing(Evas_Object *parent, int city, main_view_s *main_view_info) @@ -134,13 +138,19 @@ Evas_Object *item_create_typing(Evas_Object *parent, int city, main_view_s *main evas_object_show(item); + if (city < 0) { + elm_object_part_text_set(item, "city", "No results"); + elm_object_signal_emit(item, "disable", "item"); + return item; + } + city_info = city_get(); if (!city_info) { _E("Critical, no city information"); evas_object_del(item); return NULL; } - + snprintf(city_str, sizeof(city_str), "%s, %s", city_info[city].name, city_info[city].nation); elm_object_part_text_set(item, "city", city_str); @@ -164,34 +174,67 @@ static void _item_selecting_del_cb(void *data, Evas *e, Evas_Object *obj, void * item_destroy_selecting(obj); } -static void _item_selecting_delete_down_cb(void *data, Evas_Object *obj, const char *emission, const char *source) +static void _delete_selecting_item_cb(void *data, Evas_Object *obj, void *event_info) { - _D("Delete button is down"); -} + main_view_s *main_view_info = NULL; + Evas_Object *item = data; + int count = 0; + int ci = 0; + + _D("clicked, delete the selected item"); -static void _item_selecting_delete_up_cb(void *data, Evas_Object *obj, const char *emission, const char *source) -{ - Evas_Object *item= obj; ret_if(!item); - _D("Delete button is up"); + main_view_info = evas_object_data_get(item, DATA_KEY_MAIN_VIEW_INFO); + ret_if(!main_view_info); + + ci = (int) evas_object_data_get(item, "color_index"); + + if (EINA_FALSE == remove_city_from_map(ci)) + _E("cannot remove the city"); + color_index[ci] = 0; item_destroy_selecting(item); + + count = scroller_count_item(main_view_info->city_list); + if (count > 1) { + elm_object_signal_emit(main_view_info->main_view, "momentic,state,add_description,hide", ""); + elm_object_signal_emit(main_view_info->main_view, "momentic,state,next_btn,show", ""); + } else { + elm_object_signal_emit(main_view_info->main_view, "momentic,state,add_description,show", ""); + elm_object_signal_emit(main_view_info->main_view, "momentic,state,next_btn,hide", ""); + } } -Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color) +Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color, main_view_s *main_view_info) { Evas_Object *item = NULL; + Evas_Object *btn = NULL; city_s *city_info = NULL; selecting_info_s *selecting_info = NULL; char *path = NULL; char full_path[PATH_LEN] = {0, }; char city_str[PATH_LEN] = {0, }; + char gmt_str[PATH_LEN] = {0, }; char color_str[16] = {0, }; retv_if(!parent, NULL); + city_info = city_get(); + goto_if(!city_info, error); + + int i = 0; + for (i = 0; i < MAX_CITY; i++) { + if (color_index[i]) continue; + + if (EINA_FALSE == add_city_to_map(i, &city_info[city])) { + _E("cannot add a city to the map"); + return NULL; + } + break; + } + path = app_get_resource_path(); retv_if(!path, NULL); @@ -210,18 +253,32 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color) evas_object_size_hint_weight_set(item, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(item, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_data_set(item, DATA_KEY_MAIN_VIEW_INFO, main_view_info); evas_object_data_set(item, DATA_KEY_SELECTING, selecting_info); evas_object_event_callback_add(item, EVAS_CALLBACK_DEL, _item_selecting_del_cb, NULL); - elm_object_signal_callback_add(item, "delete,down", "item", _item_selecting_delete_down_cb, NULL); - elm_object_signal_callback_add(item, "delete,up", "item", _item_selecting_delete_up_cb, NULL); evas_object_show(item); - city_info = city_get(); - goto_if(!city_info, error); - + evas_object_data_set(item, "color_index", (void *) i); + color_index[i] = 1; + + btn = elm_button_add(item); + if (btn) { + elm_object_style_set(btn, "transparent"); + elm_object_part_content_set(item, "delete_event", btn); + evas_object_smart_callback_add(btn, "clicked", _delete_selecting_item_cb, item); + evas_object_show(btn); + } + snprintf(city_str, sizeof(city_str), "%s, %s", city_info[city].name, city_info[city].nation); elm_object_part_text_set(item, "city", city_str); + if (city_info[city].timezone > 0) + snprintf(gmt_str, sizeof(gmt_str), "GMT +%.1f", city_info[city].timezone); + else + snprintf(gmt_str, sizeof(gmt_str), "GMT %.1f", city_info[city].timezone); + + elm_object_part_text_set(item, "gmt", gmt_str); + if (color) { snprintf(color_str, sizeof(color_str), "%d", color); elm_object_signal_emit(item, color_str, "mark"); @@ -245,12 +302,12 @@ void item_destroy_selecting(Evas_Object *item) ret_if(!item); + evas_object_data_del(item, DATA_KEY_MAIN_VIEW_INFO); selecting_info = evas_object_data_del(item, DATA_KEY_SELECTING); + evas_object_data_del(item, "color_index"); free(selecting_info); evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, _item_selecting_del_cb); - elm_object_signal_callback_del(item, "delete,down", "item", _item_selecting_delete_down_cb); - elm_object_signal_callback_del(item, "delete,up", "item", _item_selecting_delete_up_cb); evas_object_del(item); } @@ -346,13 +403,13 @@ Evas_Object *item_create_result(Evas_Object *parent, int city, int color, int st evas_object_size_hint_align_set(item, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_data_set(item, DATA_KEY_RESULT, result_info); evas_object_event_callback_add(item, EVAS_CALLBACK_DEL, _item_result_del_cb, NULL); - evas_object_event_callback_add(item, EVAS_CALLBACK_RESIZE, _resize_graph_cb, result_info); - evas_object_event_callback_add(item, EVAS_CALLBACK_MOVE, _resize_graph_cb, result_info); + //evas_object_event_callback_add(item, EVAS_CALLBACK_RESIZE, _resize_graph_cb, result_info); + //evas_object_event_callback_add(item, EVAS_CALLBACK_MOVE, _resize_graph_cb, result_info); evas_object_show(item); city_info = city_get(); goto_if(!city_info, error); - + snprintf(city_str, sizeof(city_str), "%s, %s", city_info[city].name, city_info[city].nation); elm_object_part_text_set(item, "city", city_str); @@ -366,7 +423,7 @@ Evas_Object *item_create_result(Evas_Object *parent, int city, int color, int st result_info->rect1 = evas_object_rectangle_add(e); goto_if(!result_info->rect1, error); - + result_info->rect2 = evas_object_rectangle_add(e); goto_if(!result_info->rect2, error); @@ -446,7 +503,7 @@ static void _item_group_up_cb(void *data, Evas_Object *obj, const char *emission } city = (int) evas_object_data_get(item, DATA_KEY_CITY); - selecting_item = item_create_selecting(main_view_info->city_list, city, 0); + selecting_item = item_create_selecting(main_view_info->city_list, city, 0, main_view_info); ret_if(!selecting_item); scroller_append_item(main_view_info->city_list, selecting_item); @@ -495,3 +552,47 @@ void item_destroy_group(Evas_Object *item) evas_object_del(item); } + +static void _item_padding_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + item_destroy_padding(obj); +} + +Evas_Object *item_create_padding(Evas_Object *parent) +{ + Evas_Object *item = NULL; + city_s *city_info = NULL; + + char *path = NULL; + char full_path[PATH_LEN] = {0, }; + char city_str[PATH_LEN] = {0, }; + + retv_if(!parent, NULL); + + path = app_get_resource_path(); + retv_if(!path, NULL); + + snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, ITEM_EDJE); + free(path); + + item = elm_layout_add(parent); + retv_if(!item, NULL); + + elm_layout_file_set(item, full_path, "item_padding"); + + evas_object_size_hint_weight_set(item, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(item, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_event_callback_add(item, EVAS_CALLBACK_DEL, _item_padding_del_cb, NULL); + + evas_object_show(item); + + return item; +} + +void item_destroy_padding(Evas_Object *item) +{ + ret_if(!item); + evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, _item_padding_del_cb); + evas_object_del(item); +} + @@ -43,6 +43,8 @@ app_create(void *data) moment_info_s *moment_info = data;
elm_app_base_scale_set(1.8);
+ elm_config_accel_preference_set("hw");
+ elm_config_preferred_engine_set("opengl_x11");
moment_info->win = elm_win_util_standard_add(PACKAGE, PACKAGE);
retv_if(!moment_info->win, false);
diff --git a/src/main_view.c b/src/main_view.c index a1cde8f..7f7e62e 100644 --- a/src/main_view.c +++ b/src/main_view.c @@ -65,8 +65,10 @@ static void _clean_searchlist(Evas_Object *searchlist) static void _update_searchlist(Evas_Object *searchlist, const char *str, main_view_s *main_view_info) { + Evas_Object *predict_item = NULL; city_s *city_info = NULL; register int i = 0; + int count = 0; ret_if(!searchlist); @@ -75,6 +77,12 @@ static void _update_searchlist(Evas_Object *searchlist, const char *str, main_vi city_info = city_get(); ret_if(!city_info); + /* This is the padding before the search list */ + predict_item = item_create_padding(searchlist); + if (predict_item) { + _append_item_to_searchlist(searchlist, predict_item); + } + for (; i < CITY_MAX; i++) { int matched = 0; if (city_info[i].name && strstr(city_info[i].name, str)) @@ -83,13 +91,22 @@ static void _update_searchlist(Evas_Object *searchlist, const char *str, main_vi matched = 1; if (matched) { - Evas_Object *predict_item = NULL; predict_item = item_create_typing(searchlist, i, main_view_info); if (predict_item) _append_item_to_searchlist(searchlist, predict_item); } } + elm_object_signal_emit(main_view_info->main_view, "show", "entry_result"); + + count = scroller_count_item(searchlist); + if (count > 1) + return; + + predict_item = item_create_typing(searchlist, -1, main_view_info); + if (predict_item) { + _append_item_to_searchlist(searchlist, predict_item); + } } static void _change_entry_cb(void *data, Evas_Object *obj, void *event_info) @@ -206,13 +223,14 @@ static Evas_Object *_create_searchbar(Evas_Object *parent, main_view_s *main_vie retv_if(!entry_obj, NULL); elm_entry_single_line_set(entry_obj, EINA_TRUE); - elm_entry_scrollable_set(entry_obj, EINA_TRUE); + /* This makes the text upper */ + elm_entry_scrollable_set(entry_obj, EINA_FALSE); elm_entry_cnp_mode_set(entry_obj, ELM_CNP_MODE_PLAINTEXT); elm_entry_text_style_user_push(entry_obj, "DEFAULT='font_size=20'"); elm_object_part_text_set(entry_obj, "elm.guide", "<font_size=20>Search</font_size>"); evas_object_size_hint_weight_set(entry_obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(entry_obj, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_align_set(entry_obj, 0.0, 0.5); evas_object_smart_callback_add(entry_obj, "changed", _change_entry_cb, main_view_info); evas_object_smart_callback_add(entry_obj, "focused", _focus_entry_cb, main_view_info); @@ -327,6 +345,8 @@ static Evas_Object *_create_next_btn(Evas_Object *parent, main_view_s *main_view elm_object_content_set(next_btn, icon); } + button_effect(next_btn); + return next_btn; } @@ -380,7 +400,11 @@ static void _click_add_btn_cb(void *data, Evas_Object *obj, void *event_info) ret_if(!main_view_info->main_view); elm_object_signal_emit(main_view_info->main_view, "momentic,state,page1", ""); +} +static void _page1_done_cb(void *data, Evas_Object *obj, const char *signal, const char *source) +{ + elm_object_focus_set(data, EINA_TRUE); } static Evas_Object *_create_add_btn(Evas_Object *parent, main_view_s *main_view_info) @@ -409,6 +433,8 @@ static Evas_Object *_create_add_btn(Evas_Object *parent, main_view_s *main_view_ elm_object_content_set(add_btn, icon); } + button_effect(add_btn); + return add_btn; } @@ -602,6 +628,11 @@ static void _destroy_group_scroller(Evas_Object *group_scroller) evas_object_del(group_scroller); } +static void _main_view_back_cb(void *data, Evas_Object *obj, void *event_info) +{ + elm_object_signal_emit(obj, "momentic,state,page,back", ""); +} + Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info) { main_view_s *main_view_info = NULL; @@ -628,6 +659,8 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info) return NULL; } + eext_object_event_callback_add(main_view_info->main_view, EEXT_CALLBACK_BACK, _main_view_back_cb, main_view_info); + elm_layout_file_set(main_view_info->main_view, full_path, "main"); evas_object_size_hint_weight_set(main_view_info->main_view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(main_view_info->main_view, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -667,6 +700,8 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info) evas_object_hide(main_view_info->group_scroller); //elm_object_part_content_set(main_view_info->main_view, "group_scroller", main_view_info->group_scroller); + elm_object_signal_callback_add(main_view_info->main_view, "momentic,page1,done", "", _page1_done_cb, main_view_info->searchbar); + return main_view_info->main_view; } @@ -1,21 +1,32 @@ #include <Elementary.h> +#include <app.h> + #include "map.h" +#include "log.h" +#include "util.h" -#define CITY_MAX 3 +#define CITY_MAX 5 #define WORLD_W 443 #define WORLD_H 259 +#define ORIGIN_W 443 +#define ORIGIN_H 259 static Evas_Object *main_layout = NULL; static Evas_Object *map_layout = NULL; static city_data_s city[CITY_MAX] = {{{0, 0, 0, 0, 0, 0}, NULL}, {{0, 0, 0, 0, 0, 0}, NULL}, + {{0, 0, 0, 0, 0, 0}, NULL}, + {{0, 0, 0, 0, 0, 0}, NULL}, {{0, 0, 0, 0, 0, 0}, NULL}}; static void map_geom_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { - Evas_Coord x, y, w, h; - evas_object_geometry_get(obj, &x, &y, &w, &h); + Evas_Coord x, y, w, h, x2, y2, w2, h2; + evas_object_geometry_get(obj, &x, &y, &w, &h); + edje_object_part_geometry_get(elm_layout_edje_get(obj), "map", &x2, &y2, &w, &h); + double scale_w = (double) w / ORIGIN_W; + double scale_h = (double) h / ORIGIN_H; int idx; for (idx = 0; CITY_MAX > idx; idx++) @@ -24,6 +35,9 @@ map_geom_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) evas_object_move(city[idx].obj, (x + city[idx].ci.x) - (city[idx].w / 2), (y + city[idx].ci.y) - (city[idx].h / 2)); + evas_object_move(city[idx].obj, + (int)((double)city[idx].ci.x * scale_w) + x + x2 - (city[idx].w / 2), + (int)((double)city[idx].ci.y * scale_h) + y + y2 - (city[idx].h / 2)); } } @@ -61,17 +75,35 @@ create_momentic_layout(Evas_Object *parent, const char *full_path) Eina_Bool add_city_to_map(int idx, city_s *ci) { + char *path = NULL; + char full_path[PATH_LEN] = {0, }; + if (idx >= CITY_MAX) return EINA_FALSE; if (0 > idx) return EINA_FALSE; if (city[idx].obj) return EINA_FALSE; - Evas_Coord x, y; - evas_object_geometry_get(map_layout, &x, &y, NULL, NULL); + int i; + for (i = 0; i < CITY_MAX; i++) + { + if (city[i].ci.id == ci->id) return EINA_FALSE; + } + + path = app_get_resource_path(); + retv_if(!path, EINA_FALSE); + + snprintf(full_path, sizeof(full_path), "%s/edje/city.edj", path); + free(path); + + Evas_Coord x, y, w, h, x2, y2, w2, h2; + evas_object_geometry_get(map_layout, &x, &y, &w, &h); + edje_object_part_geometry_get(elm_layout_edje_get(map_layout), "map", &x2, &y2, &w, &h); + double scale_w = (double) w / ORIGIN_W; + double scale_h = (double) h / ORIGIN_H; char buf[256]; snprintf(buf, sizeof(buf), "city%d", idx); city[idx].obj = elm_layout_add(map_layout); - elm_layout_file_set(city[idx].obj, "momentic.edj", buf); + elm_layout_file_set(city[idx].obj, full_path, buf); evas_object_smart_member_add(city[idx].obj, map_layout); evas_object_show(city[idx].obj); @@ -81,9 +113,10 @@ add_city_to_map(int idx, city_s *ci) memcpy(&city[idx].ci, ci, sizeof(city_s)); evas_object_resize(city[idx].obj, city[idx].w, city[idx].h); + evas_object_move(city[idx].obj, - ci->x + x - (city[idx].w / 2), - ci->y + y - (city[idx].h / 2)); + (int)((double)ci->x * scale_w) + x + x2 - (city[idx].w / 2), + (int)((double)ci->y * scale_h) + y + y2 - (city[idx].h / 2)); Elm_Transit *trans; @@ -102,8 +135,8 @@ add_city_to_map(int idx, city_s *ci) evas_object_render_op_set(effect, EVAS_RENDER_ADD); trans = elm_transit_add(); elm_transit_object_add(trans, effect); - elm_transit_effect_color_add(trans, 0, 0, 0, 0, 127, 127, 127, 127); - elm_transit_duration_set(trans, 0.75); + elm_transit_effect_color_add(trans, 0, 0, 0, 0, 100, 100, 100, 100); + elm_transit_duration_set(trans, 1.25); elm_transit_repeat_times_set(trans, -1); elm_transit_auto_reverse_set(trans, EINA_TRUE); elm_transit_go(trans); @@ -126,6 +159,8 @@ remove_city_from_map(int idx) if (0 > idx) return EINA_FALSE; if (!city[idx].obj) return EINA_FALSE; + city[idx].ci.id = -1; + Elm_Transit *trans = elm_transit_add(); elm_transit_object_add(trans, city[idx].obj); elm_transit_effect_zoom_add(trans, 1.0, 2.0); @@ -137,3 +172,18 @@ remove_city_from_map(int idx) return EINA_TRUE; } + +void +button_effect(Evas_Object *btn) +{ + Elm_Transit *trans = elm_transit_add(); + elm_transit_object_add(trans, btn); + elm_transit_effect_zoom_add(trans, 1.0, 0.9); + elm_transit_duration_set(trans, 0.4); + elm_transit_event_enabled_set(trans, EINA_TRUE); + elm_transit_auto_reverse_set(trans, EINA_TRUE); + elm_transit_repeat_times_set(trans, -1); + elm_transit_go(trans); +} + + diff --git a/tizen-manifest.xml b/tizen-manifest.xml index 9ce0854..c39375f 100755 --- a/tizen-manifest.xml +++ b/tizen-manifest.xml @@ -2,7 +2,7 @@ <manifest xmlns="http://tizen.org/ns/packages" api-version="2.3" package="org.tizen.adventure" version="1.0.0"> <profile name="mobile"/> <ui-application appid="org.tizen.adventure" exec="adventure" multiple="false" nodisplay="false" taskmanage="true" type="capp"> - <label>adventure</label> + <label>Momentic</label> <icon>adventure.png</icon> </ui-application> <privileges> |
