[TIZENIOT-1524]Update Notification Popup GUI 11/233311/2 submit/tizen/20200514.135340
authoraman.jeph <aman.jeph@samsung.com>
Wed, 13 May 2020 14:06:18 +0000 (19:36 +0530)
committerAmritanshu Pandia <a.pandia1@samsung.com>
Thu, 14 May 2020 07:48:42 +0000 (07:48 +0000)
Change-Id: I672126f55a6fe1fad1b127ae1659ef7940e95ad7
Signed-off-by: aman.jeph <aman.jeph@samsung.com>
res/edje/quickpanel_activenoti.edc
res/images/active_noti_bg.png [new file with mode: 0644]
res/images/activenoti_popup_bg.png [new file with mode: 0644]
src/notifications/activenoti.c
src/notifications/noti_win.c

index f0b291ba4a9f35f36ecf1c88cea710f69d451a93..27616ce0d434fa0cdec0e0bd3123e626b47a5ae5 100755 (executable)
 #define ACTIVENOTI_BG_COLOR "AO003"
 #define ACTIVENOTI_MAIN_TEXT_HEIGHT_INC 1
 
-#define BOX_ICON_SIZE                  96 96
+#define BOX_ICON_SIZE  32 32
 #define BOX_ICON_SIZE_W        96
 #define BOX_ICON_SIZE_H        96
 #define BODY_SENDBUTTON_SIZE   72 68
+#define ACTIVENOTI_TEXT_PART_HEIGHT 72
+#define ACTIVENOTI_ACTION_PART_HEIGHT 72
+#define ACTIVENOTI_TEXT_PART_PADDING 40
+#define ACTIVENOTI_MAIN_TEXT_PADDING 20
 
 
 #define PADDING_LEFT(param_padding_name, param_padding_size) \
 
 images
 {
-       image: "handler_btn_02.png" COMP;
-       image: "core_theme_bg_01.png" COMP;
+       image: "active_noti_bg.png" COMP;
        image: "core_list_button_bg.#.png" COMP;
        image: "quick_button_icon_bg.png" COMP;
+       image: "activenoti_popup_bg.png" COMP;
 }
 
 collections
 {
-       base_scale: 2.6;
+       base_scale: 1.8;
 
-       group {
-               name: "headsup/base";
+       group { "headsup/base";
 
                styles {
                        style {
                                name: "style_title_text";
-                               base: "font=Tizen:style=Bold font_size="38" color=#FFFFFFFF  text_class=tizen wrap=mixed ellipsis=1.0";
+                               base: "font=Tizen:style=Bold font_size="38" color=#001447  text_class=tizen wrap=mixed ellipsis=1.0";
                        }
                }
 
                styles {
                        style {
                                name: "style_main_text";
-                               base: "font=Tizen:style=Regular font_size="32" color=#FFFFFFFF  text_class=tizen wrap=mixed ellipsis=1.0";
+                               base: "font=Tizen:style=Light font_size="22" color=#001447  text_class=tizen wrap=mixed ellipsis=1.0";
+                       }
+                       style {
+                               name: "style_sub_text";
+                               base: "font=Tizen:style=Regular font_size="18" color=#001447  text_class=tizen wrap=mixed ellipsis=1.0";
                        }
                }
 
                parts {
-                       part {
-                               name: "background";
-                               type: SWALLOW;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.0;
-                               }
-                       }
-
-                       part {
-                               name: "bg";
+                       part { name: "bg";
                                type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
+                               scale: 1;
+                               description { state: "default" 0.0;
                                        align: 0.0 0.0;
-                                       rel1 {
-                                               to: "background";
-                                       }
-                                       rel2 {
-                                               to: "background";
-                                       }
                                        image {
-                                               normal: "core_theme_bg_01.png";
+                                               normal: "active_noti_bg.png";
                                        }
+                                       visible: 1;
                                }
                        }
-
-
-                       part {
-                               name: "bg_img";
-                               type: SWALLOW;
-                               description {
-                                       state: "default" 0.0;
+                       part { name: "spacer.top_left";
+                               scale: 1;
+                               type: SPACER;
+                               description { state: "default" 0.0;
                                        align: 0.0 0.0;
-                                       rel1 {
-                                               to: "bg";
-                                       }
-                                       rel2 {
-                                               to: "bg";
-                                       }
+                                       min: 40 24;
+                                       max: 40 24;
+                                       rel.to: "bg";
+                                       fixed: 1 1;
                                }
                        }
-
-                       part {
-                               name : "space.inflexible";
+                       part { name: "spacer.bottom_right";
                                type: SPACER;
                                scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       fixed: 0 1;
-                                       min: 0 186;
+                               description { state: "default" 0.0;
+                                       align: 1.0 1.0;
                                        rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "bg";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
                                                to: "bg";
+                                               relative: 1.0 1.0;
                                        }
+                                       min: 40 24;
+                                       max: 40 24;
+                                       fixed: 1 1;
                                }
                        }
-
-                       part {
-                               name : "padding.top";
-                               type:SPACER;
+                       part { name: "popup_bg";
+                               type: IMAGE;
                                scale: 1;
-                               description {
-                                       state: "default" 0.0;
+                               description { state: "default" 0.0;
                                        align: 0.0 0.0;
-                                       fixed: 0 1;
-                                       min : 0 24;
                                        rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "space.inflexible";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to: "space.inflexible";
-                                       }
-                               }
-                       }
-
-                       part {
-                               name : "space.icon_and_text_contents";
-                               type:SPACER;
-                               scale: 1;
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.5 0.0;
-                                       fixed: 0 1;
-                                       min : 0 140;
-                                       rel1 {
-                                               relative: 0.05 1.0;
-                                               to_x: "space.inflexible";
-                                               to_y: "padding.top";
+                                               to: "spacer.top_left";
+                                               relative: 1.0 1.0;
                                        }
                                        rel2 {
-                                               relative: 0.95 1.0;
-                                               to_x: "space.inflexible";
-                                               to_y: "padding.top";
-                                       }
-                               }
-                       }
-                       part{
-                               name: "entry_layout.swallow";
-                               type:SWALLOW;
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.0;
-
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                               to: "space.inflexible";
+                                               to: "spacer.bottom_right";
+                                               relative: 0.0 0.0;
                                        }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to: "space.handle";
+                                       image {
+                                               normal: "activenoti_popup_bg.png";
                                        }
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:0;
+                                       visible: 1;
                                }
                        }
-
-                       part{
-                               name: "button_layout.swallow";
-                               type:SWALLOW;
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               description {
-                                       state: "default" 0.0;
+                       part { name: "bg_img";
+                               type: SWALLOW;
+                               description { state: "default" 0.0;
                                        align: 0.0 0.0;
                                        rel1 {
-                                               relative: 0.0 1.0;
-                                               to: "space.inflexible";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to: "space.handle";
-                                       }
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:0;
-                               }
-                       }
-
-                       part {
-                               name: "space.handle";
-                               type: SPACER;
-                               scale: 1;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 1.0;
-                                       fixed: 0 1;
-                                       min: 0 43;
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                               to: "bg";
-                                       }
-                                       rel2 {
+                                               to: "spacer.top_left";
                                                relative: 1.0 1.0;
-                                               to: "bg";
-                                       }
-                               }
-                       }
-
-                       PADDING_BOTTOM("padding_bottom", 1);
-
-                       part {
-                               name: "handle_img";
-                               type: IMAGE;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 42 42;
-                                       max: 42 42;
-                                       align: 0.5 1.0;
-                                       rel1 {
-                                               relative: 0.5 1.0;
-                                               to_x: "space.handle";
-                                               to_y: "padding_bottom";
                                        }
                                        rel2 {
-                                               relative: 0.5 1.0;
-                                               to_x: "space.handle";
-                                               to_y: "padding_bottom";
-                                       }
-                                       image {
-                                               normal: "handler_btn_02.png";
+                                               to: "spacer.bottom_right";
+                                               relative: 0.0 0.0;
                                        }
                                }
                        }
-
-                       /* icon space start */
-                       part {
-                               name : "padding.icon.top";
-                               type:SPACER;
+                       part { name: "icon.text.time.part";
                                scale: 1;
-                               description {
-                                       state: "default" 0.0;
+                               type: SPACER;
+                               description { state: "default" 0.0;
                                        align: 0.0 0.0;
                                        fixed: 0 1;
-                                       min : 96 18;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "space.icon_and_text_contents";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 0.0;
-                                               to: "space.icon_and_text_contents";
-                                       }
+                                       min: 0 ACTIVENOTI_TEXT_PART_HEIGHT;
+                                       rel1 { to: "popup_bg"; relative: 0.0 0.0; }
+                                       rel2 { to: "popup_bg"; relative: 1.0 0.0; }
                                }
                        }
-
-                       part {
-                               name: "space.icon";
-                               mouse_events: 1;
+                       part { name: "text_part.padding.left";
                                type: SPACER;
                                scale: 1;
-                               description {
-                                       state: "default" 0.0;
+                               description { state: "default" 0.0;
                                        align: 0.0 0.0;
-                                       min : BOX_ICON_SIZE;
-                                       max : BOX_ICON_SIZE;
-                                       fixed : 1 1;
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                               to: "padding.icon.top";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to: "padding.icon.top";
-                                       }
+                                       fixed: 1 0;
+                                       min: ACTIVENOTI_TEXT_PART_PADDING 0;
+                                       rel1 { to: "icon.text.time.part"; relative: 0.0 0.0; }
+                                       rel2 { to: "icon.text.time.part"; relative: 0.0 1.0; }
                                }
                        }
-
-                       part {
-                               name : "padding.icon.right";
-                               type:SPACER;
+                       part { name: "text_part.padding.right";
+                               type: SPACER;
                                scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.0;
+                               description { state: "default" 0.0;
+                                       align: 1.0 0.0;
                                        fixed: 1 0;
-                                       min : 32 BOX_ICON_SIZE_H;
-                                       rel1 {
-                                               relative: 1.0 0.0;
-                                               to: "space.icon";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to: "space.icon";
-                                       }
+                                       min: ACTIVENOTI_TEXT_PART_PADDING 0;
+                                       rel1 { to: "icon.text.time.part"; relative: 1.0 0.0; }
+                                       rel2 { to: "icon.text.time.part"; relative: 1.0 1.0; }
                                }
                        }
-
-                       part {
-                               name: "masking";
-                               type: IMAGE;
-                               precise_is_inside: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min : BOX_ICON_SIZE;
-                                       max : BOX_ICON_SIZE;
-                                       fixed : 1 1;
-                                       rel1 {
-                                               relative: 0.5 0.5;
-                                               to: "space.icon";
-                                       }
-                                       rel2 {
-                                               relative: 0.5 0.5;
-                                               to: "space.icon";
-                                       }
-                                       image.normal: "quick_button_icon_bg.png";
+                       part { name: "button.entry.part";
+                               type: SPACER;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       align: 0.0 0.0;
+                                       fixed: 0 1;
+                                       min: 0 ACTIVENOTI_ACTION_PART_HEIGHT;
+                                       rel1 { to: "icon.text.time.part"; relative: 0.0 1.0; }
+                                       rel2 { to: "popup_bg"; relative: 1.0 1.0; }
                                }
                        }
-
-                       part {
-                               name: "icon_thumbnail";
+                       part { name: "entry_layout.swallow";
                                type: SWALLOW;
-                               clip_to : "masking";
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.5 0.5;
-                                       min : BOX_ICON_SIZE;
-                                       max : BOX_ICON_SIZE;
-                                       fixed : 1 1;
-                                       rel1 {
-                                               relative: 0.5 0.5;
-                                               to: "space.icon";
-                                       }
-                                       rel2 {
-                                               relative: 0.5 0.5;
-                                               to: "space.icon";
-                                       }
+                               mouse_events: 1;
+                               repeat_events: 1;
+                               description { state: "default" 0.0;
+                                       align: 0.0 0.5;
+                                       rel.to: "button.entry.part";
                                }
-                               description {
-                                       state: "hide" 0.0;
+                               description { state: "hide" 0.0;
                                        inherit: "default" 0.0;
                                        visible:0;
                                }
                        }
-
-                       part {
-                               name: "icon_big";
+                       part { name: "button_layout.swallow";
                                type: SWALLOW;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.5 0.5;
-                                       min : BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       max : BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       fixed : 1 1;
-                                       rel1 {
-                                               relative: 0.5 0.5;
-                                               to: "space.icon";
-
-                                       }
-                                       rel2 {
-                                               relative: 0.5 0.5;
-                                               to: "space.icon";
-
-                                       }
+                               mouse_events: 1;
+                               repeat_events: 1;
+                               description { state: "default" 0.0;
+                                       align: 0.0 0.5;
+                                       rel.to: "button.entry.part";
                                }
-                               description {
-                                       state: "hide" 0.0;
+                               description { state: "hide" 0.0;
                                        inherit: "default" 0.0;
                                        visible:0;
                                }
                        }
-
-                       part {
-                               name: "icon_badge";
+                       part { name: "icon_big";
                                type: SWALLOW;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 1.0;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       align: 0.0 0.5;
+                                       min : BOX_ICON_SIZE;
+                                       max : BOX_ICON_SIZE;
                                        fixed : 1 1;
-                                       min : 45 45;
                                        rel1 {
-                                               relative: 0.6 0.6;
-                                               to: "icon_big";
+                                               relative: 1.0 0.0;
+                                               to_x: "text_part.padding.left";
+                                               to_y: "icon.text.time.part";
                                        }
                                        rel2 {
                                                relative: 1.0 1.0;
-                                               to: "icon_big";
+                                               to: "icon.text.time.part";
                                        }
+                                       visible: 1;
+                               }
+                               description { state: "hide" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 0;
                                }
                        }
-
-                       /* text space start */
-                       part {
-                               name: "space.text";
+                       part { name: "text.padding.left";
                                type: SPACER;
-                               description {
-                                       state: "default" 0.0;
+                               scale: 1;
+                               description { state: "default" 0.0;
                                        align: 0.0 0.0;
+                                       min: ACTIVENOTI_MAIN_TEXT_PADDING 0;
+                                       fixed: 1 0;
                                        rel1 {
                                                relative: 1.0 0.0;
-                                               to_x: "padding.icon.right";
-                                               to_y: "space.icon_and_text_contents";
+                                               to_x: "icon_big";
+                                               to_y: "icon.text.time.part";
                                        }
                                        rel2 {
                                                relative: 1.0 1.0;
-                                               to: "space.icon_and_text_contents";
+                                               to_x: "icon_big";
+                                               to_y: "icon.text.time.part";
                                        }
                                }
                        }
-
-                       part {
-                               name: "subtitle_text";
-                               type: TEXTBLOCK;
+                       part { name: "text.area";
+                               type: SPACER;
                                scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       fixed: 1 1;
-                                       text {
-                                               style : "style_main_text";
-                                               align: 0.0 0.0;
-                                       }
+                               description { state: "default" 0.0;
+                                       align: 0.0 0.5;
+                                       min: 0 48;
+                                       max: -1 48;
+                                       fixed: 0 1;
                                        rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "space.text";
+                                               relative: 1.0 0.0;
+                                               to_x: "text.padding.left";
+                                               to_y: "icon.text.time.part";
                                        }
                                        rel2 {
-                                               relative: 0.0 0.0;
-                                               to: "space.text";
+                                               relative: 0.0 1.0;
+                                               to_x: "text.padding.right";
+                                               to_y: "icon.text.time.part";
                                        }
                                }
-                               description {
-                                       state: "sub_show" 0.0;
-                                       inherit: "default" 0.0;
-                                       fixed: 0 0;
+                       }
+                       part { name: "text.padding.right";
+                               type: SPACER;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       align: 1.0 0.0;
+                                       min: ACTIVENOTI_MAIN_TEXT_PADDING 0;
+                                       fixed: 1 0;
                                        rel1 {
                                                relative: 0.0 0.0;
-                                               to: "space.text";
+                                               to_x: "time.text";
+                                               to_y: "icon.text.time.part";
                                        }
                                        rel2 {
-                                               relative: 1.0 0.3;
-                                               to: "space.text";
+                                               relative: 0.0 1.0;
+                                               to_x: "time.text";
+                                               to_y: "icon.text.time.part";
                                        }
                                }
-                               description {
-                                       state: "sub_hide" 0.0;
-                                       inherit: "default" 0.0;
-                               }
                        }
-
-                       part {
-                               name: "title_text";
+                       part { name: "time.text";
                                type: TEXTBLOCK;
                                scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       text {
-                                               style : "style_title_text";
-                                               align: 0.0 0.0;
-                                       }
+                               description { state: "default" 0.0;
+                                       align: 1.0 0.5;
+                                       min: 64 22;
+                                       fixed: 0 1;
                                        rel1 {
                                                relative: 0.0 0.0;
-                                               to: "space.text";
+                                               to_x: "text_part.padding.right";
+                                               to_y: "icon.text.time.part";
                                        }
                                        rel2 {
-                                               relative: 1.0 0.33;
-                                               to: "space.text";
-                                       }
-                               }
-                               description {
-                                       state: "sub_show" 0.0;
-                                       inherit: "default" 0.0;
-                                       rel1 {
-                                               relative: 0.0 0.3;
-                                               to: "space.text";
+                                               relative: 0.0 1.0;
+                                               to: "text_part.padding.right";
+                                               to_y: "icon.text.time.part";
                                        }
-                                       rel2 {
-                                               relative: 1.0 0.63;
-                                               to: "space.text";
+                                       text {
+                                               style: "style_sub_text";
+                                               align: 1.0 0.5;
+                                               min: 1 0;
                                        }
-                               }
-                               description {
-                                       state: "sub_hide" 0.0;
-                                       inherit: "default" 0.0;
+                                       visible: 1;
                                }
                        }
-
-                       part {
-                               name: "content_text";
+                       part { name: "content_text";
                                type: TEXTBLOCK;
                                scale: 1;
-                               multiline: 1;
-                               description {
-                                       state: "default" 0.0;
+                               description { state: "default" 0.0;
                                        align: 0.0 0.0;
+                                       min: 0 22;
+                                       fixed: 0 1;
                                        text {
-                                               style: "style_main_text";
+                                               style : "style_sub_text";
                                                align: 0.0 0.5;
                                        }
                                        rel1 {
-                                               relative: 0.0 0.33;
-                                               to: "space.text";
+                                               relative: 0.0 1.0;
+                                               to: "title_text";
                                        }
                                        rel2 {
-                                               relative: 1.0 0.9;
-                                               to: "space.text";
+                                               relative: 1.0 1.0;
+                                               to: "text.area";
                                        }
+                                       visible: 1;
                                }
-                               description {
-                                       state: "sub_show" 0.0;
-                                       inherit: "default" 0.0;
+                       }
+                       part { name: "title_text";
+                               type: TEXTBLOCK;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       align: 0.0 0.0;
+                                       min: 0 26;
+                                       max: -1 26;
+                                       fixed: 0 1;
+                                       text {
+                                               style : "style_main_text";
+                                               align: 0.0 0.5;
+                                       }
                                        rel1 {
-                                               relative: 0.0 0.63;
-                                               to: "space.text";
+                                               relative: 0.0 0.0;
+                                               to: "text.area";
                                        }
                                        rel2 {
                                                relative: 1.0 1.0;
-                                               to: "space.text";
+                                               to: "text.area";
                                        }
-                               }
-                               description {
-                                       state: "sub_hide" 0.0;
-                                       inherit: "default" 0.0;
+                                       visible: 1;
                                }
                        }
-
-                       part {
-                               name: "touch";
+                       part { name: "touch";
                                mouse_events: 1;
                                type: RECT;
-                               description {
-                                       state: "default" 0.0;
+                               description { state: "default" 0.0;
                                        align: 0.0 0.0;
                                        rel1 {
                                                relative: 0.0 0.0;
-                                               to: "space.text";
+                                               to: "text.area";
                                        }
                                        rel2 {
                                                relative: 1.0 1.0;
-                                               to: "space.text";
-                                       }
-                                               color : 0 0 0 0;
+                                               to: "text.area";
                                        }
+                                       color : 0 0 0 0;
                                }
                        }
+               }
 
-               programs {
+                programs {
                        program {
                                name: "pressed_noti";
                                signal: "mouse,clicked,1";
@@ -677,50 +475,6 @@ collections
                                action: SIGNAL_EMIT "image_press" "";
                        }
 
-                       program {
-                               name: "pressed_handle";
-                               signal: "mouse,clicked,1";
-                               source: "space.handle";
-                               source: "handle_img";
-                               action: SIGNAL_EMIT "del" "";
-                       }
-
-                       program {
-                               name: "subtext_show";
-                               signal: "sub_show";
-                               source: "subtitle_text";
-                               action: STATE_SET "sub_show" 0.0;
-                               target: "subtitle_text";
-                               target: "title_text";
-                               target: "content_text";
-                       }
-
-                       program {
-                               name: "subtext_hide";
-                               signal: "sub_hide";
-                               source: "subtitle_text";
-                               action: STATE_SET "sub_hide" 0.0;
-                               target: "subtitle_text";
-                               target: "title_text";
-                               target: "content_text";
-                       }
-
-                       program {
-                               name: "thumbnail_show";
-                               signal: "thumbnail_show";
-                               source: "icon_thumbnail";
-                               action: STATE_SET "default" 0.0;
-                               target: "icon_thumbnail";
-                       }
-
-                       program {
-                               name: "thumbnail_hide";
-                               signal: "thumbnail_hide";
-                               source: "icon_thumbnail";
-                               action: STATE_SET "hide" 0.0;
-                               target: "icon_thumbnail";
-                       }
-
                        program {
                                name: "icon_show";
                                signal: "icon_show";
@@ -773,6 +527,12 @@ collections
 
        group {
                name: "layout.button";
+               styles {
+                       style {
+                               name: "style_button_text";
+                               base: "font=Tizen:weight=Bold:width=BreezeSans font_size=22 align=center color=#0A0E4A ellipsis=1.0 wrap=none text_class=tizen";
+                       }
+               }
                parts {
                        part {
                                name: "space.button";
@@ -804,6 +564,7 @@ collections
                                                normal: "core_list_button_bg.#.png";
                                        }
                                        align: 0.5 0.5;
+                                       visible: 0;
                                }
                                description {
                                        state: "pressed" 0.0;
@@ -829,7 +590,7 @@ collections
 
                        part {
                                name: "content.button.text";
-                               type: TEXT;
+                               type: TEXTBLOCK;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
@@ -841,10 +602,7 @@ collections
                                                to: "button.bg.img";
                                        }
                                        text {
-                                               font: "Tizen:style=Regular";
-                                               size: 30;
-                                               text_class: "tizen";
-                                               align: 0.5 0.5;
+                                               style: "style_button_text";
                                        }
                                }
                        }
diff --git a/res/images/active_noti_bg.png b/res/images/active_noti_bg.png
new file mode 100644 (file)
index 0000000..dad416c
Binary files /dev/null and b/res/images/active_noti_bg.png differ
diff --git a/res/images/activenoti_popup_bg.png b/res/images/activenoti_popup_bg.png
new file mode 100644 (file)
index 0000000..cb087ae
Binary files /dev/null and b/res/images/activenoti_popup_bg.png differ
index bdc84d0ea56e8ea7d7e197562721dab46839ab34..35900b8c3ccd969c7db27ed07de5907db020a918 100755 (executable)
@@ -64,6 +64,7 @@
 #define BUTTON_COLOR                     255, 255, 255, 255
 #define DEFAULT_TEXT_INPUT_MAX_LENGTH 160
 #define DEFAULT_SEND_BUTTON_IMG        "noti_icons/messages_btn_send.png"
+#define ACTIVE_NOTI_BG_IMAGE "images/active_noti_bg.png"
 
 static struct info {
        Evas_Object *activenoti;
@@ -818,15 +819,15 @@ static void _activenoti_set_text(notification_h noti, int is_screenreader)
        if (ret == NOTIFICATION_ERROR_NONE && domain != NULL && dir != NULL)
                bindtextdomain(domain, dir);
 
-
-       tmp = _get_text(noti, NOTIFICATION_TEXT_TYPE_INFO_1);
+       /// This part had been removed  according to current ui guideline.
+       /* tmp = _get_text(noti, NOTIFICATION_TEXT_TYPE_INFO_1);
        if (tmp != NULL) {
                elm_object_part_text_set(s_info.layout, "subtitle_text", tmp);
                free(tmp);
                elm_object_signal_emit(s_info.layout, "sub_show", "subtitle_text");
        } else {
                elm_object_signal_emit(s_info.layout, "sub_hide", "subtitle_text");
-       }
+       } */
 
        tmp = _get_text(noti, NOTIFICATION_TEXT_TYPE_TITLE);
        if (tmp != NULL) {
@@ -845,12 +846,6 @@ static void _activenoti_set_text(notification_h noti, int is_screenreader)
        }
 }
 
-static void _handle_press_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
-{
-       DBG("");
-       _activenoti_hide(data, 0);
-}
-
 static void _noti_press_cb(void *data, Evas_Object *obj,       const char *emission, const char *source)
 {
        DBG("");
@@ -938,7 +933,13 @@ static void _noti_press_cb(void *data, Evas_Object *obj,   const char *emission, c
                } else { //single_service_handle == NULL && multi_service_handle == NULL
                        DBG("there is no execution option in notification");
                }
-               quickpanel_common_inform_launch_app_result(caller_pkgname, ret);
+               // Message in case of app is not installed.
+               if (ret == APP_CONTROL_ERROR_APP_NOT_FOUND) {
+                       /** To Do : do we need to add this mesasge in po files */
+                       notification_status_message_post("This notification is not valid");
+               } else {
+                       quickpanel_common_inform_launch_app_result(caller_pkgname, ret);
+               }
        }
 
        _activenoti_hide(data , 1);
@@ -1478,7 +1479,6 @@ static void _activenoti_create_activenoti(void)
 {
        DBG("");
        Eina_Bool ret = EINA_FALSE;
-       Evas_Object *base = NULL;
        Evas_Object *conform = NULL;
 
        if (s_info.activenoti != NULL) {
@@ -1508,19 +1508,8 @@ static void _activenoti_create_activenoti(void)
        retif(ret == EINA_FALSE, , "failed to load layout");
 
        elm_object_signal_callback_add(s_info.layout, "noti_press" , "", _noti_press_cb, NULL);
-       elm_object_signal_callback_add(s_info.layout, "del" , "", _handle_press_cb, NULL);
        evas_object_show(s_info.layout);
 
-       /* create base rectangle */
-       base = evas_object_rectangle_add(evas_object_evas_get(s_info.layout));
-       if (!base) {
-               ERR("Failed to get detailview.");
-               _activenoti_destroy_activenoti();
-               return;
-       }
-
-       evas_object_color_set(base, 0, 165, 198, 255);
-       elm_object_part_content_set(s_info.layout, "background", base);
        elm_object_content_set(conform, s_info.layout);
 
        s_info.gesture = _gesture_create(s_info.layout);
@@ -1528,6 +1517,22 @@ static void _activenoti_create_activenoti(void)
        _activenoti_win_rotated(quickpanel_get_app_data(), 0);
 }
 
+static void _activenoti_time_set()
+{
+       int noti_err = NOTIFICATION_ERROR_NONE;
+       char buf[512] = {0,};
+       time_t noti_time;
+       noti_err = notification_get_insert_time(s_info.current_noti, &noti_time);
+       if (noti_err == NOTIFICATION_ERROR_NONE) {
+               quickpanel_noti_util_get_time(noti_time, buf, 512);
+               elm_object_part_text_set(s_info.layout, "time.text", buf);
+       }
+       else{
+               elm_object_part_text_set(s_info.layout, "time.text", "");
+               ERR("Failed to set time as time-data is not available");
+       }
+}
+
 static void _activenoti_update_activenoti(void)
 {
        DBG("");
@@ -1652,37 +1657,38 @@ static void _activenoti_update_activenoti(void)
                icon = NULL;
        }
 
-       icon = elm_object_part_content_unset(s_info.layout, "icon_thumbnail");
+       /// this part has been removed according to currrent iot guidelines.
+       /*icon = elm_object_part_content_unset(s_info.layout, "icon_thumbnail");
        DBG("icon %p", icon);
        if (icon != NULL) {
                evas_object_del(icon);
                icon = NULL;
-       }
+       }*/
 
        icon = _activenoti_create_icon(s_info.layout, s_info.current_noti, &image_type);
        if (icon != NULL) {
                if (image_type == 0) {
                        elm_object_part_content_set(s_info.layout, "icon_big", icon);
-                       elm_object_signal_emit(s_info.layout, "thumbnail_hide", "icon_thumbnail");
+                       //elm_object_signal_emit(s_info.layout, "thumbnail_hide", "icon_thumbnail");
                        elm_object_signal_emit(s_info.layout, "icon_show", "icon_big");
-               } else {
+               } /* else {
                        elm_image_fill_outside_set(icon, EINA_TRUE);
                        elm_object_part_content_set(s_info.layout, "icon_thumbnail", icon);
                        elm_object_signal_emit(s_info.layout, "icon_hide", "icon_big");
                        elm_object_signal_emit(s_info.layout, "thumbnail_show", "icon_thumbnail");
-               }
+               } */
 
-               badge = elm_object_part_content_unset(s_info.layout, "icon_badge");
+               /// this part has been removed according to currrent iot guidelines.
+               /* badge = elm_object_part_content_unset(s_info.layout, "icon_badge");
                DBG("badget %p", badge);
                if (badge != NULL)
                        evas_object_del(badge);
 
-
-               badge = _activenoti_create_badge(s_info.layout, s_info.current_noti);
+                badge = _activenoti_create_badge(s_info.layout, s_info.current_noti);
                if (badge != NULL)
                        elm_object_part_content_set(s_info.layout, "icon_badge", badge);
                else
-                       INFO("badge is NULL");
+                       INFO("badge is NULL"); */
 
 
        } else {
@@ -1691,6 +1697,8 @@ static void _activenoti_update_activenoti(void)
 
        _activenoti_set_text(noti, 0);
 
+       _activenoti_time_set();
+
        evas_object_show(s_info.activenoti);
 
        ERR("activenoti noti is updated");
index 17d58626ea82d7819209f501a9e90c8cb026acf3..b56bc48af6e00e8388f5ac53510ea0077344fb59 100755 (executable)
@@ -39,7 +39,7 @@ struct Internal_Data {
        enum Noti_Orient orient;
 };
 
-#define NOTI_HEIGHT ELM_SCALE_SIZE(232)
+#define NOTI_HEIGHT ELM_SCALE_SIZE(192)
 #define NOTI_START_Y ELM_SCALE_SIZE(36)
 
 #define E_DATA_KEY "E_DATA_KEY"
@@ -163,7 +163,7 @@ HAPI Evas_Object *quickpanel_noti_win_add(Evas_Object *parent)
 
        ecore_evas_name_class_set(ee, "APP_POPUP", "APP_POPUP");
 
-       elm_win_alpha_set(win, EINA_FALSE);
+       elm_win_alpha_set(win, EINA_TRUE);
        elm_win_indicator_mode_set(win, ELM_WIN_INDICATOR_HIDE);
        elm_win_title_set(win, "noti_win");
        elm_win_borderless_set(win, EINA_TRUE);