Merge with chun and jin
authorJin Yoon <jinny.yoon@samsung.com>
Mon, 10 Aug 2015 12:04:10 +0000 (21:04 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Mon, 10 Aug 2015 12:04:10 +0000 (21:04 +0900)
60 files changed:
.cproject
.sdk_delta.info
.sign/.manifest.tmp
.sign/author-signature.xml
.sign/signature1.xml
chun/Makefile [deleted file]
chun/img/add_btn.png [deleted file]
chun/img/next_btn.png [deleted file]
chun/main.c [deleted file]
chun/main.edc [deleted file]
chun/main.o [deleted file]
chun/momentic [deleted file]
chun/momentic/Makefile [new file with mode: 0755]
chun/momentic/img/Daynight layer.png [new file with mode: 0755]
chun/momentic/img/add_btn.png [new file with mode: 0644]
chun/momentic/img/city0.png [moved from chun/img/floting_next_button.png with 63% similarity]
chun/momentic/img/city01.png [new file with mode: 0755]
chun/momentic/img/city1.png [new file with mode: 0755]
chun/momentic/img/city11.png [new file with mode: 0755]
chun/momentic/img/city2.png [new file with mode: 0755]
chun/momentic/img/city21.png [new file with mode: 0755]
chun/momentic/img/next_btn.png [new file with mode: 0755]
chun/momentic/img/orange small.png [new file with mode: 0755]
chun/momentic/img/orange.png [new file with mode: 0755]
chun/momentic/img/pink small.png [new file with mode: 0755]
chun/momentic/img/pink.png [new file with mode: 0755]
chun/momentic/img/searching list.png [moved from chun/img/searchlist.png with 100% similarity]
chun/momentic/img/searchlist.png [new file with mode: 0755]
chun/momentic/img/world_map.png [moved from chun/img/world_map.png with 100% similarity]
chun/momentic/main.c [new file with mode: 0755]
chun/momentic/main.o [new file with mode: 0644]
chun/momentic/map.c [new file with mode: 0755]
chun/momentic/map.h [new file with mode: 0755]
chun/momentic/map.o [new file with mode: 0644]
chun/momentic/momentic [new file with mode: 0755]
chun/momentic/momentic.edc [new file with mode: 0755]
chun/momentic/momentic.edj [moved from chun/main.edj with 58% similarity]
inc/city.h
inc/conf.h
inc/db.h
inc/group_info.h
inc/item.h
inc/main.h
inc/main_view.h
inc/map.h
inc/popup.h [new file with mode: 0644]
inc/scroller.h
inc/util.h
res/edje/conf.h [new file with mode: 0644]
res/edje/item.edc
res/edje/main_view.edc
res/edje/momentic.edc [new file with mode: 0644]
shared/res/adventure.png
src/db.c
src/group_info.c
src/item.c
src/main_view.c
src/map.c
src/popup.c [new file with mode: 0644]
src/scroller.c

index 91a7b66..1460dfa 100755 (executable)
--- a/.cproject
+++ b/.cproject
@@ -25,7 +25,7 @@
                                                                <option id="gnu.cpp.compiler.option.optimization.level.764615478" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.debugging.level.core.287247668" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1762641182" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-2.3-emulator.core_llvm34.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-2.3-device.core_llvm34.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1550287729" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -94,6 +94,7 @@
                                                                        <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value=" -fPIE"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="-mthumb"/>
                                                                </option>
                                                                <option id="gnu.cpp.compiler.option.include.paths.2009528832" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
                                                                <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.928507427" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.debugging.level.core.975928777" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" value="gnu.c.debugging.level.max" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.1294129822" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-2.3-emulator.core_llvm34.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-2.3-device.core_llvm34.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1153181887" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value=" -fPIE"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="-mthumb"/>
                                                                </option>
                                                                <option id="gnu.c.compiler.option.include.paths.1308825906" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1778607987" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+                                                       <tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1778607987" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.195154528" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativecore.tool.fnmapgen.523856279" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
                                                        </option>
                                                </tool>
                                        </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">
+                                                               <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/edje/images&quot;"/>
+                                                               <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/res/edje/images&quot;"/>
+                                                       </option>
+                                               </tool>
+                                       </fileInfo>
                                        <sourceEntries>
                                                <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="inc"/>
                                                <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="res"/>
index 12cc068..065ff97 100644 (file)
Binary files a/.sdk_delta.info and b/.sdk_delta.info differ
index 050768d..8ef89a4 100644 (file)
@@ -1,6 +1,6 @@
-res/edje/adventure.edj__DEL__X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE=
 res/edje/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=
-res/edje/entry.edj__DEL__dhfb2+UGowaqDXlPRl0vcyHfBKXP/z4mKSLii70kZPE=
+res/edje/conf.h__DEL__HDwI7mqDpPI19iIn/JiJt3RUD1ZfOpDXpMVbCjVPL9A=
+res/edje/entry.edj__DEL__rVp9xRys8q23H4SAGSY0fU6qD7QKrQWXbtC0zAaWo5Q=
 res/edje/images/1.png__DEL__oP1soFdNokYu42XfoWKq0uYAP9o6PGUCGdnxQYErGdQ=
 res/edje/images/10.png__DEL__gebvW4D13j2AGUPkJInqNpANPhlECcq5EkIty5Coxhk=
 res/edje/images/11.png__DEL__DL48rNIwpgkN9kmnaZrCRBEZ8eb4O7bs1cojj5TmA5E=
@@ -28,51 +28,61 @@ res/edje/images/6.png__DEL__iBo2/4T/QR9a5FofEIk9hS3Hp97ykD+WTm0Pfozmjjg=
 res/edje/images/7.png__DEL__u4g6O6zDBudC4OqOdE+cMlKH4uWwwP/HGJQEpHxmlUQ=
 res/edje/images/8.png__DEL__RgMDfNjCBIBETo6gIEN0OaYE87qk4ObJtPjq73bwUGs=
 res/edje/images/9.png__DEL__P4P/gIdawOqNuqjOxo4gfI/FCX+EQOIyIOmwajkVSR0=
-res/edje/images/Aventure01.1.png__DEL__qFNE1M/3y3JLsRmH6olzSOwfJ0aSmpNYG2g4MAfVKEM=
-res/edje/images/Aventure01.png__DEL__q1aFoIjA48lzFuleof8STv8eCmIGH05KIUpXfVUoD0E=
-res/edje/images/Aventure01_background.png__DEL__uVdgx+2km5hdx3T3JYTz+hNSxxd4gTcgmEin2og8uYI=
-res/edje/images/Location.gif__DEL__Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=
-res/edje/images/bg.jpg__DEL__SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=
-res/edje/images/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=
-res/edje/images/delete_button.png__DEL__M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=
-res/edje/images/my_status_small.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=
-res/edje/images/other_location_blue.png__DEL__HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=
-res/edje/images/other_location_blue_small.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=
-res/edje/images/other_location_mint.png__DEL__OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=
-res/edje/images/other_location_mint_small.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=
-res/edje/images/searching_X.png__DEL__6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=
-res/edje/images/searching_bar.png__DEL__j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=
-res/edje/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=
-res/edje/initial.edj__DEL__lcGlKgrBUdQ2/z7UM79zg84fs88c+kFeYcqJFowyzH4=
-res/edje/loading.edj__DEL__h2nDJeSMjLz/rZ8wSyfDFmr511KV7s++t8STE6UhqW8=
+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=
 res/images/4.png__DEL__j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=
+res/images/Day_nite_edit2.psd__DEL__ufmhTlFhFS4oze07/CUvaddgNNN+yZZWRz2QJWiNcs4=
 res/images/Moments.psd__DEL__s+2KYYryQtvLtoVmfKvejfShBtP3yu3IZ97dXjygOCI=
+res/images/Moments_EB.psd__DEL__1jY2+/cMyWCUVl+nc5NpTIGfSipno5hhEzJgB+dz8BU=
+res/images/add.png__DEL__R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=
 res/images/add_button.png__DEL__qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=
 res/images/curser.png__DEL__k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc=
-res/images/delete_button.png__DEL__M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=
 res/images/floting_next_button.png__DEL__Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0=
 res/images/line.png__DEL__mC2lw0XczhZ41ZKBKt5ft3YcObs+IGDudh0xfkOJwQE=
 res/images/map_background.png__DEL__fidI2puLNy+2OtfFScQOt4BhzflQJ2EU87bersaQZPM=
 res/images/my status.png__DEL__chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=
+res/images/next.png__DEL__1ed1D6snn2+5ecoSrgKk1FMNias5F2nwOVeMe9u1+Yo=
+res/images/next2.png__DEL__8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=
+res/images/searching_list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
+res/images/하단 ë²„튼.png__DEL__V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=
+shared/res/adventure.png__DEL__1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs=
+tizen-manifest.xml__DEL__Yqjrp1NnUuO8yN5E0COzisOuxQ6Rf1IK71K8FAFHPr8=
+author-signature.xml__DEL__u54airQkCAE+ll56lr6Qc2oC3g00R4Xeb+BFhuZbASM=
+res/images/Aventure01.1.png__DEL__qFNE1M/3y3JLsRmH6olzSOwfJ0aSmpNYG2g4MAfVKEM=
+res/images/Aventure01.png__DEL__q1aFoIjA48lzFuleof8STv8eCmIGH05KIUpXfVUoD0E=
+res/images/Aventure01_background.png__DEL__uVdgx+2km5hdx3T3JYTz+hNSxxd4gTcgmEin2og8uYI=
+res/images/Daynight layer.png__DEL__vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs=
+res/images/Location.gif__DEL__Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=
+res/images/add_btn.png__DEL__naQj2XAiAb8UgXrZ2fDkhrs8G1cyx8i1AsAT5HbbP5Q=
+res/images/bg.jpg__DEL__SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=
+res/images/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=
+res/images/city0.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=
+res/images/city01.png__DEL__UoH8TFJrnH1ihgulgKa7Rtih9QrrI6yYpooMF9Scf1o=
+res/images/city1.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=
+res/images/city11.png__DEL__Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=
+res/images/city2.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=
+res/images/city21.png__DEL__Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=
+res/images/delete_button.png__DEL__M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=
 res/images/my_status_small.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=
+res/images/next_btn.png__DEL__8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=
+res/images/orange small.png__DEL__d7kGDG+axVAtUu/MBVv2dnGOxj0NdzrOwYXTVs3Hg0E=
+res/images/orange.png__DEL__lHWZWFaSDaidvlHG48/Ik7M6FmXdqlTjiR/YJoSukPY=
 res/images/other_location_blue.png__DEL__HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=
 res/images/other_location_blue_small.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=
 res/images/other_location_mint.png__DEL__OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=
 res/images/other_location_mint_small.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=
+res/images/pink small.png__DEL__Zdqcs/dH98DcHRF+rhHeK1jXnUHJHKOCaxLjhIAt0Ss=
+res/images/pink.png__DEL__VtlsIEdXSmIhWn3X08lMCEWy2p2nIX0ZTrd7X1YesDQ=
+res/images/searching list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
 res/images/searching_X.png__DEL__6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=
 res/images/searching_bar.png__DEL__j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=
-res/images/searching_list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
+res/images/searchlist.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
 res/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=
-shared/res/adventure.png__DEL__1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs=
-tizen-manifest.xml__DEL__Yqjrp1NnUuO8yN5E0COzisOuxQ6Rf1IK71K8FAFHPr8=
-author-signature.xml__DEL__F2Bw1gK/36loCRR2gKi6JtuBduRrg9NSUEnThXWNaP0=
-res/edje/conf.h__DEL__2L7Zm8aBUiBKOlvrJDGAq6HfqPaIEm4imGYdgrAJPuc=
-res/edje/item.edj__DEL__NbZos12kPJqigFIFTr2p6uno3CFx9si9dBZ8i4qXq0c=
-res/edje/main_view.edj__DEL__I2Hbg+dKCMMGe+WFLoVF1G2ZSw0mEoVO8106wIDPgCw=
-bin/adventure__DEL__O9q561q7u3DWeJ9n2JtUa3BB4wrlEgQfvSWeiiZnoFg=
+bin/adventure__DEL__iaPgUHBbzMLOZMGH8E8Lu+4Rq4ecW1RqaoAUEBK3pKU=
index ea89e67..64bf1fb 100644 (file)
@@ -4,11 +4,7 @@
 <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>O9q561q7u3DWeJ9n2JtUa3BB4wrlEgQfvSWeiiZnoFg=</DigestValue>
-</Reference>
-<Reference URI="res%2Fedje%2Fadventure.edj">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE=</DigestValue>
+<DigestValue>iaPgUHBbzMLOZMGH8E8Lu+4Rq4ecW1RqaoAUEBK3pKU=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 </Reference>
 <Reference URI="res%2Fedje%2Fconf.h">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>2L7Zm8aBUiBKOlvrJDGAq6HfqPaIEm4imGYdgrAJPuc=</DigestValue>
+<DigestValue>HDwI7mqDpPI19iIn/JiJt3RUD1ZfOpDXpMVbCjVPL9A=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fentry.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>dhfb2+UGowaqDXlPRl0vcyHfBKXP/z4mKSLii70kZPE=</DigestValue>
+<DigestValue>rVp9xRys8q23H4SAGSY0fU6qD7QKrQWXbtC0zAaWo5Q=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fimages%2F1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>P4P/gIdawOqNuqjOxo4gfI/FCX+EQOIyIOmwajkVSR0=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2FAventure01.1.png">
+<Reference URI="res%2Fedje%2Fitem.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>qFNE1M/3y3JLsRmH6olzSOwfJ0aSmpNYG2g4MAfVKEM=</DigestValue>
+<DigestValue>HG+I/Y+Mgeh80NxsPXo2uggk1QBn6VWRUVAtb8mDu8Q=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2FAventure01.png">
+<Reference URI="res%2Fedje%2Fmain.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>q1aFoIjA48lzFuleof8STv8eCmIGH05KIUpXfVUoD0E=</DigestValue>
+<DigestValue>tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2FAventure01_background.png">
+<Reference URI="res%2Fedje%2Fmain_view.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>uVdgx+2km5hdx3T3JYTz+hNSxxd4gTcgmEin2og8uYI=</DigestValue>
+<DigestValue>yFLkgzPFVGDDbzN1D3f049Wp5QsSUEYj2wkJwvpawW0=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2FLocation.gif">
+<Reference URI="res%2Fedje%2Fmap.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=</DigestValue>
+<DigestValue>UXAXof+qIgT8nIlkBr2FlorpXygjAv+uZYUDPoHodLk=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fbg.jpg">
+<Reference URI="res%2Fedje%2Fmomentic.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=</DigestValue>
+<DigestValue>aR+zagc8OmzQtc4+FDj57NecOuAHiQqyiz/n6k7lfsI=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fbtn.png">
+<Reference URI="res%2Fedje%2Fui_manager.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
+<DigestValue>uE2PyHTnHOBJ0FD0PtaMrNq9s6UYZX/ggAwF5amY0yA=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fdelete_button.png">
+<Reference URI="res%2Fimages%2F1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=</DigestValue>
+<DigestValue>QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fmy_status_small.png">
+<Reference URI="res%2Fimages%2F2.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
+<DigestValue>Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue.png">
+<Reference URI="res%2Fimages%2F3.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue>
+<DigestValue>Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue_small.png">
+<Reference URI="res%2Fimages%2F4.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
+<DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint.png">
+<Reference URI="res%2Fimages%2FAventure01.1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=</DigestValue>
+<DigestValue>qFNE1M/3y3JLsRmH6olzSOwfJ0aSmpNYG2g4MAfVKEM=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint_small.png">
+<Reference URI="res%2Fimages%2FAventure01.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
+<DigestValue>q1aFoIjA48lzFuleof8STv8eCmIGH05KIUpXfVUoD0E=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fsearching_X.png">
+<Reference URI="res%2Fimages%2FAventure01_background.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=</DigestValue>
+<DigestValue>uVdgx+2km5hdx3T3JYTz+hNSxxd4gTcgmEin2og8uYI=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fsearching_bar.png">
+<Reference URI="res%2Fimages%2FDay_nite_edit2.psd">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=</DigestValue>
+<DigestValue>ufmhTlFhFS4oze07/CUvaddgNNN+yZZWRz2QJWiNcs4=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fworld_map.png">
+<Reference URI="res%2Fimages%2FDaynight%20layer.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=</DigestValue>
+<DigestValue>vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Finitial.edj">
+<Reference URI="res%2Fimages%2FLocation.gif">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>lcGlKgrBUdQ2/z7UM79zg84fs88c+kFeYcqJFowyzH4=</DigestValue>
+<DigestValue>Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fitem.edj">
+<Reference URI="res%2Fimages%2FMoments.psd">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>NbZos12kPJqigFIFTr2p6uno3CFx9si9dBZ8i4qXq0c=</DigestValue>
+<DigestValue>s+2KYYryQtvLtoVmfKvejfShBtP3yu3IZ97dXjygOCI=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Floading.edj">
+<Reference URI="res%2Fimages%2FMoments_EB.psd">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>h2nDJeSMjLz/rZ8wSyfDFmr511KV7s++t8STE6UhqW8=</DigestValue>
+<DigestValue>1jY2+/cMyWCUVl+nc5NpTIGfSipno5hhEzJgB+dz8BU=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fmain.edj">
+<Reference URI="res%2Fimages%2Fadd.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=</DigestValue>
+<DigestValue>R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fmain_view.edj">
+<Reference URI="res%2Fimages%2Fadd_btn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>I2Hbg+dKCMMGe+WFLoVF1G2ZSw0mEoVO8106wIDPgCw=</DigestValue>
+<DigestValue>naQj2XAiAb8UgXrZ2fDkhrs8G1cyx8i1AsAT5HbbP5Q=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fmap.edj">
+<Reference URI="res%2Fimages%2Fadd_button.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>UXAXof+qIgT8nIlkBr2FlorpXygjAv+uZYUDPoHodLk=</DigestValue>
+<DigestValue>qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fui_manager.edj">
+<Reference URI="res%2Fimages%2Fbg.jpg">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>uE2PyHTnHOBJ0FD0PtaMrNq9s6UYZX/ggAwF5amY0yA=</DigestValue>
+<DigestValue>SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2F1.png">
+<Reference URI="res%2Fimages%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=</DigestValue>
+<DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2F2.png">
+<Reference URI="res%2Fimages%2Fcity0.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=</DigestValue>
+<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2F3.png">
+<Reference URI="res%2Fimages%2Fcity01.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=</DigestValue>
+<DigestValue>UoH8TFJrnH1ihgulgKa7Rtih9QrrI6yYpooMF9Scf1o=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2F4.png">
+<Reference URI="res%2Fimages%2Fcity1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</DigestValue>
+<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2FMoments.psd">
+<Reference URI="res%2Fimages%2Fcity11.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>s+2KYYryQtvLtoVmfKvejfShBtP3yu3IZ97dXjygOCI=</DigestValue>
+<DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fadd_button.png">
+<Reference URI="res%2Fimages%2Fcity2.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=</DigestValue>
+<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Fcity21.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue>
 </Reference>
 <Reference URI="res%2Fimages%2Fcurser.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2Fnext.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>1ed1D6snn2+5ecoSrgKk1FMNias5F2nwOVeMe9u1+Yo=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Fnext2.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Fnext_btn.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Forange%20small.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>d7kGDG+axVAtUu/MBVv2dnGOxj0NdzrOwYXTVs3Hg0E=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Forange.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>lHWZWFaSDaidvlHG48/Ik7M6FmXdqlTjiR/YJoSukPY=</DigestValue>
+</Reference>
 <Reference URI="res%2Fimages%2Fother_location_blue.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2Fpink%20small.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>Zdqcs/dH98DcHRF+rhHeK1jXnUHJHKOCaxLjhIAt0Ss=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Fpink.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>VtlsIEdXSmIhWn3X08lMCEWy2p2nIX0ZTrd7X1YesDQ=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Fsearching%20list.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
+</Reference>
 <Reference URI="res%2Fimages%2Fsearching_X.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2Fsearchlist.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
+</Reference>
 <Reference URI="res%2Fimages%2Fworld_map.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2F%ED%95%98%EB%8B%A8%20%EB%B2%84%ED%8A%BC.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=</DigestValue>
+</Reference>
 <Reference URI="shared%2Fres%2Fadventure.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs=</DigestValue>
 </Reference>
 </SignedInfo>
 <SignatureValue>
-PEvfwKUu3H3x044gAQi/qz0q39iuTsqgfekmdVEr1Tov6EjJxU8AzIgChJFJC271Qd07ntKXxpc6
-PTYdni80INHUIPhFzR5YKYIb5wzaN4i9Ws/PkBLUh6r5AfW+x0CSOgfkoM+52Fxh9digl3WR1u+z
-EVquAN/IT2u8K8imMZ4yo2+LwnYrGqkAXclcqDN0Z3KqDe50Zx/DMSqsleM8YllmUjHHeOl2hvMQ
-oPAxYYVAwNIdjkPf0B5235h16ywVOy3pLtapKdEOG3qc2uwnaIkdj5zM79YRqzAqA92zyKAUFsyQ
-t9BHjHKroVEbwoHj3drUM3lvmwjRtlh/dInXFw==
+gnMEgPULHJ78ocnyS0RBiFrOd6z3sJtTNmPbOCFL2JeExIcbZtLBPQ0D6y1dqcGvl6UZgD42XDuF
+BJG9kRSSLhWyZN4/NS+8vheNfRsDe+rRaD9BVpgfNS2i0b2LMqynD7vyDmy6PHzXAfZvdcrHoZyB
+Q4y2FJp30pHucS67xa2aIL6MdNGACTXRgsoHtIQfqsw/aVU/r1YhxlHTKB3/1iJpWbaIUinS5PWl
+sD88CUd3PFRVVqbch+DFGWwHLJ880hBKGMiPqcIcajJQBvAu9phuPTEy6QpU44peSApicyrMMjy6
+1AJOHZ+0WT4gOa6tqyyZHkWQTIAANRegWnBkLw==
 </SignatureValue>
 <KeyInfo>
 <X509Data>
@@ -331,20 +371,20 @@ t9BHjHKroVEbwoHj3drUM3lvmwjRtlh/dInXFw==
 MIIDqTCCApGgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBsDELMAkGA1UEBhMCS1IxFDASBgNVBAgM
 C1NvdXRoIEtvcmVhMQ4wDAYDVQQHDAVTdXdvbjEmMCQGA1UECgwdU2Ftc3VuZyBFbGVjdHJvbmlj
 cyBDby4sIEx0ZC4xDzANBgNVBAsMBk1vYmlsZTEgMB4GA1UEAwwXU2Ftc3VuZyBBdXRob3IgQ0Eg
-Q2xhc3MxIDAeBgkqhkiG9w0BCQEWEXRpemVuQHNhbXN1bmcuY29tMB4XDTE1MDcxMjE2MzY0M1oX
-DTE2MDcxMTE2MzY0M1owYzELMAkGA1UEBhMCS1IxCTAHBgNVBAgTADEOMAwGA1UEBxMFU2VvdWwx
+Q2xhc3MxIDAeBgkqhkiG9w0BCQEWEXRpemVuQHNhbXN1bmcuY29tMB4XDTE1MDcxNDAwNTIwMVoX
+DTE2MDcxMzAwNTIwMVowYzELMAkGA1UEBhMCS1IxCTAHBgNVBAgTADEOMAwGA1UEBxMFU2VvdWwx
 FjAUBgNVBAoTDXN0b3J5Y29tcGlsZXIxCTAHBgNVBAsTADEWMBQGA1UEAxMNc3Rvcnljb21waWxl
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtSaQjkdqd3YjDUM5rnY0Ak0m0H/4Mp
-doG2AILo5iWvNCazuWUAi7kfqJZMCSooWWuoON58ymXPBVxP2wDVz2Nb8zbOsMGaYYi9I96QexeG
-RB2tR67ZC9MsVGZdPtIH8JkFsJQlh08rKz69FmrDOdIvOYaix1ww5f1KGUxZh6sNx7G/P4JvqlDL
-9VhnJhZcKEDE+VyvGEi90Hi9urw64MJajXJ7ByRLMTXni25xf63oHWsdT4u5VAvL1cH/fZK1xiZs
-sQXcuZYtM3tTPWKVbXQC69MrL5ZBOZn04ysjR2HWqvsVzdHlhn9dfQUQAqeKZPjTSHQoYIIHVnvW
-yj3yyyMCAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMCB4AwDQYJKoZIhvcNAQELBQADggEB
-AJKkHvaPqYCpmb5ZRoTu6a0wWOZ+N6T5PJIZ04LjbcED8HIeegOkTdNmnGujXfqhlgNpKGteINk7
-E2/dDm6IaYHfiGtfH6KsuMbsGqz07Kk1MYYb9hI+4453hf27dt5UlX3PCSHqDdUCTCqVBvKxSfBR
-q/arVv8Vi9HqBOQG2A+x0nyo0QTWTOt2ata2KdeTYFCReD/IT60PnEYIXB+5CF71SqQLdIBMxpis
-ERuIb0bKE/x1Cni5opYPuYQOBmVJyB15AjSnMI9wivCl5Gz/jOB/ORCjCLALrJZE2LZzqGPdScGX
-XtlunfEoxvoAf/3sCqst0xA/zq0W9dzXg/tPNLc=
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0HE4TB6oWNUk4IHuJOL+4UuH1LnTIK
+JRjMONEwpHQW7MLGVzlS6rFGeVxBaoqpKQ+D+QefE3ckLhwUNGR4vLTqQk4OQM2xtlgEoBc7FalJ
+6PtAgwKHtAJhavJxQGwmYe+jodFs/N6WoehuGv7K+JvFniXuhL5bDrnU7zOzv8yqB5S+jBR0MsvO
+GbHf2NaV/K+F+GLCMoT/FDlJFwLMntKb3kN8Y/mKIdXcdxRonOg8BTHczcqQcf4k5ocW6AxpATrS
+Y5wEkIFo2kqv8ZrsAVJbedCiUZt08akgrc+NShcEdpsPrAIieDX0mkCBqRlF7RdLX4PG7oKj3xYq
+fA1fUecCAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMCB4AwDQYJKoZIhvcNAQELBQADggEB
+AGgVJ4D9nJYDeqI0aBNL09vfbqY1JRKHS06r9/gNawlnm8NDyBwUwlGJoZoFZrHc+9ASrBF5+A6G
+GHb8HwS3mor9CbMVKFO0b7kyXMFDwx8Ev69SN067sDusHrrEy68X5oxV9coVtRu6x91aSbGG/lZb
+jK4DDzqgw4q8Sm61IhjIms1jzH6at6VMweOzHcF3+dvv4BIGZKv4+sDpmNGnj4g1cLLxe1GbnVKC
+vXXmGsLw0dh83frXoZxfHkuAu+IpyrK1oFMinxp72FzAFJXl9i2gbkWVS/+39RqtrzaV1sfmcMb1
+0D45NzqJ5VC4qZMkM7YgcICxSHoqh57eRovCJE0=
 </X509Certificate>
 <X509Certificate>
 MIIDmzCCAoOgAwIBAgICYygwDQYJKoZIhvcNAQELBQAwXjEaMBgGA1UECgwRVGl6ZW4gQXNzb2Np
index ee73263..59dfec3 100644 (file)
@@ -4,15 +4,11 @@
 <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>F2Bw1gK/36loCRR2gKi6JtuBduRrg9NSUEnThXWNaP0=</DigestValue>
+<DigestValue>u54airQkCAE+ll56lr6Qc2oC3g00R4Xeb+BFhuZbASM=</DigestValue>
 </Reference>
 <Reference URI="bin%2Fadventure">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>O9q561q7u3DWeJ9n2JtUa3BB4wrlEgQfvSWeiiZnoFg=</DigestValue>
-</Reference>
-<Reference URI="res%2Fedje%2Fadventure.edj">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE=</DigestValue>
+<DigestValue>iaPgUHBbzMLOZMGH8E8Lu+4Rq4ecW1RqaoAUEBK3pKU=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 </Reference>
 <Reference URI="res%2Fedje%2Fconf.h">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>2L7Zm8aBUiBKOlvrJDGAq6HfqPaIEm4imGYdgrAJPuc=</DigestValue>
+<DigestValue>HDwI7mqDpPI19iIn/JiJt3RUD1ZfOpDXpMVbCjVPL9A=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fentry.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>dhfb2+UGowaqDXlPRl0vcyHfBKXP/z4mKSLii70kZPE=</DigestValue>
+<DigestValue>rVp9xRys8q23H4SAGSY0fU6qD7QKrQWXbtC0zAaWo5Q=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fimages%2F1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>P4P/gIdawOqNuqjOxo4gfI/FCX+EQOIyIOmwajkVSR0=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2FAventure01.1.png">
+<Reference URI="res%2Fedje%2Fitem.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>qFNE1M/3y3JLsRmH6olzSOwfJ0aSmpNYG2g4MAfVKEM=</DigestValue>
+<DigestValue>HG+I/Y+Mgeh80NxsPXo2uggk1QBn6VWRUVAtb8mDu8Q=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2FAventure01.png">
+<Reference URI="res%2Fedje%2Fmain.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>q1aFoIjA48lzFuleof8STv8eCmIGH05KIUpXfVUoD0E=</DigestValue>
+<DigestValue>tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2FAventure01_background.png">
+<Reference URI="res%2Fedje%2Fmain_view.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>uVdgx+2km5hdx3T3JYTz+hNSxxd4gTcgmEin2og8uYI=</DigestValue>
+<DigestValue>yFLkgzPFVGDDbzN1D3f049Wp5QsSUEYj2wkJwvpawW0=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2FLocation.gif">
+<Reference URI="res%2Fedje%2Fmap.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=</DigestValue>
+<DigestValue>UXAXof+qIgT8nIlkBr2FlorpXygjAv+uZYUDPoHodLk=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fbg.jpg">
+<Reference URI="res%2Fedje%2Fmomentic.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=</DigestValue>
+<DigestValue>aR+zagc8OmzQtc4+FDj57NecOuAHiQqyiz/n6k7lfsI=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fbtn.png">
+<Reference URI="res%2Fedje%2Fui_manager.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
+<DigestValue>uE2PyHTnHOBJ0FD0PtaMrNq9s6UYZX/ggAwF5amY0yA=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fdelete_button.png">
+<Reference URI="res%2Fimages%2F1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=</DigestValue>
+<DigestValue>QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fmy_status_small.png">
+<Reference URI="res%2Fimages%2F2.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
+<DigestValue>Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue.png">
+<Reference URI="res%2Fimages%2F3.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue>
+<DigestValue>Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue_small.png">
+<Reference URI="res%2Fimages%2F4.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
+<DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint.png">
+<Reference URI="res%2Fimages%2FAventure01.1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=</DigestValue>
+<DigestValue>qFNE1M/3y3JLsRmH6olzSOwfJ0aSmpNYG2g4MAfVKEM=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint_small.png">
+<Reference URI="res%2Fimages%2FAventure01.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
+<DigestValue>q1aFoIjA48lzFuleof8STv8eCmIGH05KIUpXfVUoD0E=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fsearching_X.png">
+<Reference URI="res%2Fimages%2FAventure01_background.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=</DigestValue>
+<DigestValue>uVdgx+2km5hdx3T3JYTz+hNSxxd4gTcgmEin2og8uYI=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fsearching_bar.png">
+<Reference URI="res%2Fimages%2FDay_nite_edit2.psd">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=</DigestValue>
+<DigestValue>ufmhTlFhFS4oze07/CUvaddgNNN+yZZWRz2QJWiNcs4=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2Fworld_map.png">
+<Reference URI="res%2Fimages%2FDaynight%20layer.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=</DigestValue>
+<DigestValue>vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Finitial.edj">
+<Reference URI="res%2Fimages%2FLocation.gif">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>lcGlKgrBUdQ2/z7UM79zg84fs88c+kFeYcqJFowyzH4=</DigestValue>
+<DigestValue>Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fitem.edj">
+<Reference URI="res%2Fimages%2FMoments.psd">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>NbZos12kPJqigFIFTr2p6uno3CFx9si9dBZ8i4qXq0c=</DigestValue>
+<DigestValue>s+2KYYryQtvLtoVmfKvejfShBtP3yu3IZ97dXjygOCI=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Floading.edj">
+<Reference URI="res%2Fimages%2FMoments_EB.psd">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>h2nDJeSMjLz/rZ8wSyfDFmr511KV7s++t8STE6UhqW8=</DigestValue>
+<DigestValue>1jY2+/cMyWCUVl+nc5NpTIGfSipno5hhEzJgB+dz8BU=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fmain.edj">
+<Reference URI="res%2Fimages%2Fadd.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=</DigestValue>
+<DigestValue>R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fmain_view.edj">
+<Reference URI="res%2Fimages%2Fadd_btn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>I2Hbg+dKCMMGe+WFLoVF1G2ZSw0mEoVO8106wIDPgCw=</DigestValue>
+<DigestValue>naQj2XAiAb8UgXrZ2fDkhrs8G1cyx8i1AsAT5HbbP5Q=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fmap.edj">
+<Reference URI="res%2Fimages%2Fadd_button.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>UXAXof+qIgT8nIlkBr2FlorpXygjAv+uZYUDPoHodLk=</DigestValue>
+<DigestValue>qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fui_manager.edj">
+<Reference URI="res%2Fimages%2Fbg.jpg">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>uE2PyHTnHOBJ0FD0PtaMrNq9s6UYZX/ggAwF5amY0yA=</DigestValue>
+<DigestValue>SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2F1.png">
+<Reference URI="res%2Fimages%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=</DigestValue>
+<DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2F2.png">
+<Reference URI="res%2Fimages%2Fcity0.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=</DigestValue>
+<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2F3.png">
+<Reference URI="res%2Fimages%2Fcity01.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=</DigestValue>
+<DigestValue>UoH8TFJrnH1ihgulgKa7Rtih9QrrI6yYpooMF9Scf1o=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2F4.png">
+<Reference URI="res%2Fimages%2Fcity1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</DigestValue>
+<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2FMoments.psd">
+<Reference URI="res%2Fimages%2Fcity11.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>s+2KYYryQtvLtoVmfKvejfShBtP3yu3IZ97dXjygOCI=</DigestValue>
+<DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fadd_button.png">
+<Reference URI="res%2Fimages%2Fcity2.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=</DigestValue>
+<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Fcity21.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue>
 </Reference>
 <Reference URI="res%2Fimages%2Fcurser.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2Fnext.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>1ed1D6snn2+5ecoSrgKk1FMNias5F2nwOVeMe9u1+Yo=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Fnext2.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Fnext_btn.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Forange%20small.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>d7kGDG+axVAtUu/MBVv2dnGOxj0NdzrOwYXTVs3Hg0E=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Forange.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>lHWZWFaSDaidvlHG48/Ik7M6FmXdqlTjiR/YJoSukPY=</DigestValue>
+</Reference>
 <Reference URI="res%2Fimages%2Fother_location_blue.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2Fpink%20small.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>Zdqcs/dH98DcHRF+rhHeK1jXnUHJHKOCaxLjhIAt0Ss=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Fpink.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>VtlsIEdXSmIhWn3X08lMCEWy2p2nIX0ZTrd7X1YesDQ=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2Fsearching%20list.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
+</Reference>
 <Reference URI="res%2Fimages%2Fsearching_X.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2Fsearchlist.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
+</Reference>
 <Reference URI="res%2Fimages%2Fworld_map.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2F%ED%95%98%EB%8B%A8%20%EB%B2%84%ED%8A%BC.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=</DigestValue>
+</Reference>
 <Reference URI="shared%2Fres%2Fadventure.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs=</DigestValue>
 </Reference>
 </SignedInfo>
 <SignatureValue>
-dML8C5HAU3r5G2uLzn0E8H14POWk2sRUqktakFU2b+e3Wbu5XTpZqFILhM/gz1YnlK/psm1xrDr3
-hhZ5/YRwo/YTHslRXL7BiTIGM8uEEbZVjz0wyN/4vGRP+lLKr22ApOntH2V8eZc1c+hMqIqZU4km
-vKpmo5YjXPevPS82VyIKK7GLVigUybYrXMivHoun4X/0BB9T9inj8sxNEE+nzs5IHlVfh6FWR0dy
-KwJ5oz74HRCEmhKtHPok81emGI9ZjCWzhszEZ2OAUwPw5HhCZ3mTxrLsKhxmAhcRVBHI5XcSEgJU
-nqps2gzDcthJrZKxJfuGv+hVhhNM6TwVH/G7NQ==
+asjRSTpsuY8SFi/kjyc1TlDx4sh3jxl1yh9QdiwwUOJU0+Oq2RTJSeqaOjc0TjeWnkKCl3LGRdFF
+d+PNysmgKMcangDUpfpAdJTCjbdBz7LDeyupnBwPaZfU+iYib/CXowSI5YQaXqEX+CnL1sveGF70
+72uhu0bAcRPTzkxqJ9qPszJVsAzQpn8HWFKe3eBn01ZQgjWiiHlGxTuzvXbzx6ejDyXSCuITo/nV
+zR+dvJcklzHuFUAUWxDB3v43ZYH7eOwaoywf6Q4YdmbP/uiZW4g+dL6WlMAERikN7xr7Ed9jLK6J
+c2stHW+BcuTeSwz074mHhpR0fIkrDk1iI54yZg==
 </SignatureValue>
 <KeyInfo>
 <X509Data>
@@ -335,19 +375,19 @@ nqps2gzDcthJrZKxJfuGv+hVhhNM6TwVH/G7NQ==
 MIIDgDCCAmigAwIBAgIBZTANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMCS1IxFDASBgNVBAgM
 C1NvdXRoIEtvcmVhMQ4wDAYDVQQHDAVTdXdvbjEmMCQGA1UECgwdU2Ftc3VuZyBFbGVjdHJvbmlj
 cyBDby4sIEx0ZC4xDzANBgNVBAsMBk1vYmlsZTEwMC4GA1UEAwwnU2Ftc3VuZyBUaXplbiBERVZF
-TE9QRVIgUHVibGljIENBIENsYXNzMB4XDTE1MDcxMjE2Mzg0OVoXDTE2MDcxMTE2Mzg0OVowTDEg
+TE9QRVIgUHVibGljIENBIENsYXNzMB4XDTE1MDcxNDAwNTMwMloXDTE2MDcxMzAwNTMwMlowTDEg
 MB4GA1UEAwwXU2Ftc3VuZyBUaXplbiBEZXZlbG9wZXIxKDAmBgkqhkiG9w0BCQEWGXN0b3J5Y29t
-cGlsZXJAaGFubWFpbC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBshhsY0pe
-M09HGcZlsCIVhnRXnEnJVW0SQ5ySfH9F4lngLBx6vsiMQiztKlCnDESAanNlauw+QMVjOfDmAtaH
-xY0GwCLdpYWJ0SYbRRaITV9cqgxau0UnwK+6x++zZoRorrvHYR9uOw8rtZhSeSyLbP/VQtf6Lr1c
-gZRdCToe+eEL+pZe9ZK/a22mNjUHtTMjbobqdHgY0MAHhu8+XDM8W3I2kGVoFbEGlCqU7FaTBFLW
-aTMRaANYsNcDbZ4Q0po/TVuXnFCgdRU2Y6OKR41x7t9mabYp379IoEzFeNIG6omC0XqQ/rPynEKB
-N1uhs25nE3wLBXj0er82/mnB4EW5AgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgeAMA0G
-CSqGSIb3DQEBCwUAA4IBAQBbEG53EAnMQ/arTYz/XRZ9po4Agfg/NowPo7yFbiahYBnSefMh4jFo
-GT8GQWZLjhSs0PO5Brx6HMsLIk1RjnMiZyiQ82b5pdUoi7nNYa+NclemIVt6viTnCu5SMp9NNOzK
-iTttZI8VgepyqGOP5ky1uyikL15kBaCeiiDeuPawhnqGX1CScIZjTJ1unviBYgRc4U4cyIujNCZ9
-r9ui8yGT4dvX5cmVusmJvMA7+9ciuZ8kicjTxuJcVgQGhve66i5tY9fBDVnSpRVz3a6oyHAcRa7a
-aOlHNYdz4Feo0A44zUJXF0mKZ+TdH0XGT0uTg0O2+8w2GDsPToSXv+11YP0n
+cGlsZXJAaGFubWFpbC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnAsQ5EukD
+8yPijdHPR4SC1sxT4PlfJkzQcV5udo7WXv7zg6xKHbnunFsYPIVr5mpsZm09TsLkN4cxxRvcX8to
+ky7X59q+fQ+hv7aFSNjqFU3fXe+OImSwr7rpXbi9SaNYDtGgYN8UCCFv1HJi5P7S2CU7Y3QpeZPm
+dFxBtA6s/H9BweDPnpUGBy+P5eEA5RzAiHKFxkXsUXoocUTZD/PS6NRJ1fW/fB1G1+m71iO0W1vg
+jdAzXexATUubLKpleYO6Cv7/qabBXtK9BirhKRy1Bse7sjFHLxmpdkmnBTY0JcZVGztllLu9vOhF
+N+RYXNx8CniPme3nUEa+si749MxdAgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgeAMA0G
+CSqGSIb3DQEBCwUAA4IBAQAmNV2xLkzcBQXo6pqs0aXm5yOknlUvY+w4qFVSHZFzuTUmCvawTnU+
+WB9UxNvHawbCu9H02bglKO8W06wWOT13ut+ZBSLEA5lREJO7jPdDNdEpzgOMm0CZI7wLV1V4gMRs
+7rrjv8WYKpm7xDSseYaWpiA/9uzLrBmjea5DBX8tYNTf1p5Tlu3bflVvj62rQDX8s0eLKkDOR6of
+/mTkGtNcI5QLjuCPH+OEzehJZClEvLGHaZtnX2zqM+Txk6oW/vI7tDK99fKpkxv7yGQnvFgAl3hD
+vYMjaiv1m1V8ZFJBrrZ8xQ8o1bubhyScQnnYxD/iJg3sUP2RxvQ38Op8zyuA
 </X509Certificate>
 <X509Certificate>
 MIIDuzCCAqOgAwIBAgICL+cwDQYJKoZIhvcNAQELBQAwgY8xCzAJBgNVBAYTAktSMRQwEgYDVQQI
diff --git a/chun/Makefile b/chun/Makefile
deleted file mode 100755 (executable)
index a8d5724..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-CFLAGS += $(shell pkg-config --cflags elementary evas ecore ecore-input)
-LIBS += $(shell pkg-config --libs elementary evas ecore ecore-input)
-CFLAGS += -Wall -O2 -g
-
-BINARY=momentic
-
-PREFIX=/usr/local
-BINDIR=$(PREFIX)/bin
-
-$(BINARY): main.o
-       $(CC) -o $@ $< $(LIBS)
-
-install: $(BINARY)
-       @echo "installation of $(BINARY)"
-       @mkdir -p $(BINDIR)
-       @install -m 0755 $(BINARY) $(BINDIR)
-
-clean:
-       rm -f $(BINARY) main.o
-
diff --git a/chun/img/add_btn.png b/chun/img/add_btn.png
deleted file mode 100644 (file)
index 86e8658..0000000
Binary files a/chun/img/add_btn.png and /dev/null differ
diff --git a/chun/img/next_btn.png b/chun/img/next_btn.png
deleted file mode 100644 (file)
index 86e8658..0000000
Binary files a/chun/img/next_btn.png and /dev/null differ
diff --git a/chun/main.c b/chun/main.c
deleted file mode 100755 (executable)
index d8c0052..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <Elementary.h>
-
-#define SCRN_W 480
-#define SCRN_H 800
-
-int
-elm_main(int argc, char **argv)
-{
-   elm_config_accel_preference_set("3d");
-   elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
-
-   //create a main window
-   Evas_Object *win = elm_win_util_standard_add("Momentic", "Momentic");
-   elm_win_autodel_set(win, EINA_TRUE);
-
-   //create a overlay
-   Evas_Object *main_layout = elm_layout_add(win);
-   elm_layout_file_set(main_layout, "main.edj", "main");
-   evas_object_size_hint_weight_set(main_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_show(main_layout);
-   elm_win_resize_object_add(win, main_layout);
-
-   evas_object_resize(win, SCRN_W, SCRN_H);
-   evas_object_show(win);
-
-   elm_run();
-   elm_shutdown();
-
-   return 0;
-}
-ELM_MAIN()
diff --git a/chun/main.edc b/chun/main.edc
deleted file mode 100755 (executable)
index 3599d37..0000000
+++ /dev/null
@@ -1,285 +0,0 @@
-collections {
-   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: "add_btn.png" COMP;
-      image: "next_btn.png" COMP;
-      image: "searchlist.png" COMP;
-   }
-   group { "main";
-      parts {
-         rect { "base";
-            desc { "default";
-            }
-         }
-         rect { "map_base";
-            desc { "default";
-               rel2.relative: 1 0.51;
-               color: 246 243 243 255;
-            }
-         }
-         image { "map";
-            scale:1 ;
-            desc { "default";
-               rel1.to: "map_base";
-               rel2.to: "map_base";
-               rel1.relative: 0.0 0.27;
-               rel2.relative: 1.0 0.90;
-               image.normal: "world_map.png";
-            }
-            desc { "next";
-               inherit: "default";
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 0.4;
-            }
-         }
-// Init
-         rect { "add_dim";
-            desc { "default";
-               rel1.to: "map_base";
-               rel2.to: "map_base";
-               color: 0 0 0 50;
-            }
-            desc { "next";
-               inherit: "default";
-               color: 0 0 0 0;
-            }
-         }
-         image { "add_btn";
-            scale: 1;
-            desc { "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;
-               image.normal: "add_btn.png";
-               color: 255 255 255 255;
-            }
-            desc { "visible";
-               inherit: "default";
-               rel1.relative: 0.5 0.35;
-               rel2.relative: 0.5 0.35;
-               color: 255 255 255 255;
-            }
-            desc { "next";
-               inherit: "visible";
-               min: 84 84;
-               color: 255 255 255 0;
-            }
-         }
-         textblock { "add_desc";
-            scale: 1;
-            desc { "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;
-            }
-            desc { "visible";
-               inherit: "default";
-               rel1.relative: 0.0 0.45;
-               rel2.relative: 1.0 0.45;
-               color: 255 255 255 255;
-            }
-            desc { "next";
-               inherit: "visible";
-               color: 255 255 255 0;
-            }
-         }
-         rect{ "current_city";
-            scale: 1;
-            desc { "default";
-               rel1.relative: 0 0.51;
-               rel2.relative: 1 0.6;
-               color: 0 0 255 255;
-            }
-         }
-         textblock { "add_desc2";
-            scale: 1;
-            desc { "default";
-               rel1.relative: 0 0.6;
-               text {
-                  text: "<b>After you add cities,<br>they will be shown here.";
-                  style: "text_style";
-                  min: 0 1;
-               }
-            }
-         }
-// page 1
-         image { "searchlist";
-            scale: 1;
-            desc { "default";
-               rel1.to: "searchbar";
-               rel2.to_x: "searchbar";
-               rel2.relative: 1 0;
-               image.normal: "searchlist.png";
-               image.border: 10 10 10 10;
-               image.border_scale: 1;
-            }
-            desc { "visible";
-               inherit: "default";
-               rel2.to_y: "map";
-               rel2.relative: 1 0.5;
-            }
-         }
-         rect { "searchbar";
-            scale: 1;
-            desc { "default";
-               rel1.relative: 0.03 0.015;
-               rel2.relative: 0.97 0.015;
-               min: 0 35;
-               align: 0.5 0;
-               fixed: 1 1;
-               visible: 0;
-            }
-            desc { "visible";
-               inherit: "default";
-               visible: 1;
-            }
-         }
-         image{ "next_btn";
-            scale: 1;
-            desc { "default";
-               rel1.to: "map";
-               rel2.to: "map";
-               rel1.relative: 0.9 0.8;
-               rel2.relative: 0.9 0.8;
-               min: 60 60;
-               fixed: 1 1;
-               color: 255 255 255 0;
-               align: 1 0.5;
-               image.normal: "next_btn.png";
-            }
-            desc { "visible";
-               inherit: "default";
-               rel1.relative: 0.95 0.8;
-               rel2.relative: 0.95 0.8;
-               color: 255 255 255 255;
-            }
-         }
-         swallow { "selected_list";
-            scale: 1;
-            desc { "default";
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 1.0;
-               rel1.to: "map";
-            }
-         }
-      }
-      programs {
-         program { "start";
-            signal: "load";
-            source: "";
-            action: STATE_SET "visible";
-            target: "add_btn";
-            target: "add_desc";
-            transition: DECELERATE 1;
-         }
-         program { "page1";
-            signal: "momentic,state,page1";
-            source: "";
-            script {
-               run_program(PROGRAM:"go_page1");
-               run_program(PROGRAM:"go_page2");
-            }
-         }
-         
-         //page 1 start
-         program { "go_page1";
-            action: STATE_SET "next";
-            target: "add_btn";
-            target: "add_desc";
-            target: "add_dim";
-            transition: DECELERATE 0.25;
-         }
-         program { "go_page2";
-            action: STATE_SET "visible";
-            target: "searchbar";
-         }
-         //page 1 end
-         
-         //search bar start
-         program { "show_searchbar";
-            signal: "momentic,state,searchbar,show";
-            source: "";
-            action: STATE_SET "visible";
-            target: "searchbar";
-         }
-         program { "hide_searchbar";
-            signal: "momentic,state,searchbar,hide";
-            source: "";
-            action: STATE_SET "default";
-            target: "searchbar";
-         }
-         program { "show_searchlist";
-            signal: "momentic,state,searchlist,show";
-            source: "";
-            action: STATE_SET "visible";
-            target: "searchlist";
-            transition: DECELERATE 0.5;
-         }
-         program { "hide_searchlist";
-            signal: "momentic,state,searchlist,hide";
-            source: "";
-            action: STATE_SET "default";
-            target: "searchlist";
-            transition: DECELERATE 0.5;
-         }
-         //search bar end      
-         
-         program { "go_next_page";
-            signal: "momentic,state,next_page";
-            source: "";
-            script {
-               run_program(PROGRAM:"map_next");
-            }
-         }
-         program { "map_next";
-            action: STATE_SET "next";
-            target: "map";
-            transition: LINEAR 0.5;
-         }
-         program { "go_prev_page";
-            signal: "momentic,state,prev_page";
-            source: "";
-            action: STATE_SET "default";
-            target: "map";
-            transition: LINEAR 0.5;
-         }
-         program { "map_prev ";
-            action: STATE_SET "next";
-            target: "map";
-            transition: LINEAR 0.5;
-         }
-         program { "next_btn_show";
-            signal: "momentic,state,next_btn,show";
-            source: "";
-            action: STATE_SET "visible";
-            target: "next_btn";
-            transition: DECELERATE 0.75;
-         }
-         program { "next_btn_hide";
-            signal: "momentic,state,next_btn,hide";
-            source: "";
-            action: STATE_SET "default";
-            target: "next_btn";
-            transition: DECELERATE 0.75;
-         }
-      }
-   }
-}
diff --git a/chun/main.o b/chun/main.o
deleted file mode 100755 (executable)
index f5cb77b..0000000
Binary files a/chun/main.o and /dev/null differ
diff --git a/chun/momentic b/chun/momentic
deleted file mode 100755 (executable)
index 1ff7212..0000000
Binary files a/chun/momentic and /dev/null differ
diff --git a/chun/momentic/Makefile b/chun/momentic/Makefile
new file mode 100755 (executable)
index 0000000..fd781e3
--- /dev/null
@@ -0,0 +1,30 @@
+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/Daynight layer.png b/chun/momentic/img/Daynight layer.png
new file mode 100755 (executable)
index 0000000..394033c
Binary files /dev/null and b/chun/momentic/img/Daynight layer.png differ
diff --git a/chun/momentic/img/add_btn.png b/chun/momentic/img/add_btn.png
new file mode 100644 (file)
index 0000000..8cbec44
Binary files /dev/null and b/chun/momentic/img/add_btn.png differ
similarity index 63%
rename from chun/img/floting_next_button.png
rename to chun/momentic/img/city0.png
index d6ef24a..b70f2c3 100755 (executable)
Binary files a/chun/img/floting_next_button.png and b/chun/momentic/img/city0.png differ
diff --git a/chun/momentic/img/city01.png b/chun/momentic/img/city01.png
new file mode 100755 (executable)
index 0000000..ee8bfa7
Binary files /dev/null and b/chun/momentic/img/city01.png differ
diff --git a/chun/momentic/img/city1.png b/chun/momentic/img/city1.png
new file mode 100755 (executable)
index 0000000..cb5e3bc
Binary files /dev/null and b/chun/momentic/img/city1.png differ
diff --git a/chun/momentic/img/city11.png b/chun/momentic/img/city11.png
new file mode 100755 (executable)
index 0000000..025770a
Binary files /dev/null and b/chun/momentic/img/city11.png differ
diff --git a/chun/momentic/img/city2.png b/chun/momentic/img/city2.png
new file mode 100755 (executable)
index 0000000..404c3d8
Binary files /dev/null and b/chun/momentic/img/city2.png differ
diff --git a/chun/momentic/img/city21.png b/chun/momentic/img/city21.png
new file mode 100755 (executable)
index 0000000..025770a
Binary files /dev/null and b/chun/momentic/img/city21.png differ
diff --git a/chun/momentic/img/next_btn.png b/chun/momentic/img/next_btn.png
new file mode 100755 (executable)
index 0000000..4c8f687
Binary files /dev/null and b/chun/momentic/img/next_btn.png differ
diff --git a/chun/momentic/img/orange small.png b/chun/momentic/img/orange small.png
new file mode 100755 (executable)
index 0000000..241a680
Binary files /dev/null and b/chun/momentic/img/orange small.png differ
diff --git a/chun/momentic/img/orange.png b/chun/momentic/img/orange.png
new file mode 100755 (executable)
index 0000000..251b230
Binary files /dev/null and b/chun/momentic/img/orange.png differ
diff --git a/chun/momentic/img/pink small.png b/chun/momentic/img/pink small.png
new file mode 100755 (executable)
index 0000000..9ef57b2
Binary files /dev/null and b/chun/momentic/img/pink small.png differ
diff --git a/chun/momentic/img/pink.png b/chun/momentic/img/pink.png
new file mode 100755 (executable)
index 0000000..f0eb889
Binary files /dev/null and b/chun/momentic/img/pink.png differ
diff --git a/chun/momentic/img/searchlist.png b/chun/momentic/img/searchlist.png
new file mode 100755 (executable)
index 0000000..bf751b8
Binary files /dev/null and b/chun/momentic/img/searchlist.png differ
diff --git a/chun/momentic/main.c b/chun/momentic/main.c
new file mode 100755 (executable)
index 0000000..37d28fd
--- /dev/null
@@ -0,0 +1,105 @@
+#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
new file mode 100644 (file)
index 0000000..1cdc206
Binary files /dev/null and b/chun/momentic/main.o differ
diff --git a/chun/momentic/map.c b/chun/momentic/map.c
new file mode 100755 (executable)
index 0000000..0f1e369
--- /dev/null
@@ -0,0 +1,139 @@
+#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
new file mode 100755 (executable)
index 0000000..9fb6e4d
--- /dev/null
@@ -0,0 +1,25 @@
+#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
new file mode 100644 (file)
index 0000000..f6cf64c
Binary files /dev/null and b/chun/momentic/map.o differ
diff --git a/chun/momentic/momentic b/chun/momentic/momentic
new file mode 100755 (executable)
index 0000000..fe21c50
Binary files /dev/null and b/chun/momentic/momentic differ
diff --git a/chun/momentic/momentic.edc b/chun/momentic/momentic.edc
new file mode 100755 (executable)
index 0000000..830f455
--- /dev/null
@@ -0,0 +1,556 @@
+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         
+      }
+   }
+}
similarity index 58%
rename from chun/main.edj
rename to chun/momentic/momentic.edj
index e89521e..a14e02d 100644 (file)
Binary files a/chun/main.edj and b/chun/momentic/momentic.edj differ
index 746d0ca..279297b 100644 (file)
@@ -2,7 +2,7 @@
 #define __MOMENT_CITY_H__
 
 enum {
-       CITY_HONOLULU = 0,
+       CITY_HONOLULU = 1,
        CITY_LOS_ANGELES,
        CITY_SAN_FRANCISCO,
        CITY_VANCOUVER,
index adc65c1..95cc24e 100644 (file)
@@ -1,6 +1,12 @@
 #ifndef __MOMENT_CONF_H__
 #define __MOMENT_CONF_H__
 
+#define MAXIMUM_SELECTED_CITY 5
+
+#define BEST_START_TIME 8
+#define BEST_DURING_TIME 9
+#define BEST_END_TIME (BEST_START_TIME + BEST_DURING_TIME)
+
 #define ENTRY_WIDTH 446
 #define ENTRY_HEIGHT 38
 #define ENTRY_RESULT_HEIGHT 400
index 10a39cf..4cb735a 100644 (file)
--- a/inc/db.h
+++ b/inc/db.h
@@ -30,11 +30,13 @@ extern int db_reset(sqlite3 *db, sqlite3_stmt *stmt);
 
 extern int db_bind_bool(sqlite3 *db, sqlite3_stmt *stmt, int idx, bool value);
 extern int db_bind_int(sqlite3 *db, sqlite3_stmt *stmt, int idx, int value);
+extern int db_bind_long(sqlite3 *db, sqlite3_stmt *stmt, int idx, long value);
 extern int db_bind_double(sqlite3 *db, sqlite3_stmt *stmt, int idx, double value);
 extern int db_bind_str(sqlite3 *db, sqlite3_stmt *stmt, int idx, const char *str);
 
 extern bool db_get_bool(sqlite3_stmt *stmt, int index);
 extern int db_get_int(sqlite3_stmt *stmt, int index);
+extern int db_get_long(sqlite3_stmt *stmt, int index);
 extern int db_get_double(sqlite3_stmt *stmt, int index);
 extern const char *db_get_str(sqlite3_stmt *stmt, int index);
 
@@ -52,4 +54,9 @@ extern int db_remove_version(sqlite3 *db, int version);
 extern int db_update_version(sqlite3 *db, int version);
 extern int db_count_version(sqlite3 *db);
 
+extern int db_count_group(sqlite3 *db, int *count);
+extern long db_insert_group(sqlite3 *db, const char *title, int city1, int city2, int city3, int city4, int city5);
+extern int db_update_group(sqlite3 *db, int time, const char *title, int city1, int city2, int city3, int city4, int city5);
+extern int db_delete_group(sqlite3 *db, int time);
+
 #endif // __ADVENTURE_DB_H__
index 69b7c40..df0474e 100644 (file)
@@ -3,7 +3,7 @@
 
 struct _group_info_s {
        char *title;
-       int time;
+       long time;
        int city1;
        int city2;
        int city3;
@@ -12,7 +12,7 @@ struct _group_info_s {
 };
 typedef struct _group_info_s group_info_s;
 
-extern group_info_s *group_info_create(int time, const char *title, int city1, int city2, int city3, int city4, int city5);
+extern group_info_s *group_info_create(long time, const char *title, int city1, int city2, int city3, int city4, int city5);
 extern void group_info_destroy(group_info_s *group_info);
 
 #endif /* __MOMENTIC_GROUP_INFO_H__ */
index 086b52c..1889cfe 100644 (file)
@@ -4,6 +4,21 @@
 #include <Elementary.h>
 #include "main_view.h"
 
+struct _selecting_info_s {
+       int city;
+       int color;
+};
+typedef struct _selecting_info_s selecting_info_s;
+
+struct _result_info_s {
+       Evas_Object *rect1;
+       Evas_Object *rect2;
+       int city;
+       int start;
+       int end;
+};
+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);
 
@@ -13,4 +28,7 @@ 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);
 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);
+
 #endif /* __MOMENTIC_ITEM_H__ */
index 96f8bd5..fccac62 100644 (file)
@@ -23,6 +23,7 @@
 #include <system_settings.h>
 #include <efl_extension.h>
 #include <dlog.h>
+#include <sqlite3.h>
 
 #if !defined(PACKAGE)
 #define PACKAGE "org.tizen.moment"
@@ -38,6 +39,8 @@ struct _moment_info_s {
        Evas_Object *result_view;
 
        Evas *e;
+       Eina_List *group_list;
+       sqlite3 *db;
 
        int width;
        int height;
index 6df48e0..f1d5338 100644 (file)
@@ -7,12 +7,14 @@
 struct _main_view_s {
        Evas_Object *main_view;
        Evas_Object *entry;
-       Evas_Object *map;
        Evas_Object *result_button;
        Evas_Object *selected_scroller;
        Evas_Object *plus_button;
 
        Evas_Object *predict_scroller;
+       Evas_Object *result_scroller;
+       Evas_Object *group_scroller;
+       moment_info_s *moment_info;
 };
 typedef struct _main_view_s main_view_s;
 
index c619769..9ad4667 100644 (file)
--- a/inc/map.h
+++ b/inc/map.h
@@ -1,68 +1,16 @@
-#ifndef __MAP_H__
-#define __MAP_H__
+#ifndef MOMENT_MAP
+#define MOMENT_MAP
 
-enum {
-       CITY_HONOLULU = 0,
-       CITY_LOS_ANGELES,
-       CITY_SAN_FRANCISCO,
-       CITY_VANCOUVER,
-       CITY_CHICAGO,
-       CITY_MEICO_CITY,
-       CITY_SAN_JOSE,
-       CITY_NEW_YORK_CITY,
-       CITY_TORONTO,
-       CITY_WASHINGTON_DC,
-       CITY_BRASILIA,
-       CITY_BUENOS_AIRES,
-       CITY_SAO_PAULO,
-       CITY_DUBLIN,
-       CITY_LISBON,
-       CITY_LONDON,
-       CITY_AMSTERDAM,
-       CITY_BARCELONA,
-       CITY_BERLIN,
-       CITY_BRUSSELS,
-       CITY_CAPE_TOWN,
-       CITY_GENEVA,
-       CITY_MADRID,
-       CITY_PARIS,
-       CITY_ROME,
-       CITY_STOCKHOLM,
-       CITY_WARSAW,
-       CITY_ANKARA,
-       CITY_ATHENS,
-       CITY_HELSINKI,
-       CITY_ISTANBUL,
-       CITY_JERUSALEM,
-       CITY_KAHIRA,
-       CITY_BAGHDAD,
-       CITY_DUBAI,
-       CITY_MOSCOW,
-       CITY_ISLAMABAD,
-       CITY_DELHI,
-       CITY_MUMBAI,
-       CITY_DAKA,
-       CITY_CALCUTTA,
-       CITY_BANGKOK,
-       CITY_JAKARTA,
-       CITY_BEIJING,
-       CITY_HONG_KONG,
-       CITY_SINGAPORE,
-       CITY_TAIPEI,
-       CITY_SEOUL,
-       CITY_TOKYO,
-       CITY_SYDNEY,
-};
+#include "city.h"
 
-struct _city_info_s {
-       int id;
-       float timezone;
-       char *name;
-       char *nation;
-};
-typedef struct _city_info_s city_info_s;
+typedef struct _city_data_s {
+   city_s ci;
+   Evas_Object *obj;
+   int w, h;
+} city_data_s;
 
-extern Evas_Object *map_create(Evas_Object *parent);
-extern void map_destroy(Evas_Object *map);
+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);
 
-#endif /* __MAP_H__ */
+#endif
diff --git a/inc/popup.h b/inc/popup.h
new file mode 100644 (file)
index 0000000..96509aa
--- /dev/null
@@ -0,0 +1,8 @@
+#ifndef __MOMENT_POPUP_H__
+#define __MOMENT_POPUP_H__
+
+#include <Elementary.h>
+
+extern Evas_Object *popup_create_text(Evas_Object *parent, const char *text);
+
+#endif /* __MOMENT_POPUP_H__ */
index 7fa2368..b258f60 100644 (file)
@@ -16,7 +16,9 @@ extern void scroller_destroy(Evas_Object *scroller);
 
 extern void scroller_append_item(Evas_Object *scroller, Evas_Object *item);
 extern void scroller_remove_item(Evas_Object *scroller, Evas_Object *item);
+extern void scroller_clear_item(Evas_Object *scroller);
 
+extern int scroller_count_item(Evas_Object *scroller);
 extern void scroller_bring_in_item(Evas_Object *scroller, Evas_Object *item);
 
 extern int scroller_register_event_cb(Evas_Object *scroller, int event_type, void (*event_cb)(Evas_Object *scroller, int event_type, void *event_info, void *user_data), void *user_data);
index c944b93..b08b4a5 100644 (file)
 /* Build */
 #define HAPI __attribute__((visibility("hidden")))
 
+/* DATA */
+#define DATA_KEY_SELECTING "selecting"
+#define DATA_KEY_RESULT "result"
+
 /* Return values */
 typedef enum {
        APPL_ERROR_NONE = 0,
diff --git a/res/edje/conf.h b/res/edje/conf.h
new file mode 100644 (file)
index 0000000..95cc24e
--- /dev/null
@@ -0,0 +1,14 @@
+#ifndef __MOMENT_CONF_H__
+#define __MOMENT_CONF_H__
+
+#define MAXIMUM_SELECTED_CITY 5
+
+#define BEST_START_TIME 8
+#define BEST_DURING_TIME 9
+#define BEST_END_TIME (BEST_START_TIME + BEST_DURING_TIME)
+
+#define ENTRY_WIDTH 446
+#define ENTRY_HEIGHT 38
+#define ENTRY_RESULT_HEIGHT 400
+
+#endif /* __MOMENT_CONF_H__ */
index e1415f5..fc1e08b 100755 (executable)
@@ -7,6 +7,9 @@
 #define ITEM_RESULT_WIDTH ITEM_SELECTING_WIDTH
 #define ITEM_RESULT_HEIGHT ITEM_SELECTING_HEIGHT
 
+#define ITEM_GROUP_WIDTH 442
+#define ITEM_GROUP_HEIGHT 50
+
 images {
        image: "my_status_small.png" COMP;
        image: "other_location_blue_small.png" COMP;
@@ -418,4 +421,90 @@ collections {
                        }
                } //parts
        }
+
+       group {
+               name: "item_group";
+               parts {
+                       part {
+                               name: "bg";
+                               type: RECT;
+                               description {
+                                       rel1 { relative: 0.0 0.0; }
+                                       rel2 { relative: 1.0 1.0; }
+                                       min: ITEM_GROUP_WIDTH ITEM_GROUP_HEIGHT;
+                                       color: 247 208 143 200;
+                                       visible: 1;
+                               }
+                       }
+                       part {
+                               name: "title";
+                               type: TEXT;
+                               mouse_events: 0;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       rel1 { relative: 0.0 0.0; to: "title_event"; }
+                                       rel2 { relative: 1.0 1.0; to: "title_event"; }
+                                       color: 255 255 255 255;
+                                       text {
+                                               text: "Momentic time";
+                                               font: "Tizen:style=LIGHT";
+                                               text_class: "tizen";
+                                               min: 0 1;
+                                               size: 20;
+                                               align: 0.0 0.5;
+                                       }
+                                       align: 0.0 1.0;
+                                       visible: 1;
+                               }
+                               description {
+                                       state: "press" 0.0;
+                                       inherit: "default" 0.0;
+                                       color: 255 255 255 100;
+                               }
+                       }
+                       part {
+                               name: "title_event";
+                               type: RECT;
+                               mouse_events: 1;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       rel1 { relative: 20/ITEM_GROUP_WIDTH 0.0; to: "bg"; }
+                                       rel2 { relative: 400/ITEM_GROUP_WIDTH 1.0; to: "bg"; }
+                                       align: 0.5 0.5;
+                                       min: ITEM_GROUP_HEIGHT ITEM_GROUP_HEIGHT;
+                                       fixed: 1 1;
+                                       color: 0 0 0 0;
+                                       visible: 1;
+                               }
+                       }
+               } //parts
+               programs {
+                       program {
+                               signal: "mouse,down,1";
+                               source: "title_event";
+                               action: SIGNAL_EMIT "down" "item";
+                               after: "down,after";
+                       }   
+                       program {
+                               name: "down,after";
+                               action: STATE_SET "press" 0.0;
+                               target: "title";
+                       }
+                       program {
+                               signal: "mouse,up,1";
+                               source: "title_event";
+                               action: SIGNAL_EMIT "up" "item";
+                               after: "up,after";
+                       }
+                       program {
+                               name: "up,after";
+                               action: STATE_SET "default" 0.0;
+                               target: "title";
+                       }
+               }
+       }
+
+
 } //collections
index 0db59a7..13e497c 100755 (executable)
@@ -142,6 +142,27 @@ collections {
                                }
                        }
                        part {
+                               name: "result_scroller";
+                               type: SWALLOW;
+                               scale: 1;
+                               mouse_events: 1;
+                               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.0;
+                                       min: 480 400;
+                                       fixed: 1 1;
+                                       visible: 1;
+                               }
+                               description {
+                                       state: "hide" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 0;
+                               }
+                       }
+
+                       part {
                                name: "entry_result";
                                type: SWALLOW;
                                scale: 1;
@@ -181,6 +202,39 @@ collections {
                                        align: 0.5 1.0;
                                }
                        }
+                       part {
+                               name: "group_scroller";
+                               type: SWALLOW;
+                               scale: 1;
+                               mouse_events: 1;
+                               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.0;
+                                       min: 480 400;
+                                       fixed: 1 1;
+                                       visible: 1;
+                               }
+                               description {
+                                       state: "hide" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 0;
+                               }
+                       }
+
+
+                       part {
+                               name: "popup";
+                               type: SWALLOW;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       rel1 { relative: 0.0 0.0; }
+                                       rel2 { relative: 1.0 1.0; }
+                                       visible: 1;
+                               }
+                       }
                }
                programs {
                        program {
@@ -236,6 +290,32 @@ collections {
                                action: STATE_SET "default" 0.0;
                                target: "selected_scroller";
                        }
+
+                       program {
+                               signal: "hide";
+                               source: "result_scroller";
+                               action: STATE_SET "hide" 0.0;
+                               target: "result_scroller";
+                       }
+                       program {
+                               signal: "show";
+                               source: "result_scroller";
+                               action: STATE_SET "default" 0.0;
+                               target: "result_scroller";
+                       }
+
+                       program {
+                               signal: "hide";
+                               source: "group_scroller";
+                               action: STATE_SET "hide" 0.0;
+                               target: "group_scroller";
+                       }
+                       program {
+                               signal: "show";
+                               source: "group_scroller";
+                               action: STATE_SET "default" 0.0;
+                               target: "group_scroller";
+                       }
                }
        }
 }
diff --git a/res/edje/momentic.edc b/res/edje/momentic.edc
new file mode 100644 (file)
index 0000000..3d797f1
--- /dev/null
@@ -0,0 +1,555 @@
+collections {
+   base_scale: 1.8;
+   styles {
+      style { name: "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 { 
+      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";
+            }
+         }
+      }
+   }
+   group { name: "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 { name: "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;
+            }
+         }
+         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;
+            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_bg";
+            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: "searchlist";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default";
+               rel1.to: "searchlist_bg";
+               rel2.to: "searchlist_bg";               
+            }
+         }
+         part { name: "searchbar_clipper";
+            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: "searchbar";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "searchbar_clipper";
+            description { state: "default";
+               rel1.to: "searchbar_clipper";
+               rel2.to: "searchbar_clipper";               
+            }
+         }         
+         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" 0.0;
+            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" 0.0;
+            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" 0.0;
+            target: "searchbar_clipper";
+         }
+//page 1 end
+         
+         
+//search bar begin
+         program { name: "show_searchbar";
+            signal: "momentic,state,searchbar,show";
+            action: STATE_SET "visible" 0.0;
+            target: "searchbar_clipper";
+            transition: DECELERATE 0.25;
+         }
+         program { name: "hide_searchbar";
+            signal: "momentic,state,searchbar,hide";
+            action: STATE_SET "default" 0.0;
+            target: "searchbar_clipper";
+            transition: DECELERATE 0.25;
+         }
+         program { name: "show_searchlist";
+            signal: "momentic,state,searchlist,show";
+            action: STATE_SET "visible" 0.0;
+            target: "searchlist";
+            target: "searchlist_bg";            
+            transition: DECELERATE 0.5;
+         }
+         program { name: "hide_searchlist";
+            signal: "momentic,state,searchlist,hide";
+            action: STATE_SET "default" 0.0;
+            target: "searchlist";
+            target: "searchlist_bg";                        
+            transition: DECELERATE 0.5;
+         }
+         program { name: "hide_search";
+            signal: "momentic,state,search,hide";
+            action: STATE_SET "default" 0.0;
+            target: "searchlist";
+            target: "searchlist_bg";
+            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" 0.0;
+            target: "add_description2";
+            transition: DECELERATE 0.25;
+         }
+         program { name: "hide_add_description2";
+            signal: "momentic,state,add_description,hide";
+            action: STATE_SET "hide" 0.0;
+            target: "add_description2";
+            transition: DECELERATE 0.25;
+         }
+
+         
+//page 2 begin
+         program { name: "go_page2a";
+            action: STATE_SET "next" 0.0;
+            target: "next_btn";
+            target: "next_btn_clipper";
+            transition: DECELERATE 0.25;
+            after: "go_page2b";
+         }
+         program { name: "go_page2b";
+            action: STATE_SET "next" 0.0;
+            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" 0.0;
+            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" 0.0;
+            target: "next_btn";
+            transition: DECELERATE 0.75;
+         }
+//next button end
+         
+      }
+   }
+}
index 9765b1b..0f11028 100755 (executable)
Binary files a/shared/res/adventure.png and b/shared/res/adventure.png differ
index 6825022..f9ca46b 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <app_common.h>
+#include <time.h>
 
 #include "db.h"
 #include "log.h"
@@ -158,6 +159,23 @@ HAPI int db_bind_int(sqlite3 *db, sqlite3_stmt *stmt, int idx, int value)
 
 
 
+HAPI int db_bind_long(sqlite3 *db, sqlite3_stmt *stmt, int idx, long value)
+{
+       int ret = SQLITE_OK;
+
+       retv_if(!stmt, APPL_ERROR_FAIL);
+
+       ret = sqlite3_bind_int64(stmt, idx, value);
+       if (SQLITE_OK != ret) {
+               _E("%s", sqlite3_errmsg(db));
+               return APPL_ERROR_FAIL;
+       }
+
+       return APPL_ERROR_NONE;
+}
+
+
+
 HAPI int db_bind_double(sqlite3 *db, sqlite3_stmt *stmt, int idx, double value)
 {
        int ret = SQLITE_OK;
@@ -213,6 +231,14 @@ HAPI int db_get_int(sqlite3_stmt *stmt, int index)
 
 
 
+HAPI int db_get_long(sqlite3_stmt *stmt, int index)
+{
+       retv_if(!stmt, 0);
+       return sqlite3_column_int64(stmt, index);
+}
+
+
+
 HAPI int db_get_double(sqlite3_stmt *stmt, int index)
 {
        retv_if(!stmt, 0);
@@ -442,20 +468,24 @@ error:
 
 
 
-HAPI int db_insert_group(sqlite3 *db, const char *title, int city1, int city2, int city3, int city4, int city5)
+HAPI long db_insert_group(sqlite3 *db, const char *title, int city1, int city2, int city3, int city4, int city5)
 {
-       const char *const QUERY_INSERT = "INSERT INTO group (time, title, city1, city2, city3, city4, city5) VALUES (DATETIME('now'), ?, ?, ?, ?, ?, ?);";
+       const char *const QUERY_INSERT = "INSERT INTO group (time, title, city1, city2, city3, city4, city5) VALUES (?, ?, ?, ?, ?, ?, ?);";
        sqlite3_stmt *st = NULL;
+       time_t t;
 
-       st = db_prepare(db, QUERY_INSERT);
-       retv_if(!st, APPL_ERROR_FAIL);
+       time(&t);
 
-       goto_if(db_bind_str(db, st, 1, title) != APPL_ERROR_NONE, error);
-       goto_if(db_bind_int(db, st, 2, city1) != APPL_ERROR_NONE, error);
-       goto_if(db_bind_int(db, st, 3, city2) != APPL_ERROR_NONE, error);
-       goto_if(db_bind_int(db, st, 4, city3) != APPL_ERROR_NONE, error);
-       goto_if(db_bind_int(db, st, 5, city4) != APPL_ERROR_NONE, error);
-       goto_if(db_bind_int(db, st, 6, city5) != APPL_ERROR_NONE, error);
+       st = db_prepare(db, QUERY_INSERT);
+       retv_if(!st, 0l);
+
+       goto_if(db_bind_long(db, st, 1, (long) t) != APPL_ERROR_NONE, error);
+       goto_if(db_bind_str(db, st, 2, title) != APPL_ERROR_NONE, error);
+       goto_if(db_bind_int(db, st, 3, city1) != APPL_ERROR_NONE, error);
+       goto_if(db_bind_int(db, st, 4, city2) != APPL_ERROR_NONE, error);
+       goto_if(db_bind_int(db, st, 5, city3) != APPL_ERROR_NONE, error);
+       goto_if(db_bind_int(db, st, 6, city4) != APPL_ERROR_NONE, error);
+       goto_if(db_bind_int(db, st, 7, city5) != APPL_ERROR_NONE, error);
        goto_if(db_next(db, st) == -1, error);
 
        db_reset(db, st);
@@ -463,11 +493,11 @@ HAPI int db_insert_group(sqlite3 *db, const char *title, int city1, int city2, i
 
        /* keep the sticker panel DB opened */
 
-       return APPL_ERROR_NONE;
+       return t;
 
 error:
        db_finalize(db, st);
-       return APPL_ERROR_FAIL;
+       return 0l;
 }
 
 
@@ -528,19 +558,6 @@ error:
 
 
 
-struct _group_s {
-       char *title;
-       int time;
-       int city1;
-       int city2;
-       int city3;
-       int city4;
-       int city5;
-};
-typedef struct _group_s group_s;
-
-
-
 HAPI int db_list_group(sqlite3 *db, Eina_List **group_list, int limit)
 {
        const char *const QUERY_LIST = "SELECT time, title, city1, city2, city3, city4, city5 FROM group ORDER BY time ASC";
@@ -553,7 +570,7 @@ HAPI int db_list_group(sqlite3 *db, Eina_List **group_list, int limit)
        retv_if(!st, APPL_ERROR_FAIL);
 
        do {
-               int time = 0;
+               long time = 0l;
                const char *title = NULL;
                int city1 = 0, city2 = 0, city3 = 0, city4 = 0, city5 = 0;
                ret = db_next(db, st);
@@ -564,7 +581,7 @@ HAPI int db_list_group(sqlite3 *db, Eina_List **group_list, int limit)
                        goto error;
                }
 
-               time = db_get_int(st, 0);
+               time = db_get_long(st, 0);
                title = db_get_str(st, 1);
                city1 = db_get_int(st, 2);
                city2 = db_get_int(st, 3);
index 9159c04..ef74a4e 100644 (file)
@@ -13,7 +13,7 @@ struct _group_info_s {
 };
 typedef struct _group_info_s group_info_s;
 
-group_info_s *group_info_create(int time, const char *title, int city1, int city2, int city3, int city4, int city5)
+group_info_s *group_info_create(long time, const char *title, int city1, int city2, int city3, int city4, int city5)
 {
        group_info_s *group_info = NULL;
 
index a82c9b2..0cb8908 100644 (file)
@@ -6,24 +6,17 @@
 #include <app.h>
 
 #include "log.h"
+#include "conf.h"
 #include "util.h"
 #include "city.h"
 #include "item.h"
 #include "main_view.h"
 #include "scroller.h"
+#include "popup.h"
 
 #define _EDJ(o) elm_layout_edje_get(o)
-const char *const DATA_KEY_RESULT = "result";
 const char *const DATA_KEY_CITY = "city";
 
-struct _result_info_s {
-       Evas_Object *rect1;
-       Evas_Object *rect2;
-       int start;
-       int end;
-};
-typedef struct _result_info_s result_info_s;
-
 const char *const ITEM_EDJE = "item.edj";
 
 void _text_set_here_time(Evas_Object *item, const char *part)
@@ -58,6 +51,11 @@ void _text_set_here_time(Evas_Object *item, const char *part)
        elm_object_part_text_set(item, part, timezone_str);
 }
 
+static void _item_typing_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+       item_destroy_typing(obj);
+}
+
 static void _item_typing_down_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
        _D("An item is down");
@@ -69,6 +67,7 @@ static void _item_typing_up_cb(void *data, Evas_Object *obj, const char *emissio
        Evas_Object *selecting_item = NULL;
        main_view_s *main_view_info = data;
        int city = 0;
+       int count = 0;
 
        ret_if(!item);
        ret_if(!main_view_info);
@@ -76,6 +75,24 @@ static void _item_typing_up_cb(void *data, Evas_Object *obj, const char *emissio
 
        _D("An item is selected");
 
+       count = scroller_count_item(main_view_info->selected_scroller);
+       if (count >= 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);
+               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->selected_scroller, city, 0);
        ret_if(!selecting_item);
@@ -108,6 +125,10 @@ Evas_Object *item_create_typing(Evas_Object *parent, int city, main_view_s *main
        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_CITY, (void *) city);
+       evas_object_event_callback_add(item, EVAS_CALLBACK_DEL, _item_typing_del_cb, NULL);
+       elm_object_signal_callback_add(item, "down", "item", _item_typing_down_cb, NULL);
+       elm_object_signal_callback_add(item, "up", "item", _item_typing_up_cb, main_view_info);
+
        evas_object_show(item);
 
        city_info = city_get();
@@ -120,9 +141,6 @@ Evas_Object *item_create_typing(Evas_Object *parent, int city, main_view_s *main
        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);
 
-       elm_object_signal_callback_add(item, "down", "item", _item_typing_down_cb, NULL);
-       elm_object_signal_callback_add(item, "up", "item", _item_typing_up_cb, main_view_info);
-
        return item;
 }
 
@@ -130,6 +148,7 @@ void item_destroy_typing(Evas_Object *item)
 {
        ret_if(!item);
 
+       evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, _item_typing_del_cb);
        elm_object_signal_callback_del(item, "down", "item", _item_typing_down_cb);
        elm_object_signal_callback_del(item, "up", "item", _item_typing_up_cb);
 
@@ -137,6 +156,11 @@ void item_destroy_typing(Evas_Object *item)
        evas_object_del(item);
 }
 
+static void _item_selecting_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+       item_destroy_selecting(obj);
+}
+
 static void _delete_down_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
        _D("Delete button is down");
@@ -155,6 +179,7 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color)
 {
        Evas_Object *item = NULL;
        city_s *city_info = NULL;
+       selecting_info_s *selecting_info = NULL;
 
        char *path = NULL;
        char full_path[PATH_LEN] = {0, };
@@ -163,13 +188,17 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color)
 
        retv_if(!parent, NULL);
 
-       _D("HELLO, city:%d, color:%d", city, color);
        path = app_get_resource_path();
        retv_if(!path, NULL);
 
        snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, ITEM_EDJE);
        free(path);
 
+       selecting_info = calloc(1, sizeof(selecting_info_s));
+       retv_if(!selecting_info, NULL);
+       selecting_info->city = city;
+       selecting_info->color = color;
+
        item = elm_layout_add(parent);
        retv_if(!item, NULL);
 
@@ -177,14 +206,14 @@ 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_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", _delete_down_cb, NULL);
+       elm_object_signal_callback_add(item, "delete,up", "item", _delete_up_cb, NULL);
        evas_object_show(item);
 
        city_info = city_get();
-       if (!city_info) {
-               _E("Critical, no city information");
-               evas_object_del(item);
-               return NULL;
-       }
+       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);
@@ -194,16 +223,28 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color)
                elm_object_signal_emit(item, color_str, "mark");
        }
 
-       elm_object_signal_callback_add(item, "delete,down", "item", _delete_down_cb, NULL);
-       elm_object_signal_callback_add(item, "delete,up", "item", _delete_up_cb, NULL);
-
        return item;
+
+error:
+       if (item)
+               evas_object_del(item);
+
+       if (selecting_info)
+               free(selecting_info);
+
+       return NULL;
 }
 
 void item_destroy_selecting(Evas_Object *item)
 {
+       selecting_info_s *selecting_info = NULL;
+
        ret_if(!item);
 
+       selecting_info = evas_object_data_del(item, DATA_KEY_SELECTING);
+       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", _delete_down_cb);
        elm_object_signal_callback_del(item, "delete,up", "item", _delete_up_cb);
 
@@ -264,6 +305,11 @@ static void _resize_graph_cb(void *data, Evas *e, Evas_Object *obj, void *event_
        evas_object_show(result_info->rect1);
 }
 
+static void _item_result_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+       item_destroy_result(obj);
+}
+
 Evas_Object *item_create_result(Evas_Object *parent, int city, int color, int start, int end, struct tm *global_time)
 {
        Evas_Object *item = NULL;
@@ -295,6 +341,9 @@ Evas_Object *item_create_result(Evas_Object *parent, int city, int color, int st
        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_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_show(item);
 
        city_info = city_get();
@@ -317,12 +366,10 @@ Evas_Object *item_create_result(Evas_Object *parent, int city, int color, int st
        result_info->rect2 = evas_object_rectangle_add(e);
        goto_if(!result_info->rect2, error);
 
+       result_info->city = city;
        result_info->start = start;
        result_info->end = end;
 
-       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); 
-
        return item;
 
 error:
@@ -347,6 +394,7 @@ void item_destroy_result(Evas_Object *item)
 
        ret_if(!item);
 
+       evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, _item_result_del_cb);
        elm_object_signal_callback_del(item, "delete,down", "item", _delete_down_cb);
        elm_object_signal_callback_del(item, "delete,up", "item", _delete_up_cb);
 
@@ -361,3 +409,87 @@ void item_destroy_result(Evas_Object *item)
 
        evas_object_del(item);
 }
+
+static void _item_group_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+       item_destroy_group(obj);
+}
+
+static void _item_group_down_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+       _D("An item is down");
+}
+
+static void _item_group_up_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+       Evas_Object *item = obj;
+       Evas_Object *selecting_item = NULL;
+       main_view_s *main_view_info = data;
+       int city = 0;
+       int count = 0;
+
+       ret_if(!item);
+       ret_if(!main_view_info);
+       ret_if(!main_view_info->selected_scroller);
+
+       _D("An item is selected");
+
+       count = scroller_count_item(main_view_info->selected_scroller);
+       if (count >= 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);
+               return;
+       }
+
+       city = (int) evas_object_data_get(item, DATA_KEY_CITY);
+       selecting_item = item_create_selecting(main_view_info->selected_scroller, city, 0);
+       ret_if(!selecting_item);
+
+       scroller_append_item(main_view_info->selected_scroller, selecting_item);
+}
+
+Evas_Object *item_create_group(Evas_Object *parent, const char *title, main_view_s *main_view_info)
+{
+       Evas_Object *item = NULL;
+
+       char *path = NULL;
+       char full_path[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_group");
+
+       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_group_del_cb, NULL);
+       elm_object_signal_callback_add(item, "down", "item", _item_group_down_cb, NULL);
+       elm_object_signal_callback_add(item, "up", "item", _item_group_up_cb, main_view_info);
+
+       evas_object_show(item);
+
+       elm_object_part_text_set(item, "city", title);
+
+       return item;
+}
+
+void item_destroy_group(Evas_Object *item)
+{
+       ret_if(!item);
+
+       evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, _item_group_del_cb);
+       elm_object_signal_callback_del(item, "down", "item", _item_group_down_cb);
+       elm_object_signal_callback_del(item, "up", "item", _item_group_up_cb);
+
+       evas_object_del(item);
+}
index 7ba71b7..2ebe107 100644 (file)
@@ -1,4 +1,6 @@
 #include <Elementary.h>
+#include <time.h>
+#include <app_control.h>
 
 #include "main.h"
 #include "main_view.h"
@@ -7,8 +9,12 @@
 #include "city.h"
 #include "util.h"
 #include "item.h"
+#include "conf.h"
+#include "group_info.h"
+#include "db.h"
+#include "map.h"
 
-const char *const MAIN_VIEW_EDJE = "main_view.edj";
+const char *const MAIN_VIEW_EDJE = "momentic.edj";
 const char *const ENTRY_EDJE = "entry.edj";
 const char *const PREDICT_ITEM_EDJE = "predict_item.edj";
 
@@ -100,10 +106,12 @@ static void _change_entry_cb(void *data, Evas_Object *obj, void *event_info)
        if (!str
                || (str && !strlen(str))) {
                _clean_predict_scroller(main_view_info->predict_scroller);
+               elm_object_signal_emit(main_view_info->main_view, "momentic,state,searchlist,hide", "");
                return;
        }
 
        _update_predict_scroller(main_view_info->predict_scroller, str, main_view_info);
+       elm_object_signal_emit(main_view_info->main_view, "momentic,state,searchlist,show", "");
 }
 
 static void _focus_entry_cb(void *data, Evas_Object *obj, void *event_info)
@@ -136,8 +144,7 @@ static void _unfocus_entry_cb(void *data, Evas_Object *obj, void *event_info)
        //_clean_predict_scroller(main_view_info->predict_scroller);
 }
 
-static void
-_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+static void _resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
        int x, y, w, h;
        evas_object_geometry_get(obj, &x, &y, &w, &h);
@@ -230,56 +237,95 @@ static void _destroy_search_entry(Evas_Object *entry)
        evas_object_del(entry);
 }
 
-static Evas_Object *_create_map(Evas_Object *parent)
+static void _click_result_button_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       Evas_Object *map = NULL;
-       Evas *e = NULL;
+       main_view_s *main_view_info = data;
+       Evas_Object *box = NULL;
+       Evas_Object *item = NULL;
+       Eina_List *list = NULL;
+       struct tm *global_time = NULL;
+       struct tm *local_time = NULL;
+       time_t t;
+       city_s *city_info = NULL;
+       int cur_timezone = 0;
 
-       retv_if(!parent, NULL);
+       ret_if(!main_view_info);
+       ret_if(!main_view_info->selected_scroller);
+       ret_if(!main_view_info->result_scroller);
 
-       e = evas_object_evas_get(parent);
-       retv_if(!e, NULL);
+       _D("result button is clicked");
 
-       map = evas_object_rectangle_add(e);
-       retv_if(!map, NULL);
+       scroller_clear_item(main_view_info->result_scroller);
 
-       evas_object_color_set(map, 0, 0, 200, 255);
-       evas_object_size_hint_min_set(map, 480, 400);
-       evas_object_show(map);
+       city_info = city_get();
+       ret_if(!city_info);
 
-       return map;
-}
+       time(&t);
+       global_time = gmtime(&t);
+       local_time = localtime(&t);
 
-static void _destroy_map(Evas_Object *map)
-{
-       ret_if(!map);
+       cur_timezone = (int) local_time->tm_gmtoff / 3600;
 
-       evas_object_del(map);
-}
+       box = elm_object_content_get(main_view_info->selected_scroller);
+       ret_if(!box);
 
-static void _click_result_button_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       main_view_s *main_view_info = data;
+       list = elm_box_children_get(box);
+       ret_if(!list);
 
-       _D("result button is clicked");
+       EINA_LIST_FREE(list, item) {
+               selecting_info_s *selecting_info = NULL;
+               Evas_Object *item_result = NULL;
+               int start = 0, end = 0;
+               int tmp_timezone = 0;
 
-       ret_if(!main_view_info);
+               selecting_info = evas_object_data_get(item, DATA_KEY_SELECTING);
+               continue_if(!selecting_info);
+
+               tmp_timezone = city_info[selecting_info->city].timezone;
+               if (tmp_timezone < cur_timezone)
+                       tmp_timezone += 24;
+
+               start = tmp_timezone - cur_timezone + BEST_START_TIME;
+               end = (start + (BEST_END_TIME - BEST_START_TIME)) % 24;
+
+               item_result = item_create_result(main_view_info->result_scroller
+                               , selecting_info->city
+                               , selecting_info->color
+                               , start
+                               , end
+                               , global_time);
+
+               scroller_append_item(main_view_info->result_scroller, item_result);
+       }
+
+       elm_object_signal_emit(main_view_info->main_view, "momentic,state,page2", "");
 }
 
 static Evas_Object *_create_result_button(Evas_Object *parent, main_view_s *main_view_info)
 {
        Evas_Object *result_button = NULL;
+       Evas_Object *icon = NULL;
+       char *path = NULL;
+       char full_path[PATH_LEN] = {0, };
 
        retv_if(!parent, NULL);
 
+       path = app_get_resource_path();
+       retv_if(!path, NULL);
+
+       snprintf(full_path, sizeof(full_path), "%s/images/next_btn.png", path);
+       free(path);
+
        result_button = elm_button_add(parent);
        retv_if(!result_button, NULL);
-
-       elm_object_text_set(result_button, "Result");
-       evas_object_size_hint_weight_set(result_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(result_button, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_smart_callback_add(result_button, "clicked", _click_result_button_cb, main_view_info);
 
+       icon = elm_image_add(result_button);
+       if (icon) {
+               elm_image_file_set(icon, full_path, NULL);
+               elm_object_content_set(result_button, icon);
+       }
+
        return result_button;
 }
 
@@ -303,36 +349,65 @@ static Evas_Object *_create_selected_scroller(Evas_Object *parent)
 
 static void _destroy_selected_scroller(Evas_Object *selected_scroller)
 {
+       Evas_Object *box = NULL;
+       Evas_Object *item = NULL;
+       Eina_List *list = NULL;
+
        ret_if(!selected_scroller);
 
+       box = elm_object_content_get(selected_scroller);
+       ret_if(!box);
+
+       list = elm_box_children_get(box);
+       ret_if(!list);
+
+       EINA_LIST_FREE(list, item) {
+               evas_object_del(item);
+       }
+
+       evas_object_del(box);
        evas_object_del(selected_scroller);
 }
 
 static void _click_plus_button_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       moment_info_s *moment_info = data;
+       main_view_s *main_view_info = data;
 
        _D("Add button is clicked");
 
-       ret_if(!moment_info);
+       ret_if(!main_view_info);
+       ret_if(!main_view_info->main_view);
+
+       elm_object_signal_emit(main_view_info->main_view, "momentic,state,page1", "");
 
-       /* Show the entry */
 }
 
 static Evas_Object *_create_plus_button(Evas_Object *parent, main_view_s *main_view_info)
 {
        Evas_Object *plus_button = NULL;
+       Evas_Object *icon = NULL;
+       char *path = NULL;
+       char full_path[PATH_LEN] = {0, };
 
        retv_if(!parent, NULL);
 
+       path = app_get_resource_path();
+       retv_if(!path, NULL);
+
+       snprintf(full_path, sizeof(full_path), "%s/images/add_btn.png", path);
+       free(path);
+
        plus_button = elm_button_add(parent);
        retv_if(!plus_button, NULL);
-
-       elm_object_text_set(plus_button, "+Add");
-       evas_object_size_hint_weight_set(plus_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(plus_button, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       elm_object_style_set(plus_button, "transparent");
        evas_object_smart_callback_add(plus_button, "clicked", _click_plus_button_cb, main_view_info);
 
+       icon = elm_image_add(plus_button);
+       if (icon) {
+               elm_image_file_set(icon, full_path, NULL);
+               elm_object_content_set(plus_button, icon);
+       }
+
        return plus_button;
 }
 
@@ -342,6 +417,79 @@ static void _destroy_plus_button(Evas_Object *plus_button)
        evas_object_del(plus_button);
 }
 
+static void _click_save_button_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       main_view_s *main_view_info = data;
+       moment_info_s *moment_info = main_view_info->moment_info;
+       Evas_Object *box = NULL;
+       Evas_Object *item = NULL;
+       Eina_List *list = NULL;
+       group_info_s *group_info = NULL;
+       int city[MAXIMUM_SELECTED_CITY] = {0, };
+       int i = 0;
+       long time = 0l;
+
+       _D("Save button is clicked");
+
+       ret_if(!main_view_info);
+       ret_if(!main_view_info->result_scroller);
+
+       box = elm_object_content_get(main_view_info->result_scroller);
+       ret_if(!box);
+
+       list = elm_box_children_get(box);
+       ret_if(!list);
+
+       EINA_LIST_FREE(list, item) {
+               result_info_s *result_info = NULL;
+
+               result_info = evas_object_data_get(item, DATA_KEY_RESULT);
+               continue_if(!result_info);
+
+               city[i] = result_info->city;
+               i++;
+       }
+
+       time = db_insert_group(moment_info->db
+                       , "Momentic time"
+                       , city[0] 
+                       , city[1]
+                       , city[2]
+                       , city[3]
+                       , city[4]);
+       group_info = group_info_create(time
+                       , "Momentic time"
+                       , city[0] 
+                       , city[1]
+                       , city[2]
+                       , city[3]
+                       , city[4]);
+       moment_info->group_list = eina_list_append(moment_info->group_list, group_info);
+}
+
+static Evas_Object *_create_save_button(Evas_Object *parent, moment_info_s *moment_info)
+{
+       Evas_Object *save_button = NULL;
+
+       retv_if(!parent, NULL);
+
+       save_button = elm_button_add(parent);
+       retv_if(!save_button, NULL);
+
+       elm_object_text_set(save_button, "Save");
+       evas_object_size_hint_weight_set(save_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(save_button, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_smart_callback_add(save_button, "clicked", _click_save_button_cb, moment_info);
+
+       return save_button;
+}
+
+static void _destroy_save_button(Evas_Object *save_button)
+{
+       ret_if(!save_button);
+       evas_object_del(save_button);
+}
+
 static Evas_Object *_create_predict_scroller(Evas_Object *parent)
 {
        Evas_Object *predict_scroller = NULL;
@@ -356,11 +504,103 @@ static Evas_Object *_create_predict_scroller(Evas_Object *parent)
 
 static void _destroy_predict_scroller(Evas_Object *predict_scroller)
 {
+       Evas_Object *box = NULL;
+       Evas_Object *item = NULL;
+       Eina_List *list = NULL;
+
        ret_if(!predict_scroller);
 
+       box = elm_object_content_get(predict_scroller);
+       ret_if(!box);
+
+       list = elm_box_children_get(box);
+       ret_if(!list);
+
+       EINA_LIST_FREE(list, item) {
+               evas_object_del(item);
+       }
+
+       evas_object_del(box);
        evas_object_del(predict_scroller);
 }
 
+static Evas_Object *_create_result_scroller(Evas_Object *parent)
+{
+       Evas_Object *result_scroller = NULL;
+
+       retv_if(!parent, NULL);
+
+       result_scroller = scroller_create(parent);
+       retv_if(!result_scroller, NULL);
+
+       return result_scroller;
+}
+
+static void _destroy_result_scroller(Evas_Object *result_scroller)
+{
+       Evas_Object *box = NULL;
+       Evas_Object *item = NULL;
+       Eina_List *list = NULL;
+
+       ret_if(!result_scroller);
+
+       box = elm_object_content_get(result_scroller);
+       ret_if(!box);
+
+       list = elm_box_children_get(box);
+       ret_if(!list);
+
+       EINA_LIST_FREE(list, item) {
+               evas_object_del(item);
+       }
+
+       evas_object_del(box);
+       evas_object_del(result_scroller);
+}
+
+static Evas_Object *_create_group_scroller(Evas_Object *parent, Eina_List *list, main_view_s *main_view_info)
+{
+       Evas_Object *group_scroller = NULL;
+       group_info_s *group_info = NULL;
+       const Eina_List *l = NULL;
+
+       retv_if(!parent, NULL);
+
+       group_scroller = scroller_create(parent);
+       retv_if(!group_scroller, NULL);
+
+       EINA_LIST_FOREACH(list, l, group_info) {
+               Evas_Object *item_group = item_create_group(group_scroller
+                               , group_info->title
+                               , main_view_info);
+               scroller_append_item(group_scroller, item_group);
+       }
+
+       return group_scroller;
+}
+
+static void _destroy_group_scroller(Evas_Object *group_scroller)
+{
+       Evas_Object *box = NULL;
+       Evas_Object *item = NULL;
+       Eina_List *list = NULL;
+
+       ret_if(!group_scroller);
+
+       box = elm_object_content_get(group_scroller);
+       ret_if(!box);
+
+       list = elm_box_children_get(box);
+       ret_if(!list);
+
+       EINA_LIST_FREE(list, item) {
+               evas_object_del(item);
+       }
+
+       evas_object_del(box);
+       evas_object_del(group_scroller);
+}
+
 Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info)
 {
        main_view_s *main_view_info = NULL;
@@ -379,8 +619,9 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info)
 
        main_view_info = calloc(1, sizeof(main_view_s));
        retv_if(!main_view_info, NULL);
+       main_view_info->moment_info = moment_info;
 
-       main_view_info->main_view = elm_layout_add(parent);
+       main_view_info->main_view = create_momentic_layout(parent, full_path);
        if (!main_view_info->main_view) {
                free(main_view_info);
                return NULL;
@@ -398,27 +639,32 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info)
 
        main_view_info->entry = _create_search_entry(main_view_info->main_view, main_view_info);
        if (main_view_info->entry)
-               elm_object_part_content_set(main_view_info->main_view, "entry", main_view_info->entry);
-
-       main_view_info->map = _create_map(main_view_info->main_view);
-       if (main_view_info->map)
-               elm_object_part_content_set(main_view_info->main_view, "map", main_view_info->map);
+               elm_object_part_content_set(main_view_info->main_view, "searchbar", main_view_info->entry);
 
        main_view_info->result_button = _create_result_button(main_view_info->main_view, main_view_info);
        if (main_view_info->result_button)
-               elm_object_part_content_set(main_view_info->main_view, "result_button", main_view_info->result_button);
+               elm_object_part_content_set(main_view_info->main_view, "next_btn", main_view_info->result_button);
 
        main_view_info->selected_scroller = _create_selected_scroller(main_view_info->main_view);
        if (main_view_info->selected_scroller)
-               elm_object_part_content_set(main_view_info->main_view, "selected_scroller", main_view_info->selected_scroller);
+               elm_object_part_content_set(main_view_info->main_view, "city_list", main_view_info->selected_scroller);
 
        main_view_info->plus_button = _create_plus_button(main_view_info->main_view, main_view_info);
        if (main_view_info->plus_button)
-               elm_object_part_content_set(main_view_info->main_view, "plus_button", main_view_info->plus_button);
+               elm_object_part_content_set(main_view_info->main_view, "add_btn", main_view_info->plus_button);
 
        main_view_info->predict_scroller = _create_predict_scroller(main_view_info->main_view);
        if (main_view_info->predict_scroller)
-               elm_object_part_content_set(main_view_info->main_view, "entry_result", main_view_info->predict_scroller);
+               elm_object_part_content_set(main_view_info->main_view, "searchlist", main_view_info->predict_scroller);
+
+       main_view_info->result_scroller = _create_result_scroller(main_view_info->main_view);
+       if (main_view_info->result_scroller)
+               elm_object_part_content_set(main_view_info->main_view, "result_list", main_view_info->result_scroller);
+
+       main_view_info->group_scroller = _create_group_scroller(main_view_info->main_view, moment_info->group_list, main_view_info);
+       if (main_view_info->group_scroller)
+               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);
 
        return main_view_info->main_view;
 }
@@ -433,6 +679,12 @@ void main_view_destroy(Evas_Object *main_view)
        main_view_info = evas_object_data_del(main_view_info->main_view, DATA_KEY_INFO);
        ret_if(!main_view_info);
 
+       if (main_view_info->group_scroller)
+               _destroy_group_scroller(main_view_info->group_scroller);
+
+       if (main_view_info->result_scroller)
+               _destroy_result_scroller(main_view_info->result_scroller);
+
        if (main_view_info->predict_scroller)
                _destroy_predict_scroller(main_view_info->predict_scroller);
 
@@ -445,9 +697,6 @@ void main_view_destroy(Evas_Object *main_view)
        if (main_view_info->result_button)
                _destroy_result_button(button);
 
-       if (main_view_info->map)
-               _destroy_map(main_view_info->map);
-
        if (main_view_info->entry)
                _destroy_search_entry(main_view_info->entry);
 
@@ -455,3 +704,88 @@ void main_view_destroy(Evas_Object *main_view)
 
        evas_object_del(main_view);
 }
+
+static void _get_best_time(double *timezone, int size, double *start, double *end)
+{
+       register int i = 1;
+
+       ret_if(!timezone);
+       ret_if(!start);
+       ret_if(!end);
+
+       *start = timezone[0];
+       *end = timezone[0] + BEST_DURING_TIME;
+
+       for (; i < size; i++) {
+               double tmp = timezone[i];
+
+               if (tmp < *start) {
+                       if (tmp + BEST_DURING_TIME <= *start) {
+                               _D("No matched time");
+                               *start = 0;
+                               *end = 0;
+                               return;
+                       } else {
+                               *end = tmp + BEST_DURING_TIME;
+                       }
+               } else if (tmp > *start) {
+                       if (tmp >= *end) {
+                               _D("No matched time");
+                               *start = 0;
+                               *end = 0;
+                               return;
+                       } else {
+                               *start = tmp;
+                       }
+               } else
+                       continue;
+       }
+}
+
+static void _reply_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *user_data)
+{
+       _D("Result callback is called");
+}
+
+static void _launch_calendar_edit(int start, int end)
+{
+       app_control_h app_control = NULL;
+       time_t t;
+       struct tm *local_time = NULL;
+       int ret;
+
+       char start_str[PATH_LEN] = {0, };
+       char end_str[PATH_LEN] = {0, };
+
+       ret = app_control_create(&app_control);
+       ret_if(APP_CONTROL_ERROR_NONE != ret);
+
+       local_time = localtime(&t);
+
+       snprintf(start_str, sizeof(start_str), "%4d-%2d-%2d %2d:%2d:%2d"
+                       , local_time->tm_year + 1900
+                       , local_time->tm_mon + 1
+                       , local_time->tm_mday
+                       , start
+                       , 0
+                       , 0);
+
+       snprintf(start_str, sizeof(start_str), "%4d-%2d-%2d %2d:%2d:%2d"
+                       , local_time->tm_year + 1900
+                       , local_time->tm_mon + 1
+                       , local_time->tm_mday
+                       , end
+                       , 0
+                       , 0);
+
+       app_control_set_app_id(app_control, "com.samsung.calendar-lite-edit");
+       app_control_set_operation(app_control, "http://tizen.org/appcontrol/operation/edit");
+       app_control_add_extra_data(app_control, "start_time", start_str);
+       app_control_add_extra_data(app_control, "end_time", end_str);
+
+       app_control_send_launch_request(app_control, _reply_cb, NULL);
+       app_control_destroy(app_control);
+}
+
+
+
index 689965a..4d3c3f9 100644 (file)
--- a/src/map.c
+++ b/src/map.c
 #include <Elementary.h>
-#include "main.h"
-#include "log.h"
 #include "map.h"
-#include "util.h"
 
-const char *const MAP_EDJE = "map.edj";
+#define CITY_MAX 3
+#define WORLD_W 443
+#define WORLD_H 259
 
-Evas_Object *map_create(Evas_Object *parent)
+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, const char *full_path)
+{
+   //Main Layout
+   main_layout = elm_layout_add(parent);
+   elm_layout_file_set(main_layout, full_path, "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, full_path, "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)
 {
-       Evas_Object *map = NULL;
-       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);
+
+   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);
 
-       retv_if(!parent, NULL);
+   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));
 
-       path = app_get_resource_path();
-       retv_if(!path, NULL);
+   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));
 
-       snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, MAP_EDJE);
-       free(path);
+   Elm_Transit *trans;
 
-       map = elm_layout_add(parent);
-       retv_if(!map, NULL);
-       elm_layout_file_set(map, full_path, "main");
-       evas_object_show(map);
+   //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);
 
-       return map;
+   //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;
 }
 
-void map_destroy(Evas_Object *map)
+static void
+trans_del_cb(void *data, Elm_Transit *trans)
 {
-       ret_if(!map);
+   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);
 
-       evas_object_del(map);
+   return EINA_TRUE;
 }
diff --git a/src/popup.c b/src/popup.c
new file mode 100644 (file)
index 0000000..695bb65
--- /dev/null
@@ -0,0 +1,43 @@
+#include <Elementary.h>
+
+#include "util.h"
+#include "log.h"
+
+static void _response_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       Evas_Object *popup = data;
+       ret_if(!data);
+       evas_object_del(popup);
+}
+
+HAPI Evas_Object *popup_create_text(Evas_Object *parent, const char *text)
+{
+       Evas_Object *popup;
+       Evas_Object *btn;
+
+       retv_if(!parent, NULL);
+       retv_if(!text, NULL);
+
+       popup = elm_popup_add(parent);
+       retv_if(NULL == popup, NULL);
+
+       btn = elm_button_add(popup);
+       if (!btn) {
+               evas_object_del(popup);
+               return NULL;
+       }
+
+       elm_object_text_set(btn, "OK");
+       elm_object_part_content_set(popup, "button1", btn);
+       evas_object_smart_callback_add(btn, "clicked", _response_cb, popup);
+       evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+       elm_object_text_set(popup, text);
+       elm_popup_orient_set(popup, ELM_POPUP_ORIENT_CENTER);
+       evas_object_show(popup);
+
+       return popup;
+}
+
+
+
index bf73762..ab0f6ec 100644 (file)
@@ -183,6 +183,50 @@ void scroller_remove_item(Evas_Object *scroller, Evas_Object *item)
 
 
 
+void scroller_clear_item(Evas_Object *scroller)
+{
+       Evas_Object *box = NULL;
+       Evas_Object *item = NULL;
+       Eina_List *list = NULL;
+
+       ret_if(!scroller);
+
+       box = elm_object_content_get(scroller);
+       ret_if(!box);
+
+       list = elm_box_children_get(box);
+       ret_if(!list);
+
+       EINA_LIST_FREE(list, item) {
+               evas_object_del(item);
+       }
+}
+
+
+
+int scroller_count_item(Evas_Object *scroller)
+{
+       Evas_Object *box = NULL;
+       Eina_List *list = NULL;
+       int count = 0;
+
+       retv_if(!scroller, 0);
+
+       box = elm_object_content_get(scroller);
+       retv_if(!box, 0);
+
+       list = elm_box_children_get(box);
+       if (!list)
+               return 0;
+
+       count = eina_list_count(list);
+       eina_list_free(list);
+
+       return count;
+}
+
+
+
 void scroller_bring_in_item(Evas_Object *scroller, Evas_Object *item)
 {
        Evas_Object *box = NULL;