modify recent preview edc

Change-Id: Ibdaa04b6cb992ce031f5617dc07a10d602dc8d18
Signed-off-by: Soohye Shin <soohye.shin@samsung.com>

diff --git a/edje/view/recent.edc b/edje/view/recent.edc
index 458aac7..7091168 100644 (file)
--- a/edje/view/recent.edc
+++ b/edje/view/recent.edc
@@ -338,7 +338,7 @@ group {
                        description {
                                state, "default" 0.0;
                                min, 378 294;
-                               color, 0 0 0 70;
+                               color, 113 128 147 255;
                        }
                        description {
                                state, "focus" 0.0;
@@ -347,127 +347,140 @@ group {
                        }
                }
                part {
-                       name, "pad.thumbnail.left";
+                       name, "thumbnail";
                        type, RECT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 3 3;
-                               rel2.relative, 0.0 0.0;
-                               align, 0.0 0.0;
-                               fixed, 1 1;
-                               visible, 0;
+                               rel1.to, "bg";
+                               rel2 {
+                                       to, "bg";
+                                       relative, 1.0 0.0;
+                               }
+                               min, 0 198;
+                               fixed, 0 1;
+                               align, 0.5 0.0;
+                               color, 132 147 166 255;
                        }
                }
                part {
-                       name, "pad.thumbnail.right";
-                       type, RECT;
+                       name, PART_RECENT_THUMBNAIL;
+                       type, SWALLOW;
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 3 3;
-                               rel1.relative, 1.0 0.0;
-                               rel2.relative, 1.0 0.0;
-                               align, 1.0 0.0;
+                               rel1.to, "thumbnail";
+                               rel2.to, "thumbnail";
+                               min, 100 100;
                                fixed, 1 1;
-                               visible, 0;
                        }
                }
                part {
-                       name, PART_RECENT_THUMBNAIL;
-                       type, SWALLOW;
+                       name, "border.up";
+                       type, RECT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               rel1 {
-                                       to, "pad.thumbnail.left";
-                                       relative, 1.0 1.0;
-                               }
+                               rel1.to, "thumbnail";
                                rel2 {
-                                       to, "pad.thumbnail.right";
-                                       relative, 0.0 1.0;
+                                       to, "thumbnail";
+                                       relative, 1.0 0.0;
                                }
-                               min, 0 196;
+                               min, 0 3;
                                fixed, 0 1;
                                align, 0.5 0.0;
+                               color, 0 0 0 0;
+                       }
+                       description {
+                               state, "focus" 0.0;
+                               inherit, "default" 0.0;
+                               color, 0 119 246 255;
                        }
                }
                part {
-                       name, "pad.icon";
+                       name, "border.left";
                        type, RECT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, PART_RECENT_THUMBNAIL;
-                                       relative, 0.0 0.0;
+                                       to, "border.up";
+                                       relative, 0.0 1.0;
                                }
                                rel2 {
-                                       to, PART_RECENT_THUMBNAIL;
-                                       relative, 0.0 0.0;
+                                       to, "thumbnail";
+                                       relative, 0.0 1.0;
                                }
-                               min, 4 4;
-                               fixed, 1 1;
-                               align, 0.0 0.0;
-                               visible, 0;
+                               min, 3 0;
+                               fixed, 1 0;
+                               align, 0.0 0.5;
+                               color, 0 0 0 0;
+                       }
+                       description {
+                               state, "focus" 0.0;
+                               inherit, "default" 0.0;
+                               color, 0 119 246 255;
                        }
                }
                part {
-                       name, PART_RECENT_ICON;
-                       type, SWALLOW;
+                       name, "border.right";
+                       type, RECT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, "pad.icon";
-                                       relative, 1.0 1.0;
-                               }
-                               rel2 {
-                                       to, "pad.icon";
+                                       to, "border.up";
                                        relative, 1.0 1.0;
                                }
-                               min, 60 60;
-                               fixed, 1 1;
-                               align, 0.0 0.0;
+                               rel2.to, "thumbnail";
+                               min, 3 0;
+                               fixed, 1 0;
+                               align, 1.0 0.5;
+                               color, 0 0 0 0;
+                       }
+                       description {
+                               state, "focus" 0.0;
+                               inherit, "default" 0.0;
+                               color, 0 119 246 255;
                        }
                }
                part {
-                       name, "pad.fav";
+                       name, "pad.icon";
                        type, RECT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, PART_RECENT_THUMBNAIL;
-                                       relative, 1.0 0.0;
+                                       to, "thumbnail";
+                                       relative, 0.0 0.0;
                                }
                                rel2 {
-                                       to, PART_RECENT_THUMBNAIL;
-                                       relative, 1.0 0.0;
+                                       to, "thumbnail";
+                                       relative, 0.0 0.0;
                                }
                                min, 4 4;
                                fixed, 1 1;
-                               align, 1.0 0.0;
+                               align, 0.0 0.0;
                                visible, 0;
                        }
                }
                part {
-                       name, PART_RECENT_FAVORITE;
+                       name, PART_RECENT_ICON;
                        type, SWALLOW;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, "pad.fav";
-                                       relative, 0.0 1.0;
+                                       to, "pad.icon";
+                                       relative, 1.0 1.0;
                                }
                                rel2 {
-                                       to, "pad.fav";
-                                       relative, 0.0 1.0;
+                                       to, "pad.icon";
+                                       relative, 1.0 1.0;
                                }
                                min, 60 60;
                                fixed, 1 1;
-                               align, 1.0 0.0;
+                               align, 0.0 0.0;
                        }
                }
                part {
@@ -478,11 +491,11 @@ group {
                                state, "default" 0.0;
                                min, 15 18;
                                rel1 {
-                                       to, PART_RECENT_THUMBNAIL;
+                                       to, "thumbnail";
                                        relative, 0.0 1.0;
                                }
                                rel2 {
-                                       to, PART_RECENT_THUMBNAIL;
+                                       to, "thumbnail";
                                        relative, 0.0 1.0;
                                }
                                fixed, 1 1;
@@ -498,11 +511,11 @@ group {
                                state, "default" 0.0;
                                min, 15 18;
                                rel1 {
-                                       to, PART_RECENT_THUMBNAIL;
+                                       to, "thumbnail";
                                        relative, 1.0 1.0;
                                }
                                rel2 {
-                                       to, PART_RECENT_THUMBNAIL;
+                                       to, "thumbnail";
                                        relative, 1.0 1.0;
                                }
                                fixed, 1 1;
@@ -557,6 +570,9 @@ group {
                        action, STATE_SET "focus" 0.0;
                        transition, TRANSITION_DECEL;
                        target, "bg";
+                       target, "border.up";
+                       target, "border.right";
+                       target, "border.left";
                }
                program {
                        name, "sig,unfocus";
@@ -565,6 +581,9 @@ group {
                        action, STATE_SET "default" 0.0;
                        transition, TRANSITION_DECEL;
                        target, "bg";
+                       target, "border.up";
+                       target, "border.right";
+                       target, "border.left";
                }
        }
 }

diff --git a/src/data/data_recent.c b/src/data/data_recent.c
index 55c7486..d752b85 100644 (file)
--- a/src/data/data_recent.c
+++ b/src/data/data_recent.c
@@ -44,11 +44,12 @@ static struct datamgr_item *_new_datamgr_item(char *title, char *thumb,
        }
 
        di->title = strdup(title);
-       di->icon = strdup(thumb);
        di->focus_icon = strdup(icon);
        di->type = type;
        di->parameter = strdup(parameter);
        di->action = ITEM_SELECT_ACTION_LAUNCH;
+       if (thumb)
+               di->icon = strdup(thumb);
        if (subtitle)
                di->subtitle = strdup(subtitle);
        if (key && value) {
@@ -143,9 +144,8 @@ static void _channel_list_foreach(gpointer data, gpointer user_data)
                                channel.program_name ?
                                                channel.program_name : "");
 
-       di = _new_datamgr_item(buf, IMAGE_RECENT_THUMB_CHANNEL, NULL,
-                       PACKAGE_LIVETV, KEY_CHANNEL, rdata->id,
-                       IMAGE_RECENT_ICON_CHANNEL, 1);
+       di = _new_datamgr_item(buf, NULL, NULL, PACKAGE_LIVETV, KEY_CHANNEL,
+                       rdata->id, IMAGE_RECENT_ICON_CHANNEL, 1);
        if (di)
                dm->list = eina_list_append(dm->list, di);
 }

diff --git a/src/view/view_recent.c b/src/view/view_recent.c
index f1445b1..2f9d743 100644 (file)
--- a/src/view/view_recent.c
+++ b/src/view/view_recent.c
@@ -325,14 +325,6 @@ static struct _bar_item *_pack_item(struct _priv *priv, Evas_Object *box,
        }
        evas_object_show(eo);
 
-       thumb = utils_add_icon(eo, di->icon, PART_RECENT_THUMBNAIL);
-       if (!thumb) {
-               _ERR("failed to add thumb");
-               evas_object_del(eo);
-               free(bi);
-               return NULL;
-       }
-
        ic = utils_add_icon(eo, di->focus_icon, PART_RECENT_ICON);
        if (!ic)
                _ERR("failed to add icon");
@@ -346,6 +338,16 @@ static struct _bar_item *_pack_item(struct _priv *priv, Evas_Object *box,
                return NULL;
        }
 
+       if (di->icon) {
+               thumb = utils_add_icon(eo, di->icon, PART_RECENT_THUMBNAIL);
+               if (!thumb) {
+                       _ERR("failed to add thumb");
+                       evas_object_del(eo);
+                       free(bi);
+                       return NULL;
+               }
+       }
+
        if (di->subtitle) {
                sub_lbl = utils_add_label(eo, di->subtitle,
                                STYLE_LABEL_RECENT_SUBTITLE,