change the backgroud color of home and user item

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

diff --git a/src/view/view_home.c b/src/view/view_home.c
index b5490e5..3d296e7 100644 (file)
--- a/src/view/view_home.c
+++ b/src/view/view_home.c
@@ -19,7 +19,6 @@
 #include <app_debug.h>
 #include <viewmgr.h>
 #include <inputmgr.h>
-#include <app_contents.h>
 
 #include "defs.h"
 #include "view.h"
@@ -27,8 +26,6 @@
 #include "datamgr.h"
 #include "utils.h"
 
-#define BUF_MAX_UID 32
-
 enum input_handler_type {
        INPUT_HANDLER_TYPE_EO,
        INPUT_HANDLER_TYPE_DOWN
@@ -211,9 +208,7 @@ static struct bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box,
                struct datamgr_item *di)
 {
        struct bar_item *bi;
-       struct color_data bright_bg;
        Evas_Object *eo, *ic, *focus_ic, *lbl, *focus_lbl, *bg, *mask;
-       char buf[BUF_MAX_UID] = {0};
 
        if (!priv || !box || !di) {
                _ERR("Invalid argument");
@@ -251,19 +246,16 @@ static struct bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box,
        if (!focus_lbl)
                goto err;
 
-       /* FIXMD: After multi user demo, it should be changed to default color */
-       snprintf(buf, sizeof(buf), "%d", getuid());
-       app_contents_get_color(buf, &bright_bg, NULL);
-       bg = utils_add_bg(eo, bright_bg.r, bright_bg.g, bright_bg.b,
-                       bright_bg.a, PART_BAR_ITEM_BG);
+       bg = utils_add_bg(eo, COLOR_DEFAULT_R, COLOR_DEFAULT_G, COLOR_DEFAULT_B,
+                       COLOR_DEFAULT_A, PART_BAR_ITEM_BG);
        if (!bg)
                goto err;
 
        if (!strcmp(di->icon, di->focus_icon)) {
                elm_object_signal_emit(eo, SIG_SHOW_MASK, SRC_PROG);
                mask = utils_add_icon(eo, IMAGE_MASK, PART_BAR_ITEM_MASK);
-               evas_object_color_set(mask, bright_bg.r, bright_bg.g,
-                               bright_bg.b, bright_bg.a);
+               evas_object_color_set(mask, COLOR_DEFAULT_R, COLOR_DEFAULT_G,
+                               COLOR_DEFAULT_B, COLOR_DEFAULT_A);
        }
 
        if (di->noti)

diff --git a/src/view/view_user.c b/src/view/view_user.c
index cbc90c9..2cfa911 100644 (file)
--- a/src/view/view_user.c
+++ b/src/view/view_user.c
@@ -18,7 +18,6 @@
 #include <app_debug.h>
 #include <viewmgr.h>
 #include <inputmgr.h>
-#include <app_contents.h>
 
 #include "defs.h"
 #include "view.h"
@@ -26,7 +25,6 @@
 #include "datamgr.h"
 #include "utils.h"
 
-#define BUF_MAX_UID 32
 #define MESSAGE_POPUP_CONTENT "Can not add users more than 8.<br>If you want to add another user, delete one of users"
 
 enum input_handler_type {
@@ -337,9 +335,7 @@ static struct _bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box,
                struct datamgr_item *di)
 {
        struct _bar_item *bi;
-       struct color_data bright_bg;
        Evas_Object *eo, *ic, *focus_ic, *lbl, *focus_lbl, *bg, *mask;
-       char buf[BUF_MAX_UID] = {0};
 
        bi = calloc(1, sizeof(*bi));
        if (!bi) {
@@ -388,19 +384,16 @@ static struct _bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box,
        if (!strcmp(di->icon, di->focus_icon))
                elm_object_signal_emit(eo, SIG_SHOW_MASK, SRC_PROG);
 
-       /* FIXME: After multi user demo, it should be changed to default color */
-       snprintf(buf, sizeof(buf), "%d", getuid());
-       app_contents_get_color(buf, &bright_bg, NULL);
-       bg = utils_add_bg(eo, bright_bg.r, bright_bg.g, bright_bg.b,
-                       bright_bg.a, PART_BAR_ITEM_BG);
+       bg = utils_add_bg(eo, COLOR_DEFAULT_R, COLOR_DEFAULT_G, COLOR_DEFAULT_B,
+                       COLOR_DEFAULT_A, PART_BAR_ITEM_BG);
        if (!bg)
                goto err;
 
        if (!strcmp(di->icon, di->focus_icon)) {
                elm_object_signal_emit(eo, SIG_SHOW_MASK, SRC_PROG);
                mask = utils_add_icon(eo, IMAGE_MASK, PART_BAR_ITEM_MASK);
-               evas_object_color_set(mask, bright_bg.r, bright_bg.g,
-                               bright_bg.b, bright_bg.a);
+               evas_object_color_set(mask, COLOR_DEFAULT_R, COLOR_DEFAULT_G,
+                               COLOR_DEFAULT_B, COLOR_DEFAULT_A);
        }
 
        evas_object_size_hint_align_set(eo, 0.5, 0.0);