Version : 0813
authorJin Yoon <jinny.yoon@samsung.com>
Thu, 13 Aug 2015 06:13:07 +0000 (15:13 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Thu, 13 Aug 2015 06:13:07 +0000 (15:13 +0900)
34 files changed:
.cproject
.sdk_delta.info
.sign/.manifest.tmp
.sign/author-signature.xml
.sign/signature1.xml
inc/city.h
inc/conf.h
inc/item.h
inc/map.h
res/edje/best_time.edc [new file with mode: 0644]
res/edje/conf.h
res/edje/images/my_status.png [new file with mode: 0755]
res/edje/images/other location_pink.png [new file with mode: 0755]
res/edje/images/other location_purple.png [new file with mode: 0755]
res/edje/images/result_bar.png [new file with mode: 0755]
res/edje/images/watch_icon.png [new file with mode: 0644]
res/edje/item2.edc [new file with mode: 0644]
res/edje/momentic.edc
res/edje/popup.edc
res/edje/result_bar.png [new file with mode: 0644]
res/images/1.png
res/images/2.png
res/images/3.png
res/images/4.png
res/images/Result.png [new file with mode: 0755]
res/images/first.png [new file with mode: 0755]
res/images/popup button.png [new file with mode: 0755]
res/images/result_bar.png [new file with mode: 0755]
res/images/select list.png [new file with mode: 0755]
res/images/title bg.png [new file with mode: 0755]
res/images/watch_icon.png [new file with mode: 0755]
src/item.c
src/main_view.c
src/map.c

index a82449e..ff01315 100755 (executable)
--- a/.cproject
+++ b/.cproject
                                                        </option>
                                                </tool>
                                        </fileInfo>
+                                       <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.62290472" name="item2.edc" rcbsApplicability="disable" resourcePath="res/edje/item2.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1596255929">
+                                               <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1596255929" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924">
+                                                       <option id="sbi.gnu.edc.compiler.option.misc.id.1205646949" name="Image Path (-id)" 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>
                                        <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.553476469" name="city.edc" rcbsApplicability="disable" resourcePath="res/edje/city.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1662275044">
                                                <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1662275044" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924">
-                                                       <option id="sbi.gnu.edc.compiler.option.misc.id.738754799" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
+                                                       <option id="sbi.gnu.edc.compiler.option.misc.id.738754799" name="Image Path (-id)" 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>
                                                        </option>
                                                </tool>
                                        </fileInfo>
+                                       <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.994756919" name="best_time.edc" rcbsApplicability="disable" resourcePath="res/edje/best_time.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.558260232">
+                                               <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.558260232" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924">
+                                                       <option id="sbi.gnu.edc.compiler.option.misc.id.2029835287" 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>
                                        <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" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
index 73002b2..2d1e6e0 100644 (file)
Binary files a/.sdk_delta.info and b/.sdk_delta.info differ
index 9120832..bdf534a 100644 (file)
@@ -1,10 +1,13 @@
 res/edje/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=
-res/edje/conf.h__DEL__HDwI7mqDpPI19iIn/JiJt3RUD1ZfOpDXpMVbCjVPL9A=
+res/edje/city.edj__DEL__1/Vj7IvAumyAIOoLZv+VzQ6E4y7vgcdNxZwBw7RhdOA=
+res/edje/entry.edj__DEL__m3clWc5op/4b5I+HlkZ4z1QvAg/IXMoMihnzE27XP84=
+res/edje/group.edj__DEL__EVGdc3SQ8tI7tc55qsnZ14BPhuTz6sjYZxaKVBSLP8A=
 res/edje/images/1.png__DEL__QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=
 res/edje/images/2.png__DEL__Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=
 res/edje/images/3.png__DEL__Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=
 res/edje/images/4.png__DEL__j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=
 res/edje/images/Daynight layer.png__DEL__vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs=
+res/edje/images/Group_list_delete.png__DEL__9t3tpRRaBMNTo3+bPidryAftYNULpyiL8AS8DeTvyNw=
 res/edje/images/add.png__DEL__R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=
 res/edje/images/add_btn.png__DEL__naQj2XAiAb8UgXrZ2fDkhrs8G1cyx8i1AsAT5HbbP5Q=
 res/edje/images/add_button.png__DEL__qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=
@@ -21,17 +24,21 @@ res/edje/images/city4.png__DEL__CXjfWyF7hePzPw1/dR7PM0ShEfmwu/UmqCKwztpZBAo=
 res/edje/images/cityh.png__DEL__Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=
 res/edje/images/curser.png__DEL__k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc=
 res/edje/images/delete_button.png__DEL__M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=
+res/edje/images/drawer_bg.png__DEL__e3TPw0++i47zLwoD+fz6h121KG/8X3O5J90A3FRD0So=
 res/edje/images/drawer_btn.png__DEL__Wx+tI67e8fHbXkh7cz2Nisj5Yf2ZOREFsCQl2a3h8/E=
 res/edje/images/floting_next_button.png__DEL__Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0=
 res/edje/images/line.png__DEL__mC2lw0XczhZ41ZKBKt5ft3YcObs+IGDudh0xfkOJwQE=
 res/edje/images/map_background.png__DEL__fidI2puLNy+2OtfFScQOt4BhzflQJ2EU87bersaQZPM=
 res/edje/images/my status.png__DEL__chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=
+res/edje/images/my_status.png__DEL__chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=
 res/edje/images/my_status_small.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=
 res/edje/images/next.png__DEL__1ed1D6snn2+5ecoSrgKk1FMNias5F2nwOVeMe9u1+Yo=
 res/edje/images/next2.png__DEL__8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=
 res/edje/images/next_btn.png__DEL__8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=
 res/edje/images/orange small.png__DEL__d7kGDG+axVAtUu/MBVv2dnGOxj0NdzrOwYXTVs3Hg0E=
 res/edje/images/orange.png__DEL__lHWZWFaSDaidvlHG48/Ik7M6FmXdqlTjiR/YJoSukPY=
+res/edje/images/other location_pink.png__DEL__fOWns34bViQlnuT/Qz9dErj2iVN3XduP/JvU5yTdgIc=
+res/edje/images/other location_purple.png__DEL__GAfy+Kr3Hi66+1IPZ/oXQcz3+81k1JHOqnDc+c+Lds4=
 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=
@@ -45,10 +52,17 @@ res/edje/images/searching_list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkR
 res/edje/images/searchlist.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
 res/edje/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=
 res/edje/images/하단 버튼.png__DEL__V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=
+res/edje/item.edj__DEL__SHme/D3j0p6Szwwn90KLkvlkTr8r2n3iPXGs3AndTmA=
+res/edje/main.edj__DEL__tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=
+res/edje/main_view.edj__DEL__yFLkgzPFVGDDbzN1D3f049Wp5QsSUEYj2wkJwvpawW0=
+res/edje/popup.edj__DEL__vEjiN5VuptLxumRimxoHNvXEeT9U1DL0mdS56k9LCAQ=
+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/Group list delete.png__DEL__9t3tpRRaBMNTo3+bPidryAftYNULpyiL8AS8DeTvyNw=
+res/images/Group menu.png__DEL__gwsnS/Oemjg0Ms6fCyKZik8sHxG2piwDO44YhapXYiE=
 res/images/add.png__DEL__R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=
 res/images/add_btn.png__DEL__naQj2XAiAb8UgXrZ2fDkhrs8G1cyx8i1AsAT5HbbP5Q=
 res/images/add_button.png__DEL__qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=
@@ -86,13 +100,14 @@ res/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=
 res/images/하단 버튼.png__DEL__V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=
 shared/res/adventure.png__DEL__iF8SZahyLw7IqsH3SgtZ9umag2CVi5Kk0ie4yoUr9t0=
 tizen-manifest.xml__DEL__dk/JApvYPhj82qG80QuCOliR5wHHxZQCrfIT60ygLXA=
-author-signature.xml__DEL__rezbtekkIXaCImRocKmXxrMO87a3n2cb7hNdhMFHGTQ=
-res/edje/entry.edj__DEL__m3clWc5op/4b5I+HlkZ4z1QvAg/IXMoMihnzE27XP84=
-res/edje/item.edj__DEL__SHme/D3j0p6Szwwn90KLkvlkTr8r2n3iPXGs3AndTmA=
-res/edje/main.edj__DEL__tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=
-res/edje/main_view.edj__DEL__yFLkgzPFVGDDbzN1D3f049Wp5QsSUEYj2wkJwvpawW0=
-res/edje/ui_manager.edj__DEL__uE2PyHTnHOBJ0FD0PtaMrNq9s6UYZX/ggAwF5amY0yA=
-res/edje/images/drawer_bg.png__DEL__e3TPw0++i47zLwoD+fz6h121KG/8X3O5J90A3FRD0So=
-res/edje/momentic.edj__DEL__QNgs+EAO8TVeNCss32eB/micwszPJ5BzTPxyLOhwc6k=
-res/edje/city.edj__DEL__1/Vj7IvAumyAIOoLZv+VzQ6E4y7vgcdNxZwBw7RhdOA=
-bin/adventure__DEL__6D58iFBVNp2SlZuT+5BfAqrLQ1WAPocS/7CQPV5ZCBk=
+author-signature.xml__DEL__PqP0YZ3+PymNtNPNwlnmjYi3kS5T3oKzk+qdsUSlawU=
+res/edje/momentic.edj__DEL__9KcgIUqQTwumtjvFB6yf+3khZkOGszjXaF9G45HSKio=
+res/edje/images/result_bar.png__DEL__NnyOPowuUYyO25/+ADqzW982i9CP7DoXv6Eyrqmnp1E=
+res/edje/result_bar.png__DEL__NnyOPowuUYyO25/+ADqzW982i9CP7DoXv6Eyrqmnp1E=
+res/images/result_bar.png__DEL__NnyOPowuUYyO25/+ADqzW982i9CP7DoXv6Eyrqmnp1E=
+res/edje/conf.h__DEL__adAN+6n51vtLOfVFiEpUXmJz6SQ09usySiadZrXxvcU=
+res/edje/item2.edj__DEL__A1YQILfV+HJzxThz6cRXRzC8o8ojfDgmB26Iw+hii5s=
+res/edje/images/watch_icon.png__DEL__P1HvAuBuu2j9Jb3JNAiRoADdU1auDg4BS4x+5tD6AKo=
+res/images/watch_icon.png__DEL__P1HvAuBuu2j9Jb3JNAiRoADdU1auDg4BS4x+5tD6AKo=
+res/edje/best_time.edj__DEL__ldztiXgjvLfnc7dK0WKVWd4A1csnQ1SX/mzVZvXcvn4=
+bin/adventure__DEL__5QNhglG8+fs+XlnoiKBW5hv4wqKeOIWcxhWgL3i6Ruk=
index c0a37f9..5fed7d1 100644 (file)
@@ -4,7 +4,11 @@
 <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>6D58iFBVNp2SlZuT+5BfAqrLQ1WAPocS/7CQPV5ZCBk=</DigestValue>
+<DigestValue>5QNhglG8+fs+XlnoiKBW5hv4wqKeOIWcxhWgL3i6Ruk=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fbest_time.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>ldztiXgjvLfnc7dK0WKVWd4A1csnQ1SX/mzVZvXcvn4=</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>HDwI7mqDpPI19iIn/JiJt3RUD1ZfOpDXpMVbCjVPL9A=</DigestValue>
+<DigestValue>adAN+6n51vtLOfVFiEpUXmJz6SQ09usySiadZrXxvcU=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fentry.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>m3clWc5op/4b5I+HlkZ4z1QvAg/IXMoMihnzE27XP84=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fgroup.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>EVGdc3SQ8tI7tc55qsnZ14BPhuTz6sjYZxaKVBSLP8A=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2F1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2FGroup_list_delete.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>9t3tpRRaBMNTo3+bPidryAftYNULpyiL8AS8DeTvyNw=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2Fadd.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fmy_status.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2Fmy_status_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>lHWZWFaSDaidvlHG48/Ik7M6FmXdqlTjiR/YJoSukPY=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother%20location_pink.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>fOWns34bViQlnuT/Qz9dErj2iVN3XduP/JvU5yTdgIc=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother%20location_purple.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>GAfy+Kr3Hi66+1IPZ/oXQcz3+81k1JHOqnDc+c+Lds4=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%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>VtlsIEdXSmIhWn3X08lMCEWy2p2nIX0ZTrd7X1YesDQ=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fresult_bar.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>NnyOPowuUYyO25/+ADqzW982i9CP7DoXv6Eyrqmnp1E=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2Fsearching%20list.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fwatch_icon.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>P1HvAuBuu2j9Jb3JNAiRoADdU1auDg4BS4x+5tD6AKo=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2Fworld_map.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>SHme/D3j0p6Szwwn90KLkvlkTr8r2n3iPXGs3AndTmA=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fitem2.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>A1YQILfV+HJzxThz6cRXRzC8o8ojfDgmB26Iw+hii5s=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fmain.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmomentic.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>QNgs+EAO8TVeNCss32eB/micwszPJ5BzTPxyLOhwc6k=</DigestValue>
+<DigestValue>9KcgIUqQTwumtjvFB6yf+3khZkOGszjXaF9G45HSKio=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fpopup.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>vEjiN5VuptLxumRimxoHNvXEeT9U1DL0mdS56k9LCAQ=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fresult_bar.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>NnyOPowuUYyO25/+ADqzW982i9CP7DoXv6Eyrqmnp1E=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fui_manager.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2FGroup%20list%20delete.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>9t3tpRRaBMNTo3+bPidryAftYNULpyiL8AS8DeTvyNw=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2FGroup%20menu.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>gwsnS/Oemjg0Ms6fCyKZik8sHxG2piwDO44YhapXYiE=</DigestValue>
+</Reference>
 <Reference URI="res%2Fimages%2Fadd.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>VtlsIEdXSmIhWn3X08lMCEWy2p2nIX0ZTrd7X1YesDQ=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2Fresult_bar.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>NnyOPowuUYyO25/+ADqzW982i9CP7DoXv6Eyrqmnp1E=</DigestValue>
+</Reference>
 <Reference URI="res%2Fimages%2Fsearching%20list.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2Fwatch_icon.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>P1HvAuBuu2j9Jb3JNAiRoADdU1auDg4BS4x+5tD6AKo=</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>
 </SignedInfo>
 <SignatureValue>
-uSRKkQmzopMtDjkiX2dSMeFBhz+ZrYjYEUQhITrmRRlflj6ewPSBmopDzfUoPsEZP9+3kVbo0Fno
-sIA2JW7qNXkipJvZB/Ynj5L4YRXaoew2J5/qqfgUD09RekvjRPBJfg/zqfK1Wp0MJZr5AIuRZJ7u
-xeQs80KZd2bWSRRbsRV/1QsePFENwr5jf55D5jBYJsMUJ9lsgvalNnOCW6YQHya8gizB7pGPplfL
-Dji8mDZu/lU4o/K2UnhPE9hDp3u7nUMKyQknS82qTPedc99vAKVO2Qwh7J0xBAIVAHt2oe6vw2/0
-Rptuge1VtZId2GLVIAvBZ4vvwqg9EgEJ3cB4+w==
+hgzIduQV80DIHRy585krwTB0gFn2LkXLr/SeZ7GDa0Zbv/KoRaiEO4e6YWVK5a3eILeeX3GEPGkX
+4U3flFdZE4Vwund+EBHwFdrfejS2DUc592dOzRHqmMoZ4+sKA7pfr4HSSE9hlMNuDZWqPxJt7SLk
+80oIXkck6fgioc6VtNyQyvnrsLcLIOGWuptP1sHPqK8a0VpAh6MQ5E8g+J+6J8+gZ9XK40qcFsNd
+kRNNLT8n1z7oREVDCz9krbCmqXXedk+w8OAkhmvF43rm9aM1EjKzJ28CAfJ62xW8U3IFWdxnYBgN
+74BvKSLLurdYLiRMLjYFX+k+PF//XoHwUzWkOg==
 </SignatureValue>
 <KeyInfo>
 <X509Data>
index d7ed71d..eb2f363 100644 (file)
@@ -4,11 +4,15 @@
 <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>rezbtekkIXaCImRocKmXxrMO87a3n2cb7hNdhMFHGTQ=</DigestValue>
+<DigestValue>PqP0YZ3+PymNtNPNwlnmjYi3kS5T3oKzk+qdsUSlawU=</DigestValue>
 </Reference>
 <Reference URI="bin%2Fadventure">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>6D58iFBVNp2SlZuT+5BfAqrLQ1WAPocS/7CQPV5ZCBk=</DigestValue>
+<DigestValue>5QNhglG8+fs+XlnoiKBW5hv4wqKeOIWcxhWgL3i6Ruk=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fbest_time.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>ldztiXgjvLfnc7dK0WKVWd4A1csnQ1SX/mzVZvXcvn4=</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>HDwI7mqDpPI19iIn/JiJt3RUD1ZfOpDXpMVbCjVPL9A=</DigestValue>
+<DigestValue>adAN+6n51vtLOfVFiEpUXmJz6SQ09usySiadZrXxvcU=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fentry.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>m3clWc5op/4b5I+HlkZ4z1QvAg/IXMoMihnzE27XP84=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fgroup.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>EVGdc3SQ8tI7tc55qsnZ14BPhuTz6sjYZxaKVBSLP8A=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2F1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2FGroup_list_delete.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>9t3tpRRaBMNTo3+bPidryAftYNULpyiL8AS8DeTvyNw=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2Fadd.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fmy_status.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2Fmy_status_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>lHWZWFaSDaidvlHG48/Ik7M6FmXdqlTjiR/YJoSukPY=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother%20location_pink.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>fOWns34bViQlnuT/Qz9dErj2iVN3XduP/JvU5yTdgIc=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother%20location_purple.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>GAfy+Kr3Hi66+1IPZ/oXQcz3+81k1JHOqnDc+c+Lds4=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%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>VtlsIEdXSmIhWn3X08lMCEWy2p2nIX0ZTrd7X1YesDQ=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fresult_bar.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>NnyOPowuUYyO25/+ADqzW982i9CP7DoXv6Eyrqmnp1E=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2Fsearching%20list.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fwatch_icon.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>P1HvAuBuu2j9Jb3JNAiRoADdU1auDg4BS4x+5tD6AKo=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2Fworld_map.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>SHme/D3j0p6Szwwn90KLkvlkTr8r2n3iPXGs3AndTmA=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fitem2.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>A1YQILfV+HJzxThz6cRXRzC8o8ojfDgmB26Iw+hii5s=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fmain.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmomentic.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>QNgs+EAO8TVeNCss32eB/micwszPJ5BzTPxyLOhwc6k=</DigestValue>
+<DigestValue>9KcgIUqQTwumtjvFB6yf+3khZkOGszjXaF9G45HSKio=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fpopup.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>vEjiN5VuptLxumRimxoHNvXEeT9U1DL0mdS56k9LCAQ=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fresult_bar.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>NnyOPowuUYyO25/+ADqzW982i9CP7DoXv6Eyrqmnp1E=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fui_manager.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2FGroup%20list%20delete.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>9t3tpRRaBMNTo3+bPidryAftYNULpyiL8AS8DeTvyNw=</DigestValue>
+</Reference>
+<Reference URI="res%2Fimages%2FGroup%20menu.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>gwsnS/Oemjg0Ms6fCyKZik8sHxG2piwDO44YhapXYiE=</DigestValue>
+</Reference>
 <Reference URI="res%2Fimages%2Fadd.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>VtlsIEdXSmIhWn3X08lMCEWy2p2nIX0ZTrd7X1YesDQ=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2Fresult_bar.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>NnyOPowuUYyO25/+ADqzW982i9CP7DoXv6Eyrqmnp1E=</DigestValue>
+</Reference>
 <Reference URI="res%2Fimages%2Fsearching%20list.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
 </Reference>
+<Reference URI="res%2Fimages%2Fwatch_icon.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>P1HvAuBuu2j9Jb3JNAiRoADdU1auDg4BS4x+5tD6AKo=</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>
 </SignedInfo>
 <SignatureValue>
-pQBZ/exOY7hofr0mzOMvMSV/yxWxetbOrsOkIAK1iCvvK9Xlg8QBa7Ia1jqAJjp7spDb8hXTVuBg
-4AOFKwADTalwN1fh3IB9IeaJMnXq8+U98jCQ890VDCbKqi0mdOM5oNHar6tReqREPaCHvKY1GwhZ
-q6dcYcgOzyPDPMRLe+5Z7TAeHD9DfkamhBfa7iwrjShdO0Cge8XRMNi5iu1JPbEigpvznXPCko6f
-qgh8yFfrHqKTQI7/2TMXs4KveHKRr/ZHVEHcu2YoQfmTrxqrp825ZygBynfxefsbyjLwyrex79dK
-JppDHI2SDwn42D0ndIWvCGQhOgPTzaVc8s0j/g==
+gej9dmmKsRbPfzwN4XWBqdsEHqjDhbz444/rNrIphXri8toGck2CUgzjMlv27XxUqtl3//Hir+ZO
+YJ4J3Zm+osRhW5mnmyo5zLFyjB1N29/C3hcnVLVMH3mabd//lvUDqnWqqUxT7LFbjgvPSVbg+eEE
+KDyOKwFEMHe9XsLMYF43vsDZvVDiZH2JTbZqOMRISV7juJzLwzx2D0hKn3ec0SpVkseSE5bUHKWY
+/jdLELYgP6ixC2siSy/WYpm8Zx4XLxYItvj35y78bGOH0Vy3aQmlS9/nFaAkiowIZSQpL+o6FRDS
+Mer0j+Uu5EgUr+E76wkblr+54Yo3XncRc9NuFw==
 </SignatureValue>
 <KeyInfo>
 <X509Data>
index 279297b..0f9b0d8 100644 (file)
@@ -52,7 +52,6 @@ enum {
        CITY_SEOUL,
        CITY_TOKYO,
        CITY_SYDNEY,
-       CITY_MAX,
 };
 
 struct _city_info_s {
index 95cc24e..a0e4f3c 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __MOMENT_CONF_H__
 #define __MOMENT_CONF_H__
 
-#define MAXIMUM_SELECTED_CITY 5
+#define MAXIMUM_SELECTED_CITY 3
 
 #define BEST_START_TIME 8
 #define BEST_DURING_TIME 9
index 0afe19f..4d105fd 100644 (file)
@@ -19,19 +19,21 @@ struct _result_info_s {
 };
 typedef struct _result_info_s result_info_s;
 
+extern void item_reset_color_index(void);
+
 extern Evas_Object *item_create_typing(Evas_Object *parent, int city, main_view_s *main_view_info);
 extern void item_destroy_typing(Evas_Object *item);
 
-extern Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color, main_view_s *main_view_info);
+extern Evas_Object *item_create_selecting(Evas_Object *parent, int city, struct tm *local_time, main_view_s *main_view_info);
 extern void item_destroy_selecting(Evas_Object *item);
 
-extern Evas_Object *item_create_result(Evas_Object *parent, int city, int color, int start, int end, struct tm *global_time);
-extern void item_destroy_result(Evas_Object *item);
-
 extern Evas_Object *item_create_group(Evas_Object *parent, const char *title, main_view_s *main_view_info);
 extern void item_destroy_group(Evas_Object *item);
 
 extern Evas_Object *item_create_padding(Evas_Object *parent);
 extern void item_destroy_padding(Evas_Object *item);
 
+extern Evas_Object *item_create_best_time(Evas_Object *parent);
+extern void item_destroy_best_time(Evas_Object *item);
+
 #endif /* __MOMENTIC_ITEM_H__ */
index 8af3788..8fc158e 100644 (file)
--- a/inc/map.h
+++ b/inc/map.h
@@ -14,4 +14,7 @@ Eina_Bool add_city_to_map(int idx, city_s *ci);
 Eina_Bool remove_city_from_map(int idx);
 void button_effect(Evas_Object *btn);
 
+Eina_Bool set_time_range(Evas_Object *item, int idx, double p1, double p2, double p3, double p4);
+Eina_Bool set_marker(Evas_Object *item, int idx);
+
 #endif
diff --git a/res/edje/best_time.edc b/res/edje/best_time.edc
new file mode 100644 (file)
index 0000000..530a031
--- /dev/null
@@ -0,0 +1,124 @@
+#define ITEM_WIDTH 480
+#define ITEM_HEIGHT 90
+
+collections {
+   base_scale: 1.8;
+   images {
+      image: "result_bar.png" COMP;
+      image: "watch_icon.png" COMP;      
+   }
+   group { name: "best_time";
+      parts {
+         part { name: "base";
+            type: RECT;
+            scale: 1;
+             description { state: "default";
+               min: 0 ITEM_HEIGHT;
+               color: 255 255 255 0;               
+            }
+            description { state: "result" 0.0;
+               inherit: "default";
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "mark";
+            type: IMAGE;
+            scale: 1;
+            clip_to: "base";
+             description { state: "default";
+               rel1 { relative: (38/ITEM_WIDTH) 0.5; to: "base"; }
+               rel2 { relative: (38/ITEM_WIDTH) 0.5; to: "base"; }
+               align: 0.5 0.5;
+               min: 30 30;
+               fixed: 1 1;
+               image.normal: "watch_icon.png";
+            }
+         }
+         part { name: "city";
+            type: TEXT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "base";            
+             description { state: "default";
+               rel1 { relative: (73/ITEM_WIDTH) 0.5; to: "base"; }
+               rel2 { relative: (400/ITEM_WIDTH) 0.5; to: "base"; }
+               color: 197 191 181 255;
+               text {
+                  text: "Best Time";
+                  font: "Tizen:style="Bold"";
+                  text_class: "tizen";
+                  min: 0 1;
+                  size: 23;
+                  align: 0 1;
+               }
+               align: 0 1;
+            }
+         }
+         part { name: "time";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "base";            
+             description { state: "default";
+               rel1 { relative: 0.7 0.25; to: "city"; }
+               rel2 { relative: 0.95 0.25; to: "base"; }
+               color: 221 218 213 255;
+               text {
+                  text: "AM 9 - PM 3";
+                  font: "Tizen";
+                  text_class: "tizen";
+                  min:  0 1;
+                  size: 20;
+                  align: 1 1;
+               }
+               align: 0 0;
+            }
+         }
+         part { name: "result_bar";
+            type: IMAGE;
+            scale: 1;
+            clip_to: "graph";
+             description { state: "default";
+               rel1 { to_x: "city"; relative: 0 0.75; }
+               rel2 { to_x:"time"; relative: 1 0.75; }
+               fixed:1 1;
+               min: 0 15;
+               image.normal: "result_bar.png";
+               image.border: 3 3 3 3;
+               image.border_scale: 1;
+            }
+         }         
+         part { name: "graph";
+            type: RECT;
+            scale: 1;
+             description { state: "default";
+               rel1 { relative: (73/ITEM_WIDTH) 0.75; }
+               rel2 { to_x:"base"; relative: 0.95 0.75; }
+               min: 0 0;
+               color: 255 255 255 0;
+            }
+            description { state: "result";
+               inherit: "default";
+               min: 0 15;
+               color: 255 255 255 255;               
+            }
+         }         
+      }
+      programs {
+         program { name: "show";
+            signal: "momentic,item,state,show";
+            action: STATE_SET "result" 0.0;
+            target: "base";
+            target: "graph";
+            transition: DECELERATE 0.5;
+         }
+         program { name: "hide";
+            signal: "momentic,item,state,hide";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+            target: "graph";
+            transition: DECELERATE 0.5;
+         }
+      }
+   }
+}
index 95cc24e..a0e4f3c 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __MOMENT_CONF_H__
 #define __MOMENT_CONF_H__
 
-#define MAXIMUM_SELECTED_CITY 5
+#define MAXIMUM_SELECTED_CITY 3
 
 #define BEST_START_TIME 8
 #define BEST_DURING_TIME 9
diff --git a/res/edje/images/my_status.png b/res/edje/images/my_status.png
new file mode 100755 (executable)
index 0000000..a0d31ab
Binary files /dev/null and b/res/edje/images/my_status.png differ
diff --git a/res/edje/images/other location_pink.png b/res/edje/images/other location_pink.png
new file mode 100755 (executable)
index 0000000..7e2a759
Binary files /dev/null and b/res/edje/images/other location_pink.png differ
diff --git a/res/edje/images/other location_purple.png b/res/edje/images/other location_purple.png
new file mode 100755 (executable)
index 0000000..cdf001d
Binary files /dev/null and b/res/edje/images/other location_purple.png differ
diff --git a/res/edje/images/result_bar.png b/res/edje/images/result_bar.png
new file mode 100755 (executable)
index 0000000..082a17c
Binary files /dev/null and b/res/edje/images/result_bar.png differ
diff --git a/res/edje/images/watch_icon.png b/res/edje/images/watch_icon.png
new file mode 100644 (file)
index 0000000..774aa80
Binary files /dev/null and b/res/edje/images/watch_icon.png differ
diff --git a/res/edje/item2.edc b/res/edje/item2.edc
new file mode 100644 (file)
index 0000000..d8ac1f6
--- /dev/null
@@ -0,0 +1,277 @@
+#define ITEM_WIDTH 480
+#define ITEM_HEIGHT 75
+
+collections {
+   base_scale: 1.8;
+   images {
+      image: "delete_button.png" COMP;
+      image: "other_location_blue.png" COMP;
+      image: "other_location_mint.png" COMP;
+      image: "other location_pink.png" COMP;
+      image: "orange.png" COMP;
+      image: "my_status.png" COMP;
+      image: "result_bar.png" COMP;
+   }
+   group { name: "my_status";
+      parts {
+         part { name: "img";
+            description { state: "default" 0.0;
+               image.normal: "my_status.png";
+            }
+         }
+      }
+   }
+   group { name: "location_pink";
+      parts {
+          part { name: "img";
+             type: IMAGE;
+             description { state: "default";
+                image.normal: "other location_pink.png";
+            }
+         }
+      }
+   }
+   group { name: "location_mint";
+      parts {
+          part { name: "img";
+             type: IMAGE;
+             description { state: "default";
+                image.normal: "other_location_mint.png";
+            }
+         }
+      }
+   }
+   group { name: "location_blue";
+      parts {
+          part { name: "img";
+             type: IMAGE;
+             description { state: "default";
+                image.normal: "other_location_blue.png";
+            }
+         }
+      }
+   }
+   group { name: "location_orange";
+      parts {
+          part { name: "img";
+             type: IMAGE;
+             description { state: "default";
+                image.normal: "orange.png";
+            }
+         }
+      }
+   }
+   group { name: "item";
+      parts {
+         part { name: "base";
+            type: RECT;
+            scale: 1;
+             description { state: "default";
+               min: 0 ITEM_HEIGHT;
+            }
+         }
+         part { name: "mark";
+            type: SWALLOW;
+            scale: 1;
+             description { state: "default";
+               rel1 { relative: (38/ITEM_WIDTH) 0.5; to: "base"; }
+               rel2 { relative: (38/ITEM_WIDTH) 0.5; to: "base"; }
+               align: 0.5 0.5;
+               min: 20 20;
+               fixed: 1 1;
+            }
+            description { state: "result";
+               inherit: "default";
+               rel1 { relative: (38/ITEM_WIDTH) 0.25; }
+               rel2 { relative: (38/ITEM_WIDTH) 0.25; }
+            }
+         }
+         part { name: "city";
+            type: TEXT;
+            scale: 1;
+            mouse_events: 0;
+             description { state: "default";
+               rel1 { relative: (73/ITEM_WIDTH) 0.5; to: "base"; }
+               rel2 { relative: (400/ITEM_WIDTH) 0.5; to: "base"; }
+               color: 197 191 181 255;
+               text {
+                  text: "Seoul, Korea";
+                  font: "Tizen";
+                  text_class: "tizen";
+                  min: 0 1;
+                  size: 20;
+                  align: 0 1;
+               }
+               align: 0 1;
+            }
+            description { state: "result";
+               rel1 { relative: (73/ITEM_WIDTH) 0.25; to: "base"; }
+               rel2 { relative: (350/ITEM_WIDTH) 0.25; to: "base"; }
+               color: 197 191 181 255;
+               text {
+                  text: "Seoul, Korea";
+                  font: "Tizen";
+                  text_class: "tizen";
+                  min: 0 1;
+                  size: 20;
+                  align: 0 0.5;
+               }
+               align: 0 0.5;
+            }
+         }
+         part { name: "time";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+             description { state: "default";
+               rel1 { relative: 0.7 0.25; to: "city"; }
+               rel2 { relative: 0.95 0.25; to: "base"; }
+               color: 221 218 213 0;
+               text {
+                  text: "GMT + 8";
+                  font: "Tizen";
+                  text_class: "tizen";
+                  min:  0 1;
+                  size: 20;
+                  align: 1 1;
+               }
+               align: 0 0;
+            }
+            description { state: "result";
+               inherit: "default";
+               color: 221 218 213 255;
+            }
+         }
+         part { name: "gmt";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+             description { state: "default";
+               rel1 { relative: (73/ITEM_WIDTH) 0.48; to: "base"; }
+               rel2 { relative: (400/ITEM_WIDTH) 0.52; to: "base"; }
+               color: 221 218 213 255;
+               text {
+                  text: "GMT + 8";
+                  font: "Tizen";
+                  text_class: "tizen";
+                  min: 0 1;
+                  size: 20;
+                  align: 0 1;
+               }
+               align: 0 0;
+            }
+            description { state: "result";
+               inherit: "default";
+               color: 221 218 213 0;
+            }
+         }
+         part { name: "bottom_line";
+            type: RECT;
+             description { state: "default";
+               rel1 { relative: 0 1; }
+               rel2 { relative: 1 1; }
+               min: 0 1;
+               align: 0.5 1;
+               fixed: 0 1;
+               color: 197 191 181 255;
+            }
+            description { state: "result";
+               inherit: "default";
+               color: 197 191 181 0;
+            }
+         }
+         part { name: "result_bar";
+            type: IMAGE;
+            scale: 1;
+            clip_to: "graph";
+             description { state: "default";
+               rel1 { relative: (73/ITEM_WIDTH) 0.75; }
+               rel2 { to_x:"base"; relative: 0.95 0.75; }
+               fixed:1 1;
+               min: 0 15;
+               image.normal: "result_bar.png";
+               image.border: 3 3 3 3;
+               image.border_scale: 1;
+            }
+         }
+         part { name: "graph";
+            type: RECT;
+            scale: 1;
+             description { state: "default";
+               rel1 { relative: (73/ITEM_WIDTH) 0.75; }
+               rel2 { to_x:"base"; relative: 0.95 0.75; }
+               min: 0 0;
+               color: 255 255 255 0;
+            }
+            description { state: "result";
+               inherit: "default";
+               min: 0 15;
+               color: 255 255 255 255;               
+            }
+         }         
+         part {name: "delete";
+            type: IMAGE;
+            scale: 1;
+             description { state: "default";
+               rel1 { relative: 0.5 0.5; to: "delete_event"; }
+               rel2 { relative: 0.5 0.5; to: "delete_event"; }
+               align: 0.5 0.5;
+               min: 34 34;
+               fixed: 1 1;
+               image.normal: "delete_button.png";
+            }
+            description { state: "press";
+               inherit: "default";
+               color: 255 255 255 100;
+            }
+            description { state: "result";
+               inherit: "default";
+               color: 255 255 255 0;
+            }
+         }
+         part { name: "delete_event";
+            type: SWALLOW;
+            scale: 1;
+             description { state: "default";
+               rel1 { relative: (444/ITEM_WIDTH) 0.5; to: "base"; }
+               rel2 { relative: 1 0.5; to: "base"; }
+               align: 1 0.5;
+               min: ITEM_HEIGHT ITEM_HEIGHT;
+               fixed: 1 1;
+            }
+            description { state: "result";
+               inherit: "default";
+               visible: 0;
+            }
+         }
+      }
+      programs {
+         program { name: "go_result";
+            signal: "momentic,item,state,result";
+            action: STATE_SET "result" 0.0;
+            target: "delete_event";
+            target: "delete";
+            target: "bottom_line";
+            target: "gmt";
+            target: "time";
+        //    target: "city";
+         //   target: "mark";
+            target: "graph";
+            transition: DECELERATE 0.5;
+         }
+         program { name: "go_default";
+            signal: "momentic,item,state,default";
+            action: STATE_SET "default" 0.0;
+            target: "delete_event";
+            target: "delete";
+            target: "bottom_line";
+            target: "gmt";
+            target: "time";
+     //       target: "city";
+    //        target: "mark";
+            target: "graph";
+            transition: DECELERATE 0.5;
+         }
+      }
+   }
+}
index eaae012..667785e 100644 (file)
@@ -2,7 +2,7 @@ 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";
+         base: "font=Tizen font_size=18 text_class=tizen color=#646261 valign=0.5 align=center";
       }
    }
    images {
@@ -23,7 +23,7 @@ collections {
             }
          }
       }
-   }
+   }      
    group { name: "main";
       script {
          public drawer_activate = 0;
@@ -358,26 +358,11 @@ collections {
             }
          }
 //page 2
-         part { name: "result_list";
-            type: SWALLOW;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               rel1.to: "city_list";
-               rel2.to: "city_list";
-               visible: 0;
-            }
-            description { state: "next";
-               inherit: "default";
-               rel2.relative: 1.0 0.8;
-               visible: 1;
-            }
-         }
          part { name: "bottom_part";
             type: SPACER;
             scale: 1;
             description { state: "default";
-               rel1.to: "result_list";
+               rel1.to: "city_list";
                rel1.relative: 0 1;
                rel2.relative: 1 1;
             }
@@ -486,7 +471,6 @@ collections {
 //page 1 back begin
          program { name: "page_back_1a";
             action: STATE_SET "default" 0.0;
-            target: "result_list";            
             target: "map_base";
             target: "map";
             target: "city_list";
@@ -646,8 +630,6 @@ collections {
             action: STATE_SET "next" 0.0;
             target: "map_base";
             target: "map";
-            target: "city_list";
-            target: "result_list";
             target: "bottom_part";
             transition: DECELERATE 0.75;
             after: "go_page2c";
index 34cee1a..e69de29 100755 (executable)
@@ -1,631 +0,0 @@
-#define ITEM_TYPING_WIDTH 442\r
-#define ITEM_TYPING_HEIGHT 50\r
-#define ITEM_TYPING_HEIGHT_SMALL 30\r
-\r
-#define ITEM_SELECTING_WIDTH 480\r
-#define ITEM_SELECTING_HEIGHT 75\r
-\r
-#define ITEM_RESULT_WIDTH ITEM_SELECTING_WIDTH\r
-#define ITEM_RESULT_HEIGHT ITEM_SELECTING_HEIGHT\r
-\r
-#define ITEM_GROUP_WIDTH 282\r
-#define ITEM_GROUP_HEIGHT 40\r
-\r
-#define ITEM_PADDING_WIDTH 442\r
-#define ITEM_PADDING_HEIGHT 30\r
-\r
-images {\r
-       image: "my_status_small.png" COMP;\r
-       image: "other_location_blue_small.png" COMP;\r
-       image: "other_location_mint_small.png" COMP;\r
-       image: "delete_button.png" COMP;\r
-       image: "Group_list_delete.png" COMP;\r
-}\r
-\r
-collections {\r
-       base_scale: 1.8;\r
-       group {\r
-               name: "item_typing";\r
-               parts {\r
-                       part {\r
-                               name: "bg";\r
-                               type: RECT;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 0.0 0.0; }\r
-                                       rel2 { relative: 1.0 1.0; }\r
-                                       min: ITEM_TYPING_WIDTH ITEM_TYPING_HEIGHT;\r
-                                       //color: 247 208 143 200;\r
-                                       visible: 0;\r
-                               }\r
-                               description {\r
-                                       state: "small" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       min: ITEM_TYPING_WIDTH ITEM_TYPING_HEIGHT_SMALL;\r
-                                       max: ITEM_TYPING_WIDTH ITEM_TYPING_HEIGHT_SMALL;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "city";\r
-                               type: TEXT;\r
-                               mouse_events: 0;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 0.0 0.0; to: "city_event"; }\r
-                                       rel2 { relative: 1.0 1.0; to: "city_event"; }\r
-                                       color: 255 255 255 255;\r
-                                       text {\r
-                                               text: "";\r
-                                               font: "Tizen:style=LIGHT";\r
-                                               text_class: "tizen";\r
-                                               min: 0 1;\r
-                                               size: 20;\r
-                                               align: 0.0 0.5;\r
-                                       }\r
-                                       align: 0.0 1.0;\r
-                                       visible: 1;\r
-                               }\r
-                               description {\r
-                                       state: "press" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       color: 255 255 255 100;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "city_event";\r
-                               type: RECT;\r
-                               mouse_events: 1;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 20/ITEM_TYPING_WIDTH 0.0; to: "bg"; }\r
-                                       rel2 { relative: 400/ITEM_TYPING_WIDTH 1.0; to: "bg"; }\r
-                                       color: 0 0 0 0;\r
-                                       visible: 1;\r
-                               }\r
-                               description {\r
-                                       state: "disable" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       visible: 0;\r
-                               }\r
-                       }\r
-               } //parts\r
-               programs {\r
-                       program {\r
-                               signal: "disable";\r
-                               source: "item";\r
-                               action: STATE_SET "disable" 0.0;\r
-                               target: "city_event";\r
-                       }\r
-                       program {\r
-                               signal: "enable";\r
-                               source: "item";\r
-                               action: STATE_SET "default" 0.0;\r
-                               target: "city_event";\r
-                       }\r
-\r
-                       program {\r
-                               signal: "mouse,down,1";\r
-                               source: "city_event";\r
-                               action: SIGNAL_EMIT "down" "item";\r
-                               after: "down,after";\r
-                       }   \r
-                       program {\r
-                               name: "down,after";\r
-                               action: STATE_SET "press" 0.0;\r
-                               target: "city";\r
-                       }\r
-                       program {\r
-                               signal: "mouse,up,1";\r
-                               source: "city_event";\r
-                               action: SIGNAL_EMIT "up" "item";\r
-                               after: "up,after";\r
-                       }\r
-                       program {\r
-                               name: "up,after";\r
-                               action: STATE_SET "default" 0.0;\r
-                               target: "city";\r
-                       }\r
-               }\r
-       }\r
-\r
-       group {\r
-               name: "item_selecting";\r
-               parts {\r
-                       part {\r
-                               name: "bg";\r
-                               type: RECT;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 0.0 0.0; }\r
-                                       rel2 { relative: 1.0 1.0; }\r
-                                       min: ITEM_SELECTING_WIDTH ITEM_SELECTING_HEIGHT;\r
-                                       color: 255 255 255 255;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "mark";\r
-                               type: IMAGE;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 38/ITEM_SELECTING_WIDTH 0.5; to: "bg"; }\r
-                                       rel2 { relative: 38/ITEM_SELECTING_WIDTH 0.5; to: "bg"; }\r
-                                       align: 0.5 0.5;\r
-                                       min: 14 12;\r
-                                       fixed: 1 1;\r
-                                       image {\r
-                                               normal: "my_status_small.png";\r
-                                       }\r
-                                       visible: 1;\r
-                               }\r
-                               description {\r
-                                       state: "1" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       min: 14 14;\r
-                                       image {\r
-                                               normal: "other_location_blue_small.png";\r
-                                       }\r
-                               }\r
-                               description {\r
-                                       state: "2" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       min: 14 14;\r
-                                       image {\r
-                                               normal: "other_location_mint_small.png";\r
-                                       }\r
-                               }\r
-                               description {\r
-                                       state: "3" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       min: 14 14;\r
-                                       image {\r
-                                               normal: "other_location_blue_small.png";\r
-                                       }\r
-                               }\r
-                               description {\r
-                                       state: "4" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       min: 14 14;\r
-                                       image {\r
-                                               normal: "other_location_mint_small.png";\r
-                                       }\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "city";\r
-                               type: TEXT;\r
-                               mouse_events: 0;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 73/ITEM_SELECTING_WIDTH 0.5; to: "bg"; }\r
-                                       rel2 { relative: 400/ITEM_SELECTING_WIDTH 0.5; to: "bg"; }\r
-                                       color: 197 191 181 255;\r
-                                       text {\r
-                                               text: "Seoul, Korea";\r
-                                               font: "Tizen:style=LIGHT";\r
-                                               text_class: "tizen";\r
-                                               min: 0 1;\r
-                                               size: 20;\r
-                                               align: 0.0 1.0;\r
-                                       }\r
-                                       align: 0.0 1.0;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "gmt";\r
-                               type: TEXT;\r
-                               mouse_events: 0;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 73/ITEM_SELECTING_WIDTH 0.48; to: "bg"; }\r
-                                       rel2 { relative: 400/ITEM_SELECTING_WIDTH 0.52; to: "bg"; }\r
-                                       color: 221 218 213 255;\r
-                                       text {\r
-                                               text: "GMT + 8";\r
-                                               font: "Tizen:style=LIGHT";\r
-                                               text_class: "tizen";\r
-                                               min: 0 1;\r
-                                               size: 20;\r
-                                               align: 0.0 1.0;\r
-                                       }\r
-                                       align: 0.0 0.0;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "bottom_line";\r
-                               type: RECT;\r
-                               scale: 0;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 0.0 1.0; }\r
-                                       rel2 { relative: 1.0 1.0; }\r
-                                       min: 0 1;\r
-                                       align: 0.5 1.0;\r
-                                       fixed: 0 1;\r
-                                       color: 197 191 181 255;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "delete";\r
-                               type: IMAGE;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 0.5 0.5; to: "delete_event"; }\r
-                                       rel2 { relative: 0.5 0.5; to: "delete_event"; }\r
-                                       align: 0.5 0.5;\r
-                                       min: 34 34;\r
-                                       fixed: 1 1;\r
-                                       image {\r
-                                               normal: "delete_button.png";\r
-                                       }\r
-                                       color: 255 255 255 255;\r
-                                       visible: 1;\r
-                               }\r
-                               description {\r
-                                       state: "press" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       color: 255 255 255 100;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "delete_event";\r
-                               type: SWALLOW;\r
-                               mouse_events: 1;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 444/ITEM_SELECTING_WIDTH 0.5; to: "bg"; }\r
-                                       rel2 { relative: 444/ITEM_SELECTING_WIDTH 0.5; to: "bg"; }\r
-                                       align: 0.5 0.5;\r
-                                       min: ITEM_SELECTING_HEIGHT ITEM_SELECTING_HEIGHT;\r
-                                       fixed: 1 1;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-               } //parts\r
-               programs {\r
-                       program {\r
-                               signal: "1";\r
-                               source: "mark";\r
-                               action: STATE_SET "1" 0.0;\r
-                               target: "mark";\r
-                       } \r
-                       program {\r
-                               signal: "2";\r
-                               source: "mark";\r
-                               action: STATE_SET "2" 0.0;\r
-                               target: "mark";\r
-                       } \r
-                       program {\r
-                               signal: "3";\r
-                               source: "mark";\r
-                               action: STATE_SET "3" 0.0;\r
-                               target: "mark";\r
-                       } \r
-                       program {\r
-                               signal: "4";\r
-                               source: "mark";\r
-                               action: STATE_SET "4" 0.0;\r
-                               target: "mark";\r
-                       }\r
-\r
-                       program {\r
-                               signal: "mouse,down,1";\r
-                               source: "delete_event";\r
-                               action: SIGNAL_EMIT "down" "item";\r
-                               after: "down,after";\r
-                       }   \r
-                       program {\r
-                               name: "down,after";\r
-                               action: STATE_SET "press" 0.0;\r
-                               target: "delete";\r
-                       }\r
-                       program {\r
-                               signal: "mouse,up,1";\r
-                               source: "delete_event";\r
-                               action: SIGNAL_EMIT "up" "item";\r
-                               after: "up,after";\r
-                       }\r
-                       program {\r
-                               name: "up,after";\r
-                               action: STATE_SET "default" 0.0;\r
-                               target: "delete";\r
-                       }\r
-               }\r
-       }\r
-\r
-       group {\r
-               name: "item_result";\r
-               parts {\r
-                       part {\r
-                               name: "bg";\r
-                               type: RECT;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 0.0 0.0; }\r
-                                       rel2 { relative: 1.0 1.0; }\r
-                                       min: ITEM_RESULT_WIDTH ITEM_RESULT_HEIGHT;\r
-                                       color: 255 255 255 255;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "mark";\r
-                               type: IMAGE;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 38/ITEM_RESULT_WIDTH 0.25; to: "bg"; }\r
-                                       rel2 { relative: 38/ITEM_RESULT_WIDTH 0.25; to: "bg"; }\r
-                                       align: 0.5 0.5;\r
-                                       min: 14 12;\r
-                                       fixed: 1 1;\r
-                                       image {\r
-                                               normal: "my_status_small.png";\r
-                                       }\r
-                                       visible: 1;\r
-                               }\r
-                               description {\r
-                                       state: "1" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       min: 14 14;\r
-                                       image {\r
-                                               normal: "other_location_blue_small.png";\r
-                                       }\r
-                               }\r
-                               description {\r
-                                       state: "2" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       min: 14 14;\r
-                                       image {\r
-                                               normal: "other_location_mint_small.png";\r
-                                       }\r
-                               }\r
-                               description {\r
-                                       state: "3" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       min: 14 14;\r
-                                       image {\r
-                                               normal: "other_location_blue_small.png";\r
-                                       }\r
-                               }\r
-                               description {\r
-                                       state: "4" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       min: 14 14;\r
-                                       image {\r
-                                               normal: "other_location_mint_small.png";\r
-                                       }\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "city";\r
-                               type: TEXT;\r
-                               mouse_events: 0;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 73/ITEM_RESULT_WIDTH 0.25; to: "bg"; }\r
-                                       rel2 { relative: 350/ITEM_RESULT_WIDTH 0.25; to: "bg"; }\r
-                                       color: 197 191 181 255;\r
-                                       text {\r
-                                               text: "Seoul, Korea";\r
-                                               font: "Tizen:style=LIGHT";\r
-                                               text_class: "tizen";\r
-                                               min: 0 1;\r
-                                               size: 20;\r
-                                               align: 0.0 0.5;\r
-                                       }\r
-                                       align: 0.0 0.5;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "time";\r
-                               type: TEXT;\r
-                               mouse_events: 0;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 1.0 0.25; to: "city"; }\r
-                                       rel2 { relative: 1.0 0.25; to: "bg"; }\r
-                                       color: 221 218 213 255;\r
-                                       text {\r
-                                               text: "GMT + 8";\r
-                                               font: "Tizen:style=LIGHT";\r
-                                               text_class: "tizen";\r
-                                               min: 0 1;\r
-                                               size: 20;\r
-                                               align: 0.0 1.0;\r
-                                       }\r
-                                       align: 0.0 0.0;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "graph_base";\r
-                               type: RECT;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 0.1 0.75; to: "bg"; }\r
-                                       rel2 { relative: 0.9 0.75; to: "bg";}\r
-                                       min: 0 10;\r
-                                       color: 221 218 213 255;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-               } //parts\r
-       }\r
-\r
-       group {\r
-               name: "item_group";\r
-               parts {\r
-                       part {\r
-                               name: "bg";\r
-                               type: RECT;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 0.0 0.0; }\r
-                                       rel2 { relative: 1.0 1.0; }\r
-                                       min: ITEM_GROUP_WIDTH ITEM_GROUP_HEIGHT;\r
-                                       color: 247 208 143 200;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "title";\r
-                               type: TEXT;\r
-                               mouse_events: 0;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 0.0 0.0; to: "title_event"; }\r
-                                       rel2 { relative: 1.0 1.0; to: "title_event"; }\r
-                                       color: 255 255 255 255;\r
-                                       text {\r
-                                               text: "Momentic time";\r
-                                               font: "Tizen:style=LIGHT";\r
-                                               text_class: "tizen";\r
-                                               min: 0 1;\r
-                                               size: 20;\r
-                                               align: 0.0 0.5;\r
-                                       }\r
-                                       align: 0.0 1.0;\r
-                                       visible: 1;\r
-                               }\r
-                               description {\r
-                                       state: "press" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       color: 255 255 255 100;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "delete";\r
-                               type: IMAGE;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 0.5 0.5; to: "delete_event"; }\r
-                                       rel2 { relative: 0.5 0.5; to: "delete_event"; }\r
-                                       align: 0.5 0.5;\r
-                                       min: 20 20;\r
-                                       fixed: 1 1;\r
-                                       image {\r
-                                               normal: "Group_list_delete.png";\r
-                                       }\r
-                                       color: 255 255 255 255;\r
-                                       visible: 1;\r
-                               }\r
-                               description {\r
-                                       state: "press" 0.0;\r
-                                       inherit: "default" 0.0;\r
-                                       color: 255 255 255 100;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "delete_event";\r
-                               type: SWALLOW;\r
-                               mouse_events: 1;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 250/ITEM_GROUP_WIDTH 0.5; to: "bg"; }\r
-                                       rel2 { relative: 250/ITEM_GROUP_WIDTH 0.5; to: "bg"; }\r
-                                       align: 0.5 0.5;\r
-                                       min: ITEM_SELECTING_HEIGHT ITEM_SELECTING_HEIGHT;\r
-                                       fixed: 1 1;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-                       part {\r
-                               name: "title_event";\r
-                               type: RECT;\r
-                               mouse_events: 1;\r
-                               scale: 1;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 20/ITEM_GROUP_WIDTH 0.0; to: "bg"; }\r
-                                       rel2 { relative: 0.0 1.0; to_x: "delete_event"; to_y: "bg"; }\r
-                                       align: 0.5 0.5;\r
-                                       color: 0 0 0 0;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-               } //parts\r
-               programs {\r
-                       program {\r
-                               signal: "mouse,down,1";\r
-                               source: "delete_event";\r
-                               action: SIGNAL_EMIT "down" "item";\r
-                               after: "down,after";\r
-                       }   \r
-                       program {\r
-                               name: "down,after";\r
-                               action: STATE_SET "press" 0.0;\r
-                               target: "delete";\r
-                       }\r
-                       program {\r
-                               signal: "mouse,up,1";\r
-                               source: "delete_event";\r
-                               action: SIGNAL_EMIT "up" "item";\r
-                               after: "up,after";\r
-                       }\r
-                       program {\r
-                               name: "up,after";\r
-                               action: STATE_SET "default" 0.0;\r
-                               target: "delete";\r
-                       }\r
-\r
-                       program {\r
-                               signal: "mouse,down,1";\r
-                               source: "title_event";\r
-                               action: SIGNAL_EMIT "down" "item";\r
-                               after: "down,after";\r
-                       }   \r
-                       program {\r
-                               name: "down,after";\r
-                               action: STATE_SET "press" 0.0;\r
-                               target: "title";\r
-                       }\r
-                       program {\r
-                               signal: "mouse,up,1";\r
-                               source: "title_event";\r
-                               action: SIGNAL_EMIT "up" "item";\r
-                               after: "up,after";\r
-                       }\r
-                       program {\r
-                               name: "up,after";\r
-                               action: STATE_SET "default" 0.0;\r
-                               target: "title";\r
-                       }\r
-               }\r
-       }\r
-\r
-       group {\r
-               name: "item_padding";\r
-               parts {\r
-                       part {\r
-                               name: "bg";\r
-                               type: RECT;\r
-                               description {\r
-                                       state: "default" 0.0;\r
-                                       rel1 { relative: 0.0 0.0; }\r
-                                       rel2 { relative: 1.0 1.0; }\r
-                                       min: ITEM_PADDING_WIDTH ITEM_PADDING_HEIGHT;\r
-                                       color: 0 0 0 0;\r
-                                       visible: 1;\r
-                               }\r
-                       }\r
-               } //parts\r
-       }\r
-\r
-} //collections\r
diff --git a/res/edje/result_bar.png b/res/edje/result_bar.png
new file mode 100644 (file)
index 0000000..082a17c
Binary files /dev/null and b/res/edje/result_bar.png differ
index 599c171..ec6de11 100755 (executable)
Binary files a/res/images/1.png and b/res/images/1.png differ
index c1f1a93..e6e463f 100755 (executable)
Binary files a/res/images/2.png and b/res/images/2.png differ
index 7edb6aa..31b60fe 100755 (executable)
Binary files a/res/images/3.png and b/res/images/3.png differ
index 72508de..4c7ef59 100755 (executable)
Binary files a/res/images/4.png and b/res/images/4.png differ
diff --git a/res/images/Result.png b/res/images/Result.png
new file mode 100755 (executable)
index 0000000..4a74de0
Binary files /dev/null and b/res/images/Result.png differ
diff --git a/res/images/first.png b/res/images/first.png
new file mode 100755 (executable)
index 0000000..d33a927
Binary files /dev/null and b/res/images/first.png differ
diff --git a/res/images/popup button.png b/res/images/popup button.png
new file mode 100755 (executable)
index 0000000..4758856
Binary files /dev/null and b/res/images/popup button.png differ
diff --git a/res/images/result_bar.png b/res/images/result_bar.png
new file mode 100755 (executable)
index 0000000..082a17c
Binary files /dev/null and b/res/images/result_bar.png differ
diff --git a/res/images/select list.png b/res/images/select list.png
new file mode 100755 (executable)
index 0000000..d4039a2
Binary files /dev/null and b/res/images/select list.png differ
diff --git a/res/images/title bg.png b/res/images/title bg.png
new file mode 100755 (executable)
index 0000000..bc1ce53
Binary files /dev/null and b/res/images/title bg.png differ
diff --git a/res/images/watch_icon.png b/res/images/watch_icon.png
new file mode 100755 (executable)
index 0000000..774aa80
Binary files /dev/null and b/res/images/watch_icon.png differ
index b318b06..0318c0f 100644 (file)
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <app.h>
+#include <time.h>
 
 #include "log.h"
 #include "conf.h"
 #include "map.h"
 
 #define _EDJ(o) elm_layout_edje_get(o)
-#define MAX_CITY 5
 
 const char *const DATA_KEY_CITY = "city";
 const char *const DATA_KEY_MAIN_VIEW_INFO = "mvi";
 
 const char *const ITEM_EDJE = "item.edj";
-static int color_index[MAX_CITY] = { 0, 0, 0, 0, 0 };
+const char *const BEST_TIME_EDJE = "best_time.edj";
+const char *const ITEM2_EDJE = "item2.edj";
+static int color_index[MAXIMUM_SELECTED_CITY] = { 0, 0, 0, 0, 0 };
+
+void item_reset_color_index(void)
+{
+       register int i = 0;
+       for (; i < MAXIMUM_SELECTED_CITY; i++) {
+               if (EINA_FALSE == remove_city_from_map(i))
+                       _E("cannot remove the city");
+
+               color_index[i] = 0;
+       }
+}
+
+static double _get_local_timezone(void)
+{
+       struct tm *local_time = NULL;
+       double timezone = 0.0f;
+       time_t t;
+
+       time(&t);
+
+       local_time = localtime(&t);
+       retv_if(!local_time, 0.0f);
+
+       timezone = (double) (local_time->tm_gmtoff / 3600l);
+_D("HELLO, gmtoff:%d", local_time->tm_gmtoff / 3600l);
+
+       return timezone;
+}
 
 void _text_set_here_time(Evas_Object *item, const char *part)
 {
@@ -46,10 +76,10 @@ void _text_set_here_time(Evas_Object *item, const char *part)
        /* Timezone
           Asia/Seoul
         */
-       if (local_time->tm_gmtoff >= 0)
-               snprintf(time_result, sizeof(time_result), "%s, +%ld", timezone_str, local_time->tm_gmtoff / 3600);
+       if (local_time->tm_gmtoff >= 0l)
+               snprintf(time_result, sizeof(time_result), "%s, +%ld", timezone_str, local_time->tm_gmtoff / 3600l);
        else
-               snprintf(time_result, sizeof(time_result), "%s, %ld", timezone_str, local_time->tm_gmtoff / 3600);
+               snprintf(time_result, sizeof(time_result), "%s, %ld", timezone_str, local_time->tm_gmtoff / 3600l);
 
        free(timezone_str);
 
@@ -71,8 +101,10 @@ static void _item_typing_up_cb(void *data, Evas_Object *obj, const char *emissio
        Evas_Object *item = obj;
        Evas_Object *selecting_item = NULL;
        main_view_s *main_view_info = data;
+       struct tm *local_time = NULL;
        int city = 0;
        int count = 0;
+       time_t t = 0;
 
        ret_if(!item);
        ret_if(!main_view_info);
@@ -80,6 +112,9 @@ static void _item_typing_up_cb(void *data, Evas_Object *obj, const char *emissio
 
        _D("An item is selected");
 
+       time(&t);
+       local_time = localtime(&t);
+
        if (scroller_is_scrolling(main_view_info->searchlist))
                return;
 
@@ -93,7 +128,7 @@ static void _item_typing_up_cb(void *data, Evas_Object *obj, const char *emissio
        }
 
        city = (int) evas_object_data_get(item, DATA_KEY_CITY);
-       selecting_item = item_create_selecting(main_view_info->city_list, city, 0, main_view_info);
+       selecting_item = item_create_selecting(main_view_info->city_list, city, local_time, main_view_info);
        ret_if(!selecting_item);
        scroller_append_item(main_view_info->city_list, selecting_item);
        count++;
@@ -179,7 +214,6 @@ static void _delete_selecting_item_cb(void *data, Evas_Object *obj, void *event_
        main_view_s *main_view_info = NULL;
        Evas_Object *item = data;
        int count = 0;
-       int ci = 0;
 
        _D("clicked, delete the selected item");
 
@@ -188,12 +222,6 @@ static void _delete_selecting_item_cb(void *data, Evas_Object *obj, void *event_
        main_view_info = evas_object_data_get(item, DATA_KEY_MAIN_VIEW_INFO);
        ret_if(!main_view_info);
 
-       ci = (int) evas_object_data_get(item, "color_index");
-
-       if (EINA_FALSE == remove_city_from_map(ci))
-               _E("cannot remove the city");
-
-       color_index[ci] = 0;
        item_destroy_selecting(item);
 
        count = scroller_count_item(main_view_info->city_list);
@@ -206,7 +234,41 @@ static void _delete_selecting_item_cb(void *data, Evas_Object *obj, void *event_
        }
 }
 
-Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color, main_view_s *main_view_info)
+void _text_set_local_time(Evas_Object *item, const char *part, int city, struct tm *local_time)
+{
+       city_s *city_info = NULL;
+       int hour = local_time->tm_hour;
+       int minute = local_time->tm_min;
+
+       char time_result[PATH_LEN] = {0, };
+
+       ret_if(!item);
+       ret_if(!part);
+
+       city_info = city_get();
+       ret_if(!city_info);
+
+       if (((double) ((int) city_info[city].timezone)) < city_info[city].timezone) {
+               minute += 30;
+               if (minute > 60) {
+                       hour++;
+                       minute -= 60;
+               }
+       }
+
+       hour -= local_time->tm_gmtoff / 3600l;
+       hour += (int) city_info[city].timezone;
+       _D("HELLO : local_time:%d, diff:%d, timezone:%f, final_hour:%d", local_time->tm_hour, local_time->tm_gmtoff / 3600l, city_info[city].timezone, hour);
+       if (hour < 0)
+               hour += 24;
+
+       hour %= 24;
+
+       snprintf(time_result, sizeof(time_result), "%2d:%02d", hour, minute);
+       elm_object_part_text_set(item, part, time_result);
+}
+
+Evas_Object *item_create_selecting(Evas_Object *parent, int city, struct tm *local_time, main_view_s *main_view_info)
 {
        Evas_Object *item = NULL;
        Evas_Object *btn = NULL;
@@ -225,9 +287,10 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color, mai
        goto_if(!city_info, error);
 
        int i = 0;
-       for (i = 0; i < MAX_CITY; i++) {
+       for (i = 0; i < MAXIMUM_SELECTED_CITY; i++) {
                if (color_index[i]) continue;
 
+               _D("HELLO, i : %d, city : %d", i, city);
                if (EINA_FALSE == add_city_to_map(i, &city_info[city])) {
                        _E("cannot add a city to the map");
                        return NULL;
@@ -238,18 +301,18 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color, mai
        path = app_get_resource_path();
        retv_if(!path, NULL);
 
-       snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, ITEM_EDJE);
+       snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, ITEM2_EDJE);
        free(path);
 
        selecting_info = calloc(1, sizeof(selecting_info_s));
        retv_if(!selecting_info, NULL);
        selecting_info->city = city;
-       selecting_info->color = color;
+       selecting_info->color = i;
 
        item = elm_layout_add(parent);
        retv_if(!item, NULL);
 
-       elm_layout_file_set(item, full_path, "item_selecting");
+       elm_layout_file_set(item, full_path, "item");
 
        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);
@@ -258,9 +321,6 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color, mai
        evas_object_event_callback_add(item, EVAS_CALLBACK_DEL, _item_selecting_del_cb, NULL);
        evas_object_show(item);
 
-       evas_object_data_set(item, "color_index", (void *) i);
-       color_index[i] = 1;
-
        btn = elm_button_add(item);
        if (btn) {
                elm_object_style_set(btn, "transparent");
@@ -278,11 +338,12 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color, mai
                snprintf(gmt_str, sizeof(gmt_str), "GMT %.1f", city_info[city].timezone);
 
        elm_object_part_text_set(item, "gmt", gmt_str);
+       _text_set_local_time(item, "time", city, local_time);
 
-       if (color) {
-               snprintf(color_str, sizeof(color_str), "%d", color);
-               elm_object_signal_emit(item, color_str, "mark");
-       }
+       if (set_marker(item, i) == EINA_FALSE)
+               _E("cannot set the marker");
+
+       color_index[i] = 1;
 
        return item;
 
@@ -304,38 +365,16 @@ void item_destroy_selecting(Evas_Object *item)
 
        evas_object_data_del(item, DATA_KEY_MAIN_VIEW_INFO);
        selecting_info = evas_object_data_del(item, DATA_KEY_SELECTING);
-       evas_object_data_del(item, "color_index");
-       free(selecting_info);
+       if (selecting_info) {
+               if (EINA_FALSE == remove_city_from_map(selecting_info->color))
+                       _E("cannot remove the city");
 
-       evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, _item_selecting_del_cb);
-
-       evas_object_del(item);
-}
-
-void _text_set_local_time(Evas_Object *item, const char *part, int city, struct tm *global_time)
-{
-       city_s *city_info = NULL;
-       int hour = global_time->tm_hour;
-       int minute = global_time->tm_min;
-
-       char time_result[PATH_LEN] = {0, };
-
-       ret_if(!item);
-       ret_if(!part);
-
-       city_info = city_get();
-       ret_if(!city_info);
-
-       if (((double) ((int) city_info[city].timezone)) < city_info[city].timezone) {
-               minute += 30;
-               if (minute > 60) {
-                       hour++;
-                       minute -= 60;
-               }
+               color_index[selecting_info->color] = 0;
+               free(selecting_info);
        }
 
-       snprintf(time_result, sizeof(time_result), "%d:%d", hour, minute);
-       elm_object_part_text_set(item, part, time_result);
+       evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, _item_selecting_del_cb);
+       evas_object_del(item);
 }
 
 static void _resize_graph_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
@@ -366,109 +405,6 @@ 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;
-       city_s *city_info = NULL;
-       result_info_s *result_info = NULL;
-       Evas *e = NULL;
-
-       char *path = NULL;
-       char full_path[PATH_LEN] = {0, };
-       char city_str[PATH_LEN] = {0, };
-       char color_str[16] = {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);
-
-       result_info = calloc(1, sizeof(result_info_s));
-       retv_if(!result_info, NULL);
-
-       item = elm_layout_add(parent);
-       goto_if(!item, error);
-
-       elm_layout_file_set(item, full_path, "item_result");
-
-       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();
-       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);
-
-       snprintf(color_str, sizeof(color_str), "%d", color);
-       elm_object_signal_emit(item, color_str, "mark");
-
-       _text_set_local_time(item, "time", city, global_time);
-
-       e = evas_object_evas_get(item);
-       goto_if(!e, error);
-
-       result_info->rect1 = evas_object_rectangle_add(e);
-       goto_if(!result_info->rect1, error);
-
-       result_info->rect2 = evas_object_rectangle_add(e);
-       goto_if(!result_info->rect2, error);
-
-       result_info->city = city;
-       result_info->start = start;
-       result_info->end = end;
-
-       return item;
-
-error:
-       if (result_info) {
-               if (result_info->rect1)
-                       evas_object_del(result_info->rect1);
-               if (result_info->rect2)
-                       evas_object_del(result_info->rect2);
-               free(result_info);
-       }
-
-       if (item)
-               evas_object_del(item);
-
-       free(result_info);
-       return NULL;
-}
-
-void item_destroy_result(Evas_Object *item)
-{
-       result_info_s *result_info = NULL;
-
-       ret_if(!item);
-
-       evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, _item_result_del_cb);
-
-       result_info = evas_object_data_del(item, DATA_KEY_RESULT);
-       if (result_info) {
-               if (result_info->rect1)
-                       evas_object_del(result_info->rect1);
-               if (result_info->rect2)
-                       evas_object_del(result_info->rect2);
-               free(result_info);
-       }
-
-       evas_object_del(item);
-}
-
 static void _item_group_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
        item_destroy_group(obj);
@@ -484,8 +420,10 @@ static void _item_group_up_cb(void *data, Evas_Object *obj, const char *emission
        Evas_Object *item = obj;
        Evas_Object *selecting_item = NULL;
        main_view_s *main_view_info = data;
+       struct tm *local_time = NULL;
        int city = 0;
        int count = 0;
+       time_t t = 0;
 
        ret_if(!item);
        ret_if(!main_view_info);
@@ -493,6 +431,9 @@ static void _item_group_up_cb(void *data, Evas_Object *obj, const char *emission
 
        _D("An item is selected");
 
+       time(&t);
+       local_time = localtime(&t);
+
        count = scroller_count_item(main_view_info->city_list);
        if (count >= MAXIMUM_SELECTED_CITY) {
                Evas_Object *popup = NULL;
@@ -503,7 +444,7 @@ static void _item_group_up_cb(void *data, Evas_Object *obj, const char *emission
        }
 
        city = (int) evas_object_data_get(item, DATA_KEY_CITY);
-       selecting_item = item_create_selecting(main_view_info->city_list, city, 0, main_view_info);
+       selecting_item = item_create_selecting(main_view_info->city_list, city, local_time, main_view_info);
        ret_if(!selecting_item);
 
        scroller_append_item(main_view_info->city_list, selecting_item);
@@ -596,3 +537,48 @@ void item_destroy_padding(Evas_Object *item)
        evas_object_del(item);
 }
 
+static void _item_best_time_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+       item_destroy_best_time(obj);
+}
+
+Evas_Object *item_create_best_time(Evas_Object *parent)
+{
+       Evas_Object *item = NULL;
+       city_s *city_info = NULL;
+
+       char *path = NULL;
+       char full_path[PATH_LEN] = {0, };
+       char city_str[PATH_LEN] = {0, };
+
+       retv_if(!parent, NULL);
+
+       path = app_get_resource_path();
+       retv_if(!path, NULL);
+
+       snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, BEST_TIME_EDJE);
+       free(path);
+
+       item = elm_layout_add(parent);
+       retv_if(!item, NULL);
+
+       elm_layout_file_set(item, full_path, "best_time");
+
+       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_best_time_del_cb, NULL);
+
+       elm_object_part_text_set(item, "city", "Best time");
+
+       evas_object_show(item);
+
+       return item;
+}
+
+void item_destroy_best_time(Evas_Object *item)
+{
+       ret_if(!item);
+       evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, _item_best_time_del_cb);
+       evas_object_del(item);
+}
+
index 84b52b2..b8cca81 100644 (file)
@@ -17,6 +17,7 @@
 const char *const MAIN_VIEW_EDJE = "momentic.edj";
 const char *const ENTRY_EDJE = "entry.edj";
 const char *const PREDICT_ITEM_EDJE = "predict_item.edj";
+static int cur_page = 0;
 
 static void _append_item_to_searchlist(Evas_Object *searchlist, Evas_Object *item)
 {
@@ -83,11 +84,11 @@ static void _update_searchlist(Evas_Object *searchlist, const char *str, main_vi
                _append_item_to_searchlist(searchlist, predict_item);
        }
 
-       for (; i < CITY_MAX; i++) {
+       for (; i < CITY_SYDNEY; i++) {
                int matched = 0;
-               if (city_info[i].name && strstr(city_info[i].name, str))
+               if (city_info[i].name && str && strstr(city_info[i].name, str))
                        matched = 1;
-               else if (city_info[i].nation && strstr(city_info[i].nation, str))
+               else if (city_info[i].nation && str && strstr(city_info[i].nation, str))
                        matched = 1;
 
                if (matched) {
@@ -225,7 +226,7 @@ static Evas_Object *_create_searchbar(Evas_Object *parent, main_view_s *main_vie
        elm_entry_single_line_set(entry_obj, EINA_TRUE);
        /* This makes the text upper */
        elm_entry_scrollable_set(entry_obj, EINA_FALSE);
-       elm_entry_cnp_mode_set(entry_obj, ELM_CNP_MODE_PLAINTEXT);
+       //elm_entry_cnp_mode_set(entry_obj, ELM_CNP_MODE_PLAINTEXT);
        elm_entry_text_style_user_push(entry_obj, "DEFAULT='font_size=20'");
        elm_object_part_text_set(entry_obj, "elm.guide", "<font_size=20>Search</font_size>");
 
@@ -255,6 +256,53 @@ static void _destroy_searchbar(Evas_Object *searchbar)
        evas_object_del(searchbar);
 }
 
+static void _set_time_range(Evas_Object *item, int i, int base_city, int cur_city)
+{
+       double start1 = 0.0f;
+       double end1 = 0.0f;
+       double start2 = 0.0f;
+       double end2 = 0.0f;
+
+       city_s *city_info = NULL;
+
+       int start = 0;
+       int end = 0;
+
+       city_info = city_get();
+       ret_if(!city_info);
+
+       start = (int) city_info[cur_city].timezone - city_info[base_city].timezone + (double) BEST_START_TIME;
+
+       if (start < 0)
+               start += 24;
+
+       start %= 24;
+       end = start + BEST_DURING_TIME;
+
+       if (end > 24.0f) {
+               start1 = (double) start;
+               end1 = 24.0f;
+
+               start2 = 0.0f;
+               end2 = (double) (end % 24);
+       } else {
+               start1 = (double) start;
+               end1 = (double) end;
+       }
+
+       _D("O, %s %f:%f:%f:%f", city_info[cur_city].name, start1, end1, start2, end2);
+
+       if (set_time_range(item, i, start1, end1, start2, end2) == EINA_FALSE)
+               _E("cannot set time range");
+}
+
+typedef struct part_info
+{
+       double p1, p2;
+
+} part_info_s;
+
+
 static void _click_next_btn_cb(void *data, Evas_Object *obj, void *event_info)
 {
        main_view_s *main_view_info = data;
@@ -266,15 +314,13 @@ static void _click_next_btn_cb(void *data, Evas_Object *obj, void *event_info)
        time_t t;
        city_s *city_info = NULL;
        int cur_timezone = 0;
+       int base_city = 0;
 
        ret_if(!main_view_info);
        ret_if(!main_view_info->city_list);
-       ret_if(!main_view_info->result_list);
 
        _D("result button is clicked");
 
-       scroller_clear_item(main_view_info->result_list);
-
        city_info = city_get();
        ret_if(!city_info);
 
@@ -282,7 +328,7 @@ static void _click_next_btn_cb(void *data, Evas_Object *obj, void *event_info)
        global_time = gmtime(&t);
        local_time = localtime(&t);
 
-       cur_timezone = (int) local_time->tm_gmtoff / 3600;
+       cur_timezone = (int) local_time->tm_gmtoff / 3600l;
 
        box = elm_object_content_get(main_view_info->city_list);
        ret_if(!box);
@@ -291,8 +337,21 @@ static void _click_next_btn_cb(void *data, Evas_Object *obj, void *event_info)
        ret_if(!list);
 
        EINA_LIST_FREE(list, item) {
+               selecting_info_s *selecting_info = evas_object_data_get(item, DATA_KEY_SELECTING);
+               continue_if(!selecting_info);
+
+               elm_object_signal_emit(item, "momentic,item,state,result", "");
+               elm_object_part_content_set(item, "time", "");
+
+               if (!base_city) {
+                       base_city = selecting_info->city;
+                       _set_time_range(item, selecting_info->color, base_city, base_city);
+                       continue;
+               } else
+                       _set_time_range(item, selecting_info->color, base_city, selecting_info->city);
+
+#if 0
                selecting_info_s *selecting_info = NULL;
-               Evas_Object *item_result = NULL;
                int start = 0, end = 0;
                int tmp_timezone = 0;
 
@@ -305,18 +364,52 @@ static void _click_next_btn_cb(void *data, Evas_Object *obj, void *event_info)
 
                start = tmp_timezone - cur_timezone + BEST_START_TIME;
                end = (start + (BEST_END_TIME - BEST_START_TIME)) % 24;
+#endif
+       }
 
-               item_result = item_create_result(main_view_info->result_list
-                               , selecting_info->city
-                               , selecting_info->color
-                               , start
-                               , end
-                               , global_time);
+       item = item_create_best_time(main_view_info->city_list);
+       if (item) {
+               elm_object_signal_emit(item, "momentic,item,state,show", "");
+               scroller_append_item(main_view_info->city_list, item);
+#if 0
+        //decide best time range
+               list = elm_box_children_get(box);
+               double r1 = 0, r2 = 24, r3 = 0, r4 = 24;
+               Eina_Bool best_time = EINA_TRUE;
+           Evas_Object *it;    
+               EINA_LIST_FREE(list, it) {
+                 Evas_Object *rect1 = evas_object_data_get(it, "part1");
+                 Evas_Object *rect2 = evas_object_data_get(it, "part2");
+
+                 if (rect1)
+                 {
+                         part_info_s *pi = evas_object_data_get(rect1, "part_info");
+                         if ((pi->p1 * 24) > r1) r1 = pi->p1 * 24;
+                         else best_time = EINA_FALSE;
+                         if ((pi->p2 * 24) < r2) r2 = pi->p2 * 24;
+                         else best_time = EINA_FALSE;
+                 }
+
+                 if (rect2)
+                 {
+                         part_info_s *pi = evas_object_data_get(rect2, "part_info");
+                         if ((pi->p1 *24) > r1) r1 = pi->p1 * 24;
+                         else best_time = EINA_FALSE;
+                         if ((pi->p2 *24) < r2) r2 = pi->p2 * 24;
+                         else best_time = EINA_FALSE;
+                 }
+               }
 
-               scroller_append_item(main_view_info->result_list, item_result);
-       }
+               if (best_time){
+_D("AQAAA %f %f %f %f", r1, r2, r3, r4);
+          set_time_range(item, 5, r1, r2, r3, r4);
+               }
+#endif
+       } else
+               _E("cannot append an item");
 
        elm_object_signal_emit(main_view_info->main_view, "momentic,state,page2", "");
+       cur_page = 2;
 }
 
 static Evas_Object *_create_next_btn(Evas_Object *parent, main_view_s *main_view_info)
@@ -400,6 +493,7 @@ static void _click_add_btn_cb(void *data, Evas_Object *obj, void *event_info)
        ret_if(!main_view_info->main_view);
 
        elm_object_signal_emit(main_view_info->main_view, "momentic,state,page1", "");
+       cur_page = 1;
 }
 
 static void _page1_done_cb(void *data, Evas_Object *obj, const char *signal, const char *source)
@@ -630,6 +724,7 @@ static void _destroy_group_scroller(Evas_Object *group_scroller)
 
 static void _main_view_back_cb(void *data, Evas_Object *obj, void *event_info)
 {
+       main_view_s *main_view_info = data;
        static time_t prev_t;
        time_t cur_t;
 
@@ -642,6 +737,34 @@ static void _main_view_back_cb(void *data, Evas_Object *obj, void *event_info)
 
        prev_t = cur_t;
        elm_object_signal_emit(obj, "momentic,state,page,back", "");
+       
+       if (1 == cur_page) {
+               item_reset_color_index();
+               scroller_clear_item(main_view_info->city_list);
+
+               elm_object_focus_set(main_view_info->searchbar, EINA_FALSE);
+               cur_page = 0;
+       } else if (2 == cur_page) {
+               Eina_List *list = NULL;
+               Evas_Object *item = NULL;
+               Evas_Object *tmp = NULL;
+               Evas_Object *box = elm_object_content_get(main_view_info->city_list);
+
+               ret_if(!box);
+
+               list = elm_box_children_get(box);
+               ret_if(!list);
+
+               EINA_LIST_FREE(list, item) {
+                       elm_object_signal_emit(item, "momentic,item,state,default", "");
+                       tmp = item;
+               }
+               scroller_remove_item(main_view_info->city_list, tmp);
+               item_destroy_best_time(tmp);
+               cur_page = 1;
+       } else if (0 == cur_page) {
+               elm_win_lower(main_view_info->moment_info->win);
+       }
 }
 
 Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info)
@@ -702,10 +825,6 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info)
        if (main_view_info->searchlist)
                elm_object_part_content_set(main_view_info->main_view, "searchlist", main_view_info->searchlist);
 
-       main_view_info->result_list = _create_result_list(main_view_info->main_view);
-       if (main_view_info->result_list)
-               elm_object_part_content_set(main_view_info->main_view, "result_list", main_view_info->result_list);
-
        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);
@@ -729,9 +848,6 @@ void main_view_destroy(Evas_Object *main_view)
        if (main_view_info->group_scroller)
                _destroy_group_scroller(main_view_info->group_scroller);
 
-       if (main_view_info->result_list)
-               _destroy_result_list(main_view_info->result_list);
-
        if (main_view_info->searchlist)
                _destroy_searchlist(main_view_info->searchlist);
 
index db8fac5..d7ce295 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -4,8 +4,8 @@
 #include "map.h"
 #include "log.h"
 #include "util.h"
+#include "conf.h"
 
-#define CITY_MAX 5
 #define WORLD_W 443
 #define WORLD_H 259
 #define ORIGIN_W 443
 
 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},
+static city_data_s city[MAXIMUM_SELECTED_CITY] = {{{0, 0, 0, 0, 0, 0}, NULL},
                                      {{0, 0, 0, 0, 0, 0}, NULL},
                                      {{0, 0, 0, 0, 0, 0}, NULL},
                                      {{0, 0, 0, 0, 0, 0}, NULL},
                                      {{0, 0, 0, 0, 0, 0}, NULL}};
 
+
 static void
 map_geom_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
@@ -29,7 +30,7 @@ map_geom_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
        double scale_h = (double) h / ORIGIN_H;
 
    int idx;
-   for (idx = 0; CITY_MAX > idx; idx++)
+   for (idx = 0; MAXIMUM_SELECTED_CITY > idx; idx++)
      {
         if (!city[idx].obj) continue;
         evas_object_move(city[idx].obj,
@@ -45,7 +46,7 @@ static void
 map_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    int idx;
-   for (idx = 0; CITY_MAX > idx; idx++)
+   for (idx = 0; MAXIMUM_SELECTED_CITY > idx; idx++)
      {
         evas_object_del(city[idx].obj);
         city[idx].obj = NULL;
@@ -78,21 +79,21 @@ add_city_to_map(int idx, city_s *ci)
        char *path = NULL;
        char full_path[PATH_LEN] = {0, };
 
-   if (idx >= CITY_MAX) return EINA_FALSE;
+   if (idx >= MAXIMUM_SELECTED_CITY) return EINA_FALSE;
    if (0 > idx) return EINA_FALSE;
    if (city[idx].obj) return EINA_FALSE;
 
    int i;
-   for (i = 0; i < CITY_MAX; i++)
+   for (i = 0; i < MAXIMUM_SELECTED_CITY; i++)
    {
           if (city[i].ci.id == ci->id) return EINA_FALSE;
    }
 
-   path = app_get_resource_path();
-   retv_if(!path, EINA_FALSE);
+       path = app_get_resource_path();
+       retv_if(!path, EINA_FALSE);
 
-   snprintf(full_path, sizeof(full_path), "%s/edje/city.edj", path);
-   free(path);
+       snprintf(full_path, sizeof(full_path), "%s/edje/city.edj", path);
+       free(path);
 
    Evas_Coord x, y, w, h, x2, y2, w2, h2;
    evas_object_geometry_get(map_layout, &x, &y, &w, &h);
@@ -155,12 +156,11 @@ trans_del_cb(void *data, Elm_Transit *trans)
 Eina_Bool
 remove_city_from_map(int idx)
 {
-   if (idx >= CITY_MAX) return EINA_FALSE;
+   if (idx >= MAXIMUM_SELECTED_CITY) return EINA_FALSE;
    if (0 > idx) return EINA_FALSE;
    if (!city[idx].obj) return EINA_FALSE;
 
    city[idx].ci.id = -1;
-
    Elm_Transit *trans = elm_transit_add();
    elm_transit_object_add(trans, city[idx].obj);
    elm_transit_effect_zoom_add(trans, 1.0, 2.0);
@@ -186,4 +186,212 @@ button_effect(Evas_Object *btn)
    elm_transit_go(trans);
 }
 
+typedef struct part_info
+{
+       double p1, p2;
+
+} part_info_s;
+
+static void
+item_geom_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+       Evas_Object *rect1 = evas_object_data_get(obj, "part1");
+       Evas_Object *rect2 = evas_object_data_get(obj, "part2");
+
+       ret_if(!rect1);
+
+       Evas_Coord x, y, w, h, x2, y2, w2, h2;
+       double xx;
+       part_info_s *pi;
+
+       evas_object_geometry_get(obj, &x, &y, &w, &h);
+       edje_object_part_geometry_get(elm_layout_edje_get(obj), "graph", &x2, &y2, &w2, &h2);
+
+       pi = evas_object_data_get(rect1, "part_info");
+       if (!pi) return;
+
+       xx = (double)(x + x2) + (((double)w2) * pi->p1);
+       evas_object_move(rect1, (int) xx, (y + y2));
+       evas_object_resize(rect1, (int) (((double)w2) * (pi->p2 - pi->p1)), h2);
+
+    if (!rect2) return;
+
+       pi = evas_object_data_get(rect2, "part_info");
+       ret_if(!pi);
+
+       xx = (double)(x + x2) + (((double)w2) * pi->p1);
+       evas_object_move(rect2, (int) xx, (y + y2));
+       evas_object_resize(rect2, (int) (((double)w2) * (pi->p2 - pi->p1)), h2);
+}
+
+static void
+item_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+       Evas_Object *rect1 = evas_object_data_get(obj, "part1");
+       Evas_Object *rect2 = evas_object_data_get(obj, "part2");
+       part_info_s *p1 = evas_object_data_get(rect1, "p1");
+       part_info_s *p2 = evas_object_data_get(rect1, "p2");
+       free(p1);
+       free(p2);
+       evas_object_del(rect1);
+       evas_object_del(rect2);
+}
+
+Eina_Bool
+set_time_range(Evas_Object *item, int idx, double p1, double p2, double p3, double p4)
+{
+       if (!item) return EINA_FALSE;
+       if (idx < 0 || idx >= MAXIMUM_SELECTED_CITY) return EINA_FALSE;
+
+       if (0.0f != p1)
+               p1 /= 24.0f;
+
+       if (0.0f != p2)
+               p2 /= 24.0f;
+
+       if (0.0f != p3)
+               p3 /= 24.0f;
+       if (0.0f != p4)
+               p4 /= 24.0f;
 
+       evas_object_event_callback_del(item, EVAS_CALLBACK_MOVE, item_geom_cb);
+       evas_object_event_callback_del(item, EVAS_CALLBACK_RESIZE, item_geom_cb);
+       evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, item_del_cb);
+       evas_object_event_callback_add(item, EVAS_CALLBACK_MOVE, item_geom_cb, NULL);
+       evas_object_event_callback_add(item, EVAS_CALLBACK_RESIZE, item_geom_cb, NULL);
+       evas_object_event_callback_add(item, EVAS_CALLBACK_DEL, item_del_cb, NULL);
+
+       Evas_Object *rect;
+       rect = evas_object_data_get(item, "part1");
+       evas_object_del(rect);
+       rect = evas_object_data_get(item, "part2");
+       evas_object_del(rect);
+
+       Evas_Coord x, y, w, h, x2, y2, w2, h2;
+
+       double xx;
+       part_info_s *pi;
+
+       //Part 1
+
+       rect = evas_object_rectangle_add(evas_object_evas_get(item));
+       switch (idx)
+       {
+           case 0:
+               evas_object_color_set(rect, 239, 81, 39, 255);
+               break;
+           case 1:
+               evas_object_color_set(rect, 63, 170, 150, 255);
+        break;
+           case 2:
+               evas_object_color_set(rect, 34, 138, 255, 255);
+        break;
+           case 3:
+               evas_object_color_set(rect, 255, 47, 213, 255);
+        break;
+           case 4:
+               evas_object_color_set(rect, 248, 176, 67, 255);
+        break;
+               case 5:
+               evas_object_color_set(rect, 255, 200, 0, 255);
+               break;
+       }
+       evas_object_geometry_get(item, &x, &y, &w, &h);
+       edje_object_part_geometry_get(elm_layout_edje_get(item), "graph", &x2, &y2, &w2, &h2);
+
+       xx = x + x2 + (w2 * p1);
+       evas_object_show(rect);
+
+       evas_object_data_set(item, "part1", rect);
+
+       pi = calloc(1, sizeof(part_info_s));
+       if (pi)
+       {
+               pi->p1 = p1;
+               pi->p2 = p2;
+               evas_object_data_set(rect, "part_info", pi);
+       }
+
+       //Part 2
+       if ((p3 == 0 && p4 == 0)) return EINA_TRUE;
+
+       rect = evas_object_rectangle_add(evas_object_evas_get(item));
+       switch (idx)
+       {
+               case 0:
+                       evas_object_color_set(rect, 239, 81, 39, 255);
+                       break;
+           case 1:
+               evas_object_color_set(rect, 63, 170, 150, 255);
+               break;
+           case 2:
+               evas_object_color_set(rect, 34, 138, 255, 255);
+               break;
+           case 3:
+               evas_object_color_set(rect, 255, 47, 213, 255);
+               break;
+           case 4:
+               evas_object_color_set(rect, 248, 176, 67, 255);
+               break;
+               case 5:
+               evas_object_color_set(rect, 255, 200, 0, 255);
+               break;
+       }
+       evas_object_geometry_get(item, &x, &y, &w, &h);
+       edje_object_part_geometry_get(elm_layout_edje_get(item), "graph", &x2, &y2, &w2, &h2);
+    xx = x + x2 + (w2 * p1);
+       evas_object_show(rect);
+
+       evas_object_data_set(item, "part2", rect);
+
+       pi = calloc(1, sizeof(part_info_s));
+       if (pi)
+       {
+               pi->p1 = p3;
+               pi->p2 = p4;
+               evas_object_data_set(rect, "part_info", pi);
+       }
+
+       return EINA_TRUE;
+}
+
+
+Eina_Bool
+set_marker(Evas_Object *item, int idx)
+{
+       if (idx < 0 || idx >= MAXIMUM_SELECTED_CITY) return EINA_FALSE;
+       if (!item) return EINA_FALSE;
+
+       char *path = NULL;
+       char full_path[PATH_LEN] = {0, };
+       path = app_get_resource_path();
+       retv_if(!path, EINA_FALSE);
+
+       snprintf(full_path, sizeof(full_path), "%s/edje/item2.edj", path);
+       free(path);
+
+       Evas_Object *img = elm_image_add(item);
+       retv_if(!img, EINA_FALSE);
+
+       switch (idx)
+       {
+           case 0:
+               elm_image_file_set(img, full_path, "my_status");
+               break;
+           case 1:
+               elm_image_file_set(img, full_path, "location_mint");
+        break;
+           case 2:
+               elm_image_file_set(img, full_path, "location_blue");
+        break;
+           case 3:
+               elm_image_file_set(img, full_path, "location_pink");
+        break;
+           case 4:
+               elm_image_file_set(img, full_path, "location_orange");
+        break;
+       }
+       elm_object_part_content_set(item, "mark", img);
+
+       return EINA_TRUE;
+}