diff options
author | Jin Yoon <jinny.yoon@samsung.com> | 2015-08-08 15:29:47 +0900 |
---|---|---|
committer | Jin Yoon <jinny.yoon@samsung.com> | 2015-08-08 15:29:47 +0900 |
commit | fd534122d2564330e21596f2a4d0ae626e492953 (patch) | |
tree | 1090a54983155157ec1c5825e427a509dfe5cede | |
parent | 289102cd98728d9adc9470c368f2bcc671e789d0 (diff) | |
download | adventure-fd534122d2564330e21596f2a4d0ae626e492953.tar.gz adventure-fd534122d2564330e21596f2a4d0ae626e492953.tar.bz2 adventure-fd534122d2564330e21596f2a4d0ae626e492953.zip |
Launching : initial version
-rwxr-xr-x | .cproject | 10 | ||||
-rw-r--r-- | .rds_delta | 35 | ||||
-rw-r--r-- | .sdk_delta.info | bin | 13988 -> 35167 bytes | |||
-rw-r--r-- | .sign/.manifest.tmp | 42 | ||||
-rw-r--r-- | .sign/author-signature.xml | 164 | ||||
-rw-r--r-- | .sign/signature1.xml | 164 | ||||
-rw-r--r-- | inc/log.h | 6 | ||||
-rw-r--r-- | inc/main.h | 5 | ||||
-rw-r--r-- | res/edje/.ui_manager.edc.swp | bin | 0 -> 12288 bytes | |||
-rw-r--r-- | res/edje/entry.edc | 108 | ||||
-rw-r--r-- | res/edje/images/searching_X.png | bin | 0 -> 2964 bytes | |||
-rw-r--r--[-rwxr-xr-x] | res/edje/images/searching_bar.png (renamed from res/images/searching bar.png) | bin | 4035 -> 4035 bytes | |||
-rw-r--r-- | res/edje/main.edc | 287 | ||||
-rwxr-xr-x | res/edje/main_view.edc | 58 | ||||
-rwxr-xr-x | res/edje/ui_manager.edc | 14 | ||||
-rwxr-xr-x | res/images/searching_bar.png | bin | 0 -> 4035 bytes | |||
-rwxr-xr-x | res/images/searching_list.png (renamed from res/images/searching list.png) | bin | 3572 -> 3572 bytes | |||
-rw-r--r-- | src/main.c | 33 | ||||
-rw-r--r-- | src/main_view.c | 15 | ||||
-rw-r--r-- | src/map.c | 3 | ||||
-rw-r--r-- | src/ui_manager.c | 29 | ||||
-rwxr-xr-x | tizen-manifest.xml | 4 |
22 files changed, 818 insertions, 159 deletions
@@ -226,9 +226,17 @@ <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler"/> </toolChain> </folderInfo> + <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.653066052" name="entry.edc" rcbsApplicability="disable" resourcePath="res/edje/entry.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.848333067"> + <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.848333067" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924"> + <option id="sbi.gnu.edc.compiler.option.misc.id.592596896" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje/images""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/res/edje/images""/> + </option> + </tool> + </fileInfo> <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.358789494" name="map.edc" rcbsApplicability="disable" resourcePath="res/edje/map.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1099652705"> <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1099652705" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924"> - <option id="sbi.gnu.edc.compiler.option.misc.id.1560519824" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> + <option id="sbi.gnu.edc.compiler.option.misc.id.1560519824" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje/images""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/res/edje/images""/> </option> @@ -1,41 +1,6 @@ #delete -res/edje/images/initial.jpg #add -res/edje/loading.edj -res/edje/images/1.png -res/edje/images/10.png -res/edje/images/11.png -res/edje/images/12.png -res/edje/images/13.png -res/edje/images/14.png -res/edje/images/15.png -res/edje/images/16.png -res/edje/images/17.png -res/edje/images/18.png -res/edje/images/19.png -res/edje/images/2.png -res/edje/images/20.png -res/edje/images/21.png -res/edje/images/22.png -res/edje/images/23.png -res/edje/images/24.png -res/edje/images/25.png -res/edje/images/26.png -res/edje/images/27.png -res/edje/images/3.png -res/edje/images/4.png -res/edje/images/5.png -res/edje/images/6.png -res/edje/images/7.png -res/edje/images/8.png -res/edje/images/9.png -res/edje/images/Aventure01.1.png -res/edje/images/Aventure01.png -res/edje/images/Aventure01_background.png -res/edje/images/Location.gif #modify author-signature.xml signature1.xml bin/adventure -res/edje/adventure.edj -res/edje/initial.edj diff --git a/.sdk_delta.info b/.sdk_delta.info Binary files differindex 6b42671..72c9934 100644 --- a/.sdk_delta.info +++ b/.sdk_delta.info diff --git a/.sign/.manifest.tmp b/.sign/.manifest.tmp index e76bc5b..dfaf07c 100644 --- a/.sign/.manifest.tmp +++ b/.sign/.manifest.tmp @@ -1,8 +1,5 @@ -shared/res/adventure.png__DEL__1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs= -tizen-manifest.xml__DEL__cbScAj+EnPDG8GaHNdvaGFZz8LKME1UVSN6/+cjiMpM= -author-signature.xml__DEL__4CruBRIX/mNomHWVtl1Cq1uIiDf97KLbVHrBi+Kubxo= -bin/adventure__DEL__2VuiWFP/QBmTWjBJJDefQv7veuYE6MbtpE+vLrTh83A= -res/edje/adventure.edj__DEL__X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE= +res/edje/.ui_manager.edc.swp__DEL__FdzMWrU685Z4CBkIo+DTEMDroxiw1EWmgkBkES/WFcg= +res/edje/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8= res/edje/images/1.png__DEL__oP1soFdNokYu42XfoWKq0uYAP9o6PGUCGdnxQYErGdQ= res/edje/images/10.png__DEL__gebvW4D13j2AGUPkJInqNpANPhlECcq5EkIty5Coxhk= res/edje/images/11.png__DEL__DL48rNIwpgkN9kmnaZrCRBEZ8eb4O7bs1cojj5TmA5E= @@ -34,5 +31,36 @@ res/edje/images/Aventure01.1.png__DEL__qFNE1M/3y3JLsRmH6olzSOwfJ0aSmpNYG2g4MAfVK res/edje/images/Aventure01.png__DEL__q1aFoIjA48lzFuleof8STv8eCmIGH05KIUpXfVUoD0E= res/edje/images/Aventure01_background.png__DEL__uVdgx+2km5hdx3T3JYTz+hNSxxd4gTcgmEin2og8uYI= res/edje/images/Location.gif__DEL__Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ= -res/edje/initial.edj__DEL__lcGlKgrBUdQ2/z7UM79zg84fs88c+kFeYcqJFowyzH4= -res/edje/loading.edj__DEL__h2nDJeSMjLz/rZ8wSyfDFmr511KV7s++t8STE6UhqW8= +res/edje/images/bg.jpg__DEL__SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us= +res/edje/images/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8= +res/edje/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU= +res/edje/item.edj__DEL__jw5eZT5g7pWcWEGYD9ND6Ui38piIyyqoz6eyMM1AcwU= +res/edje/map.edj__DEL__S0shummBRTE46oVfSeS5lI7fxRlE+tzF7aBP9gqDTHI= +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/Moments.psd__DEL__s+2KYYryQtvLtoVmfKvejfShBtP3yu3IZ97dXjygOCI= +res/images/add_button.png__DEL__qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA= +res/images/curser.png__DEL__k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc= +res/images/delete_button.png__DEL__M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc= +res/images/floting_next_button.png__DEL__Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0= +res/images/line.png__DEL__mC2lw0XczhZ41ZKBKt5ft3YcObs+IGDudh0xfkOJwQE= +res/images/map_background.png__DEL__fidI2puLNy+2OtfFScQOt4BhzflQJ2EU87bersaQZPM= +res/images/my status.png__DEL__chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM= +res/images/my status_small.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8= +res/images/other location_blue.png__DEL__HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8= +res/images/other location_blue_small.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw= +res/images/other location_mint.png__DEL__OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8= +res/images/other location_mint_small.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU= +res/images/searching bar.png__DEL__j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0= +res/images/searching list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM= +res/images/searching_X.png__DEL__6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak= +res/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU= +shared/res/adventure.png__DEL__1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs= +tizen-manifest.xml__DEL__Yqjrp1NnUuO8yN5E0COzisOuxQ6Rf1IK71K8FAFHPr8= +author-signature.xml__DEL__P01vwSaf6MJgU/yPVRbZW4h4LG1OwRXSfKv9+nT2PL4= +res/edje/main_view.edj__DEL__2hl2S1o48cR+icVbA0SKHygbNOc4CSDTKk9PFZe8LdQ= +res/edje/main.edj__DEL__tRQOFk919joeNAQB6/qaVXMHO+bJwNCV6M4SUGU3cjw= +res/edje/ui_manager.edj__DEL__9CHFRPeJblDPPktd3vUohJxPSMnjFd8wMWESIUWEcbw= +bin/adventure__DEL__j337B4gT384+4G1EG98BzMHURoOu5r23+lSipZOuuA4= diff --git a/.sign/author-signature.xml b/.sign/author-signature.xml index 9dd81d3..ca52603 100644 --- a/.sign/author-signature.xml +++ b/.sign/author-signature.xml @@ -4,11 +4,15 @@ <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>2VuiWFP/QBmTWjBJJDefQv7veuYE6MbtpE+vLrTh83A=</DigestValue> +<DigestValue>j337B4gT384+4G1EG98BzMHURoOu5r23+lSipZOuuA4=</DigestValue> </Reference> -<Reference URI="res%2Fedje%2Fadventure.edj"> +<Reference URI="res%2Fedje%2F.ui_manager.edc.swp"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE=</DigestValue> +<DigestValue>FdzMWrU685Z4CBkIo+DTEMDroxiw1EWmgkBkES/WFcg=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fbtn.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fimages%2F1.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -134,13 +138,121 @@ <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=</DigestValue> </Reference> -<Reference URI="res%2Fedje%2Finitial.edj"> +<Reference URI="res%2Fedje%2Fimages%2Fbg.jpg"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2Fbtn.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</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%2Fitem.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>jw5eZT5g7pWcWEGYD9ND6Ui38piIyyqoz6eyMM1AcwU=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fmain.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>tRQOFk919joeNAQB6/qaVXMHO+bJwNCV6M4SUGU3cjw=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fmain_view.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>2hl2S1o48cR+icVbA0SKHygbNOc4CSDTKk9PFZe8LdQ=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fmap.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>S0shummBRTE46oVfSeS5lI7fxRlE+tzF7aBP9gqDTHI=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fui_manager.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>9CHFRPeJblDPPktd3vUohJxPSMnjFd8wMWESIUWEcbw=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2F1.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2F2.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2F3.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2F4.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</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%2Fadd_button.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fcurser.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fdelete_button.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Ffloting_next_button.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fline.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>mC2lw0XczhZ41ZKBKt5ft3YcObs+IGDudh0xfkOJwQE=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fmap_background.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>fidI2puLNy+2OtfFScQOt4BhzflQJ2EU87bersaQZPM=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fmy%20status.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fmy%20status_small.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fother%20location_blue.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fother%20location_blue_small.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fother%20location_mint.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fother%20location_mint_small.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fsearching%20bar.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fsearching%20list.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fsearching_X.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>lcGlKgrBUdQ2/z7UM79zg84fs88c+kFeYcqJFowyzH4=</DigestValue> +<DigestValue>6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=</DigestValue> </Reference> -<Reference URI="res%2Fedje%2Floading.edj"> +<Reference URI="res%2Fimages%2Fworld_map.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>h2nDJeSMjLz/rZ8wSyfDFmr511KV7s++t8STE6UhqW8=</DigestValue> +<DigestValue>qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=</DigestValue> </Reference> <Reference URI="shared%2Fres%2Fadventure.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -148,7 +260,7 @@ </Reference> <Reference URI="tizen-manifest.xml"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>cbScAj+EnPDG8GaHNdvaGFZz8LKME1UVSN6/+cjiMpM=</DigestValue> +<DigestValue>Yqjrp1NnUuO8yN5E0COzisOuxQ6Rf1IK71K8FAFHPr8=</DigestValue> </Reference> <Reference URI="#prop"> <Transforms> @@ -159,11 +271,11 @@ </Reference> </SignedInfo> <SignatureValue> -qSAPQlTeVs89HXGsW779sf0Vj07I6X9tg/ZiPM5PIQl1KuMRovgUZD4MTHIhcEpijn/3mEWyFlCI -2MIFe0JwbOXvpfQR1LGIBVBTby6fS8VTbcFS2DDElzJBllUB5PLhr37DuaVpjvOqCNQo09j5CLq9 -mtYoHvtq0AjkSfCd9i60h6GkcR0EXaqiadwDzqwfoA6H9kvG1atlWecHIsiLO7URnUjSqJu8PynA -SKikC4kCJh52nwmU9P3FoDGWO5xhFrqyc94OKuWgaaTeSwCGEL/ZQ44wdp6EXO7olvAgjrQ/qj/0 -oehteVeOtp/GEEaIx1QvvukpPGCuKemXO60Dmw== +FovcZ9GGakfaYEpZxqv/St7lQMTg+LD1awRtd0v16tUK7/pobkoRHo1TnPbymWtY6tWE6OGBBgSH +7eC8mH4ujTNkybWMv3V9wXkK/7cSGXGAgkDx6Z9AiYjHwAgZllKpWuST6EbUHaYBf8wzsEiEsNGk +pYAZshUd2sqR6qTehGPVBQysCBmk0RLfDjk7bgDe0YNt0n2BjJXv9w+HTwuQfVo2vuGoDV8zQjEU +7XWuRIe7icIfqjBy7oM9RJdDweBQP4NjTaCCPdOLdFvd8rYUjWvsxrc73ZG/6bfRinlmHd+yY8mz +k2wQR6WvFnKewCmknmTME6D7RMZgg4B/XswDGg== </SignatureValue> <KeyInfo> <X509Data> @@ -171,20 +283,20 @@ oehteVeOtp/GEEaIx1QvvukpPGCuKemXO60Dmw== MIIDqTCCApGgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBsDELMAkGA1UEBhMCS1IxFDASBgNVBAgM C1NvdXRoIEtvcmVhMQ4wDAYDVQQHDAVTdXdvbjEmMCQGA1UECgwdU2Ftc3VuZyBFbGVjdHJvbmlj cyBDby4sIEx0ZC4xDzANBgNVBAsMBk1vYmlsZTEgMB4GA1UEAwwXU2Ftc3VuZyBBdXRob3IgQ0Eg -Q2xhc3MxIDAeBgkqhkiG9w0BCQEWEXRpemVuQHNhbXN1bmcuY29tMB4XDTE1MDcxMjE2MzY0M1oX -DTE2MDcxMTE2MzY0M1owYzELMAkGA1UEBhMCS1IxCTAHBgNVBAgTADEOMAwGA1UEBxMFU2VvdWwx +Q2xhc3MxIDAeBgkqhkiG9w0BCQEWEXRpemVuQHNhbXN1bmcuY29tMB4XDTE1MDcxNDAwNTIwMVoX +DTE2MDcxMzAwNTIwMVowYzELMAkGA1UEBhMCS1IxCTAHBgNVBAgTADEOMAwGA1UEBxMFU2VvdWwx FjAUBgNVBAoTDXN0b3J5Y29tcGlsZXIxCTAHBgNVBAsTADEWMBQGA1UEAxMNc3Rvcnljb21waWxl -cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtSaQjkdqd3YjDUM5rnY0Ak0m0H/4Mp -doG2AILo5iWvNCazuWUAi7kfqJZMCSooWWuoON58ymXPBVxP2wDVz2Nb8zbOsMGaYYi9I96QexeG -RB2tR67ZC9MsVGZdPtIH8JkFsJQlh08rKz69FmrDOdIvOYaix1ww5f1KGUxZh6sNx7G/P4JvqlDL -9VhnJhZcKEDE+VyvGEi90Hi9urw64MJajXJ7ByRLMTXni25xf63oHWsdT4u5VAvL1cH/fZK1xiZs -sQXcuZYtM3tTPWKVbXQC69MrL5ZBOZn04ysjR2HWqvsVzdHlhn9dfQUQAqeKZPjTSHQoYIIHVnvW -yj3yyyMCAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMCB4AwDQYJKoZIhvcNAQELBQADggEB -AJKkHvaPqYCpmb5ZRoTu6a0wWOZ+N6T5PJIZ04LjbcED8HIeegOkTdNmnGujXfqhlgNpKGteINk7 -E2/dDm6IaYHfiGtfH6KsuMbsGqz07Kk1MYYb9hI+4453hf27dt5UlX3PCSHqDdUCTCqVBvKxSfBR -q/arVv8Vi9HqBOQG2A+x0nyo0QTWTOt2ata2KdeTYFCReD/IT60PnEYIXB+5CF71SqQLdIBMxpis -ERuIb0bKE/x1Cni5opYPuYQOBmVJyB15AjSnMI9wivCl5Gz/jOB/ORCjCLALrJZE2LZzqGPdScGX -XtlunfEoxvoAf/3sCqst0xA/zq0W9dzXg/tPNLc= +cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0HE4TB6oWNUk4IHuJOL+4UuH1LnTIK +JRjMONEwpHQW7MLGVzlS6rFGeVxBaoqpKQ+D+QefE3ckLhwUNGR4vLTqQk4OQM2xtlgEoBc7FalJ +6PtAgwKHtAJhavJxQGwmYe+jodFs/N6WoehuGv7K+JvFniXuhL5bDrnU7zOzv8yqB5S+jBR0MsvO +GbHf2NaV/K+F+GLCMoT/FDlJFwLMntKb3kN8Y/mKIdXcdxRonOg8BTHczcqQcf4k5ocW6AxpATrS +Y5wEkIFo2kqv8ZrsAVJbedCiUZt08akgrc+NShcEdpsPrAIieDX0mkCBqRlF7RdLX4PG7oKj3xYq +fA1fUecCAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMCB4AwDQYJKoZIhvcNAQELBQADggEB +AGgVJ4D9nJYDeqI0aBNL09vfbqY1JRKHS06r9/gNawlnm8NDyBwUwlGJoZoFZrHc+9ASrBF5+A6G +GHb8HwS3mor9CbMVKFO0b7kyXMFDwx8Ev69SN067sDusHrrEy68X5oxV9coVtRu6x91aSbGG/lZb +jK4DDzqgw4q8Sm61IhjIms1jzH6at6VMweOzHcF3+dvv4BIGZKv4+sDpmNGnj4g1cLLxe1GbnVKC +vXXmGsLw0dh83frXoZxfHkuAu+IpyrK1oFMinxp72FzAFJXl9i2gbkWVS/+39RqtrzaV1sfmcMb1 +0D45NzqJ5VC4qZMkM7YgcICxSHoqh57eRovCJE0= </X509Certificate> <X509Certificate> MIIDmzCCAoOgAwIBAgICYygwDQYJKoZIhvcNAQELBQAwXjEaMBgGA1UECgwRVGl6ZW4gQXNzb2Np diff --git a/.sign/signature1.xml b/.sign/signature1.xml index adbb402..e2fe8ba 100644 --- a/.sign/signature1.xml +++ b/.sign/signature1.xml @@ -4,15 +4,19 @@ <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>4CruBRIX/mNomHWVtl1Cq1uIiDf97KLbVHrBi+Kubxo=</DigestValue> +<DigestValue>P01vwSaf6MJgU/yPVRbZW4h4LG1OwRXSfKv9+nT2PL4=</DigestValue> </Reference> <Reference URI="bin%2Fadventure"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>2VuiWFP/QBmTWjBJJDefQv7veuYE6MbtpE+vLrTh83A=</DigestValue> +<DigestValue>j337B4gT384+4G1EG98BzMHURoOu5r23+lSipZOuuA4=</DigestValue> </Reference> -<Reference URI="res%2Fedje%2Fadventure.edj"> +<Reference URI="res%2Fedje%2F.ui_manager.edc.swp"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE=</DigestValue> +<DigestValue>FdzMWrU685Z4CBkIo+DTEMDroxiw1EWmgkBkES/WFcg=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fbtn.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue> </Reference> <Reference URI="res%2Fedje%2Fimages%2F1.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -138,13 +142,121 @@ <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> <DigestValue>Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=</DigestValue> </Reference> -<Reference URI="res%2Fedje%2Finitial.edj"> +<Reference URI="res%2Fedje%2Fimages%2Fbg.jpg"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fimages%2Fbtn.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</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%2Fitem.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>jw5eZT5g7pWcWEGYD9ND6Ui38piIyyqoz6eyMM1AcwU=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fmain.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>tRQOFk919joeNAQB6/qaVXMHO+bJwNCV6M4SUGU3cjw=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fmain_view.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>2hl2S1o48cR+icVbA0SKHygbNOc4CSDTKk9PFZe8LdQ=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fmap.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>S0shummBRTE46oVfSeS5lI7fxRlE+tzF7aBP9gqDTHI=</DigestValue> +</Reference> +<Reference URI="res%2Fedje%2Fui_manager.edj"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>9CHFRPeJblDPPktd3vUohJxPSMnjFd8wMWESIUWEcbw=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2F1.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2F2.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2F3.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2F4.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>j2vgrwMz/C1ygkzfdCMbqGnWC+2/zdgR9DkgdqAJx7A=</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%2Fadd_button.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>qlYpHBFUudXQj/negdZWbfK1zEYYmxE3++J5dJD64sA=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fcurser.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>k9vEz6tMCpAUTf9ThHoGIYGkzyUnOSqhc1sCmngykUc=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fdelete_button.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Ffloting_next_button.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTshYJ0=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fline.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>mC2lw0XczhZ41ZKBKt5ft3YcObs+IGDudh0xfkOJwQE=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fmap_background.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>fidI2puLNy+2OtfFScQOt4BhzflQJ2EU87bersaQZPM=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fmy%20status.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fmy%20status_small.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fother%20location_blue.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fother%20location_blue_small.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fother%20location_mint.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fother%20location_mint_small.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fsearching%20bar.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fsearching%20list.png"> +<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> +<DigestValue>DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=</DigestValue> +</Reference> +<Reference URI="res%2Fimages%2Fsearching_X.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>lcGlKgrBUdQ2/z7UM79zg84fs88c+kFeYcqJFowyzH4=</DigestValue> +<DigestValue>6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=</DigestValue> </Reference> -<Reference URI="res%2Fedje%2Floading.edj"> +<Reference URI="res%2Fimages%2Fworld_map.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>h2nDJeSMjLz/rZ8wSyfDFmr511KV7s++t8STE6UhqW8=</DigestValue> +<DigestValue>qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=</DigestValue> </Reference> <Reference URI="shared%2Fres%2Fadventure.png"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> @@ -152,7 +264,7 @@ </Reference> <Reference URI="tizen-manifest.xml"> <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod> -<DigestValue>cbScAj+EnPDG8GaHNdvaGFZz8LKME1UVSN6/+cjiMpM=</DigestValue> +<DigestValue>Yqjrp1NnUuO8yN5E0COzisOuxQ6Rf1IK71K8FAFHPr8=</DigestValue> </Reference> <Reference URI="#prop"> <Transforms> @@ -163,11 +275,11 @@ </Reference> </SignedInfo> <SignatureValue> -ZHpIou3SigxLqcMlm0xNaLYcwmR9/c08C6FCVAxhMAvcBslbY+jSmR0eNfIcVHxYX9I2ca9bX8T3 -WQa1REN9L4g9o2tMFOwWYQjci5yCx67RSDwxEDDRcJIZc6uVWGDLzwaFxD1W9M6bV+zASV9Ae/IM -pl0mKcjxzynigNv1IwDdANwaUcpV4LZZrz8WNCbZt9bJGbn5ei2WGJfel+Pisdu/H5mYgf4lJf/V -Ak2Hh0dh01/nkRhqaykJBLpyF3kGC4GGdCklEa04pIECjjkYxiq32qbE6PYQhWH7LI5VNg4rReNV -Ab16zNRg96eEQIuZaiCpIxzeszg/t8N8tSbFPg== +pggcbSMKEEGWUsAE7ZBcyeMaF3Q8BhKKtgNXAi0YffE9Um4X80gh7CJo0+m+t5f1Jye0WWQh2TNk +/wMlQWvDPWfEHrknxueMOhbI0d/zGiDS0nFXPZWVtZsmykuMHMAiAUrGEEi3ZJMXep1RnmNXvVMr +nZOf4LwRagG8lRt6Nbba8A+3AvWvnV0sY4mKQRlDUyDw44KXou8X1mgr2NyqqUY4nU5iwhwZ4l4I +JIoAN8keRlRUJFXJNyB1ljTbkY4sP4Qa2UHevVVrSiIsFuFF1dZ4o9ZCtIl6u1ONNniDVCIIYgGy +WgDOtetG8yNoDbW7GclD5A0GB9sUW5fRP9SCiQ== </SignatureValue> <KeyInfo> <X509Data> @@ -175,19 +287,19 @@ Ab16zNRg96eEQIuZaiCpIxzeszg/t8N8tSbFPg== MIIDgDCCAmigAwIBAgIBZTANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMCS1IxFDASBgNVBAgM C1NvdXRoIEtvcmVhMQ4wDAYDVQQHDAVTdXdvbjEmMCQGA1UECgwdU2Ftc3VuZyBFbGVjdHJvbmlj cyBDby4sIEx0ZC4xDzANBgNVBAsMBk1vYmlsZTEwMC4GA1UEAwwnU2Ftc3VuZyBUaXplbiBERVZF -TE9QRVIgUHVibGljIENBIENsYXNzMB4XDTE1MDcxMjE2Mzg0OVoXDTE2MDcxMTE2Mzg0OVowTDEg +TE9QRVIgUHVibGljIENBIENsYXNzMB4XDTE1MDcxNDAwNTMwMloXDTE2MDcxMzAwNTMwMlowTDEg MB4GA1UEAwwXU2Ftc3VuZyBUaXplbiBEZXZlbG9wZXIxKDAmBgkqhkiG9w0BCQEWGXN0b3J5Y29t -cGlsZXJAaGFubWFpbC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBshhsY0pe -M09HGcZlsCIVhnRXnEnJVW0SQ5ySfH9F4lngLBx6vsiMQiztKlCnDESAanNlauw+QMVjOfDmAtaH -xY0GwCLdpYWJ0SYbRRaITV9cqgxau0UnwK+6x++zZoRorrvHYR9uOw8rtZhSeSyLbP/VQtf6Lr1c -gZRdCToe+eEL+pZe9ZK/a22mNjUHtTMjbobqdHgY0MAHhu8+XDM8W3I2kGVoFbEGlCqU7FaTBFLW -aTMRaANYsNcDbZ4Q0po/TVuXnFCgdRU2Y6OKR41x7t9mabYp379IoEzFeNIG6omC0XqQ/rPynEKB -N1uhs25nE3wLBXj0er82/mnB4EW5AgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgeAMA0G -CSqGSIb3DQEBCwUAA4IBAQBbEG53EAnMQ/arTYz/XRZ9po4Agfg/NowPo7yFbiahYBnSefMh4jFo -GT8GQWZLjhSs0PO5Brx6HMsLIk1RjnMiZyiQ82b5pdUoi7nNYa+NclemIVt6viTnCu5SMp9NNOzK -iTttZI8VgepyqGOP5ky1uyikL15kBaCeiiDeuPawhnqGX1CScIZjTJ1unviBYgRc4U4cyIujNCZ9 -r9ui8yGT4dvX5cmVusmJvMA7+9ciuZ8kicjTxuJcVgQGhve66i5tY9fBDVnSpRVz3a6oyHAcRa7a -aOlHNYdz4Feo0A44zUJXF0mKZ+TdH0XGT0uTg0O2+8w2GDsPToSXv+11YP0n +cGlsZXJAaGFubWFpbC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnAsQ5EukD +8yPijdHPR4SC1sxT4PlfJkzQcV5udo7WXv7zg6xKHbnunFsYPIVr5mpsZm09TsLkN4cxxRvcX8to +ky7X59q+fQ+hv7aFSNjqFU3fXe+OImSwr7rpXbi9SaNYDtGgYN8UCCFv1HJi5P7S2CU7Y3QpeZPm +dFxBtA6s/H9BweDPnpUGBy+P5eEA5RzAiHKFxkXsUXoocUTZD/PS6NRJ1fW/fB1G1+m71iO0W1vg +jdAzXexATUubLKpleYO6Cv7/qabBXtK9BirhKRy1Bse7sjFHLxmpdkmnBTY0JcZVGztllLu9vOhF +N+RYXNx8CniPme3nUEa+si749MxdAgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgeAMA0G +CSqGSIb3DQEBCwUAA4IBAQAmNV2xLkzcBQXo6pqs0aXm5yOknlUvY+w4qFVSHZFzuTUmCvawTnU+ +WB9UxNvHawbCu9H02bglKO8W06wWOT13ut+ZBSLEA5lREJO7jPdDNdEpzgOMm0CZI7wLV1V4gMRs +7rrjv8WYKpm7xDSseYaWpiA/9uzLrBmjea5DBX8tYNTf1p5Tlu3bflVvj62rQDX8s0eLKkDOR6of +/mTkGtNcI5QLjuCPH+OEzehJZClEvLGHaZtnX2zqM+Txk6oW/vI7tDK99fKpkxv7yGQnvFgAl3hD +vYMjaiv1m1V8ZFJBrrZ8xQ8o1bubhyScQnnYxD/iJg3sUP2RxvQ38Op8zyuA </X509Certificate> <X509Certificate> MIIDuzCCAqOgAwIBAgICL+cwDQYJKoZIhvcNAQELBQAwgY8xCzAJBgNVBAYTAktSMRQwEgYDVQQI @@ -14,15 +14,15 @@ #define COLOR_MAGENTA "\033[1;35m" #if !defined(_D) -#define _D(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, COLOR_YELLOW "[%s:%d]" fmt COLOR_END"\n", __func__, __LINE__, ##arg) +#define _D(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, COLOR_YELLOW "[%s:%d] " fmt COLOR_END"\n", __func__, __LINE__, ##arg) #endif #if !defined(_W) -#define _W(fmt, arg...) dlog_print(DLOG_WARN, LOG_TAG, COLOR_GRAY "[%s:%d]" fmt COLOR_END"\n", __func__, __LINE__, ##arg) +#define _W(fmt, arg...) dlog_print(DLOG_WARN, LOG_TAG, COLOR_GRAY "[%s:%d] " fmt COLOR_END"\n", __func__, __LINE__, ##arg) #endif #if !defined(_E) -#define _E(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, COLOR_RED "[%s:%d]" fmt COLOR_END"\n", __func__, __LINE__, ##arg) +#define _E(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, COLOR_RED "[%s:%d] " fmt COLOR_END"\n", __func__, __LINE__, ##arg) #endif #define retv_if(expr, val) do { \ @@ -24,11 +24,6 @@ #include <efl_extension.h> #include <dlog.h> -#ifdef LOG_TAG -#undef LOG_TAG -#endif -#define LOG_TAG "MOMENT" - #if !defined(PACKAGE) #define PACKAGE "org.tizen.moment" #endif diff --git a/res/edje/.ui_manager.edc.swp b/res/edje/.ui_manager.edc.swp Binary files differnew file mode 100644 index 0000000..9b0059f --- /dev/null +++ b/res/edje/.ui_manager.edc.swp diff --git a/res/edje/entry.edc b/res/edje/entry.edc new file mode 100644 index 0000000..162d807 --- /dev/null +++ b/res/edje/entry.edc @@ -0,0 +1,108 @@ +images { + image: "searching_bar.png" COMP; + image: "searching_X.png" COMP; +} + +collections { + group { + name: "main"; + parts { + part { + name: "bg"; + type: SPACER; + description { + state: "default" 0.0; + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 1.0; } + } + } + part { + name: "bg_img"; + type: IMAGE; + description { + state: "default" 0.0; + rel1 { relative: 0.5 0.5; } + rel2 { relative: 0.5 0.5; } + align: 0.5 0.5; + min: 446 38; + fixed: 1 1; + image { + normal: "searching_bar.png"; + } + visible: 1; + } + } + part { + name: "entry"; + type: SWALLOW; + description { + rel1 { relative: 0.05 0.0; to: "bg_img"; } + rel2 { relative: 0.0 1.0; to_x: "delete_event"; to_y: "bg_img"; } + align: 0.5 0.5; + fixed: 1 1; + visible: 1; + } + } + part { + name: "delete"; + type: IMAGE; + description { + state: "default" 0.0; + rel1 { relative: 0.5 0.5; to: "delete_event"; } + rel2 { relative: 0.5 0.5; to: "delete_event"; } + align: 0.5 0.5; + min: 12 12; + fixed: 1 1; + image { + normal: "searching_X.png"; + } + color: 255 255 255 255; + visible: 1; + } + description { + state: "press" 0.0; + inherit: "default" 0.0; + color: 255 255 255 100; + } + } + part { + name: "delete_event"; + type: RECT; + description { + state: "default" 0.0; + rel1 { relative: 420/446 0.5; to: "bg_img"; } + rel2 { relative: 420/446 0.5; to: "bg_img"; } + align: 0.5 0.5; + min: 38 38; + fixed: 1 1; + color: 0 0 0 0; + visible: 1; + } + } + } + programs { + program { + signal: "mouse,down,1"; + source: "delete_event"; + action: SIGNAL_EMIT "delete,down" "entry"; + after: "delete,down,after"; + } + program { + name: "delete,down,after"; + action: STATE_SET "press" 0.0; + target: "delete"; + } + program { + signal: "mouse,up,1"; + source: "delete_event"; + action: SIGNAL_EMIT "delete,up" "entry"; + after: "delete,up,after"; + } + program { + name: "delete,up,after"; + action: STATE_SET "default" 0.0; + target: "delete"; + } + } + } +} diff --git a/res/edje/images/searching_X.png b/res/edje/images/searching_X.png Binary files differnew file mode 100644 index 0000000..27228c7 --- /dev/null +++ b/res/edje/images/searching_X.png diff --git a/res/images/searching bar.png b/res/edje/images/searching_bar.png Binary files differindex 8eb1017..8eb1017 100755..100644 --- a/res/images/searching bar.png +++ b/res/edje/images/searching_bar.png diff --git a/res/edje/main.edc b/res/edje/main.edc new file mode 100644 index 0000000..a178e78 --- /dev/null +++ b/res/edje/main.edc @@ -0,0 +1,287 @@ +/* +collections { + styles { + style { name: "text_style"; + base: "font=Tizen font_size=18 text_class=entry color=#646261 valign=0.5 align=center"; + } + } + images { + image: "world_map.png" COMP; + image: "add_btn.png" COMP; + image: "next_btn.png" COMP; + image: "searchlist.png" COMP; + } + group { name: "main"; + parts { + rect { "base"; + desc { "default"; + } + } + rect { "map_base"; + desc { "default"; + rel2.relative: 1 0.51; + color: 246 243 243 255; + } + } + image { "map"; + scale:1 ; + desc { "default"; + rel1.to: "map_base"; + rel2.to: "map_base"; + rel1.relative: 0.0 0.27; + rel2.relative: 1.0 0.90; + image.normal: "world_map.png"; + } + desc { "next"; + inherit: "default"; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.4; + } + } +// Init + rect { "add_dim"; + desc { "default"; + rel1.to: "map_base"; + rel2.to: "map_base"; + color: 0 0 0 50; + } + desc { "next"; + inherit: "default"; + color: 0 0 0 0; + } + } + image { "add_btn"; + scale: 1; + desc { "default"; + rel1.to: "map_base"; + rel2.to: "map_base"; + rel1.relative: 0.5 0.4; + rel2.relative: 0.5 0.4; + align: 0.5 0.5; + min: 54 54; + fixed: 1 1; + image.normal: "add_btn.png"; + color: 255 255 255 255; + } + desc { "visible"; + inherit: "default"; + rel1.relative: 0.5 0.35; + rel2.relative: 0.5 0.35; + color: 255 255 255 255; + } + desc { "next"; + inherit: "visible"; + min: 84 84; + color: 255 255 255 0; + } + } + textblock { "add_desc"; + scale: 1; + desc { "default"; + rel1.to: "map_base"; + rel2.to: "map_base"; + rel1.relative: 0.0 0.5; + rel2.relative: 1.0 0.5; + fixed: 1 1; + align: 0 0; + text { + text: "<b>Add cities,<br>To find best time for your chat."; + style: "text_style"; + min: 0 1; + } + color: 255 255 255 0; + } + desc { "visible"; + inherit: "default"; + rel1.relative: 0.0 0.45; + rel2.relative: 1.0 0.45; + color: 255 255 255 255; + } + desc { "next"; + inherit: "visible"; + color: 255 255 255 0; + } + } + rect{ "current_city"; + scale: 1; + desc { "default"; + rel1.relative: 0 0.51; + rel2.relative: 1 0.6; + color: 0 0 255 255; + } + } + textblock { "add_desc2"; + scale: 1; + desc { "default"; + rel1.relative: 0 0.6; + text { + text: "<b>After you add cities,<br>they will be shown here."; + style: "text_style"; + min: 0 1; + } + } + } +// page 1 + image { "searchlist"; + scale: 1; + desc { "default"; + rel1.to: "searchbar"; + rel2.to_x: "searchbar"; + rel2.relative: 1 0; + image.normal: "searchlist.png"; + image.border: 10 10 10 10; + image.border_scale: 1; + } + desc { "visible"; + inherit: "default"; + rel2.to_y: "map"; + rel2.relative: 1 0.5; + } + } + rect { "searchbar"; + scale: 1; + desc { "default"; + rel1.relative: 0.03 0.015; + rel2.relative: 0.97 0.015; + min: 0 35; + align: 0.5 0; + fixed: 1 1; + visible: 0; + } + desc { "visible"; + inherit: "default"; + visible: 1; + } + } + image{ "next_btn"; + scale: 1; + desc { "default"; + rel1.to: "map"; + rel2.to: "map"; + rel1.relative: 0.9 0.8; + rel2.relative: 0.9 0.8; + min: 60 60; + fixed: 1 1; + color: 255 255 255 0; + align: 1 0.5; + image.normal: "next_btn.png"; + } + desc { "visible"; + inherit: "default"; + rel1.relative: 0.95 0.8; + rel2.relative: 0.95 0.8; + color: 255 255 255 255; + } + } + swallow { "selected_list"; + scale: 1; + desc { "default"; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; + rel1.to: "map"; + } + } + } + programs { + program { "start"; + signal: "load"; + source: ""; + action: STATE_SET "visible"; + target: "add_btn"; + target: "add_desc"; + transition: DECELERATE 1; + } + program { "page1"; + signal: "momentic,state,page1"; + source: ""; + script { + run_program(PROGRAM:"go_page1"); + run_program(PROGRAM:"go_page2"); + } + } + + //page 1 start + program { "go_page1"; + action: STATE_SET "next"; + target: "add_btn"; + target: "add_desc"; + target: "add_dim"; + transition: DECELERATE 0.25; + } + program { "go_page2"; + action: STATE_SET "visible"; + target: "searchbar"; + } + //page 1 end + + //search bar start + program { "show_searchbar"; + signal: "momentic,state,searchbar,show"; + source: ""; + action: STATE_SET "visible"; + target: "searchbar"; + } + program { "hide_searchbar"; + signal: "momentic,state,searchbar,hide"; + source: ""; + action: STATE_SET "default"; + target: "searchbar"; + } + program { "show_searchlist"; + signal: "momentic,state,searchlist,show"; + source: ""; + action: STATE_SET "visible"; + target: "searchlist"; + transition: DECELERATE 0.5; + } + program { "hide_searchlist"; + signal: "momentic,state,searchlist,hide"; + source: ""; + action: STATE_SET "default"; + target: "searchlist"; + transition: DECELERATE 0.5; + } + //search bar end + + program { "go_next_page"; + signal: "momentic,state,next_page"; + source: ""; + script { + run_program(PROGRAM:"map_next"); + } + } + program { "map_next"; + action: STATE_SET "next"; + target: "map"; + transition: LINEAR 0.5; + } + program { "go_prev_page"; + signal: "momentic,state,prev_page"; + source: ""; + action: STATE_SET "default"; + target: "map"; + transition: LINEAR 0.5; + } + program { "map_prev "; + action: STATE_SET "next"; + target: "map"; + transition: LINEAR 0.5; + } + program { "next_btn_show"; + signal: "momentic,state,next_btn,show"; + source: ""; + action: STATE_SET "visible"; + target: "next_btn"; + transition: DECELERATE 0.75; + } + program { "next_btn_hide"; + signal: "momentic,state,next_btn,hide"; + source: ""; + action: STATE_SET "default"; + target: "next_btn"; + transition: DECELERATE 0.75; + } + } + } +} +*/
\ No newline at end of file diff --git a/res/edje/main_view.edc b/res/edje/main_view.edc index b93fc16..577bf2c 100755 --- a/res/edje/main_view.edc +++ b/res/edje/main_view.edc @@ -19,7 +19,6 @@ collections { type: RECT; description { state: "default" 0.0; - align: 0.0 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 1.0; } color: 246 243 243 255; @@ -27,22 +26,37 @@ collections { } } part { - name: "search"; + name: "entry"; type: SWALLOW; scale: 1; - mouse_events: 0; + mouse_events: 1; description { state: "default" 0.0; - rel1 { relative: 0.5 0.0; to: "bg"; } - rel2 { relative: 0.5 0.0; to: "bg"; } + rel1 { relative: 0.0 0.0; to: "bg"; } + rel2 { relative: 1.0 0.0; to: "bg"; } align: 0.5 0.0; + min: 0 35; visible: 1; } description { state: "hide" 0.0; inherit: "default" 0.0; - rel1 { relative: 0.5 -0.1; to: "bg"; } - rel2 { relative: 0.5 -0.1; to: "bg"; } + align: 0.5 1.0; + } + } + part { + name: "map_area"; + type: RECT; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { relative: 0.0 1.0; to: "entry"; } + rel2 { relative: 1.0 1.0; to: "entry"; } + align: 0.5 0.0; + color: 246 243 243 255; + min: 0 410; + visible: 1; } } part { @@ -52,9 +66,9 @@ collections { mouse_events: 0; description { state: "default" 0.0; - rel1 { relative: 0.5 1.0; to: "search"; } - rel2 { relative: 0.5 1.0; to: "search"; } - align: 0.5 0.0; + rel1 { relative: 0.5 242/410; to: "map_area"; } + rel2 { relative: 0.5 242/410; to: "map_area"; } + align: 0.5 0.5; visible: 1; } } @@ -80,7 +94,7 @@ collections { scale: 1; description { state: "default" 0.0; - rel1 { relative: 0.0 1.0; to: "map"; } + rel1 { relative: 0.0 0.0; to: "map"; } rel2 { relative: 1.0 1.0; to: "map"; } color: 0 0 0 255; align: 0.5 0.0; @@ -107,7 +121,7 @@ collections { scale: 1; description { state: "default" 0.0; - rel1 { relative: 0.0 1.0; to: "title"; } + rel1 { relative: 0.0 0.0; to: "title"; } rel2 { relative: 1.0 1.0; to: "title"; } align: 0.5 0.0; min: 0 100; @@ -142,13 +156,13 @@ collections { } } part { - name: "search_result"; + name: "entry_result"; type: SWALLOW; scale: 1; mouse_events: 0; description { state: "default" 0.0; - rel1 { relative: 0.0 1.0; to: "search"; } + rel1 { relative: 0.0 1.0; to: "entry"; } rel2 { relative: 1.0 1.0; to: "bg"; } align: 0.5 0.0; visible: 1; @@ -163,28 +177,28 @@ collections { programs { program { signal: "hide"; - source: "search"; + source: "entry"; action: STATE_SET "hide" 0.0; - target: "search"; + target: "entry"; } program { signal: "show"; - source: "search"; + source: "entry"; action: STATE_SET "default" 0.0; - target: "search"; + target: "entry"; } program { signal: "hide"; - source: "search_result"; + source: "entry_result"; action: STATE_SET "hide" 0.0; - target: "search_result"; + target: "entry_result"; } program { signal: "show"; - source: "search_result"; + source: "entry_result"; action: STATE_SET "default" 0.0; - target: "search_result"; + target: "entry_result"; } program { diff --git a/res/edje/ui_manager.edc b/res/edje/ui_manager.edc index 16b2d1a..f5205f4 100755 --- a/res/edje/ui_manager.edc +++ b/res/edje/ui_manager.edc @@ -4,21 +4,20 @@ collections { parts { part { name: "bg"; - type: SWALLOW; + type: SPACER; description { state: "default" 0.0; - align: 0.0 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 1.0; } - visible: 0; } } part { name: "content"; type: SWALLOW; description { - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } + rel1 { relative: 0.0 0.0; to: "bg"; } + rel2 { relative: 1.0 1.0; to: "bg"; } + align: 0.5 0.5; visible: 1; } } @@ -26,8 +25,9 @@ collections { name: "popup"; type: SWALLOW; description { - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } + rel1 { relative: 0.5 0.5; to: "bg"; } + rel2 { relative: 0.5 0.5; to: "bg"; } + align: 0.5 0.5; visible: 1; } } diff --git a/res/images/searching_bar.png b/res/images/searching_bar.png Binary files differnew file mode 100755 index 0000000..8eb1017 --- /dev/null +++ b/res/images/searching_bar.png diff --git a/res/images/searching list.png b/res/images/searching_list.png Binary files differindex bf751b8..bf751b8 100755 --- a/res/images/searching list.png +++ b/res/images/searching_list.png @@ -29,26 +29,44 @@ _win_delete_request_cb(void *data, Evas_Object *obj, void *event_info) ui_app_exit();
}
+static void
+_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ int x, y, w, h;
+ evas_object_geometry_get(obj, &x, &y, &w, &h);
+ _D("%s (%d:%d:%d:%d)", data, x, y, w, h);
+}
+
static bool
app_create(void *data)
{
moment_info_s *moment_info = data;
moment_info->win = elm_win_util_standard_add(PACKAGE, PACKAGE);
- elm_win_conformant_set(moment_info->win, EINA_TRUE);
- elm_win_autodel_set(moment_info->win, EINA_TRUE);
+ retv_if(!moment_info->win, false);
+
if (elm_win_wm_rotation_supported_get(moment_info->win)) {
int rots[1] = {0};
elm_win_wm_rotation_available_rotations_set(moment_info->win, (const int *)(&rots), 1);
}
- evas_object_smart_callback_add(moment_info->win, "delete,request", _win_delete_request_cb, NULL);
+ elm_win_autodel_set(moment_info->win, EINA_TRUE);
+ elm_win_indicator_mode_set(moment_info->win, ELM_WIN_INDICATOR_HIDE);
elm_win_screen_size_get(moment_info->win, NULL, NULL, &moment_info->width, &moment_info->height);
+
+ evas_object_smart_callback_add(moment_info->win, "delete,request", _win_delete_request_cb, NULL);
evas_object_show(moment_info->win);
moment_info->conform = elm_conformant_add(moment_info->win);
- elm_win_indicator_mode_set(moment_info->win, ELM_WIN_INDICATOR_HIDE);
+ elm_object_signal_emit(moment_info->conform, "elm,state,indicator,overlap", "elm");
+ elm_object_signal_emit(moment_info->conform, "elm,state,virtualkeypad,disable", "");
+ elm_object_signal_emit(moment_info->conform, "elm,state,clipboard,disable", "");
+
evas_object_size_hint_weight_set(moment_info->conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_event_callback_add(moment_info->conform, EVAS_CALLBACK_RESIZE, _resize_cb, "conform");
+
elm_win_resize_object_add(moment_info->win, moment_info->conform);
+ elm_win_conformant_set(moment_info->win, EINA_TRUE);
+
evas_object_show(moment_info->conform);
_D("Window size (%d:%d)", moment_info->width, moment_info->height);
@@ -65,20 +83,23 @@ app_control(app_control_h app_control, void *data) ret_if(!moment_info);
ret_if(!moment_info->conform);
+ _D("app_control");
+
moment_info->ui_manager = ui_manager_create(moment_info->conform, moment_info, moment_info->width, moment_info->height);
ret_if(!moment_info->ui_manager);
+ elm_object_content_set(moment_info->conform, moment_info->ui_manager);
}
static void
app_pause(void *data)
{
- /* Take necessary actions when application becomes invisible. */
+ _D("pause");
}
static void
app_resume(void *data)
{
- /* Take necessary actions when application becomes visible. */
+ _D("resume");
}
static void
diff --git a/src/main_view.c b/src/main_view.c index f775959..d01abbc 100644 --- a/src/main_view.c +++ b/src/main_view.c @@ -35,6 +35,14 @@ static void _unfocus_entry_cb(void *data, Evas_Object *obj, void *event_info) { } +static void +_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + int x, y, w, h; + evas_object_geometry_get(obj, &x, &y, &w, &h); + _D("%s (%d:%d:%d:%d)", data, x, y, w, h); +} + static Evas_Object *_create_search_entry(Evas_Object *parent, main_view_s *main_view_info) { Evas_Object *entry = NULL; @@ -80,7 +88,7 @@ static Evas_Object *_create_map(Evas_Object *parent) map = evas_object_rectangle_add(e); retv_if(!map, NULL); - evas_object_color_set(map, 200, 200, 0, 255); + evas_object_color_set(map, 0, 0, 200, 255); evas_object_size_hint_min_set(map, 480, 400); evas_object_show(map); @@ -312,7 +320,7 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info) { main_view_s *main_view_info = NULL; char *path = NULL; - char full_path[] = {0, }; + char full_path[PATH_LEN] = {0, }; retv_if(!parent, NULL); @@ -322,6 +330,8 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info) snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, MAIN_VIEW_EDJE); free(path); + _D("main_view is created with %s", full_path); + main_view_info = calloc(1, sizeof(main_view_s)); retv_if(!main_view_info, NULL); @@ -336,6 +346,7 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info) evas_object_size_hint_align_set(main_view_info->main_view, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(main_view_info->main_view); evas_object_data_set(main_view_info->main_view, DATA_KEY_INFO, main_view_info); + evas_object_event_callback_add(main_view_info->main_view, EVAS_CALLBACK_RESIZE, _resize_cb, "main_view"); 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."); @@ -2,6 +2,7 @@ #include "main.h" #include "log.h" #include "map.h" +#include "util.h" const char *const MAP_EDJE = "map.edj"; @@ -9,7 +10,7 @@ Evas_Object *map_create(Evas_Object *parent) { Evas_Object *map = NULL; char *path = NULL; - char full_path[] = {0, }; + char full_path[PATH_LEN] = {0, }; retv_if(!parent, NULL); diff --git a/src/ui_manager.c b/src/ui_manager.c index e54568c..08f193c 100644 --- a/src/ui_manager.c +++ b/src/ui_manager.c @@ -2,15 +2,23 @@ #include "main.h" #include "log.h" #include "main_view.h" +#include "util.h" const char *const UI_MANAGER_EDJE = "ui_manager.edj"; +static void +_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + int x, y, w, h; + evas_object_geometry_get(obj, &x, &y, &w, &h); + _D("%s (%d:%d:%d:%d)", data, x, y, w, h); +} + Evas_Object *ui_manager_create(Evas_Object *parent, moment_info_s *moment_info, int width, int height) { Evas_Object *ui_manager = NULL; - Evas_Object *rect = NULL; char *path = NULL; - char full_path[] = {0, }; + char full_path[PATH_LEN] = {0, }; retv_if(!parent, NULL); retv_if(!moment_info, NULL); @@ -21,23 +29,17 @@ Evas_Object *ui_manager_create(Evas_Object *parent, moment_info_s *moment_info, snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, UI_MANAGER_EDJE); free(path); + _D("ui_manager is created with %s", full_path); + ui_manager = elm_layout_add(parent); retv_if(!ui_manager, NULL); elm_layout_file_set(ui_manager, full_path, "main"); evas_object_size_hint_weight_set(ui_manager, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ui_manager, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_event_callback_add(ui_manager, EVAS_CALLBACK_RESIZE, _resize_cb, "ui_manager"); evas_object_show(ui_manager); - rect = evas_object_rectangle_add(moment_info->e); - if (rect) { - evas_object_size_hint_min_set(rect, width, height); - evas_object_color_set(rect, 200, 200, 200, 200); - evas_object_show(rect); - elm_object_part_content_set(ui_manager, "bg", rect); - } else - _E("cannot add a rectangle"); - moment_info->main_view = main_view_create(ui_manager, moment_info); if (moment_info->main_view) elm_object_part_content_set(ui_manager, "content", moment_info->main_view); @@ -51,15 +53,10 @@ Evas_Object *ui_manager_create(Evas_Object *parent, moment_info_s *moment_info, extern void ui_manager_destroy(Evas_Object *ui_manager) { - Evas_Object *rect = NULL; Evas_Object *content = NULL; ret_if(!ui_manager); - rect = elm_object_part_content_unset(ui_manager, "bg"); - if (rect) - evas_object_del(rect); - content = elm_object_part_content_unset(ui_manager, "content"); if (content) evas_object_del(content); diff --git a/tizen-manifest.xml b/tizen-manifest.xml index 0adbc05..9ce0854 100755 --- a/tizen-manifest.xml +++ b/tizen-manifest.xml @@ -6,7 +6,7 @@ <icon>adventure.png</icon> </ui-application> <privileges> - <privilege>http://tizen.org/privilege/internet</privilege> + <privilege>http://tizen.org/privilege/systemsettings</privilege> </privileges> - <feature name="http://tizen.org/feature/screen.size.all">true</feature> + <feature name="http://tizen.org/feature/screen.size.normal.480.800">true</feature> </manifest> |