summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Kurzberg <i.kurtsberg@samsung.com>2017-03-06 14:57:05 +0200
committerEugene Kurzberg <i.kurtsberg@samsung.com>2017-03-06 14:57:33 +0200
commit361b10ca69d4dcd95b6a6f0b73462ca333ae1ad6 (patch)
treed2261b4a7567ae71d1cd1b818c0d1f65fe5ff0fc
parent0ac3ae43cd1cf75214c850ea62589f3fb5ee8179 (diff)
downloadalarm-361b10ca69d4dcd95b6a6f0b73462ca333ae1ad6.tar.gz
alarm-361b10ca69d4dcd95b6a6f0b73462ca333ae1ad6.tar.bz2
alarm-361b10ca69d4dcd95b6a6f0b73462ca333ae1ad6.zip
Update "Set Alarm Repeat" GUI.
Change-Id: Ia4792e528d54969fac60485e70913901f452537b Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>
-rw-r--r--alarm-app/edje/input/images/alarm_repeat_press_bg.pngbin1880 -> 2417 bytes
-rw-r--r--alarm-app/res/input/edje/day-selector-layout.edc58
2 files changed, 28 insertions, 30 deletions
diff --git a/alarm-app/edje/input/images/alarm_repeat_press_bg.png b/alarm-app/edje/input/images/alarm_repeat_press_bg.png
index 30b67e3..5754418 100644
--- a/alarm-app/edje/input/images/alarm_repeat_press_bg.png
+++ b/alarm-app/edje/input/images/alarm_repeat_press_bg.png
Binary files differ
diff --git a/alarm-app/res/input/edje/day-selector-layout.edc b/alarm-app/res/input/edje/day-selector-layout.edc
index 8d70111..448f354 100644
--- a/alarm-app/res/input/edje/day-selector-layout.edc
+++ b/alarm-app/res/input/edje/day-selector-layout.edc
@@ -17,22 +17,25 @@
#include "DaySelectorPath.h"
#define DAY_WH 65
-#define DAY_LR (13/2)
+#define DAY_LR 13
#define DAY_TB 6
#define DAY_TEXT_SIZE 36
+#define DAY_BG_WH 65
+#define DAY_BG_PRESSED_WH 69
+
styles {
style {
name: "weekday";
- base: "font=Tizen:style=Regular font_size="DAY_TEXT_SIZE" align=center color=#fff";
+ base: "font=Tizen:style=Regular font_size="DAY_TEXT_SIZE" align=center color=#ffffff";
}
style {
- name: "weekend";
- base: "font=Tizen:style=Regular font_size="DAY_TEXT_SIZE" align=center color=#ff3224";
+ name: "weekday_checked";
+ base: "font=Tizen:style=Regular font_size="DAY_TEXT_SIZE" align=center color=#4dcfff";
}
style {
- name: "weekend_checked";
- base: "font=Tizen:style=Regular font_size="DAY_TEXT_SIZE" align=center color=#cc0e00";
+ name: "weekend";
+ base: "font=Tizen:style=Regular font_size="DAY_TEXT_SIZE" align=center color=#ff3224";
}
}
@@ -46,8 +49,8 @@ collections {
public is_checked;
public update_state() {
if (get_int(is_checked) == 1 || get_int(is_pressed) == 1) {
- set_state(PART:"elm.text", get_int(is_weekend) == 1 ? "weekend_checked" : "default", 0.0);
- set_state(PART:"image.bg", "checked", 0.0);
+ set_state(PART:"elm.text", get_int(is_weekend) == 1 ? "weekend" : "weekday_checked", 0.0);
+ set_state(PART:"image.bg", get_int(is_weekend) == 1 ? "weekend_checked" : "weekday_checked", 0.0);
} else {
set_state(PART:"elm.text", get_int(is_weekend) == 1 ? "weekend" : "default", 0.0);
set_state(PART:"image.bg", "default", 0.0);
@@ -59,34 +62,29 @@ collections {
image: PATH_DAY_BG_PRESSED COMP;
}
parts {
- spacer { "spacer.left"; scale;
- desc { "default";
- fixed: 1 0;
- min: DAY_LR 0;
- align: 0.0 0.5;
- rel2.relative: 0.0 1.0;
- }
- }
- spacer { "spacer.right"; scale;
+ spacer { "spacer.base"; scale;
desc { "default";
- fixed: 1 0;
- min: DAY_LR 0;
- align: 1.0 0.5;
- rel1.relative: 1.0 0.0;
+ min: (DAY_WH+DAY_LR) DAY_WH;
}
}
image { "image.bg"; scale;
desc { "default";
- min: DAY_WH DAY_WH;
- rel1 { relative: 1.0 0.0; to_x: "spacer.left"; }
- rel2 { relative: 0.0 1.0; to_x: "spacer.right"; }
+ fixed: 1 1;
+ min: DAY_BG_WH DAY_BG_WH;
+ rel1.relative: 0.5 0.5;
+ rel2.relative: 0.5 0.5;
image.normal: PATH_DAY_BG;
color: 255 255 255 154;
}
- desc { "checked";
+ desc { "weekday_checked";
inherit: "default";
+ min: DAY_BG_PRESSED_WH DAY_BG_PRESSED_WH;
image.normal: PATH_DAY_BG_PRESSED;
- color: 18 180 255 255;
+ color: 77 207 255 255;
+ }
+ desc { "weekend_checked";
+ inherit: "weekday_checked";
+ color: 255 50 36 255;
}
}
textblock { "elm.text"; scale;
@@ -94,14 +92,14 @@ collections {
rel.to: "image.bg";
text.style: "weekday";
}
+ desc { "weekday_checked";
+ inherit: "default";
+ text.style: "weekday_checked";
+ }
desc { "weekend";
inherit: "default";
text.style: "weekend";
}
- desc { "weekend_checked";
- inherit: "weekend";
- text.style: "weekend_checked";
- }
}
}
programs {