[GUI] Clock view updated.

Change-Id: I200349966e22e4737beab99ed20edf14d67ca58a
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/include/define.h b/include/define.h
index 2fa0156..b5a8d95 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -193,7 +193,7 @@
 #define STR_AUTO "Auto"
 #define STR_MANUAL "Manual"
 #define STR_DATE "Date"
-#define STR_24HOUR "24 hour"
+#define STR_24HOUR "Time format"
 #define STR_TIME "Time"
 #define STR_VOLUME "Volume"
 #define STR_SOURCE "Source"

diff --git a/res/view/system/clock.edc b/res/view/system/clock.edc
index 2c8c190..caf667c 100755 (executable)
--- a/res/view/system/clock.edc
+++ b/res/view/system/clock.edc
@@ -14,22 +14,20 @@
  * limitations under the License.
  */
 
-#define TITLE_BG_Y2 (104.0 / BASE_RESOLUTION_Y)
+#define CONTROLS_X1 0.3651
+#define LABELS_X2   0.3070
 
-#define CONTROLS_X1 0.30
-#define LABELS_X2 0.28
+#define DATE_ITEM_Y1 0.2752
+#define DATE_ITEM_Y2 0.4094
+#define DATE_ITEM_X2 0.8163
 
-#define DATE_ITEM_Y1 0.15
-#define DATE_ITEM_Y2 0.30
-#define DATE_ITEM_X2 0.80
+#define TIME_ITEM_Y1 0.4262
+#define TIME_ITEM_Y2 0.5604
+#define TIME_ITEM_X2 0.8163
 
-#define TIME_ITEM_Y1 0.40
-#define TIME_ITEM_Y2 0.55
-#define TIME_ITEM_X2 0.80
-
-#define _24HOUR_ITEM_Y1 0.60
-#define _24HOUR_ITEM_Y2 0.80
-#define _24HOUR_ITEM_X2 0.55
+#define _24HOUR_ITEM_Y1 0.5772
+#define _24HOUR_ITEM_Y2 0.7114
+#define _24HOUR_ITEM_X2 0.8163
 
 group {
        name, GRP_VIEW_CLOCK;
@@ -37,6 +35,8 @@ group {
        images {
                image, IC_ADD_SCHEDULE_COLON_PNG COMP;
                image, "4.0/bg_settings_gray.#.png" COMP;
+               image, "img_popup_bar_line.png" COMP;
+               image, "img_popup_bar_shadow.png" COMP;
        }
 
        parts {
@@ -59,8 +59,8 @@ group {
                        description {
                                state, "default" 0.0;
                                color, 51 51 51 255;
-                               rel1.relative, 0.0 0.0;
-                               rel2.relative, 1.0 TITLE_BG_Y2;
+                               rel1.relative, 0.0 0.1208;
+                               rel2.relative, 1.0 0.2013;
                                text {
                                        font, FONT_REGULAR;
                                        size, 46;
@@ -69,17 +69,41 @@ group {
                        }
                }
                part {
+                       name, "title.spacer.line";
+                       type, IMAGE;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               color, 255 255 255 204;
+                               rel1.relative, 0.4302 0.2416;
+                               rel2.relative, 0.5698 0.2466;
+                               image.normal: "img_popup_bar_line.png";
+                       }
+               }
+               part {
+                       name, "title.spacer.shadow";
+                       type, IMAGE;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               color, 0 0 0 255;
+                               rel1.relative, 0.4302 0.2466;
+                               rel2.relative, 0.5698 0.2617;
+                               image.normal: "img_popup_bar_shadow.png";
+                       }
+               }
+               part {
                        name, PART_MAIN_LABEL_DATE;
                        type, TEXT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               color, 116 116 116 255;
+                               color, 0 0 0 255;
                                rel1.relative, 0.0       DATE_ITEM_Y1;
                                rel2.relative, LABELS_X2 DATE_ITEM_Y2;
                                text {
                                        font, FONT_LIGHT;
-                                       size, 32;
+                                       size, 24;
                                        align, 1.0 0.5;
                                }
                        }
@@ -101,12 +125,12 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               color, 116 116 116 255;
+                               color, 0 0 0 255;
                                rel1.relative, 0.0 TIME_ITEM_Y1;
                                rel2.relative, LABELS_X2 TIME_ITEM_Y2;
                                text {
                                        font, FONT_LIGHT;
-                                       size, 32;
+                                       size, 24;
                                        align, 1.0 0.5;
                                }
                        }
@@ -128,12 +152,12 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               color, 116 116 116 255;
+                               color, 0 0 0 255;
                                rel1.relative, 0.0       _24HOUR_ITEM_Y1;
                                rel2.relative, LABELS_X2 _24HOUR_ITEM_Y2;
                                text {
                                        font, FONT_LIGHT;
-                                       size, 32;
+                                       size, 24;
                                        align, 1.0 0.5;
                                }
                        }
@@ -158,8 +182,8 @@ group {
                                min, 308 80;
                                fixed, 1 1;
                                align, 1.0 0.5;
-                               rel1.relative: 0.20 0.8;
-                               rel2.relative: 0.45 0.9;
+                               rel1.relative: 0.1674 0.7450;
+                               rel2.relative: 0.4884 0.8792;
                        }
                }
 
@@ -172,8 +196,8 @@ group {
                                min, 308 80;
                                fixed, 1 1;
                                align, 0.0 0.5;
-                               rel1.relative: 0.55 0.8;
-                               rel2.relative: 0.80 0.9;
+                               rel1.relative: 0.5116 0.7450;
+                               rel2.relative: 0.8326 0.8792;
                        }
                }
        }

diff --git a/res/widget/button.edc b/res/widget/button.edc
index 51b02ef..2c1512a 100755 (executable)
--- a/res/widget/button.edc
+++ b/res/widget/button.edc
@@ -545,6 +545,13 @@ group {
                image: SHADOW_IMG COMP;
                image: "4.0/bg_settings_item_pressed.#.png" RAW;
        }
+       styles {
+               style {
+                       name, "style.normal";
+                       base, "font=BreezeSansLight:style=Light font_size=32 color=#000000E5 wrap=word align=center";
+                       tag, "br" "\n";
+               }
+       }
        parts {
                part {
                        name: "area";
@@ -643,23 +650,22 @@ group {
                }
                part {
                        name, "elm.text";
-                       type, TEXT;
+                       type, TEXTBLOCK;
                        repeat_events, 1;
                        scale: 0;
                        description {
                                state, "default" 0.0;
                                align, 0.5 0.0;
                                rel1 {
-                                       relative, 0.0 0.2653;
+                                       relative, 0.0 0.2283;
                                        to, "bg.content";
                                }
                                rel2 {
-                                       relative, 1.0 0.3878;
+                                       relative, 1.0 0.4567;
                                        to, "bg.content";
                                }
                                text {
-                                       font, FONT_LIGHT;
-                                       size, 32;
+                                       style: "style.normal";
                                }
                                color, COLOR_TEXT_ITEM;
                        }
@@ -871,6 +877,14 @@ group {
                image: CLOCK_PRESSED COMP;
                image: CLOCK_SHADOW RAW;
        }
+       styles {
+               style {
+                       name, "style.date_time";
+                       base, "font=BreezeSans:style=Light font_size=48 color=#FFF wrap=word align=center";
+                       tag, "br" "\n";
+                       tag, "sl" "+ font_size=32";
+               }
+       }
        parts {
                part {
                        name: "area";
@@ -957,7 +971,7 @@ group {
                }
                part {
                        name, "elm.text";
-                       type, TEXT;
+                       type, TEXTBLOCK;
                        repeat_events, 1;
                        scale: 0;
                        description {
@@ -971,10 +985,7 @@ group {
                                        relative, 1.0 1.0;
                                        to, "area";
                                }
-                               text {
-                                       font, FONT_LIGHT;
-                                       size, 32;
-                               }
+                               text.style: "style.date_time";
                                color, COLOR_TEXT_ITEM;
                        }
                        description {

diff --git a/src/view/system/view_clock.c b/src/view/system/view_clock.c
index e8b03fa..0c9f125 100755 (executable)
--- a/src/view/system/view_clock.c
+++ b/src/view/system/view_clock.c
@@ -227,6 +227,7 @@ static bool _add_clock_setting(clock_view_priv_data *priv)
        /* 24/12h check: */
        priv->check_24 = elm_check_add(priv->base);
        elm_object_part_content_set(priv->base, PART_MAIN_ITEM_24HOUR, priv->check_24);
+       elm_object_text_set(priv->check_24, "<color=#5C5C5CFF>24 Hour Time</color>");
 
        bool is24h;
        if (settings_clock_is_24h_set(&is24h))
@@ -381,13 +382,13 @@ void _update_focus_chain(bool h24, clock_view_priv_data* priv)
 static void _set_displayed_time(clock_view_priv_data *priv, struct tm *current_time, bool is_24)
 {
        char ptr[255];
-       strftime (ptr, 255, "%d / %b / %Y", current_time);
+       strftime (ptr, 255, "%d <sl>/</sl> %b <sl>/</sl> %Y", current_time);
        elm_object_text_set(priv->date_part, ptr);
 
        if (is_24)
-               strftime (ptr, 255, "%H : %M", current_time);
+               strftime (ptr, 255, "%H <sl>:</sl> %M", current_time);
        else
-               strftime (ptr, 255, "%I : %M %p", current_time);
+               strftime (ptr, 255, "%I <sl>:</sl> %M %p", current_time);
 
        elm_object_text_set(priv->time_part, ptr);
 }