Changed wording and icon position due to ux change

Change-Id: Ibde18ae77a05cd3cb7eb07cc12f485322698f1f9
Signed-off-by: Younho Park <younho.park@samsung.com>

diff --git a/packaging/org.tizen.settings-adid.spec b/packaging/org.tizen.settings-adid.spec
index 2d986ac..9cd9ba2 100644 (file)
--- a/packaging/org.tizen.settings-adid.spec
+++ b/packaging/org.tizen.settings-adid.spec
@@ -40,8 +40,6 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %define RW_PREFIX      "/opt/usr/apps/org.tizen.settings-adid"
 
 cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_RW_PREFIX=%{RW_PREFIX}
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_DATADIR=%{DATADIR}
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_SHAREDDIR=%{SHAREDDIR}
 make %{?jobs:-j%jobs}
 
 
@@ -52,13 +50,6 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license/
 
 %make_install
 
-###### for package signing step ######
-%define tizen_sign 1
-%define tizen_sign_base /usr/apps/org.tizen.settings-adid
-%define tizen_sign_level platform
-%define tizen_author_sign 1
-%define tizen_dist_sign 1
-
 %post
 /sbin/ldconfig
 mkdir -p /opt/usr/apps/org.tizen.settings-adid/data

diff --git a/resources/edc/adid.edc b/resources/edc/adid.edc
index 2cc8c01..3a8302e 100644 (file)
--- a/resources/edc/adid.edc
+++ b/resources/edc/adid.edc
@@ -8,7 +8,7 @@ collections {
                align: 0.0 0.0;
                rel1 { relative: 0.0 0.0; }
                rel2 { relative: 0.0 0.0; }
-               text { font: "Tizen:style=regular"; size: 20; min: 1 1; }
+               text { font: "Tizen:style=regular"; size: 20; }
                color: 0 0 0 255;
             }
          }

diff --git a/src/ad-id.c b/src/ad-id.c
index 02023b8..b3986d5 100644 (file)
--- a/src/ad-id.c
+++ b/src/ad-id.c
@@ -114,8 +114,8 @@ _create_opt_out_popup(ad_id_app_data_s *ad, Evas_Object *chk)
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_data_set(popup, "checkobj", chk);
        elm_object_text_set(popup,
-               "You may not see ads based on your interests as you are opting out interest-based ads. However, you will still see ads.");
-       elm_object_part_text_set(popup, "title,text", "Opt out?");
+               "Interest-based ads will not be shown. Ads that are not interest-based will still be shown.");
+       elm_object_part_text_set(popup, "title,text", "Opt out of ads");
 
        /* ok button */
        btn = elm_button_add(popup);
@@ -166,8 +166,8 @@ _create_reset_id_popup(ad_id_app_data_s *ad)
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_data_set(popup, "appdata", ad);
        elm_object_text_set(popup,
-               "Your advertising ID will be replaced with a new random number");
-       elm_object_part_text_set(popup, "title,text", "Reset advertising ID?");
+               "Your advertising ID will be replaced with a new randomly assigned number.");
+       elm_object_part_text_set(popup, "title,text", "Reset advertising ID");
 
        /* ok button */
        btn = elm_button_add(popup);
@@ -200,18 +200,18 @@ _text_get_cb(void *data, Evas_Object *obj, const char *part)
        if (!strcmp(part, "elm.text")) {
                switch (id) {
                case 2:
-                       return strdup("Your advertising ID :");
+                       return strdup("Your advertising ID");
                case 3:
                        return strdup("Reset advertising ID");
                case 4:
-                       return strdup("Opt out of interest-based ad");
+                       return strdup("Opt out of interest-based ads");
                default:
                        break;
                }
        } else if (!strcmp(part, "elm.text.multiline")) {
                switch (id) {
                case 1:
-                       long_text = "Control the types of interest-based ads that you see on this device.";
+                       long_text = "Manage the types of ads you see on your device.";
                        snprintf(buf, sizeof(buf), "<font_size=40><color=#000000>%s</color></font_size>", long_text);
                        return strdup(buf);
                case 2:
@@ -219,9 +219,9 @@ _text_get_cb(void *data, Evas_Object *obj, const char *part)
                        AI_LOGD("adid: %s", adid);
                        return strdup(adid);
                case 3:
-                       return strdup("Recreate a new user profile by generating new user ID");
+                       return strdup("Create a new user profile by generating a new advertising ID.");
                case 4:
-                       return strdup("Do not let apps use your advertising ID to build profiles to show you interest bases ads");
+                       return strdup("Do not allow apps to use your advertising ID to build profiles which show you interest-bases ads.");
                default:
                        break;
                }
@@ -236,20 +236,23 @@ _content_get_cb(void *data, Evas_Object *obj, const char *part)
 {
        AI_FUNC_ENTER
        int val = 0;
+       int id = (int) data;
        vconf_get_int(VCONFKEY_SETAPPL_AD_ID_OPT_OUT, &val);
 
-       if (!strcmp("elm.swallow.icon", part)) {
-               Evas_Object *check;
-               check = elm_check_add(obj);
-               elm_object_style_set(check, "on&off");
-               if (val == 0)
-                       elm_check_state_set(check, EINA_FALSE);
-               else
-                       elm_check_state_set(check, EINA_TRUE);
-
-               elm_object_signal_emit(check, "elm,event,pass,enabled", "elm");
-               evas_object_propagate_events_set(check, EINA_TRUE);
-               return check;
+       if (id == 4) {
+               if (!strcmp("elm.swallow.end", part)) {
+                       Evas_Object *check;
+                       check = elm_check_add(obj);
+                       elm_object_style_set(check, "on&off");
+                       if (val == 0)
+                               elm_check_state_set(check, EINA_FALSE);
+                       else
+                               elm_check_state_set(check, EINA_TRUE);
+
+                       elm_object_signal_emit(check, "elm,event,pass,enabled", "elm");
+                       evas_object_propagate_events_set(check, EINA_TRUE);
+                       return check;
+               }
        }
 
        return NULL;
@@ -267,7 +270,7 @@ void sel_cb(void *data, Evas_Object *obj, void *event_info)
                _create_reset_id_popup(ad);
 
        } else if (id == 4) {
-               Evas_Object *chk = (Evas_Object *)elm_object_item_part_content_get(it, "elm.swallow.icon");
+               Evas_Object *chk = (Evas_Object *)elm_object_item_part_content_get(it, "elm.swallow.end");
                if (!elm_check_state_get(chk))
                        _create_opt_out_popup(ad, chk);
                else {
@@ -293,35 +296,22 @@ create_list_view(ad_id_app_data_s *ad)
        AI_FUNC_ENTER
        AI_LOGD("Entered in to create list view");
        Evas_Object *genlist;
-       Elm_Genlist_Item_Class *itc, *itc1, *itc2 = NULL;
+       Elm_Genlist_Item_Class *itc = NULL;
        Evas_Object *nf = ad->nf;
        Elm_Object_Item *nf_it;
 
-       itc2 = elm_genlist_item_class_new();
-       itc2->item_style = "multiline";
-       itc2->func.content_get = NULL;
-       itc2->func.text_get = _text_get_cb;
-       itc2->func.del = NULL;
-
        itc = elm_genlist_item_class_new();
-       itc->item_style = "multiline_sub.main.1icon";
+       itc->item_style = "multiline";
        itc->func.content_get = _content_get_cb;
        itc->func.text_get = _text_get_cb;
        itc->func.del = NULL;
 
-       itc1 = elm_genlist_item_class_new();
-       itc1->item_style = "multiline_sub.main";
-       itc1->func.content_get = NULL;
-       itc1->func.text_get = _text_get_cb;
-       itc1->func.del = NULL;
-
-
        genlist = elm_genlist_add(nf);
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        evas_object_data_set(genlist, "ad", ad);
 
        Elm_Object_Item *item1 = elm_genlist_item_append(genlist,       /* genlist object */
-               itc2,   /* item class */
+               itc,    /* item class */
                (void *)1,      /* item class user data */
                NULL,
                ELM_GENLIST_ITEM_NONE,  /* item type */
@@ -330,7 +320,7 @@ create_list_view(ad_id_app_data_s *ad)
        elm_genlist_item_select_mode_set(item1, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
        id_it = elm_genlist_item_append(genlist,        /* genlist object */
-               itc2,   /* item class */
+               itc,    /* item class */
                (void *)2,      /* item class user data */
                NULL,
                ELM_GENLIST_ITEM_NONE,  /* item type */
@@ -339,7 +329,7 @@ create_list_view(ad_id_app_data_s *ad)
        elm_genlist_item_select_mode_set(id_it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
        elm_genlist_item_append(genlist,        /* genlist object */
-               itc2,           /* item class */
+               itc,            /* item class */
                (void *)3,      /* item class user data */
                NULL,
                ELM_GENLIST_ITEM_NONE,  /* item type */
@@ -357,7 +347,7 @@ create_list_view(ad_id_app_data_s *ad)
        Evas_Object *back_btn = elm_button_add(ad->nf);
        elm_object_style_set(back_btn, "naviframe/back_btn/default");
        evas_object_smart_callback_add(back_btn, "clicked", prev_btn_selected_cb, ad);
-       nf_it = elm_naviframe_item_push(nf, "Ads", back_btn, NULL, genlist, NULL);
+       nf_it = elm_naviframe_item_push(nf, "Ad settings", back_btn, NULL, genlist, NULL);
        elm_naviframe_item_pop_cb_set(nf_it, naviframe_pop_cb, ad->win);
 }
 
@@ -386,7 +376,6 @@ create_base_gui(ad_id_app_data_s *ad)
        elm_win_resize_object_add(ad->win, ad->conform);
        evas_object_show(ad->conform);
 
-
        ad->nf = elm_naviframe_add(ad->conform);
        AI_LOGD("Entered in to crease base");
        create_list_view(ad);
@@ -453,40 +442,11 @@ static void _app_control_cb(app_control_h app_control, void *user_data)
        }
 }
 
-/*
-static void _app_low_memory_cb(void *user_data)
-{
-       AI_FUNC_ENTER
-       //Nothing
-}
-
-static void _app_low_battery_cb(void *user_data)
-{
-       AI_FUNC_ENTER
-       //Nothing
-}
-
-static void _app_device_orientation_cb(app_device_orientation_e orientation, void *user_data)
-{
-       AI_FUNC_ENTER
-
-       //Nothing
-}
-*/
-
 static void _app_language_changed_cb(app_event_info_h event_info, void *user_data)
 {
        AI_FUNC_ENTER
 }
 
-/*
-static void _app_region_format_changed_cb(void *user_data)
-{
-       AI_FUNC_ENTER
-       //Nothing
-}
-*/
-
 int main(int argc, char *argv[])
 {
        AI_FUNC_ENTER