diff options
author | Eugene Kurzberg <i.kurtsberg@samsung.com> | 2017-03-06 13:11:26 +0200 |
---|---|---|
committer | Eugene Kurzberg <i.kurtsberg@samsung.com> | 2017-03-06 14:14:36 +0200 |
commit | 0ac3ae43cd1cf75214c850ea62589f3fb5ee8179 (patch) | |
tree | f4d4b7d2f77194a5ed989cd5911b33c7819a66be | |
parent | 842360fb85dfc41641f11da721f39e8e3c3f6968 (diff) | |
download | alarm-0ac3ae43cd1cf75214c850ea62589f3fb5ee8179.tar.gz alarm-0ac3ae43cd1cf75214c850ea62589f3fb5ee8179.tar.bz2 alarm-0ac3ae43cd1cf75214c850ea62589f3fb5ee8179.zip |
Update "No Alarm" GUI.
Change-Id: Ib9f553fd5b84e762c0d992971df6237b71289068
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>
-rw-r--r-- | alarm-app/edje/list/images/alarm_no_alarm_icon.png | bin | 6610 -> 4469 bytes | |||
-rw-r--r-- | alarm-app/edje/list/images/b_ic_press_full_circle_bg.png | bin | 0 -> 7317 bytes | |||
-rw-r--r-- | alarm-app/res/list/edje/ListPath.h | 1 | ||||
-rw-r--r-- | alarm-app/res/list/edje/add-button-style.edc | 27 | ||||
-rw-r--r-- | alarm-app/res/list/edje/list-layout.edc | 48 |
5 files changed, 50 insertions, 26 deletions
diff --git a/alarm-app/edje/list/images/alarm_no_alarm_icon.png b/alarm-app/edje/list/images/alarm_no_alarm_icon.png Binary files differindex 8de17cd..b76e6bb 100644 --- a/alarm-app/edje/list/images/alarm_no_alarm_icon.png +++ b/alarm-app/edje/list/images/alarm_no_alarm_icon.png diff --git a/alarm-app/edje/list/images/b_ic_press_full_circle_bg.png b/alarm-app/edje/list/images/b_ic_press_full_circle_bg.png Binary files differnew file mode 100644 index 0000000..5b9f7e4 --- /dev/null +++ b/alarm-app/edje/list/images/b_ic_press_full_circle_bg.png diff --git a/alarm-app/res/list/edje/ListPath.h b/alarm-app/res/list/edje/ListPath.h index a0bd3a0..6693096 100644 --- a/alarm-app/res/list/edje/ListPath.h +++ b/alarm-app/res/list/edje/ListPath.h @@ -26,6 +26,7 @@ #define PATH_ICON_ADD_ALARM LIST_IMG_DIR"alarm_no_alarm_icon.png" #define PATH_NO_ALARMS_BG LIST_IMG_DIR"tw_no_item_bg.png" +#define PATH_NO_ALARMS_PRESS_BG LIST_IMG_DIR"b_ic_press_full_circle_bg.png" #define STYLE_ITEM_BOTTOM_BUTTON "bottom_button" #define LAYOUT_NO_ALARMS "no_alarms" diff --git a/alarm-app/res/list/edje/add-button-style.edc b/alarm-app/res/list/edje/add-button-style.edc index d3843c5..0eefcb3 100644 --- a/alarm-app/res/list/edje/add-button-style.edc +++ b/alarm-app/res/list/edje/add-button-style.edc @@ -16,16 +16,17 @@ #include "ListPath.h" -#define ICON_WH 98 +#define ICON_W 130 +#define ICON_H 110 -#define TEXT_T 8 -#define TEXT_H 74 +#define TEXT_T 28 +#define TEXT_H 37 #define TEXT_LR 60 styles { style { name: "no_alarms_text"; - base: "font=Tizen:style=Regular font_size=27 align=center color=#fff"; + base: "font=Tizen:style=Regular font_size=28 align=center color=#fff"; } } @@ -38,16 +39,12 @@ collections { images.image: PATH_ICON_ADD_ALARM COMP; desc { "default"; fixed: 1 1; - min: ICON_WH ICON_WH; + min: ICON_W ICON_H; align: 0.5 0.0; rel1.relative: 0.5 0.0; rel2.relative: 0.5 0.0; image.normal: PATH_ICON_ADD_ALARM; } - desc { "pressed"; - inherit: "default"; - color: 255 255 255 179; - } } spacer { "spacer.text.top"; scale; desc { "default"; @@ -89,18 +86,6 @@ collections { } programs { program { - signal: "mouse,down,*"; - source: "*"; - action: STATE_SET "pressed"; - target: "image"; - } - program { - signal: "mouse,up,*"; - source: "*"; - action: STATE_SET "default"; - target: "image"; - } - program { signal: "mouse,clicked,*"; source: "*"; action: SIGNAL_EMIT "elm,action,click" ""; diff --git a/alarm-app/res/list/edje/list-layout.edc b/alarm-app/res/list/edje/list-layout.edc index 0af566d..31816e8 100644 --- a/alarm-app/res/list/edje/list-layout.edc +++ b/alarm-app/res/list/edje/list-layout.edc @@ -16,13 +16,13 @@ #include "ListPath.h" -#define TITLE_T 51 -#define TITLE_H 39 - -#define ICON_T (25+16) - +#define TRANSITION_GLIDE(duration) CUBIC_BEZIER (duration) 0.25 0.46 0.45 1.0 +#define TITLE_T 51 #define TITLE_LR 64 +#define TITLE_H 39 + +#define ICON_T 35 styles { style { @@ -43,6 +43,23 @@ collections { color: 94 94 94 76; } } + image { "image.press_bg"; + images.image: PATH_NO_ALARMS_PRESS_BG COMP; + desc { "default"; + image.normal: PATH_NO_ALARMS_PRESS_BG; + color: 255 255 255 0; + } + desc { "pressed_effect"; + inherit: "default"; + rel1.relative: 0.05 0.05; + rel2.relative: 0.95 0.95; + color: 255 255 255 33; + } + desc { "pressed"; + inherit: "default"; + color: 255 255 255 33; + } + } spacer { "spacer.title.top"; scale; desc { "default"; fixed: 0 1; @@ -94,5 +111,26 @@ collections { } } } + programs { + program { + signal: "mouse,down,*"; + source: "elm.swallow.icon"; + sequence { + action: STATE_SET "pressed_effect"; + target: "image.press_bg"; + + action: STATE_SET "pressed"; + target: "image.press_bg"; + transition: TRANSITION_GLIDE(0.3); + } + } + program { + signal: "mouse,up,*"; + source: "elm.swallow.icon"; + action: STATE_SET "default"; + target: "image.press_bg"; + transition: LINEAR 0.2; + } + } } } |