From: Eugene Kurzberg Date: Thu, 1 Sep 2016 07:07:03 +0000 (+0300) Subject: Updated widget icons and "Add" button GUI. X-Git-Tag: submit/tizen/20160909.115235~1^2~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F86433%2F1;p=profile%2Fmobile%2Fapps%2Fnative%2Fphone-contacts.git Updated widget icons and "Add" button GUI. Change-Id: I31b40e64ad995d4574c4b67b4e2b6da19e1161ac Signed-off-by: Eugene Kurzberg --- diff --git a/contacts-widget/res/widget/edje/WidgetItemLayout.h b/contacts-widget/res/widget/edje/WidgetItemLayout.h index f81fe0d..0d3df3e 100644 --- a/contacts-widget/res/widget/edje/WidgetItemLayout.h +++ b/contacts-widget/res/widget/edje/WidgetItemLayout.h @@ -22,11 +22,11 @@ #define WIDGET_ITEM_STYLE "widget_item" +#define GROUP_BUTTON_ADD "button_add" #define GROUP_BUTTON_DELETE "button_delete" #define GROUP_THUMBNAIL "thumbnail" #define PART_THUMBNAIL "swallow.thumbnail" -#define PART_THUMBNAIL_MASK "image.thumbnail_mask" #define PART_ICON_DELETE "swallow.icon_delete" #define PART_ICON_TYPE "swallow.icon_type" #define PART_NAME "text.name" diff --git a/contacts-widget/res/widget/edje/WidgetLayout.h b/contacts-widget/res/widget/edje/WidgetLayout.h index 3da1591..c56c22d 100644 --- a/contacts-widget/res/widget/edje/WidgetLayout.h +++ b/contacts-widget/res/widget/edje/WidgetLayout.h @@ -22,7 +22,6 @@ #define GROUP_NO_CONTACTS "no_contacts" #define GROUP_CONTACTS "contacts" -#define GROUP_ICON_ADD "icon_add" #define PART_TITLE "text.title" #define PART_HELP "text.help" diff --git a/contacts-widget/res/widget/edje/WidgetPath.h b/contacts-widget/res/widget/edje/WidgetPath.h index 8f38db1..7a00654 100644 --- a/contacts-widget/res/widget/edje/WidgetPath.h +++ b/contacts-widget/res/widget/edje/WidgetPath.h @@ -27,15 +27,16 @@ #define NOCONTACTS_BG WIDGET_IMG_DIR"nocontacts_bg.#.png" #define NOCONTACTS_BORDER WIDGET_IMG_DIR"nocontacts_bg_stroke.#.png" -#define BUTTON_ADD WIDGET_IMG_DIR"button_add.png" -#define BUTTON_ADD_PRESSED WIDGET_IMG_DIR"button_add_pressed.png" +#define BUTTON_ADD_ICON WIDGET_IMG_DIR"add_contact_icon.png" +#define BUTTON_ADD_BG WIDGET_IMG_DIR"add_contact_bg.png" +#define BUTTON_ADD_BORDER WIDGET_IMG_DIR"add_contact_bg_ef.png" -#define BUTTON_DELETE WIDGET_IMG_DIR"button_delete.png" -#define BUTTON_DELETE_PRESSED WIDGET_IMG_DIR"button_delete_pressed.png" +#define BUTTON_DELETE WIDGET_IMG_DIR"btn_delete_nor.png" +#define BUTTON_DELETE_PRESSED WIDGET_IMG_DIR"btn_delete_press.png" -#define ICON_CALL WIDGET_IMG_DIR"icon_call.png" -#define ICON_MESSAGE WIDGET_IMG_DIR"icon_message.png" -#define ICON_EMAIL WIDGET_IMG_DIR"icon_email.png" +#define ICON_CALL WIDGET_IMG_DIR"contact_ic_voice_call.png" +#define ICON_MESSAGE WIDGET_IMG_DIR"contact_ic_message.png" +#define ICON_EMAIL WIDGET_IMG_DIR"contact_ic_email.png" #define ICON_THUMBNAIL_MASK WIDGET_IMG_DIR"thumbnail_mask.png" #endif /* WIDGET_PATH_H */ diff --git a/contacts-widget/res/widget/edje/widget-item-layout.edc b/contacts-widget/res/widget/edje/widget-item-layout.edc index cec2858..0040ad6 100644 --- a/contacts-widget/res/widget/edje/widget-item-layout.edc +++ b/contacts-widget/res/widget/edje/widget-item-layout.edc @@ -31,21 +31,73 @@ collections { IMAGE_WITH_TOUCH(GROUP_BUTTON_DELETE, BUTTON_DELETE, BUTTON_DELETE_PRESSED); + group { GROUP_BUTTON_ADD; + images { + image: BUTTON_ADD_ICON COMP; + image: BUTTON_ADD_BG COMP; + image: BUTTON_ADD_BORDER COMP; + } + parts { + image { "image.bg"; scale; + desc { "default"; + image.normal: BUTTON_ADD_BG; + color: 38 38 38 102; + } + desc { "pressed"; + inherit: "default"; + color: 240 240 240 77; + } + } + image { "image.border"; scale; + desc { "default"; + image.normal: BUTTON_ADD_BORDER; + color: 250 250 250 38; + } + desc { "pressed"; + inherit: "default"; + visible: 0; + } + } + image { "image.icon"; scale; + desc { "default"; + image.normal: BUTTON_ADD_ICON; + color: 250 250 250 255; + } + } + } + programs { + program { + name: "pressed"; + signal: "mouse,down,*"; + source: "*"; + action: STATE_SET "pressed" 0.0; + target: "image.bg"; + target: "image.border"; + } + program { + name: "unpressed"; + signal: "mouse,up,*"; + source: "*"; + action: STATE_SET "default" 0.0; + target: "image.bg"; + target: "image.border"; + } + } + } + group { name: GROUP_THUMBNAIL; images.image: ICON_THUMBNAIL_MASK COMP; parts { swallow { PART_THUMBNAIL; } - image { PART_THUMBNAIL_MASK; + image { "image.mask"; scale; desc { "default"; visible: 0; - color: 0 0 0 100; - aspect: 1 1; - aspect_preference: SOURCE; - image.normal: ICON_THUMBNAIL_MASK; rel1 { relative: 0.0 0.0; to: PART_THUMBNAIL; } rel2 { relative: 1.0 1.0; to: PART_THUMBNAIL; } + image.normal: ICON_THUMBNAIL_MASK; + color: 0 0 0 100; } desc { "pressed"; inherit: "default" 0.0; @@ -59,14 +111,14 @@ collections { signal: "mouse,down,*"; source: "*"; action: STATE_SET "pressed" 0.0; - target: PART_THUMBNAIL_MASK; + target: "image.mask"; } program { name: "unpressed"; signal: "mouse,up,*"; source: "*"; action: STATE_SET "default" 0.0; - target: PART_THUMBNAIL_MASK; + target: "image.mask"; } } } diff --git a/contacts-widget/res/widget/edje/widget-layout.edc b/contacts-widget/res/widget/edje/widget-layout.edc index 56e915a..3f3245d 100644 --- a/contacts-widget/res/widget/edje/widget-layout.edc +++ b/contacts-widget/res/widget/edje/widget-layout.edc @@ -17,7 +17,6 @@ #include "WidgetLayout.h" #include "WidgetLayoutMetrics.h" -#include "../../../../lib-apps-common/res/apps-common/edje/apps-common-utils.edc" styles { style { @@ -33,8 +32,6 @@ styles { collections { base_scale: 2.6; - IMAGE_WITH_TOUCH(GROUP_ICON_ADD, BUTTON_ADD, BUTTON_ADD_PRESSED); - group { GROUP_NO_CONTACTS; images { image: NOCONTACTS_BG COMP; diff --git a/contacts-widget/res/widget/images/add_contact_bg.png b/contacts-widget/res/widget/images/add_contact_bg.png new file mode 100644 index 0000000..349868c Binary files /dev/null and b/contacts-widget/res/widget/images/add_contact_bg.png differ diff --git a/contacts-widget/res/widget/images/add_contact_bg_ef.png b/contacts-widget/res/widget/images/add_contact_bg_ef.png new file mode 100644 index 0000000..b660f95 Binary files /dev/null and b/contacts-widget/res/widget/images/add_contact_bg_ef.png differ diff --git a/contacts-widget/res/widget/images/add_contact_icon.png b/contacts-widget/res/widget/images/add_contact_icon.png new file mode 100644 index 0000000..c4057b6 Binary files /dev/null and b/contacts-widget/res/widget/images/add_contact_icon.png differ diff --git a/contacts-widget/res/widget/images/button_delete.png b/contacts-widget/res/widget/images/btn_delete_nor.png similarity index 100% rename from contacts-widget/res/widget/images/button_delete.png rename to contacts-widget/res/widget/images/btn_delete_nor.png diff --git a/contacts-widget/res/widget/images/button_delete_pressed.png b/contacts-widget/res/widget/images/btn_delete_press.png similarity index 100% rename from contacts-widget/res/widget/images/button_delete_pressed.png rename to contacts-widget/res/widget/images/btn_delete_press.png diff --git a/contacts-widget/res/widget/images/button_add.png b/contacts-widget/res/widget/images/button_add.png deleted file mode 100644 index f351bb6..0000000 Binary files a/contacts-widget/res/widget/images/button_add.png and /dev/null differ diff --git a/contacts-widget/res/widget/images/button_add_pressed.png b/contacts-widget/res/widget/images/button_add_pressed.png deleted file mode 100644 index d58e935..0000000 Binary files a/contacts-widget/res/widget/images/button_add_pressed.png and /dev/null differ diff --git a/contacts-widget/res/widget/images/contact_ic_email.png b/contacts-widget/res/widget/images/contact_ic_email.png new file mode 100644 index 0000000..c36acaa Binary files /dev/null and b/contacts-widget/res/widget/images/contact_ic_email.png differ diff --git a/contacts-widget/res/widget/images/contact_ic_message.png b/contacts-widget/res/widget/images/contact_ic_message.png new file mode 100644 index 0000000..602ab71 Binary files /dev/null and b/contacts-widget/res/widget/images/contact_ic_message.png differ diff --git a/contacts-widget/res/widget/images/contact_ic_voice_call.png b/contacts-widget/res/widget/images/contact_ic_voice_call.png new file mode 100644 index 0000000..8f05455 Binary files /dev/null and b/contacts-widget/res/widget/images/contact_ic_voice_call.png differ diff --git a/contacts-widget/res/widget/images/icon_call.png b/contacts-widget/res/widget/images/icon_call.png deleted file mode 100644 index 48523e9..0000000 Binary files a/contacts-widget/res/widget/images/icon_call.png and /dev/null differ diff --git a/contacts-widget/res/widget/images/icon_email.png b/contacts-widget/res/widget/images/icon_email.png deleted file mode 100644 index 76ed8ec..0000000 Binary files a/contacts-widget/res/widget/images/icon_email.png and /dev/null differ diff --git a/contacts-widget/res/widget/images/icon_message.png b/contacts-widget/res/widget/images/icon_message.png deleted file mode 100644 index 0d9d35b..0000000 Binary files a/contacts-widget/res/widget/images/icon_message.png and /dev/null differ diff --git a/contacts-widget/src/AddButtonItem.cpp b/contacts-widget/src/AddButtonItem.cpp index 681d592..b32de56 100644 --- a/contacts-widget/src/AddButtonItem.cpp +++ b/contacts-widget/src/AddButtonItem.cpp @@ -16,14 +16,13 @@ */ #include "AddButtonItem.h" -#include "WidgetLayout.h" #include "WidgetItemLayout.h" #include "App/Path.h" namespace { - const std::string layoutPath = App::getResourcePath(WIDGET_LAYOUT_EDJ); + const std::string layoutPath = App::getResourcePath(WIDGET_ITEM_LAYOUT_EDJ); } AddButtonItem::AddButtonItem() @@ -41,7 +40,7 @@ Evas_Object *AddButtonItem::getContent(Evas_Object *parent, const char *part) { if (strcmp(part, PART_THUMBNAIL) == 0) { Evas_Object *layout = elm_layout_add(parent); - elm_layout_file_set(layout, layoutPath.c_str(), GROUP_ICON_ADD); + elm_layout_file_set(layout, layoutPath.c_str(), GROUP_BUTTON_ADD); return layout; } diff --git a/lib-apps-common/res/apps-common/edje/apps-common-buttons.edc b/lib-apps-common/res/apps-common/edje/apps-common-buttons.edc index 1622c31..658790d 100644 --- a/lib-apps-common/res/apps-common/edje/apps-common-buttons.edc +++ b/lib-apps-common/res/apps-common/edje/apps-common-buttons.edc @@ -24,8 +24,8 @@ #define BUTTON_DEFAULT_TEXT_TB ((BUTTON_DEFAULT_H-BUTTON_DEFAULT_TEXT_H)/2) #define BUTTON_SMALL_CORNER_RADIUS "25" -#define BUTTOM_SMALL_H 47 -#define BUTTON_SMALL_TEXT_LR 20 +#define BUTTOM_SMALL_H 50 +#define BUTTON_SMALL_TEXT_LR 24 #define BUTTON_SMALL_TEXT_TB 2 #define BUTTON_SMALL_TEXT_H (BUTTOM_SMALL_H-(BUTTON_SMALL_TEXT_TB*2))