[Timer] Fix Jira issues TSAM-8781, TSAM-8782.

Fix for blank title
Fix for blank seconds during expiry

Change-Id: Ia223be2d2c431d2a3c98f257ca23ffe79c469f58

diff --git a/edje_include/timer_main_group.edc b/edje_include/timer_main_group.edc
index 8f1910093b3dc1f3e38e96947600f21ffd25f595..8e3bb484e69c21e231c09b654c66e82a68cbe178 100755 (executable)
--- a/edje_include/timer_main_group.edc
+++ b/edje_include/timer_main_group.edc
@@ -21,7 +21,7 @@ group
    name: "main,gear3_new";
    styles {
       style { name: "datetime_text_title";
-         base: "font=Tizen:style=Regular font_size=32 color=#12b4ff color_class=T191 align=center ellipsis=1.0 text_class=T191";
+         base: "font=Tizen:style=Regular font_size=34 color=#12b4ff color_class=AT019 align=center ellipsis=1.0 text_class=AT019";
       }
       style { name: "rbutton_normal";
          base: "font=Tizen:style=Regular font_size=24 color=#d93f3f alpha=20 color_class=AT015 align=center ellipsis=1.0 text_class=AT015";

diff --git a/edje_include/timer_time_panel.edc b/edje_include/timer_time_panel.edc
index 47381c4378d74163b70464ee4eaba7ad6aa34cff..3698f5e518315264ea5a7ff9356e89b3390fa806 100755 (executable)
--- a/edje_include/timer_time_panel.edc
+++ b/edje_include/timer_time_panel.edc
@@ -24,6 +24,14 @@ styles {
                 tag: "b" "+ color=#ffff";
                 tag: "tab" "\t";
         }
+        style {
+                name: "style_txt_volume1";
+                base: "font=Tizen:style=Regular font_size=50 align=center color=#ffffffff color_class=AT0142 wrap=mixed text_class=AT0142";
+                tag: "br" "\n";
+                tag: "hilight" "+ color=#ffff";
+                tag: "b" "+ color=#ffff";
+                tag: "tab" "\t";
+        }
 }
 
 group{
@@ -71,13 +79,9 @@ group{
             }
             text 
             {
-               //  text_class: T2711;/
                style : "style_txt_volume";
                min: 1 1;
             }
-            //color_class: T2711;/
-            //color: 255 255 255 0;/
-            //My own line
          }
          description 
          {
@@ -106,15 +110,8 @@ group{
             }
             text 
             {
-               //text_class: T273S;
-               
                min: 1 1;
             }
-            //color_class: T273S;/
-            //color: 255 255 106 0; /
-            // Chenaged actually 255 255 255 0
-            
-               
          }
          description 
          {
@@ -156,7 +153,6 @@ group{
       {
          name: "min";
          type: TEXTBLOCK;
-         //mouse_events: 0;
          scale: 1;
          description 
          {
@@ -173,13 +169,9 @@ group{
             }
             text 
             {
-               //text_class: T2711;
                style : "style_txt_volume";
                min: 0 1;
             }
-            //color_class: T2711;/
-          //  color : 255 255 255 100;
-            // My ownline to test color
          }
          description 
          {
@@ -194,14 +186,11 @@ group{
                to: "bg";
             }
             color_class: T2711;
-          //  color : 255 255 255 100;//My own line
-            
          }
          description 
          {
             state: "alert" 0.0;
             inherit: "default" 0.0;
-               
             color : 255 255 255 100;  //My own line
          }
       }
@@ -225,12 +214,9 @@ group{
             }
             text 
             {
-               //text_class: T273S;
-               
                min: 1 1;
             }
             color_class: T273S;
-           // color : 255 255 255 100;
          }
          description 
          {
@@ -295,7 +281,6 @@ group{
       part {
          name: "sec";
          type: TEXTBLOCK;
-         //mouse_events: 0;
          scale: 1;
          description {
             state: "default" 0.0;
@@ -312,13 +297,8 @@ group{
             text 
             {
                style : "style_txt_volume";
-               
-     
-              // text_class: T2711;
                min: 1 1;
             }
-            // color_class: T2711;/
-           
          }
          description 
          {
@@ -338,7 +318,11 @@ group{
          description {
             state: "alert" 0.0;
             inherit: "default" 0.0;
-            color_class: AT0142;
+            text 
+            {
+               style : "style_txt_volume1";
+               min: 1 1;
+            } 
          }
       }
       part {
@@ -359,14 +343,8 @@ group{
             }
             text 
             {
-           
-                        
-              // text_class: T273S;
-             
                min: 1 1;
             }
-            //color_class: T273S;
-            
          }
          description 
          {

diff --git a/res/edje/timer.edc b/res/edje/timer.edc
index c8238c887dffe31831a3b75780d661339492c1c9..fe778dacf2d14e07e6b45ed2a7de363579829296 100755 (executable)
--- a/res/edje/timer.edc
+++ b/res/edje/timer.edc
@@ -27,91 +27,91 @@ collections {
 color_classes{
    color_class{
       name: "AT015";
-      color: 216.75 62.86 62.86 100;
+      color: 216.75 62.86 62.86 255;
    }
    color_class{
       name: "AT015P";
-      color: 216.75 62.86 62.86 40;
+      color: 216.75 62.86 62.86 102;
    }
    color_class{
       name: "AT015D";
-      color: 216.75 62.86 62.86 40;
+      color: 216.75 62.86 62.86 102;
    }
    color_class{
       name: "AT016";
-      color: 0 191.25 175.3 100;
+      color: 0 191.25 175.3 255;
    }
    color_class{
       name: "AT016P";
-      color: 0 191.25 175.3 40;
+      color: 0 191.25 175.3 102;
    }
    color_class{
       name: "AT016D";
-      color: 0 191.25 175.3 40;
+      color: 0 191.25 175.3 102;
    }
    color_class{
       name: "AT017";
-      color: 255 255 255 100;
+      color: 255 255 255 255;
    }
    color_class{
       name: "AT017P";
-      color: 255 255 255 40;
+      color: 255 255 255 102;
    }
    color_class{
       name: "AT017D";
-      color: 255 255 255 40;
+      color: 255 255 255 102;
    }
    color_class{
       name: "AT0142";
-      color: 216.75 62.86 62.86 100;
+      color: 216.75 62.86 62.86 255;
    }
    color_class{
       name: "AO0171";
-      color: 89.25 25.88 25.88 100;
+      color: 89.25 25.88 25.88 255;
    }
    color_class{
       name: "AO0171D";
-      color: 45.9 45.9 45.9 100;
+      color: 45.9 45.9 45.9 255;
    }
    color_class{
       name: "AO0181";
-      color: 216.75 62.86 62.86 100;
+      color: 216.75 62.86 62.86 255;
    }
    color_class{
       name: "AO0181D";
-      color: 216.75 62.86 62.86 70;
+      color: 216.75 62.86 62.86 178.5;
    }
    color_class{
       name: "BO2111";
-      color: 0 0 0 12;
+      color: 0 0 0 30.6;
    }
    color_class{
       name: "W501";
-      color: 24.99 255 25.37 100;
+      color: 24.99 255 25.37 255;
    }
    color_class{
       name: "AO0111";
-      color: 0 0 0 100;
+      color: 0 0 0 255;
    }
    color_class{
       name: "AO0112";
-      color: 0 0 0 100;
+      color: 0 0 0 255;
    }
    color_class{
       name: "T191";
-      color: 0 0 0 100;
+      color: 0 0 0 255;
    }
    color_class{
       name: "W284";
-      color: 255 255 255 100;
+      color: 255 255 255 255;
    }
    color_class{
       name: "B065L2";
-      color: 0 0 0 100;
+      color: 0 0 0 255;
    }   
    color_class{
       name: "B065L3";
-      color: 0 0 0 100;
+      color: 0 0 0 255;
    }   
    
 }      

diff --git a/src/main.c b/src/main.c
index bbb0d74ef5c807d1914ec77c3c738e5692b41e35..72db9f733c116d329e71cb9a7d4c8a21adef41b9 100755 (executable)
--- a/src/main.c
+++ b/src/main.c
@@ -389,8 +389,8 @@ static void _tmr_hour_spinner_focused_cb(void *data, Evas_Object * obj, void *ev
        ad->t_type = TMR_TIME_TYPE_HOUR;
        ad->hour = (int) elm_spinner_value_get(ad->hour_spinner);
        TMR_INFO("hour = %d", ad->hour);
-       evas_object_color_set(ad->focused_obj, 250, 250, 250, 255);
-       ad->focused_obj = obj;
+       evas_object_color_set(ad->focused_obj, 255, 255, 255, 255);
+       ad->focused_obj = elm_object_part_content_get(ad->hour_spinner, "elm.swallow.text_button");
        evas_object_color_set(ad->focused_obj, 18, 180, 255, 255);
        eext_rotary_object_event_activated_set(obj, EINA_TRUE);
        _tmr_button_state_update(ad);
@@ -406,11 +406,13 @@ static void _tmr_min_spinner_focused_cb(void *data, Evas_Object * obj, void *eve
        ad->t_type = TMR_TIME_TYPE_MIN;
        ad->min = (int) elm_spinner_value_get(ad->min_spinner);
        TMR_INFO("min = %d", ad->min);
-       evas_object_color_set(ad->focused_obj, 250, 250, 250, 255);
-       ad->focused_obj = obj;
+       evas_object_color_set(ad->focused_obj, 255, 255, 255, 255);
+       ad->focused_obj = elm_object_part_content_get(ad->min_spinner, "elm.swallow.text_button");
        evas_object_color_set(ad->focused_obj, 18, 180, 255, 255);
        eext_rotary_object_event_activated_set(obj, EINA_TRUE);
        _tmr_button_state_update(ad);
+
+
 }
 
 static void _tmr_sec_spinner_focused_cb(void *data, Evas_Object * obj, void *event_info)
@@ -423,11 +425,12 @@ static void _tmr_sec_spinner_focused_cb(void *data, Evas_Object * obj, void *eve
        ad->t_type = TMR_TIME_TYPE_SEC;
        ad->sec = (int) elm_spinner_value_get(ad->sec_spinner);
        TMR_INFO("sec = %d", ad->sec);
-       evas_object_color_set(ad->focused_obj, 250, 250, 250, 255);
-       ad->focused_obj = obj;
+       evas_object_color_set(ad->focused_obj, 255, 255, 255, 255);
+       ad->focused_obj = elm_object_part_content_get(ad->sec_spinner, "elm.swallow.text_button");
        evas_object_color_set(ad->focused_obj, 18, 180, 255, 255);
        eext_rotary_object_event_activated_set(obj, EINA_TRUE);
        _tmr_button_state_update(ad);
+
 }
 
 static void _tmr_hour_spinner_unfocused_cb(void *data, Evas_Object * obj, void *event_info)
@@ -548,11 +551,9 @@ static void _panel_timeset_add(void *data)
        evas_object_smart_callback_add(ad->sec_spinner, "changed", _tmr_sec_spinner_change_cb, ad);
        evas_object_smart_callback_add(ad->sec_spinner, "focused", _tmr_sec_spinner_focused_cb, ad);
        evas_object_smart_callback_add(ad->sec_spinner, "unfocused", _tmr_sec_spinner_unfocused_cb, ad);
-       elm_object_focus_set(ad->sec_spinner, EINA_TRUE);
        ad->focused_obj = elm_object_part_content_get(ad->sec_spinner, "elm.swallow.text_button");
        evas_object_color_set(ad->focused_obj, 18, 180, 255, 255);
        _tmr_spinner_special_value_set(ad);
-
        evas_object_show(ad->timepicker);
 }
 
@@ -689,7 +690,7 @@ static void _tmr_set_time_number(struct appdata *ad, int min, int sec)
                r = 216.75;
                g = 62.86;
                b = 62.86;
-               a = 100;
+               a = 255;
 
                eext_circle_object_item_color_set(ad->progressbar, "default", r, g, b, a);
 
@@ -699,7 +700,7 @@ static void _tmr_set_time_number(struct appdata *ad, int min, int sec)
                r = 89.25;
                g = 25.88;
                b = 25.88;
-               a = 100;
+               a = 255;
 
                TMR_INFO("r:%d, g:%d, b:%d, a:%d", r, g, b, a);
 
@@ -1209,7 +1210,7 @@ static void _tmr_startbtn_cb_ex(void *data, Evas_Object * obj, void *event_info)
                r = 15.17;
                g = 152.92;
                b = 216.75;
-               a = 100;
+               a = 255;
                eext_circle_object_item_color_set(ad->progressbar, "default", r, g, b, a);
 
                //todo:
@@ -1217,7 +1218,7 @@ static void _tmr_startbtn_cb_ex(void *data, Evas_Object * obj, void *event_info)
                r = 6.25;
                g = 62.97;
                b = 89.25;
-               a = 100;
+               a = 255;
                eext_circle_object_item_color_set(ad->progressbar, "bg", r, g, b, a);
                edje_object_signal_emit(_EDJ(ad->ly_main), "progressbar.show", "*");