This patch fixes below things-

1) reduces font size from 30 to 22
2) reduces base scale to 1.8 (iot-headed)
3) changes genlist part name to reflect new theme
4) fixes naviframe back button
5) changes style "type1" to "1line".

Change-Id: Ic2d8423468a7d49bc7c78f260c721f03f4a2fddc
Signed-off-by: Jagrat Patidar <j1.patidar@samsung.com>

diff --git a/inc/common-efl.h b/inc/common-efl.h
index e03b33f99abe08c61266875b0e0a9f9b999a048e..9d38db859d35714a32ee939b54f19a7eafec8640 100644 (file)
--- a/inc/common-efl.h
+++ b/inc/common-efl.h
@@ -52,7 +52,7 @@ typedef struct ug_data_t {
  */
 enum {
        ITEM_STYLE_DEFAULT = 0,/**< "default" style.*/
-       ITEM_STYLE_TYPE_ONE,   /**< "type1" style. */
+       ITEM_STYLE_TYPE_ONE,   /**< "1line" style. */
        ITEM_STYLE_ONE_ICON,   /**< "one_icon" style. */
        ITEM_STYLE_RADIO,      /**< "radio" style.*/
 };

diff --git a/res/edje/reject_calls_popup.edc b/res/edje/reject_calls_popup.edc
index 917862e657e6a0444628907e43245e8bdf3dbf54..440135a403730196fcacde332e37c14816ae76d2 100644 (file)
--- a/res/edje/reject_calls_popup.edc
+++ b/res/edje/reject_calls_popup.edc
@@ -20,7 +20,7 @@
 #define POPUP_CHECK_VIEW_LAYOUT_BOTTOM_MIN_INC 0 98
 #define POPUP_CHECK_VIEW_SWALLOW_END_MIN_INC 50 50
 collections {
-   base_scale: 2.6;
+   base_scale: 1.8;
    group { name: "popup_checkview_layout";
       parts {
          part { name: "bg";

diff --git a/res/edje/repeat_weekly_item.edc b/res/edje/repeat_weekly_item.edc
index a3d57016763d85d1e5766427cb6aa900786a6264..53d6f6732183f3c9ef1c3de10b1a3c80393addee 100644 (file)
--- a/res/edje/repeat_weekly_item.edc
+++ b/res/edje/repeat_weekly_item.edc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 collections {
-   base_scale: 2.6;
+   base_scale: 1.8;
    group { name: "weekly_item";
       parts {
          part { name: "base";
@@ -149,4 +149,4 @@ collections {
          }
       }
    }
-}
\ No newline at end of file
+}

diff --git a/res/edje/setting_notification.edc b/res/edje/setting_notification.edc
index 572eb0fc9f278bba9b674a5c873c939e7e6a83a3..c65b84ecc530a45bd971291b06015ff0fe9aa872 100644 (file)
--- a/res/edje/setting_notification.edc
+++ b/res/edje/setting_notification.edc
@@ -27,7 +27,7 @@
 #define SELECT_BUTTON_W 200
 #define GRID_PAD_H 15
 collections {
-   base_scale: 2.6;
+   base_scale: 1.8;
    styles {
       style { name: "text_style";
          base: "font=Samsungcondenced:style=Regular font_size=30 text_class=tizen align=center valign=top color=#000000 ellipsis=-1 wrap=mixed";

diff --git a/res/edje/time_button_layout.edc b/res/edje/time_button_layout.edc
index 83ffb399150c9ffe8f0f1f9ccdb39336824679c9..aacfa8ba253b78cd345fda436592c7430b197a5f 100644 (file)
--- a/res/edje/time_button_layout.edc
+++ b/res/edje/time_button_layout.edc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 collections {
-   base_scale: 2.6;
+   base_scale: 1.8;
    group { name: "button_layout";
       parts {
          part { name: "base";

diff --git a/src/allowed-calls.c b/src/allowed-calls.c
index e637b196c7e4812b26ca2c65c51ad79836b75e67..8e5bf975c575fa979eeef07dc0298afa0e37635a 100644 (file)
--- a/src/allowed-calls.c
+++ b/src/allowed-calls.c
@@ -325,7 +325,7 @@ static void create_allow_calls_from_popup()
        /* genlist */
        genlist = elm_genlist_add(box);
 
-       itc.item_style = "type1";
+       itc.item_style = "1line";
        itc.func.text_get = gl_text_get_cb;
        itc.func.content_get = NULL;
        itc.func.state_get = NULL;

diff --git a/src/app-details.c b/src/app-details.c
index 57b0fd970a61c630f8fff659c6baf525e7d63b96..273f5b8d0ada534ff71ca85b69de286ff4b00db5 100644 (file)
--- a/src/app-details.c
+++ b/src/app-details.c
@@ -276,7 +276,7 @@ static Evas_Object *app_details_gl_content_get_cb(void *data, Evas_Object *obj,
 
        switch (item) {
        case APP_DETAILS_ALLOW_NOTI:
-               if (!strcmp(part, "elm.swallow.end")) {
+               if (!strcmp(part, "elm.icon")) {
                        check = create_check(obj, "on&off");
                        elm_check_state_set(check, allow_noti_status_get());
                        evas_object_smart_callback_add(check, "changed", allow_noti_check_changed_cb, NULL);
@@ -286,7 +286,7 @@ static Evas_Object *app_details_gl_content_get_cb(void *data, Evas_Object *obj,
                }
                break;
        case APP_DETAILS_POPUP_NOTI:
-               if (!strcmp(part, "elm.swallow.end")) {
+               if (!strcmp(part, "elm.icon")) {
                        check = create_check(obj, "on&off");
                        elm_check_state_set(check, popup_noti_status_get());
                        evas_object_smart_callback_add(check, "changed", popup_noti_check_changed_cb, NULL);
@@ -294,7 +294,7 @@ static Evas_Object *app_details_gl_content_get_cb(void *data, Evas_Object *obj,
                }
                break;
        case APP_DETAILS_APP_BADGE:
-               if (!strcmp(part, "elm.swallow.end")) {
+               if (!strcmp(part, "elm.icon")) {
                        check = create_check(obj, "on&off");
                        elm_check_state_set(check, app_badge_status_get());
                        evas_object_smart_callback_add(check, "changed", app_badge_check_changed_cb, NULL);
@@ -422,7 +422,7 @@ static void show_noti_on_lock_popup()
        Evas_Object *radio = elm_radio_add(genlist);
        evas_object_data_set(genlist, "radio", radio);
 
-       itc.item_style = "type1";
+       itc.item_style = "1line";
        itc.func.text_get = gl_text_get_cb;
        itc.func.content_get = gl_content_get_cb;
        itc.func.state_get = NULL;
@@ -521,11 +521,11 @@ void app_details_create_view(ug_data *data, item_info_s *app_info)
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-       app_details_gl_append(genlist, "type1", APP_DETAILS_ALLOW_NOTI);
+       app_details_gl_append(genlist, "1line", APP_DETAILS_ALLOW_NOTI);
        app_details_gl_append(genlist, "group_index", APP_DETAILS_GROUP_INDEX);
        app_details_gl_append(genlist, "multiline", APP_DETAILS_POPUP_NOTI);
-       app_details_gl_append(genlist, "type1", APP_DETAILS_APP_BADGE);
-       app_details_gl_append(genlist, "type1", APP_DETAILS_NOTI_ON_LOCK);
+       app_details_gl_append(genlist, "1line", APP_DETAILS_APP_BADGE);
+       app_details_gl_append(genlist, "1line", APP_DETAILS_NOTI_ON_LOCK);
 
        Elm_Object_Item *navi_item = elm_naviframe_item_push(data->naviframe, g_app_info->name, back_btn, NULL, genlist, NULL);
        elm_naviframe_item_pop_cb_set(navi_item, app_details_pop_cb, NULL);

diff --git a/src/common-efl.c b/src/common-efl.c
index 005cc04b4de20d64bc498fb337ed5497baa948cb..003f22e35bf7cb57c79940e34d4ec2df1caef6df 100644 (file)
--- a/src/common-efl.c
+++ b/src/common-efl.c
@@ -209,7 +209,7 @@ static Evas_Object *gl_content_get_cb(void *data, Evas_Object *obj, const char *
                }
        }
 
-       if (!strcmp(part, "elm.swallow.end")) {
+       if (!strcmp(part, "elm.icon")) {
                if (data_list->item_style == ITEM_STYLE_TYPE_ONE) {
                        return NULL;
                } else if (data_list->item_style == ITEM_STYLE_DEFAULT) {
@@ -314,11 +314,11 @@ void append_gl_item_list(Evas_Object *genlist, Eina_List *list, int style, char
        ret_if(!itc);
 
        if (style == ITEM_STYLE_TYPE_ONE) {
-               itc->item_style = "type1";
+               itc->item_style = "1line";
        } else if (style == ITEM_STYLE_ONE_ICON) {
                itc->item_style = "one_icon";
        } else {
-               itc->item_style = "default";
+               itc->item_style = "1line";
        }
        itc->func.text_get = gl_text_get_cb;
        itc->func.content_get = gl_content_get_cb;
@@ -351,7 +351,7 @@ static char *_gl_option_text_get_cb(void *data, Evas_Object *obj, const char *pa
        retv_if(!data, NULL);
        if (!strcmp(data, "do-not-disturb")) {
                if (!strcmp("elm.text.multiline", part)) {
-                       snprintf(buf, sizeof(buf), "<font_size=30>%s</font_size>", APP_STRING("IDS_ST_BODY_MUTE_ALL_ALERTS_AND_ONLY_SHOW_NOTIFICATIONS_IN_THE_NOTIFICATION_PANEL_ADD_APPS_BELOW_TO_ALLOW_EXCEPTIONS"));
+                       snprintf(buf, sizeof(buf), "<font_size=20>%s</font_size>", APP_STRING("IDS_ST_BODY_MUTE_ALL_ALERTS_AND_ONLY_SHOW_NOTIFICATIONS_IN_THE_NOTIFICATION_PANEL_ADD_APPS_BELOW_TO_ALLOW_EXCEPTIONS"));
                        return strdup(buf);
                }
 
@@ -370,10 +370,10 @@ static char *_gl_option_text_get_cb(void *data, Evas_Object *obj, const char *pa
                                struct tm end_time;
                                load_dnd_schedule_time(&start_time, &end_time);
 
-                               snprintf(buf, sizeof(buf), "<font_size=30>%s<br/>%s</font_size>",
+                               snprintf(buf, sizeof(buf), "<font_size=22>%s<br/>%s</font_size>",
                                                get_day_string(dndSchedule), get_time_string(&start_time, &end_time));
                        } else
-                               snprintf(buf, sizeof(buf), "<font_size=30>%s</font_size>", APP_STRING("WDS_ST_ACBUTTON_OFF_ABB2"));
+                               snprintf(buf, sizeof(buf), "<font_size=22>%s</font_size>", APP_STRING("WDS_ST_ACBUTTON_OFF_ABB2"));
 
                        return strdup(buf);
                }
@@ -389,7 +389,7 @@ static char *_gl_option_text_get_cb(void *data, Evas_Object *obj, const char *pa
                return strdup(APP_STRING("IDS_ST_SBODY_NEXT_DAY_M_LC_ABB"));
        } else if (!strcmp(data, "allowed-calls")) {
                if (!strcmp("elm.text.multiline", part)) {
-                       snprintf(buf, sizeof(buf), "<font_size=30>%s</font_size>", APP_STRING(get_allowed_calls_string()));
+                       snprintf(buf, sizeof(buf), "<font_size=20>%s</font_size>", APP_STRING(get_allowed_calls_string()));
                        return strdup(buf);
                }
                if (!strcmp("elm.text", part)) {
@@ -422,7 +422,7 @@ static Evas_Object *_gl_option_content_get_cb(void *data, Evas_Object *obj, cons
 {
        retv_if(!data, NULL);
 
-       if (!strcmp(data, "do-not-disturb") && !strcmp(part, "elm.swallow.end")) {
+       if (!strcmp(data, "do-not-disturb") && !strcmp(part, "elm.icon")) {
                Evas_Object *check = NULL;
                check = create_check(obj, "on&off");
                elm_check_state_set(check, get_do_not_disturb());
@@ -430,18 +430,18 @@ static Evas_Object *_gl_option_content_get_cb(void *data, Evas_Object *obj, cons
                return check;
        }
 
-       if (!strcmp(data, "set-schedule") && !strcmp("elm.swallow.end", part)) {
+       if (!strcmp(data, "set-schedule") && !strcmp(part, "elm.icon")) {
                Evas_Object *check = create_check(obj, "on&off");
                elm_check_state_set(check, get_schedule());
                evas_object_smart_callback_add(check, "changed", set_schedule_check_changed_cb, NULL);
                return check;
        }
 
-       if (!strcmp(data, "start-time") && !strcmp("elm.swallow.end", part)) {
+       if (!strcmp(data, "start-time") && !strcmp(part, "elm.icon")) {
                return start_end_time_item(obj, true);
        }
 
-       if (!strcmp(data, "end-time") && !strcmp("elm.swallow.end", part)) {
+       if (!strcmp(data, "end-time") && !strcmp(part, "elm.icon")) {
                return start_end_time_item(obj, false);
        }
 

diff --git a/src/excepted-apps-efl.c b/src/excepted-apps-efl.c
index f3cc0044207ece61e0ea0ee92212a9141d36e488..5e1659fdafa98e889310a1ae1db04935dca40dfc 100644 (file)
--- a/src/excepted-apps-efl.c
+++ b/src/excepted-apps-efl.c
@@ -161,10 +161,10 @@ void exception_application_clicked_cb(void *data, Evas_Object *obj, void *event_
 
        /* Title Done Button */
        done_btn = elm_button_add(u_data->naviframe);
-       elm_object_style_set(done_btn, "naviframe/title_right");
+       elm_object_style_set(done_btn, "naviframe/end_btn/default");
        evas_object_smart_callback_add(done_btn, "clicked", _done_button_cb, u_data);
        elm_object_text_set(done_btn, APP_STRING("IDS_TPLATFORM_ACBUTTON_DONE_ABB"));
-       elm_object_item_part_content_set(navi_item, "title_right_btn", done_btn);
+       elm_object_item_part_content_set(navi_item, "elm.swallow.prev_btn", done_btn);
        u_data->done_button = done_btn;
 
 }

diff --git a/src/lock_screen_content.c b/src/lock_screen_content.c
index c1e1cce3f15fab48b408a2a23432a772cf6ac1fc..55972fe67b8e66c232f1d4d1d7a46d53daefc04a 100644 (file)
--- a/src/lock_screen_content.c
+++ b/src/lock_screen_content.c
@@ -29,7 +29,7 @@ void show_all_content_clicked()
        if (genlist_item)
                elm_genlist_clear(ugd->list_sub);
        g_lock_screen_content_level = SHOW_ALL_CONTENT;
-       append_gl_start_option(ugd->list_sub, "type1", "show-all-content");
+       append_gl_start_option(ugd->list_sub, "1line", "show-all-content");
 
 }
 
@@ -43,7 +43,7 @@ void hide_sensitive_content_clicked()
        if (genlist_item)
                elm_genlist_clear(ugd->list_sub);
        g_lock_screen_content_level = HIDE_SENSITIVE_CONTENT;
-       append_gl_start_option(ugd->list_sub, "type1", "hide-sensitive-content");
+       append_gl_start_option(ugd->list_sub, "1line", "hide-sensitive-content");
 }
 
 void do_not_show_notifications_clicked()

diff --git a/src/set-schedule-info.c b/src/set-schedule-info.c
index bdfeee5a592c203af41d169822b4daa2118290e2..bbfccfbb3d2f9d71c403233ddb3928cb362b6da8 100644 (file)
--- a/src/set-schedule-info.c
+++ b/src/set-schedule-info.c
@@ -832,10 +832,10 @@ void gl_set_schedule_selected(ug_data *data)
 
        /* Push to naviframe */
        ugd->list_sub = _create_set_schedule_disturb_gl(ugd);
-       append_gl_start_option(ugd->list_sub, "type1", "set-schedule");
+       append_gl_start_option(ugd->list_sub, "1line", "set-schedule");
        append_gl_full_item(ugd->list_sub, repeat_weekly_layout_cb, NULL);
-       append_gl_start_option(ugd->list_sub, "type1", "start-time");
-       append_gl_start_option(ugd->list_sub, "type1", "end-time");
+       append_gl_start_option(ugd->list_sub, "1line", "start-time");
+       append_gl_start_option(ugd->list_sub, "1line", "end-time");
        ugd->navi_item = elm_naviframe_item_push(ugd->naviframe, APP_STRING("IDS_ST_MBODY_SET_SCHEDULE_M_TIME"), back_btn, NULL, ugd->list_sub, NULL);
        enable_time_items(get_schedule());
 }