Alarm: expand week text

The Tizen do not provide expanded fonts, so spread text
by adding space between letters. Additionally change colors
to fit guideline.

Change-Id: I6648decf5b521b608f43cace8e0e79c3116e2a8c

diff --git a/clock/res/edje/alarm.edc b/clock/res/edje/alarm.edc
index 22796136212f7619f576bc18fe7b4e6f5e2ea7a6..3fde62dc116fde262719149f1cb85626bd12462a 100644 (file)
--- a/clock/res/edje/alarm.edc
+++ b/clock/res/edje/alarm.edc
@@ -36,15 +36,16 @@ collections {
                                base: "font=Tizen:style=Regular color=#00000028 font_size=36 ellipsis=1.0";
                        }
                        style {
-                               name: "font4_normal";
-                               base: "font=Tizen:style=Regular color=#59AF3AFF font_size=32 ellipsis=1.0";
-                               tag: "off" "+ color=#B2B2B2FF";
+                               name: "font_weekflags_normal";
+                               base: "font=Tizen:style=Regular font_size=32";
+                               tag: "on" "+ color=#97e57bff";
+                               tag: "off" "+ color=#b3b3b3ff";
                        }
                        style {
-                               name: "font4_dim";
-                               base: "font=Tizen:style=Regular color=#23461766 font_size=32  ellipsis=1.0";
-                               tag: "off" "+ color=#47474766";
-                               tag: "on" "+ color=#23461766";
+                               name: "font_weekflags_dim";
+                               base: "font=Tizen:style=Regular font_size=32";
+                               tag: "on" "+ color=#97e57b66";
+                               tag: "off" "+ color=#b3b3b366";
                        }
                }
                data.item: "texts" "time meridiem name weekflags";
@@ -135,11 +136,11 @@ collections {
                                        align: 0.0 1.0;
                                        rel1.to: "spacer.name.week";
                                        rel2.to: "spacer.name.week";
-                                       text.style: "font4_normal";
+                                       text.style: "font_weekflags_normal";
                                }
                                desc { "disabled";
                                        inherit: "default";
-                                       text.style: "font4_dim";
+                                       text.style: "font_weekflags_dim";
                                }
                        }
                        group { "repeat"; scale;

diff --git a/clock/src/View/AlarmListView.cpp b/clock/src/View/AlarmListView.cpp
index 8f51118fb53f560f46979eba6c704315c8f54b56..288fbd4ae949bed69ff94821dce42bf34aa67e4f 100644 (file)
--- a/clock/src/View/AlarmListView.cpp
+++ b/clock/src/View/AlarmListView.cpp
@@ -153,9 +153,9 @@ static std::string GetWeekDayAcronym(WeekDay day)
 static std::string GetFormattedWeekDayAcronym(WeekDay day, bool on)
 {
        if (on)
-               return "<on>" + GetWeekDayAcronym(day) + "</on>";
+               return "<on>" + GetWeekDayAcronym(day) + "</on> ";
        else
-               return "<off>" + GetWeekDayAcronym(day) + "</off>";
+               return "<off>" + GetWeekDayAcronym(day) + "</off> ";
 }
 
 static char *WeekFlag2FormattedString(WeekFlags flags)

diff --git a/clock/src/View/DeleteAlarmView.cpp b/clock/src/View/DeleteAlarmView.cpp
index 8413f778b1194b37694dcf8898c4ab4251521c57..0b149c66b9932a9c5a01f93734b15e78643f549a 100644 (file)
--- a/clock/src/View/DeleteAlarmView.cpp
+++ b/clock/src/View/DeleteAlarmView.cpp
@@ -79,9 +79,9 @@ static std::string GetWeekDayAcronym(WeekDay day)
 static std::string GetFormattedWeekDayAcronym(WeekDay day, bool on)
 {
        if (on)
-               return "<on>" + GetWeekDayAcronym(day) + "</on>";
+               return "<on>" + GetWeekDayAcronym(day) + "</on> ";
        else
-               return "<off>" + GetWeekDayAcronym(day) + "</off>";
+               return "<off>" + GetWeekDayAcronym(day) + "</off> ";
 }
 
 static char *WeekFlag2FormattedString(WeekFlags flags)