[P170307-03171] add callback for anchor in UC

Signed-off-by: jomui <jongmun.woo@samsung.com>
Change-Id: I3fffc9cb8545013f884d02acc78d1bd0a427cb80

diff --git a/heremaps-uc/org.tizen.heremaps-uc.xml b/heremaps-uc/org.tizen.heremaps-uc.xml
index 18c4af6eb8c473cfbc708ad56a554ddea53ca842..0264e3d1c473f08c7d72cd929df3435902e2a0ec 100644 (file)
--- a/heremaps-uc/org.tizen.heremaps-uc.xml
+++ b/heremaps-uc/org.tizen.heremaps-uc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.heremaps-uc" api-version="2.4" version="1.1.0" install-location="internal-only">
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.heremaps-uc" api-version="2.4" version="1.1.1" install-location="internal-only">
        <label>HereMaps UC</label>
        <author email="cbible.kim@samsung.com" href="www.samsung.com">Seechan Kim</author>
        <author email="jongmun.woo@samsung.com" href="www.samsung.com">JongMun Woo</author>

diff --git a/heremaps-uc/src/heremaps-uc.c b/heremaps-uc/src/heremaps-uc.c
index 2931fd70d23523d77f20c8540996d77c0ebda1ff..1265b98c94cd1497487abe497f180eb29691b300 100644 (file)
--- a/heremaps-uc/src/heremaps-uc.c
+++ b/heremaps-uc/src/heremaps-uc.c
@@ -132,6 +132,20 @@ static Evas_Object *create_win(const char *name)
        return eo;
 }
 
+static void anchor_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       LS_FUNC_ENTER
+       Elm_Entry_Anchor_Info *ai = event_info;
+       LS_RETURN_IF_FAILED(ai);
+
+       app_control_h ac = NULL;
+       app_control_create(&ac);
+       app_control_set_operation(ac, APP_CONTROL_OPERATION_VIEW);
+       app_control_set_uri(ac, ai->name);
+       app_control_send_launch_request(ac, NULL, NULL);
+       app_control_destroy(ac);
+}
+
 #ifdef TIZEN_WEARABLE
 static Evas_Object *create_popup_wearable(Evas_Object *layout, heremaps_uc_app_data *ad)
 {
@@ -170,6 +184,7 @@ static Evas_Object *create_popup_wearable(Evas_Object *layout, heremaps_uc_app_d
        elm_entry_editable_set(entry, EINA_FALSE);
        elm_object_part_text_set(entry, "elm.text", text);
        elm_entry_text_style_user_push(entry, "DEFAULT='align=center'");
+       evas_object_smart_callback_add(entry, "anchor,clicked", anchor_clicked_cb, NULL);
        elm_box_pack_end(box, entry);
        evas_object_show(entry);
 
@@ -201,13 +216,27 @@ static Evas_Object *create_popup(Evas_Object *layout, heremaps_uc_app_data *ad)
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_object_part_text_set(popup, "title,text", P_("IDS_POSITIONING_CONSENT_TITLE"));
 
+       Evas_Object *box = elm_box_add(popup);
+       elm_box_align_set(box, 0.5, 0);
+       elm_object_part_content_set(popup, "elm.swallow.content", box);
+       evas_object_show(box);
+
        char buf[4096] = {0};
        char *str1 = P_("IDS_POSITIONING_CONSENT_BODY");
-       char *str2 = "<color=#006fd1ff underline=on underline_color=#006fd1ff><a href=http://here.com/terms/service-    terms>http://here.com/terms/service-terms</a></color>";
-       char *str3 = "<color=#006fd1ff underline=on underline_color=#006fd1ff><a href=http://here.com/privacy/privac    y-policy>http://here.com/privacy/privacy-policy</a></color>";
+       char *str2 = "<color=#006fd1ff underline=on underline_color=#006fd1ff><a href=http://here.com/terms/service-terms>http://here.com/terms/service-terms</a></color>";
+       char *str3 = "<color=#006fd1ff underline=on underline_color=#006fd1ff><a href=http://here.com/privacy/privacy-policy>http://here.com/privacy/privacy-policy</a></color>";
        snprintf(buf, 4096, str1, str2, str3);
        char *text = strdup(buf);
-       elm_object_text_set(popup, text);
+
+       Evas_Object* entry = elm_entry_add(box);
+       evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0.0);
+       evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       elm_entry_editable_set(entry, EINA_FALSE);
+       elm_object_part_text_set(entry, "elm.text", text);
+       elm_entry_text_style_user_push(entry, "DEFAULT='align=center'");
+       evas_object_smart_callback_add(entry, "anchor,clicked", anchor_clicked_cb, NULL);
+       elm_box_pack_end(box, entry);
+       evas_object_show(entry);
 
        /* Disagree button */
        disagree_btn = elm_button_add(popup);

diff --git a/maps-plugin-here.changes b/maps-plugin-here.changes
index 1fcd89bed43704a0eec5410fb33e17fbc3945b7d..ff329cf103bc89dad66bb5ab31eab00ac735082f 100644 (file)
--- a/maps-plugin-here.changes
+++ b/maps-plugin-here.changes
@@ -1,3 +1,8 @@
+[Version]   maps-plugin-here_0.3.16
+[Date]      09 Mar 2017
+[Title]     fixed to URL link of UC
+[Developer] Jongmun Woo <jongmun.woo@samsung.com>
+
 [Version]   maps-plugin-here_0.3.15
 [Date]      13 Jan 2017
 [Title]     fixed to set vconf value

diff --git a/packaging/maps-plugin-here.spec b/packaging/maps-plugin-here.spec
index 3931915ef9851010c9a8ada1b7b9ce9c157ac329..0532a331675c032eaa599bebe9ee53656c672687 100644 (file)
--- a/packaging/maps-plugin-here.spec
+++ b/packaging/maps-plugin-here.spec
@@ -1,6 +1,6 @@
 Name:       maps-plugin-here
 Summary:    Tizen HERE Maps Plug-in Library
-Version:    0.3.15
+Version:    0.3.16
 Release:    1
 Group:      Location/Libraries
 License:    Apache-2.0 and HERE