TizenRefApp-6994 [Call UI] Reimplement quick panel mini control buttons style 21/85021/2
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Tue, 23 Aug 2016 09:24:32 +0000 (12:24 +0300)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Tue, 23 Aug 2016 09:27:23 +0000 (12:27 +0300)
Change-Id: Ic2329fc65fce99fe93f746af3f977acb89219d43

edje_src/edc/callui-color-classes.edc
edje_src/images/call_theme/bg/call_noti_btn_bg.png [new file with mode: 0644]
edje_src/images/call_theme/bg/vc_toggle_focus.png [deleted file]
edje_src/images/call_theme/icon/call_noti_btn_end.png
edje_src/images/call_theme/icon/call_noti_btn_mute.png
edje_src/images/call_theme/icon/call_noti_btn_send.png
edje_src/images/call_theme/icon/call_noti_btn_speaker.png
res/edje/call_theme.edc

index 2de3005..6abefa0 100644 (file)
@@ -426,5 +426,22 @@ color_classes {
                name: "keypad_btn_bg"; //AO019
                color: 250 250 250 10;
        }
+       // Quick panel mini control toggle buttons
+       color_class {
+               name: "qp_mc_toogle_norm";
+               color: 61 185 204 255;
+       }
+       color_class {
+               name: "qp_mc_toogle_off";
+               color: 34 104 115 255;
+       }
+       color_class {
+               name: "qp_mc_toogle_dim";
+               color: 0 0 0 77;
+       }
+       color_class {
+               name: "qp_mc_toogle_icon";
+               color: 250 250 250 255;
+       }
 }
 
diff --git a/edje_src/images/call_theme/bg/call_noti_btn_bg.png b/edje_src/images/call_theme/bg/call_noti_btn_bg.png
new file mode 100644 (file)
index 0000000..bf7d908
Binary files /dev/null and b/edje_src/images/call_theme/bg/call_noti_btn_bg.png differ
diff --git a/edje_src/images/call_theme/bg/vc_toggle_focus.png b/edje_src/images/call_theme/bg/vc_toggle_focus.png
deleted file mode 100644 (file)
index 589e79b..0000000
Binary files a/edje_src/images/call_theme/bg/vc_toggle_focus.png and /dev/null differ
index 97eb8cb..d45a0b4 100644 (file)
Binary files a/edje_src/images/call_theme/icon/call_noti_btn_end.png and b/edje_src/images/call_theme/icon/call_noti_btn_end.png differ
index 7ac836a..572604d 100644 (file)
Binary files a/edje_src/images/call_theme/icon/call_noti_btn_mute.png and b/edje_src/images/call_theme/icon/call_noti_btn_mute.png differ
index cf48689..a29be96 100644 (file)
Binary files a/edje_src/images/call_theme/icon/call_noti_btn_send.png and b/edje_src/images/call_theme/icon/call_noti_btn_send.png differ
index fe08bbb..f97a4e9 100644 (file)
Binary files a/edje_src/images/call_theme/icon/call_noti_btn_speaker.png and b/edje_src/images/call_theme/icon/call_noti_btn_speaker.png differ
index 28298be..3dbd849 100644 (file)
@@ -55,6 +55,9 @@
 #define AO025  0 0 0 64
 #define AO025P 0 0 0 77
 
+// QP MC BUTTONS
+#define TOGGLE_BTN_MIN_SIZE 90 90
+
 #define STYLE_TAGS \
        tag: "br" "\n";\
        tag: "ps" "ps";\
@@ -1087,31 +1090,29 @@ styles {
                } \
        }
 
-#define TOGGLE_BTN(grp_name, bg_cc, bg_cc_p, img, img_cc, img_cc_p) \
+#define QP_MC_TOGGLE_BTN(grp_name, bg_cc, bg_cc_p, img, img_cc, img_cc_p) \
        group { name: "elm/button/base/"grp_name; \
                data { \
                        item: "focus_highlight" "on"; \
                } \
                images { \
-                       image: BG_IMG_PATH"/call_btn_circle.png" COMP; \
-                       image: BG_IMG_PATH"/vc_toggle_focus.png" COMP; \
+                       image: BG_IMG_PATH"/call_noti_btn_bg.png" COMP; \
                        image: img COMP; \
-               }\
+               } \
                script { \
                        public button_state = 0; \
                } \
-               parts { \
-                       part { name: "button_image";\
+               parts { \
+                       part { name: "button_image"; \
                                type: IMAGE; \
                                scale: 1; \
                                description { state: "default" 0.0; \
-                                       rel1 { relative: 0.0 0.0;} \
-                                       rel2 { relative: 1.0 1.0;} \
+                                       min: TOGGLE_BTN_MIN_SIZE; \
+                                       color_class: bg_cc; \
                                        image { \
-                                               normal: BG_IMG_PATH"/call_btn_circle.png"; \
+                                               normal: BG_IMG_PATH"/call_noti_btn_bg.png"; \
+                                               middle: DEFAULT; \
                                        } \
-                                       aspect_preference: SOURCE;\
-                                       color_class: bg_cc; \
                                } \
                                description { state: "clicked" 0.0; \
                                        inherit: "default" 0.0; \
@@ -1119,52 +1120,36 @@ styles {
                                } \
                                description { state: "disabled" 0.0; \
                                        inherit: "default" 0.0; \
-                                       color_class: "AO014D"; \
-                               } \
-                       } \
-                       part { name: "focus_image"; \
-                               scale: 1; \
-                               mouse_events: 0; \
-                               repeat_events: 1; \
-                               description { state: "default" 0.0; \
-                                       visible: 0; \
-                                       rel1.to : "button_image"; \
-                                       rel2.to : "button_image"; \
-                                       image { \
-                                               normal: BG_IMG_PATH"/vc_toggle_focus.png"; \
-                                               border: COLOR_BG_ALPHA; \
-                                               border_scale: 1; \
-                                       } \
-                               } \
-                               description { state: "focused" 0.0; \
-                                       inherit: "default" 0.0; \
-                                       visible: 1; \
+                                       color_class: "qp_mc_toogle_dim"; \
                                } \
                        } \
                        part { name: "content_image"; \
                                type: IMAGE; \
                                scale: 1; \
                                description { state: "default" 0.0; \
-                                       rel1 { relative: BUTTON_BOTTOM_ICON_OFFSET_L CALL_QUICKPANEL_BTN_ICON_T; to: "button_image";} \
-                                       rel2 { relative: BUTTON_BOTTOM_ICON_OFFSET_R CALL_QUICKPANEL_BTN_ICON_B; to: "button_image";} \
-                                       image.normal: img; \
-                                       color_class: img_cc; \
-                                       align: 0.5 0.5; \
+                                       min: TOGGLE_BTN_MIN_SIZE; \
                                        aspect_preference: SOURCE; \
+                                       color_class: qp_mc_toogle_icon; \
+                                       rel1 { to: "button_image"; } \
+                                       rel2 { to: "button_image"; } \
+                                       image { \
+                                               normal: img; \
+                                               middle: DEFAULT; \
+                                       } \
                                } \
                                description { state: "clicked" 0.0; \
                                        inherit: "default" 0.0; \
-                                       color_class: img_cc_p; \
+                                       color_class: qp_mc_toogle_icon; \
                                } \
                                description { state: "disabled" 0.0; \
                                        inherit: "default" 0.0; \
-                                       color_class: "ATO017"; \
+                                       color_class: "qp_mc_toogle_dim"; \
                                } \
                        } \
                        part { name: "over2"; \
                                type: RECT; \
                                repeat_events: 1; \
-                               ignore_flags: ON_HOLD; \
+                               ignore_flags: "ON_HOLD"; \
                                description { state: "default" 0.0; \
                                        color: COLOR_BG_ALPHA; \
                                } \
@@ -1179,12 +1164,11 @@ styles {
                        part { name: "disabler"; \
                                type: RECT; \
                                description { state: "default" 0.0; \
-                                       color: COLOR_BG_ALPHA; \
                                        visible: 0; \
+                                       color: COLOR_BG_ALPHA; \
                                } \
                                description { state: "disabled" 0.0; \
-                                       inherit: "default" 0.0; \
-                                       visible: 1; \
+                                       color: COLOR_BG_ALPHA; \
                                } \
                        } \
                } \
@@ -1195,37 +1179,26 @@ styles {
                                action: SIGNAL_EMIT "elm,action,press" ""; \
                                after: "button_click_anim"; \
                        } \
-                       program { name: "button_click_anim"; \
-                               action: STATE_SET "clicked" 0.0; \
-                               target: "button_image"; \
-                               target: "content_image"; \
-                       } \
                        program { name: "button_double_click"; \
                                signal: "mouse,down,1,double"; \
                                source: "over3"; \
                                after: "button_click_anim"; \
                        } \
-                       program { name: "button_unpress"; \
-                               action: SIGNAL_EMIT "elm,action,unpress" ""; \
-                       } \
                        program { name: "button_mouseout_clicked"; \
                                signal: "mouse,up,1"; \
                                source: "over3"; \
                                script { \
-                               if (get_int(button_state) != 1) \
-                                       set_state(PART:"button_image", "default", 0.0); \
+                                       if (get_int(button_state) != 1) \
+                                               set_state(PART:"button_image", "default", 0.0); \
                                        set_state(PART:"content_image", "default", 0.0); \
                                } \
-                               after: button_unpress; \
+                               after: "button_unpress"; \
                        } \
                        program { name: "touch_snd"; \
                                signal: "mouse,clicked,1"; \
                                source: "over2"; \
                                action: RUN_PLUGIN "touch_sound"; \
-                               after: button_unclick3; \
-                       } \
-                       program { name: "button_unclick3"; \
-                               action: SIGNAL_EMIT "elm,action,click" ""; \
+                               after: "button_unclick3"; \
                        } \
                        program { name: "disable"; \
                                signal: "elm,state,disabled"; \
@@ -1243,17 +1216,16 @@ styles {
                                target: "content_image"; \
                                target: "disabler"; \
                        } \
-                       program { name: "action_focus"; \
-                               signal: "elm,action,focus_highlight,show"; \
-                               source: "elm"; \
-                               action: STATE_SET "focused" 0.0; \
-                               target: "focus_image"; \
+                       program { name: "button_click_anim"; \
+                               action: STATE_SET "clicked" 0.0; \
+                               target: "button_image"; \
+                               target: "content_image"; \
                        } \
-                       program { name: "action_unfocus"; \
-                               signal: "elm,action,focus_highlight,hide"; \
-                               source: "elm"; \
-                               action: STATE_SET "default" 0.0; \
-                               target: "focus_image"; \
+                       program { name: "button_unpress"; \
+                               action: SIGNAL_EMIT "elm,action,unpress" ""; \
+                       } \
+                       program { name: "button_unclick3"; \
+                               action: SIGNAL_EMIT "elm,action,click" ""; \
                        } \
                } \
        }
@@ -1341,7 +1313,7 @@ styles {
                                type: RECT; \
                                description { state: "default" 0.0; \
                                        visible: 0; \
-                                       color: 0 0 0 0; \
+                                       color: COLOR_BG_ALPHA; \
                                } \
                                description { state: "ready" 0.0; \
                                        inherit: "default" 0.0; \
@@ -1512,7 +1484,7 @@ styles {
                                description { state: "default" 0.0; \
                                        rel1.to: "tizen_vg_shape"; \
                                        rel2.to: "tizen_vg_shape"; \
-                                       color: 0 0 0 0; \
+                                       color: COLOR_BG_ALPHA; \
                                } \
                        } \
                } \
@@ -1783,42 +1755,6 @@ collections {
        }
 
        styles {
-               style { name: "normal_hold";
-                       base: "font=Tizen:style=Regular font_size=36 align=center color=#FAFAFAFF style=shadow,bottom shadow_color=#000000FF ellipsis=1.0 wrap=none text_class=tizen";
-                       STYLE_TAGS
-               }
-               style { name: "disabled_hold";
-                       base: "font=Tizen:style=Regular font_size=36 align=center color=#FAFAFA80 style=shadow,bottom shadow_color=#000000FF ellipsis=1.0 wrap=none text_class=tizen";
-                       STYLE_TAGS
-               }
-               style { name: "normal_unhold";
-                       base: "font=Tizen:style=Regular font_size=36 align=center color=#87E22DFF style=shadow,bottom shadow_color=#000000FF ellipsis=1.0 wrap=none text_class=tizen";
-                       STYLE_TAGS
-               }
-               style { name: "disabled_unhold";
-                       base: "font=Tizen:style=Regular font_size=36 align=center color=#87E22D80 style=shadow,bottom shadow_color=#000000FF ellipsis=1.0 wrap=none text_class=tizen";
-                       STYLE_TAGS
-               }
-               style { name: "normal_swap";
-                       base: "font=Tizen:style=Regular font_size=36 align=center color=#FAFAFAFF style=shadow,bottom shadow_color=#000000FF ellipsis=1.0 wrap=none text_class=tizen";
-                       STYLE_TAGS
-               }
-               style { name: "disabled_swap";
-                       base: "font=Tizen:style=Regular font_size=36 align=center color=#00000080 style=shadow,bottom shadow_color=#00000066 ellipsis=1.0 wrap=none text_class=tizen";
-                       STYLE_TAGS
-               }
-               style { name: "end_button";
-                       base: "font=Tizen:style=Regular color=#FAFAFAFF text_class="ATO008"";
-                       STYLE_TAGS
-               }
-               style { name: "end_button_disabled";
-                       base: "font=Tizen:style=Regular color=#FAFAFAFF text_class="ATO008"";
-                       STYLE_TAGS
-               }
-               style { name: "end_button_disabled_visible";
-                       base: "font=Tizen:style=Regular color=#FAFAFAFF text_class="ATO008"";
-                       STYLE_TAGS
-               }
                style { name: "button_bottom";
                        base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class="ATO012" text_class="ATO012" ellipsis=1.0";
                        STYLE_TAGS
@@ -1856,22 +1792,22 @@ collections {
 
 /* elm/button/base/style_call_icon_only_end */
 /* This style is for End button in quickpanel view */
-       TOGGLE_BTN(callui_qp_btn_end, "AO013", "AO013P", ICON_IMG_PATH"/call_noti_btn_end.png", "ATO017", "ATO017");
-       TOGGLE_BTN(callui_qp_btn_call, "AO012P1", "AO012P", ICON_IMG_PATH"/call_noti_btn_send.png", "ATO017", "ATO017");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_end, "AO013", "AO013P", ICON_IMG_PATH"/call_noti_btn_end.png", "ATO017", "ATO017");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_call, "AO012P1", "AO012P", ICON_IMG_PATH"/call_noti_btn_send.png", "ATO017", "ATO017");
 
 /* elm/button/base/callui_qp_btn_mute */
 /* This style is for mute/unhold button in quickpanel view */
-       TOGGLE_BTN(callui_qp_btn_mute, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_mute.png", "AO019", "AO019P");
-       TOGGLE_BTN(callui_qp_btn_mute_on, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_mute.png", "AO018", "AO018P");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_mute, "qp_mc_toogle_norm", "qp_mc_toogle_norm", ICON_IMG_PATH"/call_noti_btn_mute.png", "AO019", "AO019P");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_mute_on, "qp_mc_toogle_off", "qp_mc_toogle_off", ICON_IMG_PATH"/call_noti_btn_mute.png", "AO018", "AO018P");
 
 /* elm/button/base/callui_qp_btn_speaker */
 /* This style is for speaker/unhold button in quickpanel view */
-       TOGGLE_BTN(callui_qp_btn_speaker, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_speaker.png", "AO019", "AO019P");
-       TOGGLE_BTN(callui_qp_btn_speaker_on, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_speaker.png", "AO018", "AO018P");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_speaker, "qp_mc_toogle_norm", "qp_mc_toogle_norm", ICON_IMG_PATH"/call_noti_btn_speaker.png", "AO019", "AO019P");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_speaker_on, "qp_mc_toogle_off", "qp_mc_toogle_off", ICON_IMG_PATH"/call_noti_btn_speaker.png", "AO018", "AO018P");
 
 /* This style is for speaker/resume button in quickpanel view */
-       TOGGLE_BTN(callui_qp_btn_resume, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_resume.png", "AO019", "AO019P");
-       TOGGLE_BTN(callui_qp_btn_resume_on, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_resume.png", "AO018", "AO018P");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_resume, "qp_mc_toogle_norm", "qp_mc_toogle_norm", ICON_IMG_PATH"/call_noti_btn_resume.png", "AO019", "AO019P");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_resume_on, "qp_mc_toogle_off", "qp_mc_toogle_off", ICON_IMG_PATH"/call_noti_btn_resume.png", "AO018", "AO018P");
 
 group { name: "elm/button/base/end_call";
        script {
@@ -1880,6 +1816,7 @@ group { name: "elm/button/base/end_call";
        }
        images {
                image: BG_IMG_PATH"/core_button_bg.#.png" COMP;
+               image: BG_IMG_PATH"/call_btn_circle.png" COMP;
        }
        parts {
                part { name: "base";
@@ -2083,8 +2020,8 @@ group { name: "elm/button/base/end_call";
                                if (get_int(multi_down) == 0) {
                                        get_state(PART:"bg", st, 30, vl);
                                        if (strcmp(st, "disabled")) {
-                                       run_program(PROGRAM:"touch_sound");
-                                       emit("elm,action,click", "");
+                                               run_program(PROGRAM:"touch_sound");
+                                               emit("elm,action,click", "");
                                        }
                                }
                        }
@@ -2159,4 +2096,4 @@ group { name: "elm/button/base/end_call";
        DEFAULT_CUSTOM_BG_BTN("active_noti_accept", AO037, AO037);
        DEFAULT_CUSTOM_BG_BTN("active_noti_reject", AO038, AO038);
        DEFAULT_CUSTOM_BG_BTN("active_noti_reject_with_msg", AO025, AO025);
-}
\ No newline at end of file
+}