From ceedd455fd87d05bab170eeb2920251968aee5d8 Mon Sep 17 00:00:00 2001 From: Soohye Shin Date: Fri, 7 Aug 2015 23:09:21 +0900 Subject: [PATCH] set recent item bg color - modify recent app default image file - add utils_add_rectangle Change-Id: I595d6bbadb79cf68066801489e3f295b38e5d969 Signed-off-by: Soohye Shin --- edje/view/recent.edc | 148 ++++++++++++++++++++++++++++++-------------- edje/widget/label.edc | 2 +- images/ic_default_app.png | Bin 524 -> 18283 bytes images/ic_thumbnail_app.png | Bin 267 -> 3049 bytes include/defs.h | 2 + include/utils.h | 1 + src/utils.c | 26 +++++++- src/view/view_recent.c | 29 ++++++++- 8 files changed, 157 insertions(+), 51 deletions(-) diff --git a/edje/view/recent.edc b/edje/view/recent.edc index 60a7755..5437578 100644 --- a/edje/view/recent.edc +++ b/edje/view/recent.edc @@ -347,17 +347,12 @@ group { description { state, "default" 0.0; min, 378 294; - color, 113 128 147 255; - } - description { - state, "focus" 0.0; - inherit, "default" 0.0; - color, 0 119 246 255; + visible, 0; } } part { - name, "thumbnail"; - type, RECT; + name, PART_RECENT_THUMBNAIL_BG; + type, SWALLOW; scale, 1; description { state, "default" 0.0; @@ -369,7 +364,43 @@ group { min, 0 198; fixed, 0 1; align, 0.5 0.0; - color, 132 147 166 255; + } + } + part { + name, PART_RECENT_TEXT_BG; + type, SWALLOW; + scale, 1; + description { + state, "default" 0.0; + rel1 { + to, PART_RECENT_THUMBNAIL_BG; + relative, 0.0 1.0; + } + rel2.to, "bg"; + fixed, 1 1; + visible, 1; + } + description { + state, "focus" 0.0; + inherit, "default" 0.0; + visible, 0; + } + } + part { + name, "text.bg"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + rel1.to, PART_RECENT_TEXT_BG; + rel2.to, PART_RECENT_TEXT_BG; + fixed, 1 1; + color, 0 0 0 0; + } + description { + state, "focus" 0.0; + inherit, "default" 0.0; + color, 0 119 246 255; } } part { @@ -378,8 +409,8 @@ group { scale, 1; description { state, "default" 0.0; - rel1.to, "thumbnail"; - rel2.to, "thumbnail"; + rel1.to, PART_RECENT_THUMBNAIL_BG; + rel2.to, PART_RECENT_THUMBNAIL_BG; min, 100 100; fixed, 1 1; } @@ -390,9 +421,9 @@ group { scale, 1; description { state, "default" 0.0; - rel1.to, "thumbnail"; + rel1.to, PART_RECENT_THUMBNAIL_BG; rel2 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 1.0 0.0; } min, 0 3; @@ -417,7 +448,7 @@ group { relative, 0.0 1.0; } rel2 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.0 1.0; } min, 3 0; @@ -441,7 +472,7 @@ group { to, "border.up"; relative, 1.0 1.0; } - rel2.to, "thumbnail"; + rel2.to, PART_RECENT_THUMBNAIL_BG; min, 3 0; fixed, 1 0; align, 1.0 0.5; @@ -460,11 +491,11 @@ group { description { state, "default" 0.0; rel1 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.0 0.0; } rel2 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.0 0.0; } min, 4 4; @@ -500,11 +531,11 @@ group { state, "default" 0.0; min, 15 18; rel1 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.0 1.0; } rel2 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.0 1.0; } fixed, 1 1; @@ -520,11 +551,11 @@ group { state, "default" 0.0; min, 15 18; rel1 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 1.0 1.0; } rel2 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 1.0 1.0; } fixed, 1 1; @@ -578,7 +609,7 @@ group { source, SRC_PROG; action, STATE_SET "focus" 0.0; transition, TRANSITION_DECEL; - target, "bg"; + target, "text.bg"; target, "border.up"; target, "border.right"; target, "border.left"; @@ -589,7 +620,7 @@ group { source, SRC_PROG; action, STATE_SET "default" 0.0; transition, TRANSITION_DECEL; - target, "bg"; + target, "text.bg"; target, "border.up"; target, "border.right"; target, "border.left"; @@ -607,17 +638,12 @@ group { description { state, "default" 0.0; min, 236 294; - color, 113 128 147 255; - } - description { - state, "focus" 0.0; - inherit, "default" 0.0; - color, 0 119 246 255; + visible, 0; } } part { - name, "thumbnail"; - type, RECT; + name, PART_RECENT_THUMBNAIL_BG; + type, SWALLOW; scale, 1; description { state, "default" 0.0; @@ -629,7 +655,37 @@ group { min, 0 198; fixed, 0 1; align, 0.5 0.0; - color, 132 147 166 255; + } + } + part { + name, PART_RECENT_TEXT_BG; + type, SWALLOW; + scale, 1; + description { + state, "default" 0.0; + rel1 { + to, PART_RECENT_THUMBNAIL_BG; + relative, 0.0 1.0; + } + rel2.to, "bg"; + fixed, 1 1; + } + } + part { + name, "text.bg"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + rel1.to, PART_RECENT_TEXT_BG; + rel2.to, PART_RECENT_TEXT_BG; + fixed, 1 1; + color, 0 0 0 0; + } + description { + state, "focus" 0.0; + inherit, "default" 0.0; + color, 0 119 246 255; } } part { @@ -639,11 +695,11 @@ group { description { state, "default" 0.0; rel1 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.5 0.5; } rel2 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.5 0.5; } min, 100 100; @@ -656,9 +712,9 @@ group { scale, 1; description { state, "default" 0.0; - rel1.to, "thumbnail"; + rel1.to, PART_RECENT_THUMBNAIL_BG; rel2 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 1.0 0.0; } min, 0 3; @@ -683,7 +739,7 @@ group { relative, 0.0 1.0; } rel2 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.0 1.0; } min, 3 0; @@ -707,7 +763,7 @@ group { to, "border.up"; relative, 1.0 1.0; } - rel2.to, "thumbnail"; + rel2.to, PART_RECENT_THUMBNAIL_BG; min, 3 0; fixed, 1 0; align, 1.0 0.5; @@ -726,11 +782,11 @@ group { description { state, "default" 0.0; rel1 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.0 0.0; } rel2 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.0 0.0; } min, 4 4; @@ -766,11 +822,11 @@ group { state, "default" 0.0; min, 15 18; rel1 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.0 1.0; } rel2 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 0.0 1.0; } fixed, 1 1; @@ -786,11 +842,11 @@ group { state, "default" 0.0; min, 15 18; rel1 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 1.0 1.0; } rel2 { - to, "thumbnail"; + to, PART_RECENT_THUMBNAIL_BG; relative, 1.0 1.0; } fixed, 1 1; @@ -844,7 +900,7 @@ group { source, SRC_PROG; action, STATE_SET "focus" 0.0; transition, TRANSITION_DECEL; - target, "bg"; + target, "text.bg"; target, "border.up"; target, "border.right"; target, "border.left"; @@ -855,7 +911,7 @@ group { source, SRC_PROG; action, STATE_SET "default" 0.0; transition, TRANSITION_DECEL; - target, "bg"; + target, "text.bg"; target, "border.up"; target, "border.right"; target, "border.left"; diff --git a/edje/widget/label.edc b/edje/widget/label.edc index 26cdc24..f29473d 100644 --- a/edje/widget/label.edc +++ b/edje/widget/label.edc @@ -29,7 +29,7 @@ styles { } style { name, "recent_label_subtitle"; - base, "font=TizenSans font_size=20 color=#999999 align=left"; + base, "font=TizenSans font_size=20 color=#cdcdcd align=left"; } } diff --git a/images/ic_default_app.png b/images/ic_default_app.png index 63c2a8cc76f7fb45914b3fb8c0b862bc03fb992e..c8c5b68cd0dc16206f7b12f35af43453ad612b3b 100644 GIT binary patch literal 18283 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 G`~C~XC|hd) literal 524 zcmeAS@N?(olHy`uVBq!ia0vp^DIm!!ZcN~i7D`;)swCTE=**a3W63j-g_E z|FeS4@z4UNLwif>JAaC#_IAH`fBT`DM6A1dPC@4E4Dp-(ZzDwj@;1IQI+G6Gh zGWp9|M0Wq>n=NQ~Om0qn)gi&CA6Jyzm2xmGRt{4!J@=ZCq3c0ZVAb+{Qy00KF*MBm zSdzxg5W&W&&2Zq_j1AgrqgJ0tzN5~K{I@dvy61|BDluZ-cwVIyYQ&n#ku?@NAKKyYv6(iexoi&EGMysl?b}Ul=+}*Kw>(hga(j_Nu_%O3;-u`ZE ex`CnpgTeTwoyhUa9m2p^X7F_Nb6Mw<&;$T&Oyq0; diff --git a/images/ic_thumbnail_app.png b/images/ic_thumbnail_app.png index 02a51028c80455498554b1ab917e61b27f40e241..88721aa11273263bd3e44cf1a07fadff6da94cd2 100644 GIT binary patch literal 3049 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 delta 250 zcmV2lJ2QDo)Ch;?SSk}FuSV8Ma~3;qobh+uX_1cMc` zidMQ;-*RO77CmpU z($mZShMUWDOfBeDttrf4DfpM@0B7>K?&!+7( z3TrzF7CZ&4?euP6U^~q-TRvQZ1q&7|Sn$I00zyoHB(z5>YybcN07*qoM6N<$f)uT8 AzyJUM diff --git a/include/defs.h b/include/defs.h index 698f276..57f84d8 100644 --- a/include/defs.h +++ b/include/defs.h @@ -60,6 +60,8 @@ #define PART_RECENT_TITLE "part.recent.title" #define PART_RECENT_SUBTITLE "part.recent.subtitle" #define PART_RECENT_THUMBNAIL "part.recent.thumbnail" +#define PART_RECENT_THUMBNAIL_BG "part.recent.thumbnail.bg" +#define PART_RECENT_TEXT_BG "part.recent.text.bg" #define PART_RECENT_ICON "part.recent.icon" #define PART_RECENT_FAVORITE "part.recent.favorite" #define PART_RECENT_DELETE "part.recent.delete" diff --git a/include/utils.h b/include/utils.h index 7c6c3d5..b69e716 100644 --- a/include/utils.h +++ b/include/utils.h @@ -48,6 +48,7 @@ Evas_Object *utils_add_button(Evas_Object *base, char *text, const char *part); Evas_Object *utils_add_entry(Evas_Object *base, char *text, bool password, const char *part); Evas_Object *utils_add_popup(Evas_Object *base, char *title, char *message); +Evas_Object *utils_add_rectangle(Evas_Object *base, int r, int g, int b, int a); bool utils_launch_app(const char *pkg, const char *key, const char *value); #endif /* __AIR_HOME_UTILS_H__ */ diff --git a/src/utils.c b/src/utils.c index 36c6fa6..d938bd1 100644 --- a/src/utils.c +++ b/src/utils.c @@ -167,7 +167,11 @@ Evas_Object *utils_add_icon(Evas_Object *base, const char *file, return NULL; } - elm_image_file_set(ic, file, NULL); + if (!elm_image_file_set(ic, file, NULL)) { + _ERR("failed to set image file"); + evas_object_del(ic); + return NULL; + } if (part) elm_object_part_content_set(base, part, ic); @@ -371,6 +375,26 @@ Evas_Object *utils_add_popup(Evas_Object *base, char *title, char *message) return popup; } +Evas_Object *utils_add_rectangle(Evas_Object *base, int r, int g, int b, int a) +{ + Evas_Object *rect; + + if (!base) { + _ERR("Invalid argument"); + return NULL; + } + + rect = evas_object_rectangle_add(evas_object_evas_get(base)); + if (!rect) { + _ERR("failed to add rectangle"); + return NULL; + } + + evas_object_color_set(rect, r, g, b, a); + + return rect; +} + bool utils_launch_app(const char *pkg, const char *key, const char *value) { app_control_h app_control; diff --git a/src/view/view_recent.c b/src/view/view_recent.c index 2f9d743..5319f3a 100644 --- a/src/view/view_recent.c +++ b/src/view/view_recent.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "defs.h" #include "view.h" @@ -293,12 +294,26 @@ static Evas_Object *_create(Evas_Object *win, void *data) return base; } +static void _set_item_bg(struct color_data bg, Evas_Object *eo, + const char *part) +{ + Evas_Object *rect = utils_add_rectangle(eo, bg.r, bg.g, bg.b, bg.a); + + if (!rect) { + _ERR("failed to set item bg"); + return; + } + + elm_object_part_content_set(eo, part, rect); +} + static struct _bar_item *_pack_item(struct _priv *priv, Evas_Object *box, struct datamgr_item *di) { Evas_Object *eo, *lbl, *sub_lbl, *thumb, *ic; struct _bar_item *bi; const char *group; + struct color_data bright_bg, dark_bg; switch (di->type) { case RECENT_ITEM_PREVIEW: @@ -342,9 +357,13 @@ static struct _bar_item *_pack_item(struct _priv *priv, Evas_Object *box, 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; + thumb = utils_add_icon(eo, IMAGE_RECENT_THUMB_APP, + PART_RECENT_THUMBNAIL); + if (!thumb) { + evas_object_del(eo); + free(bi); + return NULL; + } } } @@ -356,6 +375,10 @@ static struct _bar_item *_pack_item(struct _priv *priv, Evas_Object *box, _ERR("failed to add sub title"); } + app_contents_get_color(di->title, &bright_bg, &dark_bg); + _set_item_bg(bright_bg, eo, PART_RECENT_THUMBNAIL_BG); + _set_item_bg(dark_bg, eo, PART_RECENT_TEXT_BG); + elm_object_focus_next_object_set(eo, priv->del_btn, ELM_FOCUS_UP); inputmgr_add_callback(eo, INPUT_HANDLER_TYPE_EO, &handler, bi); elm_box_pack_end(box, eo); -- 2.7.4