0810 version

author: Jin Yoon <jinny.yoon@samsung.com> 2015-08-10 21:58:03 +0900
committer: Jin Yoon <jinny.yoon@samsung.com> 2015-08-10 21:58:03 +0900
commit: 598df99f7946d0a78428cea81b865b61f8670b2b (patch)
tree: 113903fc4db438b1a5444cb8b1f8c3fa44af97f4
parent: 5c0a97167ce06660e193a3e339369599f064583d (diff)
download: adventure-598df99f7946d0a78428cea81b865b61f8670b2b.tar.gz
adventure-598df99f7946d0a78428cea81b865b61f8670b2b.tar.bz2
adventure-598df99f7946d0a78428cea81b865b61f8670b2b.zip
80 files changed, 408 insertions, 417 deletions
diff --git a/.rds_delta b/.rds_delta
index 0793a12..6231267 100644
--- a/.rds_delta
+++ b/.rds_delta
@@ -1,6 +1,8 @@
 #delete
+res/edje/.item.edc.swp
 #add
 #modify
 author-signature.xml
 signature1.xml
 bin/adventure
+res/edje/item.edj
diff --git a/.sdk_delta.info b/.sdk_delta.info
index 065ff97..6e65589 100644
--- a/.sdk_delta.info
+++ b/.sdk_delta.info
diff --git a/.sign/.manifest.tmp b/.sign/.manifest.tmp
index 8ef89a4..dc4a7ca 100644
--- a/.sign/.manifest.tmp
+++ b/.sign/.manifest.tmp
@@ -1,33 +1,42 @@
+bin/adventure__DEL__hjrZ9hKxN//TFpt2IuVJsjyTs6C3faZ5+KgAysqrZbY=
 res/edje/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=
 res/edje/conf.h__DEL__HDwI7mqDpPI19iIn/JiJt3RUD1ZfOpDXpMVbCjVPL9A=
 res/edje/entry.edj__DEL__rVp9xRys8q23H4SAGSY0fU6qD7QKrQWXbtC0zAaWo5Q=
-res/edje/images/1.png__DEL__oP1soFdNokYu42XfoWKq0uYAP9o6PGUCGdnxQYErGdQ=
-res/edje/images/10.png__DEL__gebvW4D13j2AGUPkJInqNpANPhlECcq5EkIty5Coxhk=
-res/edje/images/11.png__DEL__DL48rNIwpgkN9kmnaZrCRBEZ8eb4O7bs1cojj5TmA5E=
-res/edje/images/12.png__DEL__RAVm0olQtSMEFJfbmOU8yv6q1CGQXIedfx1y57092zc=
-res/edje/images/13.png__DEL__TA5JVYM0MSNqWRCFGJ0+zMMCBQYsRvedVFdCmZiFjXg=
-res/edje/images/14.png__DEL__vCnLiA/mpyqe8596UcSpjgsYQ3C+UlrHcQMhfBVMIhw=
-res/edje/images/15.png__DEL__XYAcewRG6NI38KJwDhG/NgJ3yjfabDiDtfbhTfqhB4k=
-res/edje/images/16.png__DEL__AlelvBWD4ZFZXe9Q3lsKtK6pmvKESQ5TkZP+ga0eeN0=
-res/edje/images/17.png__DEL__hokt4oVMK5qPReLBCMCFrVE5NoaFb6GCHpUI0ZV9R/g=
-res/edje/images/18.png__DEL__KIpwvMfEF1pHOYESYdnUOlw8Nc3woIzfC+whrq9NMZQ=
-res/edje/images/19.png__DEL__k7gT1/mVjZHlo2JwM0d/KPgMcf+VRwlD3Q1LynEGKA4=
-res/edje/images/2.png__DEL__+SysDKJdRJ3bhcrSWP30GynSNoMzsspjt+D+4+r4dW0=
-res/edje/images/20.png__DEL__mvjNLwT/oRGXfplP4fxEUt2l9nh6f6hL/2u/Jz/xmOY=
-res/edje/images/21.png__DEL__Z1JNCPYTwq8GRqmXtx959Hh8anEayyovGQ200Fn8Agg=
-res/edje/images/22.png__DEL__+g3GEodV8HrC3ZfwqEvJ4CDz53HlwLGon9U72Rg7MQc=
-res/edje/images/23.png__DEL__Qf05o+2j4UWBa76D278XRLqMPvXoeEjGLep0UAjyIwI=
-res/edje/images/24.png__DEL__ZnGdo5P2tif/pojgdJkxnmYtX1/cP34MxsizZk/3jY0=
-res/edje/images/25.png__DEL__hYfdJzPNNP6Aq2QjozrNo6Vn6gvWiLM/o4pGm17Oqhs=
-res/edje/images/26.png__DEL__TFKIiB9BKPb0bOW4bj4K9+aspUY5FjT1jnyJ1XKqdWc=
-res/edje/images/27.png__DEL__YGc3K5MLVPZuH7RzDH72tvur0au03N3uExXAOVvKGuM=
-res/edje/images/3.png__DEL__2EbX8jW86mI535so/O/NXZ23up9EjBr9nuL554zr1hE=
-res/edje/images/4.png__DEL__jzDV6J8ergh5adaC6t5sK4AEvtOohPQRV6ZMyronTxA=
-res/edje/images/5.png__DEL__nrqnkWFhkuO+H3CjDr3rRbT0M0aNh0L7rMlB+GwHlcA=
-res/edje/images/6.png__DEL__iBo2/4T/QR9a5FofEIk9hS3Hp97ykD+WTm0Pfozmjjg=
-res/edje/images/7.png__DEL__u4g6O6zDBudC4OqOdE+cMlKH4uWwwP/HGJQEpHxmlUQ=
-res/edje/images/8.png__DEL__RgMDfNjCBIBETo6gIEN0OaYE87qk4ObJtPjq73bwUGs=
-res/edje/images/9.png__DEL__P4P/gIdawOqNuqjOxo4gfI/FCX+EQOIyIOmwajkVSR0=
+res/edje/images/add.png__DEL__R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=
+res/edje/images/add_btn.png__DEL__naQj2XAiAb8UgXrZ2fDkhrs8G1cyx8i1AsAT5HbbP5Q=
+res/edje/images/add_button.png__DEL__qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=
+res/edje/images/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=
+res/edje/images/city0.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=
+res/edje/images/city01.png__DEL__UoH8TFJrnH1ihgulgKa7Rtih9QrrI6yYpooMF9Scf1o=
+res/edje/images/city1.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=
+res/edje/images/city11.png__DEL__Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=
+res/edje/images/city2.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=
+res/edje/images/city21.png__DEL__Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=
+res/edje/images/curser.png__DEL__k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc=
+res/edje/images/delete_button.png__DEL__M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=
+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_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_blue.png__DEL__HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=
+res/edje/images/other_location_blue_small.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=
+res/edje/images/other_location_mint.png__DEL__OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=
+res/edje/images/other_location_mint_small.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=
+res/edje/images/pink small.png__DEL__Zdqcs/dH98DcHRF+rhHeK1jXnUHJHKOCaxLjhIAt0Ss=
+res/edje/images/pink.png__DEL__VtlsIEdXSmIhWn3X08lMCEWy2p2nIX0ZTrd7X1YesDQ=
+res/edje/images/searching list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
+res/edje/images/searching_X.png__DEL__6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=
+res/edje/images/searching_bar.png__DEL__j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=
+res/edje/images/searching_list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
+res/edje/images/searchlist.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
+res/edje/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=
+res/edje/images/하단 버튼.png__DEL__V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=
 res/edje/item.edj__DEL__HG+I/Y+Mgeh80NxsPXo2uggk1QBn6VWRUVAtb8mDu8Q=
 res/edje/main.edj__DEL__tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=
 res/edje/main_view.edj__DEL__yFLkgzPFVGDDbzN1D3f049Wp5QsSUEYj2wkJwvpawW0=
@@ -38,30 +47,9 @@ res/images/1.png__DEL__QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=
 res/images/2.png__DEL__Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=
 res/images/3.png__DEL__Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=
 res/images/4.png__DEL__j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=
-res/images/Day_nite_edit2.psd__DEL__ufmhTlFhFS4oze07/CUvaddgNNN+yZZWRz2QJWiNcs4=
-res/images/Moments.psd__DEL__s+2KYYryQtvLtoVmfKvejfShBtP3yu3IZ97dXjygOCI=
-res/images/Moments_EB.psd__DEL__1jY2+/cMyWCUVl+nc5NpTIGfSipno5hhEzJgB+dz8BU=
 res/images/add.png__DEL__R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=
-res/images/add_button.png__DEL__qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=
-res/images/curser.png__DEL__k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc=
-res/images/floting_next_button.png__DEL__Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0=
-res/images/line.png__DEL__mC2lw0XczhZ41ZKBKt5ft3YcObs+IGDudh0xfkOJwQE=
-res/images/map_background.png__DEL__fidI2puLNy+2OtfFScQOt4BhzflQJ2EU87bersaQZPM=
-res/images/my status.png__DEL__chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=
-res/images/next.png__DEL__1ed1D6snn2+5ecoSrgKk1FMNias5F2nwOVeMe9u1+Yo=
-res/images/next2.png__DEL__8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=
-res/images/searching_list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
-res/images/하단 버튼.png__DEL__V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=
-shared/res/adventure.png__DEL__1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs=
-tizen-manifest.xml__DEL__Yqjrp1NnUuO8yN5E0COzisOuxQ6Rf1IK71K8FAFHPr8=
-author-signature.xml__DEL__u54airQkCAE+ll56lr6Qc2oC3g00R4Xeb+BFhuZbASM=
-res/images/Aventure01.1.png__DEL__qFNE1M/3y3JLsRmH6olzSOwfJ0aSmpNYG2g4MAfVKEM=
-res/images/Aventure01.png__DEL__q1aFoIjA48lzFuleof8STv8eCmIGH05KIUpXfVUoD0E=
-res/images/Aventure01_background.png__DEL__uVdgx+2km5hdx3T3JYTz+hNSxxd4gTcgmEin2og8uYI=
-res/images/Daynight layer.png__DEL__vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs=
-res/images/Location.gif__DEL__Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=
 res/images/add_btn.png__DEL__naQj2XAiAb8UgXrZ2fDkhrs8G1cyx8i1AsAT5HbbP5Q=
-res/images/bg.jpg__DEL__SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=
+res/images/add_button.png__DEL__qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=
 res/images/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=
 res/images/city0.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=
 res/images/city01.png__DEL__UoH8TFJrnH1ihgulgKa7Rtih9QrrI6yYpooMF9Scf1o=
@@ -69,8 +57,15 @@ res/images/city1.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=
 res/images/city11.png__DEL__Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=
 res/images/city2.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=
 res/images/city21.png__DEL__Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=
+res/images/curser.png__DEL__k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc=
 res/images/delete_button.png__DEL__M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=
+res/images/floting_next_button.png__DEL__Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0=
+res/images/line.png__DEL__mC2lw0XczhZ41ZKBKt5ft3YcObs+IGDudh0xfkOJwQE=
+res/images/map_background.png__DEL__fidI2puLNy+2OtfFScQOt4BhzflQJ2EU87bersaQZPM=
+res/images/my status.png__DEL__chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=
 res/images/my_status_small.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=
+res/images/next.png__DEL__1ed1D6snn2+5ecoSrgKk1FMNias5F2nwOVeMe9u1+Yo=
+res/images/next2.png__DEL__8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=
 res/images/next_btn.png__DEL__8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=
 res/images/orange small.png__DEL__d7kGDG+axVAtUu/MBVv2dnGOxj0NdzrOwYXTVs3Hg0E=
 res/images/orange.png__DEL__lHWZWFaSDaidvlHG48/Ik7M6FmXdqlTjiR/YJoSukPY=
@@ -83,6 +78,10 @@ res/images/pink.png__DEL__VtlsIEdXSmIhWn3X08lMCEWy2p2nIX0ZTrd7X1YesDQ=
 res/images/searching list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
 res/images/searching_X.png__DEL__6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=
 res/images/searching_bar.png__DEL__j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=
+res/images/searching_list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
 res/images/searchlist.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
 res/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=
-bin/adventure__DEL__iaPgUHBbzMLOZMGH8E8Lu+4Rq4ecW1RqaoAUEBK3pKU=
+res/images/하단 버튼.png__DEL__V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=
+shared/res/adventure.png__DEL__iF8SZahyLw7IqsH3SgtZ9umag2CVi5Kk0ie4yoUr9t0=
+tizen-manifest.xml__DEL__Yqjrp1NnUuO8yN5E0COzisOuxQ6Rf1IK71K8FAFHPr8=
+author-signature.xml__DEL__BTI+Obi8GtziCVvRkieiQZFUEuWr89kp29N3Iw8tQfY=
diff --git a/.sign/author-signature.xml b/.sign/author-signature.xml
index 64bf1fb..9b9e331 100644
--- a/.sign/author-signature.xml
+++ b/.sign/author-signature.xml
@@ -4,7 +4,7 @@
 <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
 <Reference URI="bin%2Fadventure">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>iaPgUHBbzMLOZMGH8E8Lu+4Rq4ecW1RqaoAUEBK3pKU=</DigestValue>
+<DigestValue>hjrZ9hKxN//TFpt2IuVJsjyTs6C3faZ5+KgAysqrZbY=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -18,113 +18,145 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>rVp9xRys8q23H4SAGSY0fU6qD7QKrQWXbtC0zAaWo5Q=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F1.png">
+<Reference URI="res%2Fedje%2Fimages%2Fadd.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>oP1soFdNokYu42XfoWKq0uYAP9o6PGUCGdnxQYErGdQ=</DigestValue>
+<DigestValue>R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F10.png">
+<Reference URI="res%2Fedje%2Fimages%2Fadd_btn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>gebvW4D13j2AGUPkJInqNpANPhlECcq5EkIty5Coxhk=</DigestValue>
+<DigestValue>naQj2XAiAb8UgXrZ2fDkhrs8G1cyx8i1AsAT5HbbP5Q=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F11.png">
+<Reference URI="res%2Fedje%2Fimages%2Fadd_button.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>DL48rNIwpgkN9kmnaZrCRBEZ8eb4O7bs1cojj5TmA5E=</DigestValue>
+<DigestValue>qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F12.png">
+<Reference URI="res%2Fedje%2Fimages%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>RAVm0olQtSMEFJfbmOU8yv6q1CGQXIedfx1y57092zc=</DigestValue>
+<DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F13.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity0.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>TA5JVYM0MSNqWRCFGJ0+zMMCBQYsRvedVFdCmZiFjXg=</DigestValue>
+<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F14.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity01.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>vCnLiA/mpyqe8596UcSpjgsYQ3C+UlrHcQMhfBVMIhw=</DigestValue>
+<DigestValue>UoH8TFJrnH1ihgulgKa7Rtih9QrrI6yYpooMF9Scf1o=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F15.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>XYAcewRG6NI38KJwDhG/NgJ3yjfabDiDtfbhTfqhB4k=</DigestValue>
+<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F16.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity11.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>AlelvBWD4ZFZXe9Q3lsKtK6pmvKESQ5TkZP+ga0eeN0=</DigestValue>
+<DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F17.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity2.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>hokt4oVMK5qPReLBCMCFrVE5NoaFb6GCHpUI0ZV9R/g=</DigestValue>
+<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F18.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity21.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>KIpwvMfEF1pHOYESYdnUOlw8Nc3woIzfC+whrq9NMZQ=</DigestValue>
+<DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F19.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcurser.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>k7gT1/mVjZHlo2JwM0d/KPgMcf+VRwlD3Q1LynEGKA4=</DigestValue>
+<DigestValue>k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F2.png">
+<Reference URI="res%2Fedje%2Fimages%2Fdelete_button.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>+SysDKJdRJ3bhcrSWP30GynSNoMzsspjt+D+4+r4dW0=</DigestValue>
+<DigestValue>M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F20.png">
+<Reference URI="res%2Fedje%2Fimages%2Ffloting_next_button.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>mvjNLwT/oRGXfplP4fxEUt2l9nh6f6hL/2u/Jz/xmOY=</DigestValue>
+<DigestValue>Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F21.png">
+<Reference URI="res%2Fedje%2Fimages%2Fline.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Z1JNCPYTwq8GRqmXtx959Hh8anEayyovGQ200Fn8Agg=</DigestValue>
+<DigestValue>mC2lw0XczhZ41ZKBKt5ft3YcObs+IGDudh0xfkOJwQE=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F22.png">
+<Reference URI="res%2Fedje%2Fimages%2Fmap_background.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>+g3GEodV8HrC3ZfwqEvJ4CDz53HlwLGon9U72Rg7MQc=</DigestValue>
+<DigestValue>fidI2puLNy+2OtfFScQOt4BhzflQJ2EU87bersaQZPM=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F23.png">
+<Reference URI="res%2Fedje%2Fimages%2Fmy%20status.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Qf05o+2j4UWBa76D278XRLqMPvXoeEjGLep0UAjyIwI=</DigestValue>
+<DigestValue>chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F24.png">
+<Reference URI="res%2Fedje%2Fimages%2Fmy_status_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>ZnGdo5P2tif/pojgdJkxnmYtX1/cP34MxsizZk/3jY0=</DigestValue>
+<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F25.png">
+<Reference URI="res%2Fedje%2Fimages%2Fnext.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>hYfdJzPNNP6Aq2QjozrNo6Vn6gvWiLM/o4pGm17Oqhs=</DigestValue>
+<DigestValue>1ed1D6snn2+5ecoSrgKk1FMNias5F2nwOVeMe9u1+Yo=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F26.png">
+<Reference URI="res%2Fedje%2Fimages%2Fnext2.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>TFKIiB9BKPb0bOW4bj4K9+aspUY5FjT1jnyJ1XKqdWc=</DigestValue>
+<DigestValue>8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F27.png">
+<Reference URI="res%2Fedje%2Fimages%2Fnext_btn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>YGc3K5MLVPZuH7RzDH72tvur0au03N3uExXAOVvKGuM=</DigestValue>
+<DigestValue>8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F3.png">
+<Reference URI="res%2Fedje%2Fimages%2Forange%20small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>2EbX8jW86mI535so/O/NXZ23up9EjBr9nuL554zr1hE=</DigestValue>
+<DigestValue>d7kGDG+axVAtUu/MBVv2dnGOxj0NdzrOwYXTVs3Hg0E=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F4.png">
+<Reference URI="res%2Fedje%2Fimages%2Forange.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>jzDV6J8ergh5adaC6t5sK4AEvtOohPQRV6ZMyronTxA=</DigestValue>
+<DigestValue>lHWZWFaSDaidvlHG48/Ik7M6FmXdqlTjiR/YJoSukPY=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F5.png">
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>nrqnkWFhkuO+H3CjDr3rRbT0M0aNh0L7rMlB+GwHlcA=</DigestValue>
+<DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F6.png">
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>iBo2/4T/QR9a5FofEIk9hS3Hp97ykD+WTm0Pfozmjjg=</DigestValue>
+<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F7.png">
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>u4g6O6zDBudC4OqOdE+cMlKH4uWwwP/HGJQEpHxmlUQ=</DigestValue>
+<DigestValue>OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F8.png">
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>RgMDfNjCBIBETo6gIEN0OaYE87qk4ObJtPjq73bwUGs=</DigestValue>
+<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F9.png">
+<Reference URI="res%2Fedje%2Fimages%2Fpink%20small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>P4P/gIdawOqNuqjOxo4gfI/FCX+EQOIyIOmwajkVSR0=</DigestValue>
+<DigestValue>Zdqcs/dH98DcHRF+rhHeK1jXnUHJHKOCaxLjhIAt0Ss=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fpink.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>VtlsIEdXSmIhWn3X08lMCEWy2p2nIX0ZTrd7X1YesDQ=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fsearching%20list.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fsearching_X.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fsearching_bar.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fsearching_list.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fsearchlist.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</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>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2F%ED%95%98%EB%8B%A8%20%EB%B2%84%ED%8A%BC.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fitem.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -166,38 +198,6 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2FAventure01.1.png">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>qFNE1M/3y3JLsRmH6olzSOwfJ0aSmpNYG2g4MAfVKEM=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FAventure01.png">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>q1aFoIjA48lzFuleof8STv8eCmIGH05KIUpXfVUoD0E=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FAventure01_background.png">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>uVdgx+2km5hdx3T3JYTz+hNSxxd4gTcgmEin2og8uYI=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FDay_nite_edit2.psd">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>ufmhTlFhFS4oze07/CUvaddgNNN+yZZWRz2QJWiNcs4=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FDaynight%20layer.png">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FLocation.gif">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FMoments.psd">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>s+2KYYryQtvLtoVmfKvejfShBtP3yu3IZ97dXjygOCI=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FMoments_EB.psd">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>1jY2+/cMyWCUVl+nc5NpTIGfSipno5hhEzJgB+dz8BU=</DigestValue>
-</Reference>
 <Reference URI="res%2Fimages%2Fadd.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=</DigestValue>
@@ -210,10 +210,6 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fbg.jpg">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=</DigestValue>
-</Reference>
 <Reference URI="res%2Fimages%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
@@ -344,7 +340,7 @@
 </Reference>
 <Reference URI="shared%2Fres%2Fadventure.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs=</DigestValue>
+<DigestValue>iF8SZahyLw7IqsH3SgtZ9umag2CVi5Kk0ie4yoUr9t0=</DigestValue>
 </Reference>
 <Reference URI="tizen-manifest.xml">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -359,11 +355,11 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-gnMEgPULHJ78ocnyS0RBiFrOd6z3sJtTNmPbOCFL2JeExIcbZtLBPQ0D6y1dqcGvl6UZgD42XDuF
-BJG9kRSSLhWyZN4/NS+8vheNfRsDe+rRaD9BVpgfNS2i0b2LMqynD7vyDmy6PHzXAfZvdcrHoZyB
-Q4y2FJp30pHucS67xa2aIL6MdNGACTXRgsoHtIQfqsw/aVU/r1YhxlHTKB3/1iJpWbaIUinS5PWl
-sD88CUd3PFRVVqbch+DFGWwHLJ880hBKGMiPqcIcajJQBvAu9phuPTEy6QpU44peSApicyrMMjy6
-1AJOHZ+0WT4gOa6tqyyZHkWQTIAANRegWnBkLw==
+kni2MoPv7PFgWCh7qFycXiox94PrRHAoRUXCO2PQZURdSy/Ujppje25sAF+0uIRb8cAjTBplQCsI
+GUP/gxG8CCEFqmOUcDgCa0UZERUo5ueY1Fjw5kifrBsmq/Vsjukpwk8tZynX+bf6h6B/Xrkp16pI
+SyfZ9yko1imY4S7RCtC2p2ZQnjf7WnHMEH8zuZK63WLKac2E+FR9Ef62VzhvPr7F1u5hVnNMSKPv
+/9MTov8DNYU5yLI96CZGodWUx+xBx7PxOSbarFcz+Fb0vV9xiO2h3lbPTMB2/exEZstyeABxocSi
+S0NOIwo8K8FisAJwcXXdPV8wlMvmwAo9KOc5EQ==
 </SignatureValue>
 <KeyInfo>
 <X509Data>
diff --git a/.sign/signature1.xml b/.sign/signature1.xml
index 59dfec3..58a19c3 100644
--- a/.sign/signature1.xml
+++ b/.sign/signature1.xml
@@ -4,11 +4,11 @@
 <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
 <Reference URI="author-signature.xml">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>u54airQkCAE+ll56lr6Qc2oC3g00R4Xeb+BFhuZbASM=</DigestValue>
+<DigestValue>BTI+Obi8GtziCVvRkieiQZFUEuWr89kp29N3Iw8tQfY=</DigestValue>
 </Reference>
 <Reference URI="bin%2Fadventure">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>iaPgUHBbzMLOZMGH8E8Lu+4Rq4ecW1RqaoAUEBK3pKU=</DigestValue>
+<DigestValue>hjrZ9hKxN//TFpt2IuVJsjyTs6C3faZ5+KgAysqrZbY=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -22,113 +22,145 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>rVp9xRys8q23H4SAGSY0fU6qD7QKrQWXbtC0zAaWo5Q=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F1.png">
+<Reference URI="res%2Fedje%2Fimages%2Fadd.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>oP1soFdNokYu42XfoWKq0uYAP9o6PGUCGdnxQYErGdQ=</DigestValue>
+<DigestValue>R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F10.png">
+<Reference URI="res%2Fedje%2Fimages%2Fadd_btn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>gebvW4D13j2AGUPkJInqNpANPhlECcq5EkIty5Coxhk=</DigestValue>
+<DigestValue>naQj2XAiAb8UgXrZ2fDkhrs8G1cyx8i1AsAT5HbbP5Q=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F11.png">
+<Reference URI="res%2Fedje%2Fimages%2Fadd_button.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>DL48rNIwpgkN9kmnaZrCRBEZ8eb4O7bs1cojj5TmA5E=</DigestValue>
+<DigestValue>qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F12.png">
+<Reference URI="res%2Fedje%2Fimages%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>RAVm0olQtSMEFJfbmOU8yv6q1CGQXIedfx1y57092zc=</DigestValue>
+<DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F13.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity0.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>TA5JVYM0MSNqWRCFGJ0+zMMCBQYsRvedVFdCmZiFjXg=</DigestValue>
+<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F14.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity01.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>vCnLiA/mpyqe8596UcSpjgsYQ3C+UlrHcQMhfBVMIhw=</DigestValue>
+<DigestValue>UoH8TFJrnH1ihgulgKa7Rtih9QrrI6yYpooMF9Scf1o=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F15.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>XYAcewRG6NI38KJwDhG/NgJ3yjfabDiDtfbhTfqhB4k=</DigestValue>
+<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F16.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity11.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>AlelvBWD4ZFZXe9Q3lsKtK6pmvKESQ5TkZP+ga0eeN0=</DigestValue>
+<DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F17.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity2.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>hokt4oVMK5qPReLBCMCFrVE5NoaFb6GCHpUI0ZV9R/g=</DigestValue>
+<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F18.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcity21.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>KIpwvMfEF1pHOYESYdnUOlw8Nc3woIzfC+whrq9NMZQ=</DigestValue>
+<DigestValue>Jb0t6SthHz3ThXJ9TqIoEWYL0wRq0Ng3hZmh42mue5U=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F19.png">
+<Reference URI="res%2Fedje%2Fimages%2Fcurser.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>k7gT1/mVjZHlo2JwM0d/KPgMcf+VRwlD3Q1LynEGKA4=</DigestValue>
+<DigestValue>k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F2.png">
+<Reference URI="res%2Fedje%2Fimages%2Fdelete_button.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>+SysDKJdRJ3bhcrSWP30GynSNoMzsspjt+D+4+r4dW0=</DigestValue>
+<DigestValue>M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F20.png">
+<Reference URI="res%2Fedje%2Fimages%2Ffloting_next_button.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>mvjNLwT/oRGXfplP4fxEUt2l9nh6f6hL/2u/Jz/xmOY=</DigestValue>
+<DigestValue>Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F21.png">
+<Reference URI="res%2Fedje%2Fimages%2Fline.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Z1JNCPYTwq8GRqmXtx959Hh8anEayyovGQ200Fn8Agg=</DigestValue>
+<DigestValue>mC2lw0XczhZ41ZKBKt5ft3YcObs+IGDudh0xfkOJwQE=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F22.png">
+<Reference URI="res%2Fedje%2Fimages%2Fmap_background.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>+g3GEodV8HrC3ZfwqEvJ4CDz53HlwLGon9U72Rg7MQc=</DigestValue>
+<DigestValue>fidI2puLNy+2OtfFScQOt4BhzflQJ2EU87bersaQZPM=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F23.png">
+<Reference URI="res%2Fedje%2Fimages%2Fmy%20status.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Qf05o+2j4UWBa76D278XRLqMPvXoeEjGLep0UAjyIwI=</DigestValue>
+<DigestValue>chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F24.png">
+<Reference URI="res%2Fedje%2Fimages%2Fmy_status_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>ZnGdo5P2tif/pojgdJkxnmYtX1/cP34MxsizZk/3jY0=</DigestValue>
+<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F25.png">
+<Reference URI="res%2Fedje%2Fimages%2Fnext.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>hYfdJzPNNP6Aq2QjozrNo6Vn6gvWiLM/o4pGm17Oqhs=</DigestValue>
+<DigestValue>1ed1D6snn2+5ecoSrgKk1FMNias5F2nwOVeMe9u1+Yo=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F26.png">
+<Reference URI="res%2Fedje%2Fimages%2Fnext2.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>TFKIiB9BKPb0bOW4bj4K9+aspUY5FjT1jnyJ1XKqdWc=</DigestValue>
+<DigestValue>8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F27.png">
+<Reference URI="res%2Fedje%2Fimages%2Fnext_btn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>YGc3K5MLVPZuH7RzDH72tvur0au03N3uExXAOVvKGuM=</DigestValue>
+<DigestValue>8KE9LfXoeS2pdIAbZs7i3LgxsSrRYpF7S8z1aZ0K5y0=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F3.png">
+<Reference URI="res%2Fedje%2Fimages%2Forange%20small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>2EbX8jW86mI535so/O/NXZ23up9EjBr9nuL554zr1hE=</DigestValue>
+<DigestValue>d7kGDG+axVAtUu/MBVv2dnGOxj0NdzrOwYXTVs3Hg0E=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F4.png">
+<Reference URI="res%2Fedje%2Fimages%2Forange.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>jzDV6J8ergh5adaC6t5sK4AEvtOohPQRV6ZMyronTxA=</DigestValue>
+<DigestValue>lHWZWFaSDaidvlHG48/Ik7M6FmXdqlTjiR/YJoSukPY=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F5.png">
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>nrqnkWFhkuO+H3CjDr3rRbT0M0aNh0L7rMlB+GwHlcA=</DigestValue>
+<DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F6.png">
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>iBo2/4T/QR9a5FofEIk9hS3Hp97ykD+WTm0Pfozmjjg=</DigestValue>
+<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F7.png">
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>u4g6O6zDBudC4OqOdE+cMlKH4uWwwP/HGJQEpHxmlUQ=</DigestValue>
+<DigestValue>OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F8.png">
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>RgMDfNjCBIBETo6gIEN0OaYE87qk4ObJtPjq73bwUGs=</DigestValue>
+<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
 </Reference>
-<Reference URI="res%2Fedje%2Fimages%2F9.png">
+<Reference URI="res%2Fedje%2Fimages%2Fpink%20small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>P4P/gIdawOqNuqjOxo4gfI/FCX+EQOIyIOmwajkVSR0=</DigestValue>
+<DigestValue>Zdqcs/dH98DcHRF+rhHeK1jXnUHJHKOCaxLjhIAt0Ss=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fpink.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>VtlsIEdXSmIhWn3X08lMCEWy2p2nIX0ZTrd7X1YesDQ=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fsearching%20list.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fsearching_X.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fsearching_bar.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fsearching_list.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fsearchlist.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</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>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2F%ED%95%98%EB%8B%A8%20%EB%B2%84%ED%8A%BC.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>V8qiFz8nOWFWaG7CLYiPSBBuFMWQj9Ox4vrR6guq+io=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fitem.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -170,38 +202,6 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2FAventure01.1.png">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>qFNE1M/3y3JLsRmH6olzSOwfJ0aSmpNYG2g4MAfVKEM=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FAventure01.png">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>q1aFoIjA48lzFuleof8STv8eCmIGH05KIUpXfVUoD0E=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FAventure01_background.png">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>uVdgx+2km5hdx3T3JYTz+hNSxxd4gTcgmEin2og8uYI=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FDay_nite_edit2.psd">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>ufmhTlFhFS4oze07/CUvaddgNNN+yZZWRz2QJWiNcs4=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FDaynight%20layer.png">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>vh7h76j65ObzcCyGvv3ovEU/8ukFaIWkUCGKwL5iKCs=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FLocation.gif">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FMoments.psd">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>s+2KYYryQtvLtoVmfKvejfShBtP3yu3IZ97dXjygOCI=</DigestValue>
-</Reference>
-<Reference URI="res%2Fimages%2FMoments_EB.psd">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>1jY2+/cMyWCUVl+nc5NpTIGfSipno5hhEzJgB+dz8BU=</DigestValue>
-</Reference>
 <Reference URI="res%2Fimages%2Fadd.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>R1TlAhW4ueQKSFNIEcR0uQUGCCveEPUr7STYsJ820I8=</DigestValue>
@@ -214,10 +214,6 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fbg.jpg">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=</DigestValue>
-</Reference>
 <Reference URI="res%2Fimages%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
@@ -348,7 +344,7 @@
 </Reference>
 <Reference URI="shared%2Fres%2Fadventure.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs=</DigestValue>
+<DigestValue>iF8SZahyLw7IqsH3SgtZ9umag2CVi5Kk0ie4yoUr9t0=</DigestValue>
 </Reference>
 <Reference URI="tizen-manifest.xml">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -363,11 +359,11 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-asjRSTpsuY8SFi/kjyc1TlDx4sh3jxl1yh9QdiwwUOJU0+Oq2RTJSeqaOjc0TjeWnkKCl3LGRdFF
-d+PNysmgKMcangDUpfpAdJTCjbdBz7LDeyupnBwPaZfU+iYib/CXowSI5YQaXqEX+CnL1sveGF70
-72uhu0bAcRPTzkxqJ9qPszJVsAzQpn8HWFKe3eBn01ZQgjWiiHlGxTuzvXbzx6ejDyXSCuITo/nV
-zR+dvJcklzHuFUAUWxDB3v43ZYH7eOwaoywf6Q4YdmbP/uiZW4g+dL6WlMAERikN7xr7Ed9jLK6J
-c2stHW+BcuTeSwz074mHhpR0fIkrDk1iI54yZg==
+F+xuy38D9bn8Sh8Q/R8YrGtO9anvpDCGt9m0RbRxW/BpakPIuJV93j2uT7v+sgndokxphU/v/8Z4
+ezh5gYu36AAN8DoWunynkDym7N4ujbIQ/W259pb31w6iNW5i5mnw9nHUrGxBhDAgETFvqqBfrAiB
+TLojJkoZ/moNScowJxWzHCUgchKAn67h36WM2gvyNZW7q81mqI7/9y+/teb05mJms90FiuJgMI1E
+vAZTVZxYzlwk53VEjAvmFHuI5q37+fKb7mFPOY1OvkcmPTPKuteJysTKv4lyl0DSirOxSZMP2Cys
+MoXpY/9o0GN0/w3KwEWixdyDpNI/d9Ue41LWdA==
 </SignatureValue>
 <KeyInfo>
 <X509Data>
diff --git a/inc/main_view.h b/inc/main_view.h
index f1d5338..67a4003 100644
--- a/inc/main_view.h
+++ b/inc/main_view.h
@@ -6,13 +6,13 @@
 
 struct _main_view_s {
 	Evas_Object *main_view;
-	Evas_Object *entry;
-	Evas_Object *result_button;
-	Evas_Object *selected_scroller;
-	Evas_Object *plus_button;
+	Evas_Object *searchbar;
+	Evas_Object *next_btn;
+	Evas_Object *city_list;
+	Evas_Object *add_btn;
 
-	Evas_Object *predict_scroller;
-	Evas_Object *result_scroller;
+	Evas_Object *searchlist;
+	Evas_Object *result_list;
 	Evas_Object *group_scroller;
 	moment_info_s *moment_info;
 };
diff --git a/res/edje/images/1.png b/res/edje/images/1.png
deleted file mode 100755
index 2a26113..0000000
--- a/res/edje/images/1.png
+++ /dev/null
diff --git a/res/edje/images/10.png b/res/edje/images/10.png
deleted file mode 100755
index 317f135..0000000
--- a/res/edje/images/10.png
+++ /dev/null
diff --git a/res/edje/images/11.png b/res/edje/images/11.png
deleted file mode 100755
index 350f8dd..0000000
--- a/res/edje/images/11.png
+++ /dev/null
diff --git a/res/edje/images/12.png b/res/edje/images/12.png
deleted file mode 100755
index ef39993..0000000
--- a/res/edje/images/12.png
+++ /dev/null
diff --git a/res/edje/images/13.png b/res/edje/images/13.png
deleted file mode 100755
index ccfb5b0..0000000
--- a/res/edje/images/13.png
+++ /dev/null
diff --git a/res/edje/images/14.png b/res/edje/images/14.png
deleted file mode 100755
index ef0320a..0000000
--- a/res/edje/images/14.png
+++ /dev/null
diff --git a/res/edje/images/15.png b/res/edje/images/15.png
deleted file mode 100755
index df9b0f4..0000000
--- a/res/edje/images/15.png
+++ /dev/null
diff --git a/res/edje/images/16.png b/res/edje/images/16.png
deleted file mode 100755
index 14cb22d..0000000
--- a/res/edje/images/16.png
+++ /dev/null
diff --git a/res/edje/images/17.png b/res/edje/images/17.png
deleted file mode 100755
index 205eae7..0000000
--- a/res/edje/images/17.png
+++ /dev/null
diff --git a/res/edje/images/18.png b/res/edje/images/18.png
deleted file mode 100755
index 46be1b0..0000000
--- a/res/edje/images/18.png
+++ /dev/null
diff --git a/res/edje/images/19.png b/res/edje/images/19.png
deleted file mode 100755
index ce7738b..0000000
--- a/res/edje/images/19.png
+++ /dev/null
diff --git a/res/edje/images/2.png b/res/edje/images/2.png
deleted file mode 100755
index a480bbd..0000000
--- a/res/edje/images/2.png
+++ /dev/null
diff --git a/res/edje/images/20.png b/res/edje/images/20.png
deleted file mode 100755
index cef266d..0000000
--- a/res/edje/images/20.png
+++ /dev/null
diff --git a/res/edje/images/21.png b/res/edje/images/21.png
deleted file mode 100755
index 8fc79a8..0000000
--- a/res/edje/images/21.png
+++ /dev/null
diff --git a/res/edje/images/22.png b/res/edje/images/22.png
deleted file mode 100755
index 99b0de5..0000000
--- a/res/edje/images/22.png
+++ /dev/null
diff --git a/res/edje/images/23.png b/res/edje/images/23.png
deleted file mode 100755
index e0a35ce..0000000
--- a/res/edje/images/23.png
+++ /dev/null
diff --git a/res/edje/images/24.png b/res/edje/images/24.png
deleted file mode 100755
index 8a33372..0000000
--- a/res/edje/images/24.png
+++ /dev/null
diff --git a/res/edje/images/25.png b/res/edje/images/25.png
deleted file mode 100755
index 8531df6..0000000
--- a/res/edje/images/25.png
+++ /dev/null
diff --git a/res/edje/images/26.png b/res/edje/images/26.png
deleted file mode 100755
index 8cad05f..0000000
--- a/res/edje/images/26.png
+++ /dev/null
diff --git a/res/edje/images/27.png b/res/edje/images/27.png
deleted file mode 100755
index 856a217..0000000
--- a/res/edje/images/27.png
+++ /dev/null
diff --git a/res/edje/images/3.png b/res/edje/images/3.png
deleted file mode 100755
index a946f85..0000000
--- a/res/edje/images/3.png
+++ /dev/null
diff --git a/res/edje/images/4.png b/res/edje/images/4.png
deleted file mode 100755
index 73d7785..0000000
--- a/res/edje/images/4.png
+++ /dev/null
diff --git a/res/edje/images/5.png b/res/edje/images/5.png
deleted file mode 100755
index a99ad7c..0000000
--- a/res/edje/images/5.png
+++ /dev/null
diff --git a/res/edje/images/6.png b/res/edje/images/6.png
deleted file mode 100755
index 8dbcba5..0000000
--- a/res/edje/images/6.png
+++ /dev/null
diff --git a/res/edje/images/7.png b/res/edje/images/7.png
deleted file mode 100755
index 1f2645a..0000000
--- a/res/edje/images/7.png
+++ /dev/null
diff --git a/res/edje/images/8.png b/res/edje/images/8.png
deleted file mode 100755
index 332b24d..0000000
--- a/res/edje/images/8.png
+++ /dev/null
diff --git a/res/edje/images/9.png b/res/edje/images/9.png
deleted file mode 100755
index 3d6c25c..0000000
--- a/res/edje/images/9.png
+++ /dev/null
diff --git a/res/edje/images/add.png b/res/edje/images/add.png
new file mode 100644
index 0000000..8a31f19
--- /dev/null
+++ b/res/edje/images/add.png
diff --git a/res/edje/images/add_btn.png b/res/edje/images/add_btn.png
new file mode 100644
index 0000000..8cbec44
--- /dev/null
+++ b/res/edje/images/add_btn.png
diff --git a/res/edje/images/add_button.png b/res/edje/images/add_button.png
new file mode 100644
index 0000000..6685578
--- /dev/null
+++ b/res/edje/images/add_button.png
diff --git a/res/edje/images/btn.png b/res/edje/images/btn.png
new file mode 100644
index 0000000..1cb7440
--- /dev/null
+++ b/res/edje/images/btn.png
diff --git a/res/edje/images/city0.png b/res/edje/images/city0.png
new file mode 100644
index 0000000..b70f2c3
--- /dev/null
+++ b/res/edje/images/city0.png
diff --git a/res/edje/images/city01.png b/res/edje/images/city01.png
new file mode 100644
index 0000000..ee8bfa7
--- /dev/null
+++ b/res/edje/images/city01.png
diff --git a/res/edje/images/city1.png b/res/edje/images/city1.png
new file mode 100644
index 0000000..cb5e3bc
--- /dev/null
+++ b/res/edje/images/city1.png
diff --git a/res/edje/images/city11.png b/res/edje/images/city11.png
new file mode 100644
index 0000000..025770a
--- /dev/null
+++ b/res/edje/images/city11.png
diff --git a/res/edje/images/city2.png b/res/edje/images/city2.png
new file mode 100644
index 0000000..404c3d8
--- /dev/null
+++ b/res/edje/images/city2.png
diff --git a/res/edje/images/city21.png b/res/edje/images/city21.png
new file mode 100644
index 0000000..025770a
--- /dev/null
+++ b/res/edje/images/city21.png
diff --git a/res/edje/images/curser.png b/res/edje/images/curser.png
new file mode 100644
index 0000000..f96d6ab
--- /dev/null
+++ b/res/edje/images/curser.png
diff --git a/res/edje/images/delete_button.png b/res/edje/images/delete_button.png
new file mode 100644
index 0000000..d72b7d3
--- /dev/null
+++ b/res/edje/images/delete_button.png
diff --git a/res/edje/images/floting_next_button.png b/res/edje/images/floting_next_button.png
new file mode 100644
index 0000000..d6ef24a
--- /dev/null
+++ b/res/edje/images/floting_next_button.png
diff --git a/res/edje/images/line.png b/res/edje/images/line.png
new file mode 100644
index 0000000..41e3d1e
--- /dev/null
+++ b/res/edje/images/line.png
diff --git a/res/edje/images/map_background.png b/res/edje/images/map_background.png
new file mode 100644
index 0000000..572d7dd
--- /dev/null
+++ b/res/edje/images/map_background.png
diff --git a/res/edje/images/my status.png b/res/edje/images/my status.png
new file mode 100644
index 0000000..a0d31ab
--- /dev/null
+++ b/res/edje/images/my status.png
diff --git a/res/edje/images/my_status_small.png b/res/edje/images/my_status_small.png
new file mode 100644
index 0000000..b70f2c3
--- /dev/null
+++ b/res/edje/images/my_status_small.png
diff --git a/res/edje/images/next.png b/res/edje/images/next.png
new file mode 100644
index 0000000..fcdba0c
--- /dev/null
+++ b/res/edje/images/next.png
diff --git a/res/edje/images/next2.png b/res/edje/images/next2.png
new file mode 100644
index 0000000..4c8f687
--- /dev/null
+++ b/res/edje/images/next2.png
diff --git a/res/edje/images/next_btn.png b/res/edje/images/next_btn.png
new file mode 100644
index 0000000..4c8f687
--- /dev/null
+++ b/res/edje/images/next_btn.png
diff --git a/res/edje/images/orange small.png b/res/edje/images/orange small.png
new file mode 100644
index 0000000..241a680
--- /dev/null
+++ b/res/edje/images/orange small.png
diff --git a/res/edje/images/orange.png b/res/edje/images/orange.png
new file mode 100644
index 0000000..251b230
--- /dev/null
+++ b/res/edje/images/orange.png
diff --git a/res/edje/images/other_location_blue.png b/res/edje/images/other_location_blue.png
new file mode 100644
index 0000000..f5a2db5
--- /dev/null
+++ b/res/edje/images/other_location_blue.png
diff --git a/res/edje/images/other_location_blue_small.png b/res/edje/images/other_location_blue_small.png
new file mode 100644
index 0000000..cb5e3bc
--- /dev/null
+++ b/res/edje/images/other_location_blue_small.png
diff --git a/res/edje/images/other_location_mint.png b/res/edje/images/other_location_mint.png
new file mode 100644
index 0000000..372eec3
--- /dev/null
+++ b/res/edje/images/other_location_mint.png
diff --git a/res/edje/images/other_location_mint_small.png b/res/edje/images/other_location_mint_small.png
new file mode 100644
index 0000000..404c3d8
--- /dev/null
+++ b/res/edje/images/other_location_mint_small.png
diff --git a/res/edje/images/pink small.png b/res/edje/images/pink small.png
new file mode 100644
index 0000000..9ef57b2
--- /dev/null
+++ b/res/edje/images/pink small.png
diff --git a/res/edje/images/pink.png b/res/edje/images/pink.png
new file mode 100644
index 0000000..f0eb889
--- /dev/null
+++ b/res/edje/images/pink.png
diff --git a/res/edje/images/searching list.png b/res/edje/images/searching list.png
new file mode 100644
index 0000000..bf751b8
--- /dev/null
+++ b/res/edje/images/searching list.png
diff --git a/res/edje/images/searching_X.png b/res/edje/images/searching_X.png
new file mode 100644
index 0000000..27228c7
--- /dev/null
+++ b/res/edje/images/searching_X.png
diff --git a/res/edje/images/searching_bar.png b/res/edje/images/searching_bar.png
new file mode 100644
index 0000000..8eb1017
--- /dev/null
+++ b/res/edje/images/searching_bar.png
diff --git a/res/edje/images/searching_list.png b/res/edje/images/searching_list.png
new file mode 100644
index 0000000..bf751b8
--- /dev/null
+++ b/res/edje/images/searching_list.png
diff --git a/res/edje/images/searchlist.png b/res/edje/images/searchlist.png
new file mode 100644
index 0000000..bf751b8
--- /dev/null
+++ b/res/edje/images/searchlist.png
diff --git a/res/edje/images/world_map.png b/res/edje/images/world_map.png
new file mode 100644
index 0000000..3f50872
--- /dev/null
+++ b/res/edje/images/world_map.png
diff --git a/res/edje/images/하단 버튼.png b/res/edje/images/하단 버튼.png
new file mode 100644
index 0000000..51d8fa5
--- /dev/null
+++ b/res/edje/images/하단 버튼.png
diff --git a/res/images/Aventure01.1.png b/res/images/Aventure01.1.png
deleted file mode 100755
index e1b4687..0000000
--- a/res/images/Aventure01.1.png
+++ /dev/null
diff --git a/res/images/Aventure01.png b/res/images/Aventure01.png
deleted file mode 100755
index 7324f9f..0000000
--- a/res/images/Aventure01.png
+++ /dev/null
diff --git a/res/images/Aventure01_background.png b/res/images/Aventure01_background.png
deleted file mode 100755
index 4543125..0000000
--- a/res/images/Aventure01_background.png
+++ /dev/null
diff --git a/res/images/Day_nite_edit2.psd b/res/images/Day_nite_edit2.psd
deleted file mode 100755
index 7dd4d5a..0000000
--- a/res/images/Day_nite_edit2.psd
+++ /dev/null
diff --git a/res/images/Daynight layer.png b/res/images/Daynight layer.png
deleted file mode 100755
index 394033c..0000000
--- a/res/images/Daynight layer.png
+++ /dev/null
diff --git a/res/images/Location.gif b/res/images/Location.gif
deleted file mode 100755
index 19df4ca..0000000
--- a/res/images/Location.gif
+++ /dev/null
diff --git a/res/images/Moments.psd b/res/images/Moments.psd
deleted file mode 100755
index 21c74e7..0000000
--- a/res/images/Moments.psd
+++ /dev/null
diff --git a/res/images/Moments_EB.psd b/res/images/Moments_EB.psd
deleted file mode 100755
index 69d1756..0000000
--- a/res/images/Moments_EB.psd
+++ /dev/null
diff --git a/res/images/bg.jpg b/res/images/bg.jpg
deleted file mode 100755
index a5d0169..0000000
--- a/res/images/bg.jpg
+++ /dev/null
diff --git a/src/item.c b/src/item.c
index 0cb8908..8463a04 100644
--- a/src/item.c
+++ b/src/item.c
@@ -71,11 +71,14 @@ static void _item_typing_up_cb(void *data, Evas_Object *obj, const char *emissio
 
 	ret_if(!item);
 	ret_if(!main_view_info);
-	ret_if(!main_view_info->selected_scroller);
+	ret_if(!main_view_info->city_list);
 
 	_D("An item is selected");
 
-	count = scroller_count_item(main_view_info->selected_scroller);
+	if (scroller_is_scrolling(main_view_info->searchlist))
+		return;
+
+	count = scroller_count_item(main_view_info->city_list);
 	if (count >= MAXIMUM_SELECTED_CITY) {
 		Evas_Object *popup = NULL;
 		_D("Cities selected are limited.");
@@ -94,10 +97,10 @@ 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->selected_scroller, city, 0);
+	selecting_item = item_create_selecting(main_view_info->city_list, city, 0);
 	ret_if(!selecting_item);
 
-	scroller_append_item(main_view_info->selected_scroller, selecting_item);
+	scroller_append_item(main_view_info->city_list, selecting_item);
 }
 
 Evas_Object *item_create_typing(Evas_Object *parent, int city, main_view_s *main_view_info)
@@ -161,17 +164,18 @@ static void _item_selecting_del_cb(void *data, Evas *e, Evas_Object *obj, void *
 	item_destroy_selecting(obj);
 }
 
-static void _delete_down_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+static void _item_selecting_delete_down_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
 	_D("Delete button is down");
 }
 
-static void _delete_up_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+static void _item_selecting_delete_up_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
 	Evas_Object *item= obj;
-
 	ret_if(!item);
 
+	_D("Delete button is up");
+
 	item_destroy_selecting(item);
 }
 
@@ -208,8 +212,8 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color)
 	evas_object_size_hint_align_set(item, EVAS_HINT_FILL, EVAS_HINT_FILL);
 	evas_object_data_set(item, DATA_KEY_SELECTING, selecting_info);
 	evas_object_event_callback_add(item, EVAS_CALLBACK_DEL, _item_selecting_del_cb, NULL);
-	elm_object_signal_callback_add(item, "delete,down", "item", _delete_down_cb, NULL);
-	elm_object_signal_callback_add(item, "delete,up", "item", _delete_up_cb, NULL);
+	elm_object_signal_callback_add(item, "delete,down", "item", _item_selecting_delete_down_cb, NULL);
+	elm_object_signal_callback_add(item, "delete,up", "item", _item_selecting_delete_up_cb, NULL);
 	evas_object_show(item);
 
 	city_info = city_get();
@@ -245,8 +249,8 @@ void item_destroy_selecting(Evas_Object *item)
 	free(selecting_info);
 
 	evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, _item_selecting_del_cb);
-	elm_object_signal_callback_del(item, "delete,down", "item", _delete_down_cb);
-	elm_object_signal_callback_del(item, "delete,up", "item", _delete_up_cb);
+	elm_object_signal_callback_del(item, "delete,down", "item", _item_selecting_delete_down_cb);
+	elm_object_signal_callback_del(item, "delete,up", "item", _item_selecting_delete_up_cb);
 
 	evas_object_del(item);
 }
@@ -395,8 +399,6 @@ void item_destroy_result(Evas_Object *item)
 	ret_if(!item);
 
 	evas_object_event_callback_del(item, EVAS_CALLBACK_DEL, _item_result_del_cb);
-	elm_object_signal_callback_del(item, "delete,down", "item", _delete_down_cb);
-	elm_object_signal_callback_del(item, "delete,up", "item", _delete_up_cb);
 
 	result_info = evas_object_data_del(item, DATA_KEY_RESULT);
 	if (result_info) {
@@ -430,11 +432,11 @@ static void _item_group_up_cb(void *data, Evas_Object *obj, const char *emission
 
 	ret_if(!item);
 	ret_if(!main_view_info);
-	ret_if(!main_view_info->selected_scroller);
+	ret_if(!main_view_info->city_list);
 
 	_D("An item is selected");
 
-	count = scroller_count_item(main_view_info->selected_scroller);
+	count = scroller_count_item(main_view_info->city_list);
 	if (count >= MAXIMUM_SELECTED_CITY) {
 		Evas_Object *popup = NULL;
 		_D("Cities selected are limited.");
@@ -444,10 +446,10 @@ 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->selected_scroller, city, 0);
+	selecting_item = item_create_selecting(main_view_info->city_list, city, 0);
 	ret_if(!selecting_item);
 
-	scroller_append_item(main_view_info->selected_scroller, selecting_item);
+	scroller_append_item(main_view_info->city_list, selecting_item);
 }
 
 Evas_Object *item_create_group(Evas_Object *parent, const char *title, main_view_s *main_view_info)
diff --git a/src/main_view.c b/src/main_view.c
index 2ebe107..a1cde8f 100644
--- a/src/main_view.c
+++ b/src/main_view.c
@@ -18,41 +18,41 @@ 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 void _append_item_to_predict_scroller(Evas_Object *predict_scroller, Evas_Object *item)
+static void _append_item_to_searchlist(Evas_Object *searchlist, Evas_Object *item)
 {
 	Evas_Object *box = NULL;
 
-	ret_if(!predict_scroller);
+	ret_if(!searchlist);
 	ret_if(!item);
 
-	box = elm_object_content_get(predict_scroller);
+	box = elm_object_content_get(searchlist);
 	ret_if(!box);
 
 	elm_box_pack_end(box, item);
 }
 
-static void _remove_item_in_predict_scroller(Evas_Object *predict_scroller, Evas_Object *item)
+static void _remove_item_in_searchlist(Evas_Object *searchlist, Evas_Object *item)
 {
 	Evas_Object *box = NULL;
 
-	ret_if(!predict_scroller);
+	ret_if(!searchlist);
 	ret_if(!item);
 
-	box = elm_object_content_get(predict_scroller);
+	box = elm_object_content_get(searchlist);
 	ret_if(!box);
 
 	elm_box_unpack(box, item);
 }
 
-static void _clean_predict_scroller(Evas_Object *predict_scroller)
+static void _clean_searchlist(Evas_Object *searchlist)
 {
 	Evas_Object *box = NULL;
 	Evas_Object *predict_item = NULL;
 	Eina_List *list = NULL;
 
-	ret_if(!predict_scroller);
+	ret_if(!searchlist);
 
-	box = elm_object_content_get(predict_scroller);
+	box = elm_object_content_get(searchlist);
 	ret_if(!box);
 
 	list = elm_box_children_get(box);
@@ -63,14 +63,14 @@ static void _clean_predict_scroller(Evas_Object *predict_scroller)
 	}
 }
 
-static void _update_predict_scroller(Evas_Object *predict_scroller, const char *str, main_view_s *main_view_info)
+static void _update_searchlist(Evas_Object *searchlist, const char *str, main_view_s *main_view_info)
 {
 	city_s *city_info = NULL;
 	register int i = 0;
 
-	ret_if(!predict_scroller);
+	ret_if(!searchlist);
 
-	_clean_predict_scroller(predict_scroller);
+	_clean_searchlist(searchlist);
 
 	city_info = city_get();
 	ret_if(!city_info);
@@ -84,9 +84,9 @@ static void _update_predict_scroller(Evas_Object *predict_scroller, const char *
 
 		if (matched) {
 			Evas_Object *predict_item = NULL;
-			predict_item = item_create_typing(predict_scroller, i, main_view_info);
+			predict_item = item_create_typing(searchlist, i, main_view_info);
 			if (predict_item)
-				_append_item_to_predict_scroller(predict_scroller, predict_item);
+				_append_item_to_searchlist(searchlist, predict_item);
 		}
 	}
 	elm_object_signal_emit(main_view_info->main_view, "show", "entry_result");
@@ -105,12 +105,12 @@ static void _change_entry_cb(void *data, Evas_Object *obj, void *event_info)
 	str = elm_entry_entry_get(entry);
 	if (!str
 		|| (str && !strlen(str))) {
-		_clean_predict_scroller(main_view_info->predict_scroller);
+		_clean_searchlist(main_view_info->searchlist);
 		elm_object_signal_emit(main_view_info->main_view, "momentic,state,searchlist,hide", "");
 		return;
 	}
 
-	_update_predict_scroller(main_view_info->predict_scroller, str, main_view_info);
+	_update_searchlist(main_view_info->searchlist, str, main_view_info);
 	elm_object_signal_emit(main_view_info->main_view, "momentic,state,searchlist,show", "");
 }
 
@@ -128,7 +128,7 @@ static void _focus_entry_cb(void *data, Evas_Object *obj, void *event_info)
 	if (!str)
 		return;
 
-	_update_predict_scroller(main_view_info->predict_scroller, str, main_view_info);
+	_update_searchlist(main_view_info->searchlist, str, main_view_info);
 }
 
 static void _unfocus_entry_cb(void *data, Evas_Object *obj, void *event_info)
@@ -136,12 +136,12 @@ static void _unfocus_entry_cb(void *data, Evas_Object *obj, void *event_info)
 	main_view_s *main_view_info = data;
 
 	ret_if(!main_view_info);
-	ret_if(!main_view_info->predict_scroller);
+	ret_if(!main_view_info->searchlist);
 
 	_D("Entry is unfocused");
 
 	elm_object_signal_emit(main_view_info->main_view, "hide", "entry_result");
-	//_clean_predict_scroller(main_view_info->predict_scroller);
+	//_clean_searchlist(main_view_info->searchlist);
 }
 
 static void _resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
@@ -158,26 +158,26 @@ static void _delete_down_cb(void *data, Evas_Object *obj, const char *emission,
 
 static void _delete_up_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-	Evas_Object *entry = obj;
+	Evas_Object *searchbar = obj;
 	Evas_Object *entry_obj = NULL;
 	main_view_s *main_view_info = data;
 
-	ret_if(!entry);
+	ret_if(!searchbar);
 	ret_if(!main_view_info);
-	ret_if(!main_view_info->predict_scroller);
+	ret_if(!main_view_info->searchlist);
 
 	_D("Delete button is up");
 
-	entry_obj = elm_object_part_content_get(entry, "entry");
+	entry_obj = elm_object_part_content_get(searchbar, "entry");
 	if (entry_obj)
 		elm_entry_entry_set(entry_obj, "");
 
-	_clean_predict_scroller(main_view_info->predict_scroller);
+	_clean_searchlist(main_view_info->searchlist);
 }
 
-static Evas_Object *_create_search_entry(Evas_Object *parent, main_view_s *main_view_info)
+static Evas_Object *_create_searchbar(Evas_Object *parent, main_view_s *main_view_info)
 {
-	Evas_Object *entry = NULL;
+	Evas_Object *searchbar = NULL;
 	Evas_Object *entry_obj = NULL;
 
 	char *path = NULL;
@@ -191,16 +191,16 @@ static Evas_Object *_create_search_entry(Evas_Object *parent, main_view_s *main_
 	snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, ENTRY_EDJE);
 	free(path);
 
-	entry = elm_layout_add(parent);
-	retv_if(!entry, NULL);
+	searchbar = elm_layout_add(parent);
+	retv_if(!searchbar, NULL);
 
-	elm_layout_file_set(entry, full_path, "main");
-	elm_object_signal_callback_add(entry, "delete,down", "entry", _delete_down_cb, main_view_info);
-	elm_object_signal_callback_add(entry, "delete,up", "entry", _delete_up_cb, main_view_info);
+	elm_layout_file_set(searchbar, full_path, "main");
+	elm_object_signal_callback_add(searchbar, "delete,down", "entry", _delete_down_cb, main_view_info);
+	elm_object_signal_callback_add(searchbar, "delete,up", "entry", _delete_up_cb, main_view_info);
 
-	evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	evas_object_show(entry);
+	evas_object_size_hint_weight_set(searchbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(searchbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_show(searchbar);
 
 	entry_obj = elm_entry_add(parent);
 	retv_if(!entry_obj, NULL);
@@ -219,25 +219,25 @@ static Evas_Object *_create_search_entry(Evas_Object *parent, main_view_s *main_
 	evas_object_smart_callback_add(entry_obj, "unfocused", _unfocus_entry_cb, main_view_info);
 
 	evas_object_show(entry_obj);
-	elm_object_part_content_set(entry, "entry", entry_obj);
+	elm_object_part_content_set(searchbar, "entry", entry_obj);
 
-	return entry;
+	return searchbar;
 }
 
-static void _destroy_search_entry(Evas_Object *entry)
+static void _destroy_searchbar(Evas_Object *searchbar)
 {
 	Evas_Object *entry_obj = NULL;
 
-	ret_if(!entry);
+	ret_if(!searchbar);
 
-	entry_obj = elm_object_part_content_unset(entry, "entry");
+	entry_obj = elm_object_part_content_unset(searchbar, "entry");
 	if (entry_obj)
 		evas_object_del(entry_obj);
 
-	evas_object_del(entry);
+	evas_object_del(searchbar);
 }
 
-static void _click_result_button_cb(void *data, Evas_Object *obj, void *event_info)
+static void _click_next_btn_cb(void *data, Evas_Object *obj, void *event_info)
 {
 	main_view_s *main_view_info = data;
 	Evas_Object *box = NULL;
@@ -250,12 +250,12 @@ static void _click_result_button_cb(void *data, Evas_Object *obj, void *event_in
 	int cur_timezone = 0;
 
 	ret_if(!main_view_info);
-	ret_if(!main_view_info->selected_scroller);
-	ret_if(!main_view_info->result_scroller);
+	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_scroller);
+	scroller_clear_item(main_view_info->result_list);
 
 	city_info = city_get();
 	ret_if(!city_info);
@@ -266,7 +266,7 @@ static void _click_result_button_cb(void *data, Evas_Object *obj, void *event_in
 
 	cur_timezone = (int) local_time->tm_gmtoff / 3600;
 
-	box = elm_object_content_get(main_view_info->selected_scroller);
+	box = elm_object_content_get(main_view_info->city_list);
 	ret_if(!box);
 
 	list = elm_box_children_get(box);
@@ -288,22 +288,22 @@ static void _click_result_button_cb(void *data, Evas_Object *obj, void *event_in
 		start = tmp_timezone - cur_timezone + BEST_START_TIME;
 		end = (start + (BEST_END_TIME - BEST_START_TIME)) % 24;
 
-		item_result = item_create_result(main_view_info->result_scroller
+		item_result = item_create_result(main_view_info->result_list
 				, selecting_info->city
 				, selecting_info->color
 				, start
 				, end
 				, global_time);
 
-		scroller_append_item(main_view_info->result_scroller, item_result);
+		scroller_append_item(main_view_info->result_list, item_result);
 	}
 
 	elm_object_signal_emit(main_view_info->main_view, "momentic,state,page2", "");
 }
 
-static Evas_Object *_create_result_button(Evas_Object *parent, main_view_s *main_view_info)
+static Evas_Object *_create_next_btn(Evas_Object *parent, main_view_s *main_view_info)
 {
-	Evas_Object *result_button = NULL;
+	Evas_Object *next_btn = NULL;
 	Evas_Object *icon = NULL;
 	char *path = NULL;
 	char full_path[PATH_LEN] = {0, };
@@ -316,46 +316,47 @@ static Evas_Object *_create_result_button(Evas_Object *parent, main_view_s *main
 	snprintf(full_path, sizeof(full_path), "%s/images/next_btn.png", path);
 	free(path);
 
-	result_button = elm_button_add(parent);
-	retv_if(!result_button, NULL);
-	evas_object_smart_callback_add(result_button, "clicked", _click_result_button_cb, main_view_info);
+	next_btn = elm_button_add(parent);
+	retv_if(!next_btn, NULL);
+	elm_object_style_set(next_btn, "transparent");
+	evas_object_smart_callback_add(next_btn, "clicked", _click_next_btn_cb, main_view_info);
 
-	icon = elm_image_add(result_button);
+	icon = elm_image_add(next_btn);
 	if (icon) {
 		elm_image_file_set(icon, full_path, NULL);
-		elm_object_content_set(result_button, icon);
+		elm_object_content_set(next_btn, icon);
 	}
 
-	return result_button;
+	return next_btn;
 }
 
-static void _destroy_result_button(Evas_Object *result_button)
+static void _destroy_next_btn(Evas_Object *next_btn)
 {
-	ret_if(!result_button);
-	evas_object_del(result_button);
+	ret_if(!next_btn);
+	evas_object_del(next_btn);
 }
 
-static Evas_Object *_create_selected_scroller(Evas_Object *parent)
+static Evas_Object *_create_city_list(Evas_Object *parent)
 {
-	Evas_Object *selected_scroller = NULL;
+	Evas_Object *city_list = NULL;
 
 	retv_if(!parent, NULL);
 
-	selected_scroller = scroller_create(parent);
-	retv_if(!selected_scroller, NULL);
+	city_list = scroller_create(parent);
+	retv_if(!city_list, NULL);
 
-	return selected_scroller;
+	return city_list;
 }
 
-static void _destroy_selected_scroller(Evas_Object *selected_scroller)
+static void _destroy_city_list(Evas_Object *city_list)
 {
 	Evas_Object *box = NULL;
 	Evas_Object *item = NULL;
 	Eina_List *list = NULL;
 
-	ret_if(!selected_scroller);
+	ret_if(!city_list);
 
-	box = elm_object_content_get(selected_scroller);
+	box = elm_object_content_get(city_list);
 	ret_if(!box);
 
 	list = elm_box_children_get(box);
@@ -366,10 +367,10 @@ static void _destroy_selected_scroller(Evas_Object *selected_scroller)
 	}
 
 	evas_object_del(box);
-	evas_object_del(selected_scroller);
+	evas_object_del(city_list);
 }
 
-static void _click_plus_button_cb(void *data, Evas_Object *obj, void *event_info)
+static void _click_add_btn_cb(void *data, Evas_Object *obj, void *event_info)
 {
 	main_view_s *main_view_info = data;
 
@@ -382,9 +383,9 @@ static void _click_plus_button_cb(void *data, Evas_Object *obj, void *event_info
 
 }
 
-static Evas_Object *_create_plus_button(Evas_Object *parent, main_view_s *main_view_info)
+static Evas_Object *_create_add_btn(Evas_Object *parent, main_view_s *main_view_info)
 {
-	Evas_Object *plus_button = NULL;
+	Evas_Object *add_btn = NULL;
 	Evas_Object *icon = NULL;
 	char *path = NULL;
 	char full_path[PATH_LEN] = {0, };
@@ -397,24 +398,24 @@ static Evas_Object *_create_plus_button(Evas_Object *parent, main_view_s *main_v
 	snprintf(full_path, sizeof(full_path), "%s/images/add_btn.png", path);
 	free(path);
 
-	plus_button = elm_button_add(parent);
-	retv_if(!plus_button, NULL);
-	elm_object_style_set(plus_button, "transparent");
-	evas_object_smart_callback_add(plus_button, "clicked", _click_plus_button_cb, main_view_info);
+	add_btn = elm_button_add(parent);
+	retv_if(!add_btn, NULL);
+	elm_object_style_set(add_btn, "transparent");
+	evas_object_smart_callback_add(add_btn, "clicked", _click_add_btn_cb, main_view_info);
 
-	icon = elm_image_add(plus_button);
+	icon = elm_image_add(add_btn);
 	if (icon) {
 		elm_image_file_set(icon, full_path, NULL);
-		elm_object_content_set(plus_button, icon);
+		elm_object_content_set(add_btn, icon);
 	}
 
-	return plus_button;
+	return add_btn;
 }
 
-static void _destroy_plus_button(Evas_Object *plus_button)
+static void _destroy_add_btn(Evas_Object *add_btn)
 {
-	ret_if(!plus_button);
-	evas_object_del(plus_button);
+	ret_if(!add_btn);
+	evas_object_del(add_btn);
 }
 
 static void _click_save_button_cb(void *data, Evas_Object *obj, void *event_info)
@@ -432,9 +433,9 @@ static void _click_save_button_cb(void *data, Evas_Object *obj, void *event_info
 	_D("Save button is clicked");
 
 	ret_if(!main_view_info);
-	ret_if(!main_view_info->result_scroller);
+	ret_if(!main_view_info->result_list);
 
-	box = elm_object_content_get(main_view_info->result_scroller);
+	box = elm_object_content_get(main_view_info->result_list);
 	ret_if(!box);
 
 	list = elm_box_children_get(box);
@@ -490,27 +491,27 @@ static void _destroy_save_button(Evas_Object *save_button)
 	evas_object_del(save_button);
 }
 
-static Evas_Object *_create_predict_scroller(Evas_Object *parent)
+static Evas_Object *_create_searchlist(Evas_Object *parent)
 {
-	Evas_Object *predict_scroller = NULL;
+	Evas_Object *searchlist = NULL;
 
 	retv_if(!parent, NULL);
 
-	predict_scroller = scroller_create(parent);
-	retv_if(!predict_scroller, NULL);
+	searchlist = scroller_create(parent);
+	retv_if(!searchlist, NULL);
 
-	return predict_scroller;
+	return searchlist;
 }
 
-static void _destroy_predict_scroller(Evas_Object *predict_scroller)
+static void _destroy_searchlist(Evas_Object *searchlist)
 {
 	Evas_Object *box = NULL;
 	Evas_Object *item = NULL;
 	Eina_List *list = NULL;
 
-	ret_if(!predict_scroller);
+	ret_if(!searchlist);
 
-	box = elm_object_content_get(predict_scroller);
+	box = elm_object_content_get(searchlist);
 	ret_if(!box);
 
 	list = elm_box_children_get(box);
@@ -521,30 +522,30 @@ static void _destroy_predict_scroller(Evas_Object *predict_scroller)
 	}
 
 	evas_object_del(box);
-	evas_object_del(predict_scroller);
+	evas_object_del(searchlist);
 }
 
-static Evas_Object *_create_result_scroller(Evas_Object *parent)
+static Evas_Object *_create_result_list(Evas_Object *parent)
 {
-	Evas_Object *result_scroller = NULL;
+	Evas_Object *result_list = NULL;
 
 	retv_if(!parent, NULL);
 
-	result_scroller = scroller_create(parent);
-	retv_if(!result_scroller, NULL);
+	result_list = scroller_create(parent);
+	retv_if(!result_list, NULL);
 
-	return result_scroller;
+	return result_list;
 }
 
-static void _destroy_result_scroller(Evas_Object *result_scroller)
+static void _destroy_result_list(Evas_Object *result_list)
 {
 	Evas_Object *box = NULL;
 	Evas_Object *item = NULL;
 	Eina_List *list = NULL;
 
-	ret_if(!result_scroller);
+	ret_if(!result_list);
 
-	box = elm_object_content_get(result_scroller);
+	box = elm_object_content_get(result_list);
 	ret_if(!box);
 
 	list = elm_box_children_get(box);
@@ -555,7 +556,7 @@ static void _destroy_result_scroller(Evas_Object *result_scroller)
 	}
 
 	evas_object_del(box);
-	evas_object_del(result_scroller);
+	evas_object_del(result_list);
 }
 
 static Evas_Object *_create_group_scroller(Evas_Object *parent, Eina_List *list, main_view_s *main_view_info)
@@ -637,29 +638,29 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info)
 	elm_object_part_text_set(main_view_info->main_view, "title", "No cities");
 	elm_object_part_text_set(main_view_info->main_view, "description", "After you add cities, they will be shown here.");
 
-	main_view_info->entry = _create_search_entry(main_view_info->main_view, main_view_info);
-	if (main_view_info->entry)
-		elm_object_part_content_set(main_view_info->main_view, "searchbar", main_view_info->entry);
+	main_view_info->searchbar = _create_searchbar(main_view_info->main_view, main_view_info);
+	if (main_view_info->searchbar)
+		elm_object_part_content_set(main_view_info->main_view, "searchbar", main_view_info->searchbar);
 
-	main_view_info->result_button = _create_result_button(main_view_info->main_view, main_view_info);
-	if (main_view_info->result_button)
-		elm_object_part_content_set(main_view_info->main_view, "next_btn", main_view_info->result_button);
+	main_view_info->next_btn = _create_next_btn(main_view_info->main_view, main_view_info);
+	if (main_view_info->next_btn)
+		elm_object_part_content_set(main_view_info->main_view, "next_btn", main_view_info->next_btn);
 
-	main_view_info->selected_scroller = _create_selected_scroller(main_view_info->main_view);
-	if (main_view_info->selected_scroller)
-		elm_object_part_content_set(main_view_info->main_view, "city_list", main_view_info->selected_scroller);
+	main_view_info->city_list = _create_city_list(main_view_info->main_view);
+	if (main_view_info->city_list)
+		elm_object_part_content_set(main_view_info->main_view, "city_list", main_view_info->city_list);
 
-	main_view_info->plus_button = _create_plus_button(main_view_info->main_view, main_view_info);
-	if (main_view_info->plus_button)
-		elm_object_part_content_set(main_view_info->main_view, "add_btn", main_view_info->plus_button);
+	main_view_info->add_btn = _create_add_btn(main_view_info->main_view, main_view_info);
+	if (main_view_info->add_btn)
+		elm_object_part_content_set(main_view_info->main_view, "add_btn", main_view_info->add_btn);
 
-	main_view_info->predict_scroller = _create_predict_scroller(main_view_info->main_view);
-	if (main_view_info->predict_scroller)
-		elm_object_part_content_set(main_view_info->main_view, "searchlist", main_view_info->predict_scroller);
+	main_view_info->searchlist = _create_searchlist(main_view_info->main_view);
+	if (main_view_info->searchlist)
+		elm_object_part_content_set(main_view_info->main_view, "searchlist", main_view_info->searchlist);
 
-	main_view_info->result_scroller = _create_result_scroller(main_view_info->main_view);
-	if (main_view_info->result_scroller)
-		elm_object_part_content_set(main_view_info->main_view, "result_list", main_view_info->result_scroller);
+	main_view_info->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)
@@ -682,23 +683,23 @@ 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_scroller)
-		_destroy_result_scroller(main_view_info->result_scroller);
+	if (main_view_info->result_list)
+		_destroy_result_list(main_view_info->result_list);
 
-	if (main_view_info->predict_scroller)
-		_destroy_predict_scroller(main_view_info->predict_scroller);
+	if (main_view_info->searchlist)
+		_destroy_searchlist(main_view_info->searchlist);
 
-	if (main_view_info->plus_button)
-		_destroy_plus_button(main_view_info->plus_button);
+	if (main_view_info->add_btn)
+		_destroy_add_btn(main_view_info->add_btn);
 
-	if (main_view_info->selected_scroller)
-		_destroy_selected_scroller(main_view_info->selected_scroller);
+	if (main_view_info->city_list)
+		_destroy_city_list(main_view_info->city_list);
 
-	if (main_view_info->result_button)
-		_destroy_result_button(button);
+	if (main_view_info->next_btn)
+		_destroy_next_btn(button);
 
-	if (main_view_info->entry)
-		_destroy_search_entry(main_view_info->entry);
+	if (main_view_info->searchbar)
+		_destroy_searchbar(main_view_info->searchbar);
 
 	free(main_view_info);
 
diff --git a/src/scroller.c b/src/scroller.c
index ab0f6ec..1382b9d 100644
--- a/src/scroller.c
+++ b/src/scroller.c
@@ -5,7 +5,6 @@
 #include "scroller.h"
 
 #define PRIVATE_DATA_KEY_SCROLLER_IS_SCROLLING "p_is_sc"
-#define PRIVATE_DATA_KEY_SCROLLER_DRAG_START "p_dg_st"
 #define PRIVATE_DATA_KEY_EVENT_CALLBACK_LIST "pdkec"
 
 
@@ -27,6 +26,17 @@ int scroller_is_scrolling(Evas_Object *scroller)
 
 
 
+static void __scroller_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+	Evas_Object *scroller = obj;
+
+	ret_if(!scroller);
+
+	evas_object_data_set(scroller, PRIVATE_DATA_KEY_SCROLLER_IS_SCROLLING, NULL);
+}
+
+
+
 static void __anim_start_cb(void *data, Evas_Object *scroller, void *event_info)
 {
 	_D("start the scroller(%p) animation", scroller);
@@ -38,8 +48,6 @@ static void __anim_start_cb(void *data, Evas_Object *scroller, void *event_info)
 static void __anim_stop_cb(void *data, Evas_Object *scroller, void *event_info)
 {
 	_D("stop the scroller(%p) animation", scroller);
-	evas_object_data_del(scroller, PRIVATE_DATA_KEY_SCROLLER_IS_SCROLLING);
-	evas_object_data_del(scroller, PRIVATE_DATA_KEY_SCROLLER_DRAG_START);
 }
 
 
@@ -47,7 +55,7 @@ static void __anim_stop_cb(void *data, Evas_Object *scroller, void *event_info)
 static void __drag_start_cb(void *data, Evas_Object *scroller, void *event_info)
 {
 	_D("start to drag the scroller(%p)", scroller);
-	evas_object_data_set(scroller, PRIVATE_DATA_KEY_SCROLLER_DRAG_START, (void *) 1);
+	evas_object_data_set(scroller, PRIVATE_DATA_KEY_SCROLLER_IS_SCROLLING, (void *) 1);
 }
 
 
@@ -59,20 +67,6 @@ static void __drag_stop_cb(void *data, Evas_Object *scroller, void *event_info)
 
 
 
-static void __scroll_cb(void *data, Evas_Object *scroller, void *event_info)
-{
-	int y = 0;
-
-	ret_if(!scroller);
-
-	if (!evas_object_data_get(scroller, PRIVATE_DATA_KEY_SCROLLER_DRAG_START))
-		return;
-
-	elm_scroller_region_get(scroller, NULL, &y, NULL, NULL);
-}
-
-
-
 Evas_Object *scroller_create(Evas_Object *parent)
 {
 	Evas_Object *box = NULL;
@@ -101,7 +95,7 @@ Evas_Object *scroller_create(Evas_Object *parent)
 	evas_object_smart_callback_add(scroller, "scroll,anim,stop", __anim_stop_cb, NULL);
 	evas_object_smart_callback_add(scroller, "scroll,drag,start", __drag_start_cb, NULL);
 	evas_object_smart_callback_add(scroller, "scroll,drag,stop", __drag_stop_cb, NULL);
-	evas_object_smart_callback_add(scroller, "scroll", __scroll_cb, NULL);
+	evas_object_event_callback_add(scroller, EVAS_CALLBACK_MOUSE_DOWN, __scroller_mouse_down_cb, NULL);
 
 	box = elm_box_add(scroller);
 	goto_if(!box, ERROR);
@@ -137,6 +131,7 @@ void scroller_destroy(Evas_Object *scroller)
 		evas_object_del(box);
 	}
 
+	evas_object_data_del(scroller, PRIVATE_DATA_KEY_SCROLLER_IS_SCROLLING);
 	evas_object_del(scroller);
 }
author	Jin Yoon <jinny.yoon@samsung.com>	2015-08-10 21:58:03 +0900
committer	Jin Yoon <jinny.yoon@samsung.com>	2015-08-10 21:58:03 +0900
commit	598df99f7946d0a78428cea81b865b61f8670b2b (patch)
tree	113903fc4db438b1a5444cb8b1f8c3fa44af97f4
parent	5c0a97167ce06660e193a3e339369599f064583d (diff)
download	adventure-598df99f7946d0a78428cea81b865b61f8670b2b.tar.gz adventure-598df99f7946d0a78428cea81b865b61f8670b2b.tar.bz2 adventure-598df99f7946d0a78428cea81b865b61f8670b2b.zip