TizenRefApp-6544 [Call UI] Reimplement Add Contact functionality in End Call view...

Change-Id: I4d1f51a3428df033dbc059aaac2f0ab3e12802c0

diff --git a/edje_src/edc/call_edc/callui-view-caller-info.edc b/edje_src/edc/call_edc/callui-view-caller-info.edc
index 3ba83a9..a3193d7 100644 (file)
--- a/edje_src/edc/call_edc/callui-view-caller-info.edc
+++ b/edje_src/edc/call_edc/callui-view-caller-info.edc
@@ -50,6 +50,8 @@
 #define CI_CONT_NAME_PAD_BOTTOM_2L_H   (CI_CONT_NUMB_PAD_BOTTOM_2L_H+CI_PHONE_NUMB_SIZE_MIN_H+CI_PHONE_NUMB_PAD_TOP_2LINE_H)
 #define CI_CONT_NAME_PAD_BOTTOM_3L_H   (CI_CONT_MESSAGED_BOTTOM_3L_H+CI_PHONE_NUMB_SIZE_MIN_H+CI_PHONE_MESSAGE_SIZE_MIN_H+CI_PHONE_NUMB_PAD_TOP_3LINE_H)
 
+#define CI_ADD_CONTACT_CLICK_AREA_H            (CALL_STATUS_TXT_PAD_TOP + CALL_STATUS_TXT_HEIGHT)
+
 styles {
        style {
                name: "ci_contact_info_first_line";
@@ -349,15 +351,38 @@ group{
                                inherit: "default" 0.0;
                        }
                )
-               CU_PART_SWALLOW( "ec_add_contact_btn",
+               CU_PART_IMAGE( "ec_add_contact_img",
                        description { state: "default" 0.0;
+                               visible: 0;
+                               fixed: 1 1;
+                               align: 1.0 0.0;
                                min: EC_ADD_CONT_BTN_SIZE;
                                max: EC_ADD_CONT_BTN_SIZE;
-                               fixed: 1 1;
                                rel1 { relative: 0.0 1.0;       to_x: "ec_add_cont.padding.left";       to_y: "ec_add_cont.padding.top"; }
                                rel2 { relative: 0.0 1.0;       to_x: "ec_add_cont.padding.left"; }
-                               align: 1.0 0.0;
+                               image.normal: IMG_SRC_DIR/"core_button_add.png";
+                               color: COLOR_WHITE;
+                       }
+                       description { state: "show" 0.0;
+                               inherit: "default" 0.0;
+                               visible: 1;
+                       }
+                       description { state: "hide" 0.0;
+                               inherit: "default" 0.0;
+                       }
+               )
+
+               // ADD CONTACT CLICK AREA
+
+               CU_PART_PADDING_TOP_NAME("ec_add_contact.click_area.padding.top", CI_ADD_CONTACT_CLICK_AREA_H)
+               CU_PART_RECT( "ec_add_contact.click_area",
+                       mouse_events: 1;
+                       repeat_events: 1;
+                       description { state: "default" 0.0;
                                visible: 0;
+                               rel1 { relative: 0.0 1.0;       to: "ec_add_contact.click_area.padding.top"; }
+                               rel2 { relative: 1.0 1.0;       to: "bg"; }
+                               color: COLOR_BG_ALPHA;
                        }
                        description { state: "show" 0.0;
                                inherit: "default" 0.0;
@@ -367,240 +392,252 @@ group{
                                inherit: "default" 0.0;
                        }
                )
-               programs {
+       }
+       programs {
+               script {
+                       public show_ec_add_cont_btn;
+                       public cont_info_2line;
+               }
+               program { name: "show_contact_name";
+                       action: STATE_SET "show" 0.0;
+                       target: "contact_name";
+               }
+               program { name: "show_contact_number";
+                       action: STATE_SET "show" 0.0;
+                       target: "phone_number";
+               }
+               program { name: "hide_contact_number";
+                       action: STATE_SET "hide" 0.0;
+                       target: "phone_number";
+               }
+               program { name: "show_message";
+                       action: STATE_SET "show" 0.0;
+                       target: "message";
+               }
+               program { name: "hide_message";
+                       action: STATE_SET "hide" 0.0;
+                       target: "message";
+               }
+               program { name: "caller_name_1line";
+                       signal: "1line";
+                       source: "caller_name";
+                       action: STATE_SET "1line" 0.0;
+                       target: "contact_name.padding.bottom";
+                       target: "phone_number.padding.bottom";
+                       target: "message.padding.bottom";
+                       target: "contact_name.padding.top";
+                       after: "show_contact_name";
+                       after: "hide_contact_number";
+                       after: "hide_message";
+                       after: "deinit_cont_info_two_line";
+               }
+               program { name: "caller_name_2line";
+                       signal: "2line";
+                       source: "caller_name";
+                       action: STATE_SET "2line" 0.0;
+                       target: "contact_name.padding.bottom";
+                       target: "phone_number.padding.bottom";
+                       target: "message.padding.bottom";
+                       target: "contact_name.padding.top";
+                       after: "show_contact_name";
+                       after: "show_contact_number";
+                       after: "hide_message";
+                       after: "init_cont_info_two_line";
+               }
+               program { name: "caller_name_3line";
+                       signal: "3line";
+                       source: "caller_name";
+                       action: STATE_SET "3line" 0.0;
+                       target: "contact_name.padding.bottom";
+                       target: "phone_number.padding.bottom";
+                       target: "message.padding.bottom";
+                       target: "contact_name.padding.top";
+                       after: "show_contact_name";
+                       after: "show_contact_number";
+                       after: "show_message";
+               }
+               program { name: "show_arrow";
+                       signal: "show_manage_calls_btn";
+                       source: "";
+                       action: STATE_SET "default" 0.0;
+                       target: "manage_calls_btn";
+                       after: "set_txt_bounds_on_arrow_show";
+               }
+               program { name: "hide_arrow";
+                       signal: "hide_manage_calls_btn";
+                       source: "";
+                       action: STATE_SET "hide" 0.0;
+                       target: "manage_calls_btn";
+                       after: "set_txt_bounds_on_arrow_hide";
+
+               }
+               program { name: "set_txt_bounds_on_arrow_hide";
+                       action: STATE_SET "default" 0.0;
+                       target: "contact_name";
+                       target: "phone_number";
+               }
+               program { name: "set_txt_bounds_on_arrow_show";
+                       action: STATE_SET "manage_call_btn_enable" 0.0;
+                       target: "contact_name";
+                       target: "phone_number";
+               }
+
+               // END CALL ANIMATION
+
+               // CALLER INFO ANIMATION LOGIC
+
+               program { name: "anim_show_cont_info_1line";
+                       action: STATE_SET "show" 0.0;
+                       transition: LINEAR EC_ANIM_DUR_CONT_INFO_B_S;
+                       target: "contact_name";
+               }
+               program { name: "anim_show_cont_info_2line";
+                       action: STATE_SET "show" 0.0;
+                       transition: LINEAR EC_ANIM_DUR_CONT_INFO_B_S;
+                       target: "contact_name";
+                       target: "phone_number";
+               }
+               program { name: "anim_hide_cont_info_1line";
+                       action: STATE_SET "hide" 0.0;
+                       transition: LINEAR EC_ANIM_DUR_CONT_INFO_B_S;
+                       target: "contact_name";
+                       after: "anim_show_ec_contact_info";
+               }
+               program { name: "anim_hide_cont_info_2line";
+                       action: STATE_SET "hide" 0.0;
+                       transition: LINEAR EC_ANIM_DUR_CONT_INFO_B_S;
+                       target: "contact_name";
+                       target: "phone_number";
+                       after: "anim_show_ec_contact_info";
+               }
+
+               // END CALL CALLER INFO ANIMATION LOGIC
+
+               program { name: "anim_show_ec_contact_info";
+                       action: STATE_SET "show" 0.0;
+                       transition: LINEAR EC_ANIM_DUR_CONT_INFO_S_B;
+                       target: "ec_contact_name";
+                       target: "ec_phone_number";
+               }
+               program { name: "anim_hide_ec_contact_info";
+                       action: STATE_SET "hide" 0.0;
+                       transition: LINEAR EC_ANIM_DUR_CONT_INFO_S_B;
+                       target: "ec_contact_name";
+                       target: "ec_phone_number";
+                       after: "select_show_cont_info_type";
+               }
+               program { name: "select_show_cont_info_type";
                        script {
-                               public show_ec_add_cont_btn;
-                               public cont_info_2line;
-                       }
-                       program { name: "show_contact_name";
-                               action: STATE_SET "show" 0.0;
-                               target: "contact_name";
-                       }
-                       program { name: "show_contact_number";
-                               action: STATE_SET "show" 0.0;
-                               target: "phone_number";
-                       }
-                       program { name: "hide_contact_number";
-                               action: STATE_SET "hide" 0.0;
-                               target: "phone_number";
-                       }
-                       program { name: "show_message";
-                               action: STATE_SET "show" 0.0;
-                               target: "message";
-                       }
-                       program { name: "hide_message";
-                               action: STATE_SET "hide" 0.0;
-                               target: "message";
-                       }
-                       program { name: "caller_name_1line";
-                               signal: "1line";
-                               source: "caller_name";
-                               action: STATE_SET "1line" 0.0;
-                               target: "contact_name.padding.bottom";
-                               target: "phone_number.padding.bottom";
-                               target: "message.padding.bottom";
-                               target: "contact_name.padding.top";
-                               after: "show_contact_name";
-                               after: "hide_contact_number";
-                               after: "hide_message";
-                               after: "deinit_cont_info_two_line";
-                       }
-                       program { name: "caller_name_2line";
-                               signal: "2line";
-                               source: "caller_name";
-                               action: STATE_SET "2line" 0.0;
-                               target: "contact_name.padding.bottom";
-                               target: "phone_number.padding.bottom";
-                               target: "message.padding.bottom";
-                               target: "contact_name.padding.top";
-                               after: "show_contact_name";
-                               after: "show_contact_number";
-                               after: "hide_message";
-                               after: "init_cont_info_two_line";
-                       }
-                       program { name: "caller_name_3line";
-                               signal: "3line";
-                               source: "caller_name";
-                               action: STATE_SET "3line" 0.0;
-                               target: "contact_name.padding.bottom";
-                               target: "phone_number.padding.bottom";
-                               target: "message.padding.bottom";
-                               target: "contact_name.padding.top";
-                               after: "show_contact_name";
-                               after: "show_contact_number";
-                               after: "show_message";
-                       }
-                       program { name: "show_arrow";
-                               signal: "show_manage_calls_btn";
-                               source: "";
-                               action: STATE_SET "default" 0.0;
-                               target: "manage_calls_btn";
-                               after: "set_txt_bounds_on_arrow_show";
-                       }
-                       program { name: "hide_arrow";
-                               signal: "hide_manage_calls_btn";
-                               source: "";
-                               action: STATE_SET "hide" 0.0;
-                               target: "manage_calls_btn";
-                               after: "set_txt_bounds_on_arrow_hide";
-
-                       }
-                       program { name: "set_txt_bounds_on_arrow_hide";
-                               action: STATE_SET "default" 0.0;
-                               target: "contact_name";
-                               target: "phone_number";
-                       }
-                       program { name: "set_txt_bounds_on_arrow_show";
-                               action: STATE_SET "manage_call_btn_enable" 0.0;
-                               target: "contact_name";
-                               target: "phone_number";
-                       }
-
-                       // END CALL ANIMATION
-
-                       // CALLER INFO ANIMATION LOGIC
-
-                       program { name: "anim_show_cont_info_1line";
-                               action: STATE_SET "show" 0.0;
-                               transition: LINEAR EC_ANIM_DUR_CONT_INFO_B_S;
-                               target: "contact_name";
-                       }
-                       program { name: "anim_show_cont_info_2line";
-                               action: STATE_SET "show" 0.0;
-                               transition: LINEAR EC_ANIM_DUR_CONT_INFO_B_S;
-                               target: "contact_name";
-                               target: "phone_number";
-                       }
-                       program { name: "anim_hide_cont_info_1line";
-                               action: STATE_SET "hide" 0.0;
-                               transition: LINEAR EC_ANIM_DUR_CONT_INFO_B_S;
-                               target: "contact_name";
-                               after: "anim_show_ec_contact_info";
-                       }
-                       program { name: "anim_hide_cont_info_2line";
-                               action: STATE_SET "hide" 0.0;
-                               transition: LINEAR EC_ANIM_DUR_CONT_INFO_B_S;
-                               target: "contact_name";
-                               target: "phone_number";
-                               after: "anim_show_ec_contact_info";
-                       }
-
-                       // END CALL CALLER INFO ANIMATION LOGIC
-
-                       program { name: "anim_show_ec_contact_info";
-                               action: STATE_SET "show" 0.0;
-                               transition: LINEAR EC_ANIM_DUR_CONT_INFO_S_B;
-                               target: "ec_contact_name";
-                               target: "ec_phone_number";
-                       }
-                       program { name: "anim_hide_ec_contact_info";
-                               action: STATE_SET "hide" 0.0;
-                               transition: LINEAR EC_ANIM_DUR_CONT_INFO_S_B;
-                               target: "ec_contact_name";
-                               target: "ec_phone_number";
-                               after: "select_show_cont_info_type";
-                       }
-                       program { name: "select_show_cont_info_type";
-                               script {
-                                       if (get_int(cont_info_2line) == 1) {
-                                               run_program(PROGRAM:"anim_show_cont_info_2line");
-                                       } else {
-                                               run_program(PROGRAM:"anim_show_cont_info_1line");
-                                       }
+                               if (get_int(cont_info_2line) == 1) {
+                                       run_program(PROGRAM:"anim_show_cont_info_2line");
+                               } else {
+                                       run_program(PROGRAM:"anim_show_cont_info_1line");
                                }
                        }
-                       program { name: "select_hide_cont_info_type";
-                               script {
-                                       if (get_int(cont_info_2line) == 1) {
-                                               run_program(PROGRAM:"anim_hide_cont_info_2line");
-                                       } else {
-                                               run_program(PROGRAM:"anim_hide_cont_info_1line");
-                                       }
+               }
+               program { name: "select_hide_cont_info_type";
+                       script {
+                               if (get_int(cont_info_2line) == 1) {
+                                       run_program(PROGRAM:"anim_hide_cont_info_2line");
+                               } else {
+                                       run_program(PROGRAM:"anim_hide_cont_info_1line");
                                }
                        }
+               }
 
-                       // END CALL ADD CONTACT BUTTON
+               // END CALL ADD CONTACT BUTTON
 
-                       program { name: "set_ec_add_cont_btn_enabled";
-                               signal: "set_ec_add_cont_btn_enabled";
-                               source: "caller_info";
+               program { name: "set_ec_add_cont_btn_enabled";
+                       signal: "set_ec_add_cont_btn_enabled";
+                       source: "caller_info";
 
-                               action: STATE_SET "add_contact_btn_enabled" 0.0;
-                               target: "ec_contact_info.padding.right";
-                               after: "init_show_ec_add_cont_btn_state";
-                       }
-                       program { name: "show_ec_add_cont_btn";
-                               action: STATE_SET "show" 0.0;
-                               target: "ec_add_contact_btn";
-                       }
-                       program { name: "hide_add_contact_btn";
-                               action: STATE_SET "hide" 0.0;
-                               target: "ec_add_contact_btn";
-                       }
-                       program { name: "try_show_ec_add_cont_btn";
-                               script {
-                                       if (get_int(show_ec_add_cont_btn) == 1) {
-                                               run_program(PROGRAM:"show_ec_add_cont_btn");
-                                       }
+                       action: STATE_SET "add_contact_btn_enabled" 0.0;
+                       target: "ec_contact_info.padding.right";
+                       after: "init_show_ec_add_cont_btn_state";
+               }
+               program { name: "show_ec_add_cont_btn";
+                       action: STATE_SET "show" 0.0;
+                       target: "ec_add_contact_img";
+                       after: "enable_add_contact_click_area";
+               }
+               program { name: "hide_add_contact_btn";
+                       action: STATE_SET "hide" 0.0;
+                       target: "ec_add_contact_img";
+                       after: "dissable_add_contact_click_area";
+               }
+               program { name: "try_show_ec_add_cont_btn";
+                       script {
+                               if (get_int(show_ec_add_cont_btn) == 1) {
+                                       run_program(PROGRAM:"show_ec_add_cont_btn");
                                }
                        }
-                       program { name: "try_hide_add_contact_btn";
-                               script {
-                                       if (get_int(show_ec_add_cont_btn) == 1) {
-                                               run_program(PROGRAM:"hide_add_contact_btn");
-                                       }
+               }
+               program { name: "try_hide_add_contact_btn";
+                       script {
+                               if (get_int(show_ec_add_cont_btn) == 1) {
+                                       run_program(PROGRAM:"hide_add_contact_btn");
                                }
                        }
+               }
 
-                       // MINIMIZE / MAXIMIZE START LOGIC
+               // MINIMIZE / MAXIMIZE START LOGIC
 
-                       program { name: "minimize";
-                               signal: "minimize";
-                               source: "caller_info";
+               program { name: "minimize";
+                       signal: "minimize";
+                       source: "caller_info";
 
-                               after: "try_hide_add_contact_btn";
-                               after: "run_minimize_animation";
-                               after: "select_hide_cont_info_type";
-                       }
-                       program { name: "maximize";
-                               signal: "maximize";
-                               source: "caller_info";
+                       after: "try_hide_add_contact_btn";
+                       after: "run_minimize_animation";
+                       after: "select_hide_cont_info_type";
+               }
+               program { name: "maximize";
+                       signal: "maximize";
+                       source: "caller_info";
 
-                               after: "try_hide_add_contact_btn";
-                               after: "run_maximize_animation";
-                               after: "anim_hide_ec_contact_info";
-                       }
-                       program { name: "run_minimize_animation";
-                               action: STATE_SET "minimize" 0.0;
-                               transition: LINEAR EC_ANIM_DUR;
-                               target: "contact_icon_base";
-                               after: "try_show_ec_add_cont_btn";
-                               after: "minimize_anim_finished";
-                       }
-                       program { name: "run_maximize_animation";
-                               action: STATE_SET "maximize" 0.0;
-                               transition: LINEAR EC_ANIM_DUR;
-                               target: "contact_icon_base";
-                               after: "maximize_anim_finished";
-                       }
-                       program { name: "minimize_anim_finished";
-                               action: SIGNAL_EMIT "minimize.anim.finished" "caller_info";
-                       }
-                       program { name: "maximize_anim_finished";
-                               action: SIGNAL_EMIT "maximize.anim.finished" "caller_info";
-                       }
-                       program {
-                               name: "init_show_ec_add_cont_btn_state";
-                               script { set_int(show_ec_add_cont_btn, 1); }
-                       }
-                       program {
-                               name: "init_cont_info_two_line";
-                               script { set_int(cont_info_2line, 1); }
-                       }
-                       program {
-                               name: "deinit_cont_info_two_line";
-                               script { set_int(cont_info_2line, 0); }
-                       }
+                       after: "try_hide_add_contact_btn";
+                       after: "run_maximize_animation";
+                       after: "anim_hide_ec_contact_info";
+               }
+               program { name: "run_minimize_animation";
+                       action: STATE_SET "minimize" 0.0;
+                       transition: LINEAR EC_ANIM_DUR;
+                       target: "contact_icon_base";
+                       after: "try_show_ec_add_cont_btn";
+                       after: "minimize_anim_finished";
+               }
+               program { name: "run_maximize_animation";
+                       action: STATE_SET "maximize" 0.0;
+                       transition: LINEAR EC_ANIM_DUR;
+                       target: "contact_icon_base";
+                       after: "maximize_anim_finished";
+               }
+               program { name: "minimize_anim_finished";
+                       action: SIGNAL_EMIT "minimize.anim.finished" "caller_info";
+               }
+               program { name: "maximize_anim_finished";
+                       action: SIGNAL_EMIT "maximize.anim.finished" "caller_info";
+               }
+               program { name: "init_show_ec_add_cont_btn_state";
+                       script { set_int(show_ec_add_cont_btn, 1); }
+               }
+               program { name: "init_cont_info_two_line";
+                       script { set_int(cont_info_2line, 1); }
+               }
+               program { name: "deinit_cont_info_two_line";
+                       script { set_int(cont_info_2line, 0); }
+               }
+               program { name: "enable_add_contact_click_area";
+                       action: STATE_SET "show" 0.0;
+                       target: "ec_add_contact.click_area";
+               }
+               program { name: "dissable_add_contact_click_area";
+                       action: STATE_SET "hide" 0.0;
+                       target: "ec_add_contact.click_area";
+               }
+               program { name: "contact_info_area_clicked";
+                       signal: "mouse,clicked,1";
+                       source: "ec_add_contact.click_area";
+                       action: SIGNAL_EMIT "add_contact.clicked" "caller_info";
                }
        }
 }

diff --git a/edje_src/edc/call_edc/callui_view_end_call.edc b/edje_src/edc/call_edc/callui_view_end_call.edc
index aea4c13..bebe1b6 100644 (file)
--- a/edje_src/edc/call_edc/callui_view_end_call.edc
+++ b/edje_src/edc/call_edc/callui_view_end_call.edc
@@ -205,46 +205,3 @@ group { \
 
 EC_REPLY_BUTTON("call_back", IMG_SRC_DIR/"call_button_icon_03.png")
 EC_REPLY_BUTTON("message_button", IMG_SRC_DIR/"call_button_icon_04.png")
-
-group {
-       name: "add_contact_button";
-       parts {
-               CU_PART_RECT( "bg",
-                       description { state: "default" 0.0;
-                               color: COLOR_BG_ALPHA;
-                       }
-                       description { state: "pressed" 0.0;
-                               inherit: "default" 0.0;
-                               color_class: "W0113P";
-                       }
-               )
-               CU_PART_PADDING_TOP(EC_ADD_CONT_BTN_IMAGE_BORDER)
-               CU_PART_PADDING_LEFT(EC_ADD_CONT_BTN_IMAGE_BORDER)
-               CU_PART_PADDING_BOTTOM(EC_ADD_CONT_BTN_IMAGE_BORDER)
-               CU_PART_PADDING_RIGHT(EC_ADD_CONT_BTN_IMAGE_BORDER)
-               CU_PART_IMAGE( "icon",
-                       description { state: "default" 0.0;
-                               min: EC_ADD_CONT_BTN_IMAGE_SIZE;
-                               max: EC_ADD_CONT_BTN_IMAGE_SIZE;
-                               rel1 { relative: 1.0 1.0;       to_x: "padding.left";   to_y: "padding.top"; }
-                               rel2 { relative: 0.0 0.0;       to_x: "padding.right";  to_y: "padding.bottom"; }
-                               image.normal: IMG_SRC_DIR/"call_button_add.png";
-                               color: COLOR_WHITE;
-                       }
-               )
-       }
-       programs {
-               program { name: "pressed";
-                       signal: "mouse,down,*";
-                       source: "*";
-                       action: STATE_SET "pressed" 0.0;
-                       target: "bg";
-               }
-               program { name: "unpressed";
-                       signal: "mouse,up,*";
-                       source: "*";
-                       action: STATE_SET "default" 0.0;
-                       target: "bg";
-               }
-       }
-}

diff --git a/edje_src/images/call_edc/call_button_add.png b/edje_src/images/call_edc/call_button_add.png
deleted file mode 100644 (file)
index dad2078..0000000
Binary files a/edje_src/images/call_edc/call_button_add.png and /dev/null differ

diff --git a/res/edje/call.edc b/res/edje/call.edc
index 9d42169..2fd3c1f 100644 (file)
--- a/res/edje/call.edc
+++ b/res/edje/call.edc
@@ -65,7 +65,6 @@ images {
        image: IMG_SRC_DIR/"button_edit_bg_new.png" COMP;
        image: IMG_SRC_DIR/"background.png" COMP;
        image: IMG_SRC_DIR/"background_dim.png" COMP;
-       image: IMG_SRC_DIR/"call_button_add.png" COMP;
        image: IMG_SRC_DIR/"call_active_ic_call.png" COMP;
        image: IMG_SRC_DIR/"core_button_add.png" COMP;
 
@@ -92,7 +91,6 @@ collections {
 
        base_scale: 2.6;
 
-       RESOURCE_IMAGE("call_button_add.png", IMG_SRC_DIR/"call_button_add.png");
        RESOURCE_IMAGE("call_button_icon_01.png", IMG_SRC_DIR/"call_button_icon_01.png");
        RESOURCE_IMAGE("call_button_icon_03.png", IMG_SRC_DIR/"call_button_icon_03.png");
        RESOURCE_IMAGE("call_button_icon_04.png", IMG_SRC_DIR/"call_button_icon_04.png");

diff --git a/src/callui-view-callend.c b/src/callui-view-callend.c
index 136c533..925f10a 100644 (file)
--- a/src/callui-view-callend.c
+++ b/src/callui-view-callend.c
@@ -28,7 +28,6 @@
 
 #define CALLUI_GROUP_CALL_BACK_BTN             "call_back"
 #define CALLUI_GROUP_MSG_BTN                   "message_button"
-#define CALLUI_GROUP_ADD_CONTACT_BTN   "add_contact_button"
 
 #define CALLUI_APP_CONTROL_MIME_CONTACT        "application/vnd.tizen.contact"
 #define CALLUI_OUTGOING_CALL_TIME_DURATION_STR "00:00"
@@ -73,7 +72,7 @@ static char *__vcui_endcall_get_item_text(void *data, Evas_Object *obj, const ch
 static void __create_contact_btn_click_cb(void *data, Evas_Object *obj, void *event_info);
 static void __update_contact_btn_click_cb(void *data, Evas_Object *obj, void *event_info);
 static void __popup_back_click_cb(void *data, Evas_Object *obj, void *event_info);
-static void __add_contact_btn_click_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info);
+static void __add_contact_click_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
 
 static Eina_Bool __ending_timer_expired_cb(void *data);
 static Eina_Bool __ending_timer_blink_cb(void *data);
@@ -199,6 +198,8 @@ static callui_result_e __create_main_content(callui_view_callend_h vd, Evas_Obje
        CALLUI_RETURN_VALUE_IF_FAIL(vd->caller_info, CALLUI_RESULT_ALLOCATION_FAIL);
        elm_object_part_content_set(vd->base_view.contents, "swallow.caller_info", vd->caller_info);
 
+       elm_object_signal_callback_add(vd->caller_info, "add_contact.clicked", "caller_info", __add_contact_click_cb, vd);
+
        _callui_action_bar_show(ad->action_bar);
        _callui_action_bar_set_disabled_state(ad->action_bar, true);
 
@@ -242,11 +243,6 @@ static callui_result_e __create_single_contact_info(callui_view_callend_h vd, co
        const char *call_name = call_data->call_ct_info.call_disp_name;
 
        if (STRING_EMPTY(call_name)) {
-               Evas_Object *add_contact_btn = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_ADD_CONTACT_BTN);
-               CALLUI_RETURN_VALUE_IF_FAIL(add_contact_btn,  CALLUI_RESULT_ALLOCATION_FAIL);
-               evas_object_event_callback_add(add_contact_btn, EVAS_CALLBACK_MOUSE_UP, __add_contact_btn_click_cb, vd);
-
-               elm_object_part_content_set(vd->caller_info, "ec_add_contact_btn", add_contact_btn);
                elm_object_signal_emit(vd->caller_info, "set_ec_add_cont_btn_enabled", "caller_info");
 
                /* maximized contact info */
@@ -528,10 +524,11 @@ static void __popup_back_click_cb(void *data, Evas_Object *obj, void *event_info
        }
 }
 
-static void __add_contact_btn_click_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+static void __add_contact_click_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
        CALLUI_RETURN_IF_FAIL(data);
-       callui_view_callend_h vd = (callui_view_callend_h)data;
+
+       callui_view_callend_h vd = data;
 
        if (vd->ending_timer) {
                ecore_timer_freeze(vd->ending_timer);
@@ -544,14 +541,15 @@ static void __add_contact_btn_click_cb(void *data, Evas *evas, Evas_Object *obj,
 
        vd->create_update_popup = elm_popup_add(parent);
        eext_object_event_callback_add(vd->create_update_popup, EEXT_CALLBACK_BACK, __popup_back_click_cb, vd);
-
        elm_popup_align_set(vd->create_update_popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
+
        elm_object_part_text_set(vd->create_update_popup, "title,text",  vd->call_number);
 
        Evas_Object *genlist = elm_genlist_add(vd->create_update_popup);
        elm_genlist_homogeneous_set(genlist, EINA_TRUE);
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE);
+       evas_object_show(genlist);
 
        Elm_Genlist_Item_Class *itc = elm_genlist_item_class_new();
        CALLUI_RETURN_IF_FAIL(itc);
@@ -564,8 +562,10 @@ static void __add_contact_btn_click_cb(void *data, Evas *evas, Evas_Object *obj,
                        NULL, ELM_GENLIST_ITEM_NONE, __update_contact_btn_click_cb, vd);
 
        elm_genlist_item_class_free(itc);
-       elm_object_content_set(vd->create_update_popup, genlist);
+
+       elm_object_part_content_set(vd->create_update_popup, "elm.swallow.content", genlist);
        elm_popup_orient_set(vd->create_update_popup, ELM_POPUP_ORIENT_CENTER);
+
        evas_object_show(vd->create_update_popup);
 }
 

diff --git a/src/callui-view-incoming-call-noti.c b/src/callui-view-incoming-call-noti.c
index b98c113..d3ae8f8 100644 (file)
--- a/src/callui-view-incoming-call-noti.c
+++ b/src/callui-view-incoming-call-noti.c
@@ -57,8 +57,8 @@
 #define CALLUI_REJ_MSG_SCREEN_USED_H           (CALLUI_AN_CONTACT_INFO_BG_H + CALLUI_AN_ACTION_BG_W_REJECT_MSG_H + CALLUI_AN_STROKE_H)
 #define CALLUI_REJ_MSG_FLICK_TIME_LIMIT_MS     500
 
-#define CALLUI_REJ_MSG_DIMMER_ALFA_START       0
-#define CALLUI_REJ_MSG_DIMMER_ALFA_END         77
+#define CALLUI_REJ_MSG_DIMMER_ALPHA_START      0
+#define CALLUI_REJ_MSG_DIMMER_ALPHA_END                77
 #define CALLUI_REJ_MSG_DIMMER_COLOR                    0, 0, 0
 
 #define CALLUI_REJ_MSG_OPACITY                         (0.3 - 0.04)
@@ -109,8 +109,8 @@ struct _callui_view_incoming_call_noti {
        int rm_actualize_state;
 
        Ecore_Animator *rm_animator;
-       int rm_dimmer_alfa;
-       int rm_dimmer_alfa_start;
+       int rm_dimmer_alpha;
+       int rm_dimmer_alpha_start;
 };
 
 typedef struct _callui_view_incoming_call_noti _callui_view_incoming_call_noti_t;
@@ -473,18 +473,18 @@ static Eina_Bool __rm_animation_cb(void *data, double pos)
        Evas_Coord new_scroller_h = 0;
 
        int dim_step = 0;
-       if (CALLUI_REJ_MSG_DIMMER_ALFA_END == vd->rm_dimmer_alfa_start) {
-               dim_step = dtoi(CALLUI_REJ_MSG_DIMMER_ALFA_END * pos);
+       if (CALLUI_REJ_MSG_DIMMER_ALPHA_END == vd->rm_dimmer_alpha_start) {
+               dim_step = dtoi(CALLUI_REJ_MSG_DIMMER_ALPHA_END * pos);
        } else {
-               dim_step = dtoi((CALLUI_REJ_MSG_DIMMER_ALFA_END - vd->rm_dimmer_alfa_start) * pos);
+               dim_step = dtoi((CALLUI_REJ_MSG_DIMMER_ALPHA_END - vd->rm_dimmer_alpha_start) * pos);
        }
 
        if (vd->rm_state == CALLUI_REJ_MSG_SHOW_IN_PROG) {
                new_scroller_h = vd->rm_scroller_anim_start_h + path_step;
-               vd->rm_dimmer_alfa = vd->rm_dimmer_alfa_start + dim_step;
+               vd->rm_dimmer_alpha = vd->rm_dimmer_alpha_start + dim_step;
        } else if (vd->rm_state == CALLUI_REJ_MSG_HIDE_IN_PROG) {
                new_scroller_h = vd->rm_scroller_anim_start_h - path_step;
-               vd->rm_dimmer_alfa = vd->rm_dimmer_alfa_start - dim_step;
+               vd->rm_dimmer_alpha = vd->rm_dimmer_alpha_start - dim_step;
        } else {
                err("Invalid state for animation. rm_state[%d]", vd->rm_state);
                __rm_reset_anim_params(vd);
@@ -492,7 +492,7 @@ static Eina_Bool __rm_animation_cb(void *data, double pos)
        }
        dbg("anim pos[%f], RM scroller new size [%d][%d]", pos,  vd->rm_scroller_anim_start_w, new_scroller_h);
 
-       evas_object_color_set(vd->base_view.contents, CALLUI_REJ_MSG_DIMMER_COLOR, vd->rm_dimmer_alfa);
+       evas_object_color_set(vd->base_view.contents, CALLUI_REJ_MSG_DIMMER_COLOR, vd->rm_dimmer_alpha);
 
        evas_object_resize(vd->rm_scroller, vd->rm_scroller_anim_start_w, new_scroller_h);
        evas_object_geometry_set(vd->rm_scroller_bg, vd->rm_scroller_x, vd->rm_scroller_y, vd->rm_scroller_anim_start_w, new_scroller_h);
@@ -754,7 +754,7 @@ static callui_result_e __create_main_content(callui_view_incoming_call_noti_h vd
        CALLUI_RETURN_VALUE_IF_FAIL(vd->base_view.contents, CALLUI_RESULT_ALLOCATION_FAIL);
        evas_object_size_hint_weight_set(vd->base_view.contents, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(vd->base_view.contents, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       evas_object_color_set(vd->base_view.contents, CALLUI_REJ_MSG_DIMMER_COLOR, CALLUI_REJ_MSG_DIMMER_ALFA_START);
+       evas_object_color_set(vd->base_view.contents, CALLUI_REJ_MSG_DIMMER_COLOR, CALLUI_REJ_MSG_DIMMER_ALPHA_START);
        elm_object_part_content_set(parent, "elm.swallow.content", vd->base_view.contents);
        evas_object_show(vd->base_view.contents);
 
@@ -874,7 +874,7 @@ static void __rm_prepare_animator(callui_view_incoming_call_noti_h vd)
        dbg("Animation start params: path[%f], time[%f], w[%d], h[%d]",
                        vd->rm_anim_path, anim_time, vd->rm_scroller_anim_start_w, vd->rm_scroller_anim_start_h);
 
-       vd->rm_dimmer_alfa_start = vd->rm_dimmer_alfa;
+       vd->rm_dimmer_alpha_start = vd->rm_dimmer_alpha;
        vd->rm_animator = ecore_animator_timeline_add(anim_time, __rm_animation_cb, vd);
        if (!vd->rm_animator) {
                err("Failed to create animator.");
@@ -933,8 +933,8 @@ static void __rm_hide_instantly(callui_view_incoming_call_noti_h vd)
 {
        __rm_reset_anim_params(vd);
 
-       vd->rm_dimmer_alfa = CALLUI_REJ_MSG_DIMMER_ALFA_START;
-       evas_object_color_set(vd->base_view.contents, CALLUI_REJ_MSG_DIMMER_COLOR, vd->rm_dimmer_alfa);
+       vd->rm_dimmer_alpha = CALLUI_REJ_MSG_DIMMER_ALPHA_START;
+       evas_object_color_set(vd->base_view.contents, CALLUI_REJ_MSG_DIMMER_COLOR, vd->rm_dimmer_alpha);
 
        __rm_close_cb(vd);
 
@@ -945,8 +945,8 @@ static void __rm_show_instantly(callui_view_incoming_call_noti_h vd)
 {
        __rm_reset_anim_params(vd);
 
-       vd->rm_dimmer_alfa = CALLUI_REJ_MSG_DIMMER_ALFA_END;
-       evas_object_color_set(vd->base_view.contents, CALLUI_REJ_MSG_DIMMER_COLOR, vd->rm_dimmer_alfa);
+       vd->rm_dimmer_alpha = CALLUI_REJ_MSG_DIMMER_ALPHA_END;
+       evas_object_color_set(vd->base_view.contents, CALLUI_REJ_MSG_DIMMER_COLOR, vd->rm_dimmer_alpha);
 
        __rm_recalculate(vd);