TizenRefApp-8145 Update the Widget GUI

Change-Id: I203c5b186be48e2841261eee3570b33b13607619
Signed-off-by: Sergii Kyryliuk <s.kyryliuk@partner.samsung.com>

4 files changed, 54 insertions, 31 deletions

diff --git a/alarm-widget/edje/widget/images/alarm_widget_no_alarm.png b/alarm-widget/edje/widget/images/alarm_widget_no_alarm.png
index b583668..b65895c 100644
--- a/alarm-widget/edje/widget/images/alarm_widget_no_alarm.png
+++ b/alarm-widget/edje/widget/images/alarm_widget_no_alarm.png
diff --git a/alarm-widget/edje/widget/images/b_ic_press_full_circle_bg.png b/alarm-widget/edje/widget/images/b_ic_press_full_circle_bg.png
new file mode 100644
index 0000000..5b9f7e4
--- /dev/null
+++ b/alarm-widget/edje/widget/images/b_ic_press_full_circle_bg.png
diff --git a/alarm-widget/res/widget/edje/WidgetPath.h b/alarm-widget/res/widget/edje/WidgetPath.h
index 30c11b9..86001fd 100644
--- a/alarm-widget/res/widget/edje/WidgetPath.h
+++ b/alarm-widget/res/widget/edje/WidgetPath.h
@@ -23,4 +23,6 @@
 #define PATH_WIDGET_LAYOUT           WIDGET_EDJ_DIR"widget-layout.edj"
 #define PATH_NO_ALARM                WIDGET_IMG_DIR"alarm_widget_no_alarm.png"
 
+#define PATH_NO_ALARM_PRESS_BG      WIDGET_IMG_DIR"b_ic_press_full_circle_bg.png"
+
 #endif /* WIDGET_PATH_H */
diff --git a/alarm-widget/res/widget/edje/widget-layout.edc b/alarm-widget/res/widget/edje/widget-layout.edc
index fc0748b..6341cd5 100644
--- a/alarm-widget/res/widget/edje/widget-layout.edc
+++ b/alarm-widget/res/widget/edje/widget-layout.edc
@@ -16,6 +16,8 @@
 
 #include "WidgetLayout.h"
 
+#define TRANSITION_GLIDE(duration) CUBIC_BEZIER (duration) 0.25 0.46 0.45 1.0
+
 #define ICON_T              107
 #define ICON_WH             110
 
@@ -23,11 +25,11 @@
 #define TEXT_NO_ALARM_H     42
 #define TEXT_NO_ALARM_T     16
 
-#define TIME_T              59
-#define TIME_H              95
+#define REPEAT_T            84
+#define REPEAT_H            35
 
-#define REPEAT_T            8
-#define REPEAT_H            41
+#define TIME_T              119
+#define TIME_H              84
 
 #define ON_OFF_T            221
 #define ON_OFF_WH           94
@@ -43,11 +45,11 @@ styles {
 	}
 	style {
 		name: "time_style";
-		base: "font=Tizen:style=Thin font_size=79 align=center color=#ffffff ellipsis=-1.0";
+		base: "font=Tizen:style=Regular font_size=82 align=center color=#ffffff ellipsis=-1.0";
 	}
 	style {
 		name: "time_disabled_style";
-		base: "font=Tizen:style=Thin font_size=79 align=center color=#ffffff4C ellipsis=-1.0";
+		base: "font=Tizen:style=Regular font_size=82 align=center color=#ffffff4C ellipsis=-1.0";
 	}
 	style {
 		name: "repeat_style";
@@ -77,6 +79,23 @@ collections {
 					rel2.relative: 1.0 0.0;
 				}
 			}
+			image { "image.press_bg";
+				images.image: PATH_NO_ALARM_PRESS_BG COMP;
+				desc { "default";
+					image.normal: PATH_NO_ALARM_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;
+				}
+			}
 			image { "image.icon"; scale;
 				desc { "default";
 					fixed: 1 1;
@@ -135,65 +154,67 @@ collections {
 			program {
 				signal: "mouse,down,*";
 				source: "*";
-				action: STATE_SET "pressed";
-				target: "image.icon";
-				target: PART_NO_ALARM_TEXT;
+				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: "*";
 				action: STATE_SET "default";
-				target: "image.icon";
-				target: PART_NO_ALARM_TEXT;
+				target: "image.press_bg";
+				transition: LINEAR 0.2;
 			}
 		}
 	}
-
 	group { LAYOUT_ALARM;
 		parts {
-			spacer { "spacer.time.top"; scale;
+			spacer { "spacer.repeat.top"; scale;
 				desc { "default";
 					fixed: 0 1;
-					min: 0 TIME_T;
+					min: 0 REPEAT_T;
 					align: 0.5 0.0;
 					rel2.relative: 1.0 0.0;
 				}
 			}
-			textblock { PART_TIME; scale;
+			textblock { PART_REPEAT; scale;
 				desc { "default";
 					fixed: 0 1;
-					min: 0 TIME_H;
+					min: 0 REPEAT_H;
 					align: 0.5 0.0;
-					rel1 { relative: 0.0 1.0; to_y: "spacer.time.top"; }
-					rel2 { relative: 1.0 1.0; to_y: "spacer.time.top"; }
-					text.style: "time_style";
+					rel1 { relative: 0.0 1.0; to_y: "spacer.repeat.top"; }
+					rel2 { relative: 1.0 1.0; to_y: "spacer.repeat.top"; }
+					text.style: "repeat_style";
 				}
 				desc { "disabled";
 					inherit: "default";
-					text.style: "time_disabled_style";
+					text.style: "repeat_disabled_style";
 				}
 			}
-			spacer { "spacer.repeat.top"; scale;
+			spacer { "spacer.time.top"; scale;
 				desc { "default";
 					fixed: 0 1;
-					min: 0 REPEAT_T;
-					align: 0.5 1.0;
-					rel1 { relative: 0.0 1.0; to_y: PART_TIME; }
-					rel2 { relative: 1.0 1.0; to_y: PART_TIME; }
+					min: 0 TIME_T;
+					align: 0.5 0.0;
+					rel2.relative: 1.0 0.0;
 				}
 			}
-			textblock { PART_REPEAT; scale;
+			textblock { PART_TIME; scale;
 				desc { "default";
 					fixed: 0 1;
-					min: 0 REPEAT_H;
+					min: 0 TIME_H;
 					align: 0.5 0.0;
-					rel1 { relative: 0.0 1.0; to_y: "spacer.repeat.top"; }
-					rel2 { relative: 1.0 1.0; to_y: "spacer.repeat.top"; }
-					text.style: "repeat_style";
+					rel1 { relative: 0.0 1.0; to_y: "spacer.time.top"; }
+					rel2 { relative: 1.0 1.0; to_y: "spacer.time.top"; }
+					text.style: "time_style";
 				}
 				desc { "disabled";
 					inherit: "default";
-					text.style: "repeat_disabled_style";
+					text.style: "time_disabled_style";
 				}
 			}
 			spacer { "spacer.on_off.top"; scale;