From 91b73a9c6f08d3fd16088b58ca63bbed0e4b1ec5 Mon Sep 17 00:00:00 2001 From: Igor Olshevskyi Date: Thu, 9 Jun 2016 12:48:51 +0300 Subject: [PATCH] TizenRefApp-6495 [Call UI] Refactor common defines in source files Change-Id: I168ab86e7c86f0e718b3c194f5155a6b40990abb --- CMake/CMakeLists.txt | 2 - edje_src/edc/call_edc/callui-keypad.edc | 26 ++-- .../edc/call_edc/callui-view-button-layout.edc | 14 +- edje_src/edc/call_edc/callui-view-elements.edc | 6 +- edje_src/edc/call_edc/callui-view-main-layout.edc | 24 +-- .../edc/call_edc/callui-view-multi-call-list.edc | 2 +- .../callui-view-one-hold-in-conference.edc | 73 +++++---- inc/callui-common-def.h | 164 --------------------- inc/callui-common-defines.h | 128 ++++++++++++++++ inc/callui-common.h | 15 +- inc/callui-view-caller-info-defines.h | 56 ------- inc/callui-view-elements-defines.h | 27 ---- inc/callui-view-elements.h | 1 - inc/callui-view-layout.h | 3 + inc/callui.h | 4 +- res/edje/call.edc | 2 - src/callui-action-bar.c | 31 ++-- src/callui-color-box.c | 2 +- src/callui-common.c | 22 +-- src/callui-display.c | 30 ++-- src/callui-keypad.c | 32 ++-- src/callui-proximity-lock-manager.c | 4 +- src/callui-view-callend.c | 45 +++--- src/callui-view-circle.c | 11 +- src/callui-view-dialing.c | 13 +- src/callui-view-elements.c | 19 +-- src/callui-view-incoming-call-noti.c | 26 ++-- src/callui-view-incoming-call.c | 37 ++--- src/callui-view-lock-screen.c | 2 +- src/callui-view-manager.c | 6 +- src/callui-view-multi-call-conf.c | 22 +-- src/callui-view-multi-call-list.c | 17 ++- src/callui-view-multi-call-split.c | 101 +++++++------ src/callui-view-quickpanel.c | 25 ++-- src/callui-view-single-call.c | 23 ++- src/callui-window.c | 4 +- src/callui.c | 36 ++--- 37 files changed, 486 insertions(+), 569 deletions(-) delete mode 100644 inc/callui-common-def.h create mode 100644 inc/callui-common-defines.h delete mode 100644 inc/callui-view-caller-info-defines.h delete mode 100644 inc/callui-view-elements-defines.h diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt index ff743ff..6821c61 100755 --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt @@ -70,8 +70,6 @@ ADD_CUSTOM_COMMAND( ${EDJE_DIR}/call.edc ${CMAKE_BINARY_DIR}/call.edj DEPENDS ${EDJE_DIR}/call.edc ${INC_DIR}/callui-view-layout.h - ${INC_DIR}/callui-view-caller-info-defines.h - ${INC_DIR}/callui-view-elements-defines.h ${EDC_SRC_DIR}/callui-color-classes.edc ${EDC_SRC_DIR}/callui-parts.edc ${EDC_SRC_DIR}/call_edc/edc_image_macro.edc diff --git a/edje_src/edc/call_edc/callui-keypad.edc b/edje_src/edc/call_edc/callui-keypad.edc index 8750747..a828af9 100644 --- a/edje_src/edc/call_edc/callui-keypad.edc +++ b/edje_src/edc/call_edc/callui-keypad.edc @@ -222,7 +222,7 @@ group{ align: 0 1; } } - part { name: PART_SWALLOW_TEXTBLOCK_AREA; + part { name: "swallow.textarea"; type: SWALLOW; scale: 1; description { @@ -245,7 +245,7 @@ group{ visible: 0; } } - part { name: PART_SWALLOW_KEYPAD; + part { name: "swallow.keypad_region"; type: SWALLOW; scale: 1; description { @@ -270,29 +270,29 @@ group{ } programs { program { name: "show_keypadbtn_anim"; - signal: "SHOW"; - source: "KEYPAD_BTN"; + signal: "show"; + source: "keypad_btn"; after: "show_entry"; after: "show_keypadbtn"; } program { name: "show_entry"; action: STATE_SET "show" 0.0; - target: PART_SWALLOW_TEXTBLOCK_AREA; + target: "swallow.textarea"; } program { name: "show_keypadbtn"; action: STATE_SET "show" 0.0; transition: LINEAR 0.25; - target: PART_SWALLOW_KEYPAD; + target: "swallow.keypad_region"; } program { name: "hide_keypadbtn_anim"; - signal: "HIDE"; - source: "KEYPAD_BTN"; + signal: "hide"; + source: "keypad_btn"; after: "hide_keypadbtn_with_anim"; } program { name: "hide_keypadbtn_no_anim"; - signal: "QUICK_HIDE"; - source: "KEYPAD_BTN"; + signal: "quick_hide"; + source: "keypad_btn"; after: "hide_keypadbtn_without_anim"; } program { @@ -302,20 +302,20 @@ group{ program { name: "hide_entry"; action: STATE_SET "hide" 0.0; - target: PART_SWALLOW_TEXTBLOCK_AREA; + target: "swallow.textarea"; } program { name: "hide_keypadbtn_with_anim"; action: STATE_SET "default" 0.0; transition: LINEAR 0.25; - target: PART_SWALLOW_KEYPAD; + target: "swallow.keypad_region"; after: "hide_entry"; after: "hide_complete_notify"; } program { name: "hide_keypadbtn_without_anim"; action: STATE_SET "default" 0.0; - target: PART_SWALLOW_KEYPAD; + target: "swallow.keypad_region"; after: "hide_entry"; after: "hide_complete_notify"; } diff --git a/edje_src/edc/call_edc/callui-view-button-layout.edc b/edje_src/edc/call_edc/callui-view-button-layout.edc index cfa701f..1d0e744 100644 --- a/edje_src/edc/call_edc/callui-view-button-layout.edc +++ b/edje_src/edc/call_edc/callui-view-button-layout.edc @@ -27,7 +27,7 @@ } group{ - name: "button-layout"; + name: "action_bar"; parts{ part { name: "background"; type: RECT; @@ -38,27 +38,27 @@ group{ } /*TOP FIRST BUTTON*/ - SWL_BUTTON(PART_TOP_FIRST_BTN, TOP_FIRST_BUTTON_L, TOP_FIRST_BUTTON_T, + SWL_BUTTON("swallow.top_first_btn", TOP_FIRST_BUTTON_L, TOP_FIRST_BUTTON_T, TOP_FIRST_BUTTON_R, TOP_FIRST_BUTTON_B) /*TOP SECOND BUTTON*/ - SWL_BUTTON(PART_TOP_SECOND_BTN, TOP_SECOND_BUTTON_L, TOP_SECOND_BUTTON_T, + SWL_BUTTON("swallow.top_second_btn", TOP_SECOND_BUTTON_L, TOP_SECOND_BUTTON_T, TOP_SECOND_BUTTON_R, TOP_SECOND_BUTTON_B) /*TOP THIRD BUTTON*/ - SWL_BUTTON(PART_TOP_THIRD_BTN, TOP_THIRD_BUTTON_L, TOP_THIRD_BUTTON_T, + SWL_BUTTON("swallow.top_third_btn", TOP_THIRD_BUTTON_L, TOP_THIRD_BUTTON_T, TOP_THIRD_BUTTON_R, TOP_THIRD_BUTTON_B) /*BOTTOM FIRST BUTTON*/ - SWL_BUTTON(PART_BOTTOM_FIRST_BTN, BOTTOM_FIRST_BUTTON_L, BOTTOM_FIRST_BUTTON_T, + SWL_BUTTON("swallow.bottom_first_btn", BOTTOM_FIRST_BUTTON_L, BOTTOM_FIRST_BUTTON_T, BOTTOM_FIRST_BUTTON_R, BOTTOM_FIRST_BUTTON_B) /*BOTTOM SECOND BUTTON*/ - SWL_BUTTON(PART_BOTTOM_SECOND_BTN, BOTTOM_SECOND_BUTTON_L, BOTTOM_SECOND_BUTTON_T, + SWL_BUTTON("swallow.bottom_second_btn", BOTTOM_SECOND_BUTTON_L, BOTTOM_SECOND_BUTTON_T, BOTTOM_SECOND_BUTTON_R, BOTTOM_SECOND_BUTTON_B) /*BOTTOM THIRD BUTTON*/ - SWL_BUTTON(PART_BOTTOM_THIRD_BTN, BOTTOM_THIRD_BUTTON_L, BOTTOM_THIRD_BUTTON_T, + SWL_BUTTON("swallow.bottom_third_btn", BOTTOM_THIRD_BUTTON_L, BOTTOM_THIRD_BUTTON_T, BOTTOM_THIRD_BUTTON_R, BOTTOM_THIRD_BUTTON_B) } } diff --git a/edje_src/edc/call_edc/callui-view-elements.edc b/edje_src/edc/call_edc/callui-view-elements.edc index 8d2cd12..97fbdc6 100644 --- a/edje_src/edc/call_edc/callui-view-elements.edc +++ b/edje_src/edc/call_edc/callui-view-elements.edc @@ -15,6 +15,8 @@ * */ +#define CALL_BTN_IC_SIZE 64 + // Caller id layout group { name: "caller_id"; images { @@ -213,5 +215,5 @@ group { name: "caller_id"; } // Layouts with touchable buttons for multicall list view -RES_IMG_WITH_BG_AND_TOUCH(GROUP_CALL_BTN_IC_SPLIT, IMG_SRC_DIR/"call_btn_ic_split.png", IMG_SRC_DIR/"call_btn_circle_02.png", CALL_BTN_IC_SIZE, CALL_BTN_IC_BG_SIZE, "btn_ic", "btn_ic_split_bg", "btn_ic_split_bg_pressed") -RES_IMG_WITH_BG_AND_TOUCH(GROUP_CALL_BTN_IC_END, IMG_SRC_DIR/"call_btn_ic_end.png", IMG_SRC_DIR/"call_btn_circle_02.png", CALL_BTN_IC_SIZE, CALL_BTN_IC_BG_SIZE, "btn_ic", "btn_ic_end_bg", "btn_ic_end_bg_pressed") +RES_IMG_WITH_BG_AND_TOUCH("call_btn_ic_split", IMG_SRC_DIR/"call_btn_ic_split.png", IMG_SRC_DIR/"call_btn_circle_02.png", CALL_BTN_IC_SIZE, MULTI_LIST_LIST_ICON_BG_SIZE, "btn_ic", "btn_ic_split_bg", "btn_ic_split_bg_pressed") +RES_IMG_WITH_BG_AND_TOUCH("call_btn_ic_end", IMG_SRC_DIR/"call_btn_ic_end.png", IMG_SRC_DIR/"call_btn_circle_02.png", CALL_BTN_IC_SIZE, MULTI_LIST_LIST_ICON_BG_SIZE, "btn_ic", "btn_ic_end_bg", "btn_ic_end_bg_pressed") diff --git a/edje_src/edc/call_edc/callui-view-main-layout.edc b/edje_src/edc/call_edc/callui-view-main-layout.edc index ecd529d..65fa11e 100644 --- a/edje_src/edc/call_edc/callui-view-main-layout.edc +++ b/edje_src/edc/call_edc/callui-view-main-layout.edc @@ -28,7 +28,7 @@ group { CU_PART_SWALLOW( "elm.swallow.content", description { state: "default" 0.0; } ) - CU_PART_SWALLOW( "action_bar", + CU_PART_SWALLOW( "swallow.action_bar", clip_to: "keypadarea.clipper"; description { state: "default" 0.0; rel1{ relative: ACTION_BAR_LAYOUT_L ACTION_BAR_LAYOUT_T; } @@ -62,7 +62,7 @@ group { rel2 { relative: 1.0 1.0; to: "keypadarea.clipper.minimized"; } } ) - CU_PART_SWALLOW( PART_SWALLOW_KEYPAD_LAYOUT_AREA, + CU_PART_SWALLOW( "swallow.keypad_layout_area", clip_to: "keypadarea.clipper"; description { state: "default" 0.0; @@ -180,7 +180,7 @@ group { } ) CU_PART_PADDING_BOTTOM_NAME( "caller_info.padding.bottom", VML_CALLER_INFO_PAD_BOTTOM) - CU_PART_SWALLOW( "caller_info", + CU_PART_SWALLOW( "swallow.caller_info", clip_to: "content.clipper"; description { state: "default" 0.0; @@ -243,8 +243,8 @@ group { ) CU_PART_RECT( "end_btn.clipper", description { state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "end_btn"; } - rel2 { relative: 1.0 1.0; to: "end_btn"; } + rel1 { relative: 0.0 0.0; to: "swallow.end_btn"; } + rel2 { relative: 1.0 1.0; to: "swallow.end_btn"; } color: COLOR_WHITE; } description { state: "maximize" 0.0; @@ -255,7 +255,7 @@ group { color: COLOR_WHITE_TRANSP; } ) - CU_PART_SWALLOW( "end_btn", + CU_PART_SWALLOW( "swallow.end_btn", clip_to: "end_btn.clipper"; description { state: "default" 0.0; rel1 { relative: 0.0 0.0; to: "end_btn.bg"; } @@ -292,16 +292,16 @@ group { public show_reply_btns; } program { name: "show_keypadbtn_no_effect"; - signal: "SHOW"; - source: "KEYPAD_BTN"; + signal: "hide_caller_info"; + source: "view_main_ly"; action: STATE_SET "hide" 0.0; - target: "caller_info"; + target: "swallow.caller_info"; } program { name: "hide_keypadbtn"; - signal: "HIDE"; - source: "KEYPAD_BTN"; + signal: "show_caller_info"; + source: "view_main_ly"; action: STATE_SET "default" 0.0; - target: "caller_info"; + target: "swallow.caller_info"; } // REPLY BUTTONS diff --git a/edje_src/edc/call_edc/callui-view-multi-call-list.edc b/edje_src/edc/call_edc/callui-view-multi-call-list.edc index fe23a63..8f98dd4 100644 --- a/edje_src/edc/call_edc/callui-view-multi-call-list.edc +++ b/edje_src/edc/call_edc/callui-view-multi-call-list.edc @@ -16,7 +16,7 @@ */ group { - name: "multicall-list"; + name: "multicall_list"; parts { part { name: "background"; type: RECT; diff --git a/edje_src/edc/call_edc/callui-view-one-hold-in-conference.edc b/edje_src/edc/call_edc/callui-view-one-hold-in-conference.edc index 306da25..ec7eb70 100644 --- a/edje_src/edc/call_edc/callui-view-one-hold-in-conference.edc +++ b/edje_src/edc/call_edc/callui-view-one-hold-in-conference.edc @@ -92,7 +92,7 @@ styles { } \ } \ part { \ - name: MERGE_SWAP_BTN_PART_TEXT; \ + name: "text"; \ type: TEXTBLOCK; \ scale: 1; \ description { \ @@ -143,7 +143,7 @@ styles { description { state: "default" 0.0; } \ } \ -#define SPLIT_CALL_LAYOUT(_name, _bg_part, _status_pad_top, _status_pad_bottom) \ +#define SPLIT_CALLER_INFO_LAYOUT(_name, _bg_part, _status_pad_top, _status_pad_bottom) \ group { \ name: _name; \ parts { \ @@ -183,7 +183,7 @@ group { \ inherit: "default" 0.0; \ } \ ) \ - CU_PART_TEXTBLOCK( PART_TEXT_STATUS, \ + CU_PART_TEXTBLOCK( "text.status", \ description { state: "default" 0.0; \ min: 0 STATUS_TXT_MIN_HEIGHT; \ max: -1 STATUS_TXT_MIN_HEIGHT; \ @@ -201,12 +201,12 @@ group { \ description { state: "default" 0.0; \ fixed: 0 1; \ min: 0 _status_pad_bottom; \ - rel1 { relative: 0.0 1.0; to: PART_TEXT_STATUS; } \ - rel2 { relative: 1.0 1.0; to: PART_TEXT_STATUS; } \ + rel1 { relative: 0.0 1.0; to: "text.status"; } \ + rel2 { relative: 1.0 1.0; to: "text.status"; } \ align: 0.5 0.0; \ } \ ) \ - CU_PART_SWALLOW( PART_SWALLOW_CALLER_ID, \ + CU_PART_SWALLOW( "swallow.caller_id", \ description { state: "default" 0.0; \ min: CALLER_ID_SIZE; \ max: CALLER_ID_SIZE; \ @@ -220,12 +220,12 @@ group { \ description { state: "default" 0.0; \ min: CALLER_ID_PAD_LEFT_W 0; \ fixed: 1 0; \ - rel1 { relative: 1.0 0.0; to_x: PART_SWALLOW_CALLER_ID; } \ - rel2 { relative: 1.0 1.0; to_x: PART_SWALLOW_CALLER_ID; } \ + rel1 { relative: 1.0 0.0; to_x: "swallow.caller_id"; } \ + rel2 { relative: 1.0 1.0; to_x: "swallow.caller_id"; } \ align: 0.0 0.5; \ } \ ) \ - CU_PART_TEXTBLOCK( PART_TEXT_MAIN, \ + CU_PART_TEXTBLOCK( "text.main", \ description { state: "default" 0.0; \ min: 0 TXT_MAIN_H; \ max: -1 TXT_MAIN_H; \ @@ -243,12 +243,12 @@ group { \ description { state: "default" 0.0; \ fixed: 0 1; \ min: 0 TXT_MAIN_PAD_BOTTOM_H; \ - rel1 { relative: 0.0 1.0; to: PART_TEXT_MAIN; } \ - rel2 { relative: 1.0 1.0; to: PART_TEXT_MAIN; } \ + rel1 { relative: 0.0 1.0; to: "text.main"; } \ + rel2 { relative: 1.0 1.0; to: "text.main"; } \ align: 0.5 0.0; \ } \ ) \ - CU_PART_TEXTBLOCK( PART_TEXT_SUB, \ + CU_PART_TEXTBLOCK( "text.sub", \ description { state: "default" 0.0; \ min: 0 TXT_SUB_MIN_H; \ max: -1 TXT_SUB_MIN_H; \ @@ -314,13 +314,13 @@ group { \ target: "pad.right"; \ } \ program { name: "show_arrow"; \ - signal: SIGNAL_SHOW_ARROW; \ + signal: "show_manage_calls_btn"; \ action: STATE_SET "show" 0.0; \ target: "arrow"; \ after: "max_pad_right"; \ } \ program { name: "hide_arrow"; \ - signal: SIGNAL_HIDE_ARROW; \ + signal: "hide_manage_calls_btn"; \ action: STATE_SET "hide" 0.0; \ target: "arrow"; \ after: "min_pad_right"; \ @@ -340,21 +340,21 @@ group { \ } \ } \ -SPLIT_CALL_LAYOUT(GROUP_HOLD_INFO, BG_PART_IMAGE, HOLD_INFO_PADDING_TOP_MIN_H, HOLD_INFO_STATUS_TXT_PADDING_BOTTOM_H) -SPLIT_CALL_LAYOUT(GROUP_ACTIVE_INFO, BG_PART_SPACER, ACTIVE_INFO_PADDING_TOP_MIN_H, ACTIVE_INFO_STATUS_TXT_PADDING_BOTTOM_H) +SPLIT_CALLER_INFO_LAYOUT("split_hold_info", BG_PART_IMAGE, HOLD_INFO_PADDING_TOP_MIN_H, HOLD_INFO_STATUS_TXT_PADDING_BOTTOM_H) +SPLIT_CALLER_INFO_LAYOUT("split_active_info", BG_PART_SPACER, ACTIVE_INFO_PADDING_TOP_MIN_H, ACTIVE_INFO_STATUS_TXT_PADDING_BOTTOM_H) -MERGE_SWAP_BTN(GROUP_MERGE_BTN, +MERGE_SWAP_BTN("merge_btn", IMG_SRC_DIR/"call_multi_hold_btn_merge_bg.png", IMG_SRC_DIR/"call_multi_ic_merge.png", "merge_btn_bg", "pressed") -MERGE_SWAP_BTN(GROUP_SWAP_BTN, +MERGE_SWAP_BTN("swap_btn", IMG_SRC_DIR/"call_multi_hold_btn_swap_bg.png", IMG_SRC_DIR/"call_multi_ic_swap.png", "swap_btn_bg", "pressed") group { - name: GROUP_ONE_HOLD_IN_CONFERENCE; + name: "split_callers_info"; parts { part { name: "background"; @@ -367,7 +367,7 @@ group { } part { - name: PART_SWALLOW_HOLD_INFO; + name: "swallow.hold_info"; type: SWALLOW; description { state: "default" 0.0; @@ -377,7 +377,7 @@ group { } part { - name: PART_SWALLOW_MERGE; + name: "swallow.merge"; type: SWALLOW; description { state: "default" 0.0; @@ -387,7 +387,7 @@ group { } part { - name: PART_SWALLOW_SWAP; + name: "swallow.swap"; type: SWALLOW; description { state: "default" 0.0; @@ -397,7 +397,7 @@ group { } part { - name: PART_SWALLOW_ACTIVE_INFO; + name: "swallow.active_info"; type: SWALLOW; description { state: "default" 0.0; @@ -408,10 +408,9 @@ group { } } -group { - name: GROUP_SPLIT; +group { name: "multi_call_split"; parts { - part { + part { name: "background"; type: IMAGE; scale: 1; @@ -421,7 +420,7 @@ group { } } part { - name: PART_SWALLOW_CALL_INFO; + name: "swallow.call_info"; type: SWALLOW; description { state: "default" 0.0; @@ -434,7 +433,7 @@ group { visible: 0; } } - part { name: PART_TEXT_CALL_DURATION; + part { name: "call.duration"; type: TEXT; scale: 1; description { @@ -468,7 +467,7 @@ group { } } part { - name: PART_END_BTN; + name: "swallow.end_btn"; type: SWALLOW; scale: 1; description { @@ -488,26 +487,26 @@ group { program { name: "hide_call_duration"; action: STATE_SET "default" 0.0; - target: PART_TEXT_CALL_DURATION; + target: "call.duration"; } program { name: "show_call_duration"; action: STATE_SET "show" 0.0; - target: PART_TEXT_CALL_DURATION; + target: "call.duration"; } program { name: "show_keypad"; - signal: "SHOW"; - source: "KEYPAD_BTN"; + signal: "hide_callers_info"; + source: "multi_call_split"; action: STATE_SET "hide" 0.0; - target: PART_SWALLOW_CALL_INFO; + target: "swallow.call_info"; after: "show_call_duration"; } program { name: "hide_keypad"; - signal: "HIDE"; - source: "KEYPAD_BTN"; + signal: "show_callers_info"; + source: "multi_call_split"; action: STATE_SET "default" 0.0; - target: PART_SWALLOW_CALL_INFO; + target: "swallow.call_info"; after: "hide_call_duration"; } } diff --git a/inc/callui-common-def.h b/inc/callui-common-def.h deleted file mode 100644 index ed474e9..0000000 --- a/inc/callui-common-def.h +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef __CALLUI_COMMON_DEFINES_H__ -#define __CALLUI_COMMON_DEFINES_H__ - -#define _DBUS_DISPLAY_DEVICE_TIMEOUT_ - -#ifndef CALLUI_EXPORT_API -#define CALLUI_EXPORT_API __attribute__ ((visibility("default"))) -#endif - -#define PACKAGE "org.tizen.call-ui" - -#define CALL_EDJ_NAME "/edje/call.edj" -#define CALL_THEME_EDJ_NAME "/edje/call_theme.edj" - -#define EDJ_NAME _callui_common_get_call_edj_path() -#define CALL_THEME _callui_common_get_call_theme_path() - -#ifndef _EDJ -#define _EDJ(obj) elm_layout_edje_get(obj) -#endif - -#undef _ -#define _(s) gettext(s) - -#define GRP_VIEW_MAIN_LY "view_main_ly" -#define GRP_KEYPAD "keypad" -#define GRP_MULTICALL "multicall-list" -#define GRP_REJECT_MSG "reject_with_msg" -#define GRP_QUICKPANEL "quickpanel" -#define GRP_SEPARATOR_LAYOUT "separator-layout" -#define GRP_SEPARATOR_LAYOUT_1BUTTON "separator-layout-1button" -#define GRP_SEPARATOR_LAYOUT_2BUTTON "separator-layout-2button" -#define GRP_BUTTON_LAYOUT "button-layout" - -#define APP_CONTROL_OPERATION_DURING_CALL "http://tizen.org/appcontrol/oparation/during_call" -#define APP_CONTROL_OPERATION_MESSAGE_REJECT "http://tizen.org/appcontrol/operation/message_reject" -#define APP_CONTROL_OPERATION_END_CALL "http://tizen.org/appcontrol/operation/end_call" -#define APP_CONTROL_OPERATION_QP_RESUME "http://tizen.org/appcontrol/operation/qp_resume" - -#define GRP_CALLER_INFO "caller_info" -#define GRP_MANAGE_CALLS "manage_calls" - -#define GRP_LOCK_ACCEPT "lock_accept" -#define GRP_LOCK_REJECT "lock_reject" -#define GRP_LOCK_REJECT_WITH_MSG "lock_reject_with_msg" -#define GRP_DIMMING_LAYOUT "dimming_ly" -#define GRP_ENDCALL_MAIN_LAYOUT "main_end_call" -#define GRP_ENDCALL_CALL_BACK_BTN "call_back" -#define GRP_ENDCALL_MSG_BTN "message_button" -#define GRP_ENDCALL_ADD_CONTACT_BTN "add_contact_button" - -#define CALLUI_DISPLAY_NAME_LENGTH_MAX (255+1) /**< Voiecall Display Name Max Length */ -#define CALLUI_IMAGE_PATH_LENGTH_MAX (255+1) /**< Max File length for image */ -#define CALLUI_RINGTONE_PATH_LENGTH_MAX (255+1) /**< Max File length for Ringtone */ -#define CALLUI_VIB_PATH_LENGTH_MAX (255+1) /**< Max File length for Vibration */ -#define CALLUI_DATA_LENGTH_MAX (255+1) /**< Max data length for misc */ -#define CALLUI_PHONE_NUMBER_LENGTH_MAX (82+1) /**< Maximum length of a phone number */ -#define CALLUI_FORMATTED_NUMBER_LENGTH_MAX (164+1) /**< Maximum length of a phone number */ -#define CALLUI_PHONE_DISP_NUMBER_LENGTH_MAX (82+10+1) /**< Maximum length of a display phone number */ -#define CALLUI_PHONE_NAME_LENGTH_MAX (80+1) /**< Maximum length of a calling name */ -#define CALLUI_PHONE_SUBADDRESS_LENGTH_MAX (40+1) /**< Maximum length of a SUB address */ -#define CALLUI_PHONE_USSD_LENGTH_MAX (182+1) /**< Maximum length of a phone number */ -#define CALLUI_MAX_CALL_GROUP_MEMBER 5 /**< Maximum number of members in a group */ -#define CALLUI_MAX_CALL_MEMBER 8 /**< This is the maximum number of members possible */ -#define CALLUI_INVALID_CALL_ID 0 /**< This is the invalid entry for call ID */ - -#define CALLUI_BUF_MEMBER_SIZE 512 - -#define NO_HANDLE 0 - -#define CALLUI_KEY_BACK "XF86Back" -#define CALLUI_KEY_MEDIA "XF86AudioMedia" -#define CALLUI_KEY_SELECT "XF86Phone" -#define CALLUI_KEY_POWER "XF86PowerOff" -#define CALLUI_KEY_HOME "XF86Home" -#define CALLUI_KEY_VOLUMEUP "XF86AudioRaiseVolume" -#define CALLUI_KEY_VOLUMEDOWN "XF86AudioLowerVolume" - -#define CALLUI_REJ_MSG_MAX_LENGTH (210+1) -#define CALLUI_REJ_MSG_MAX_COUNT 6 - -#define CALLUI_SAFE_C_CAST(type, value) ((type)(ptrdiff_t)value) - -#undef FREE -#define FREE(ptr) \ - do {\ - free(ptr);\ - ptr = NULL;\ - } while (0) - -#undef G_FREE -#define G_FREE(ptr) \ - do {\ - g_free(ptr);\ - ptr = NULL;\ - } while (0) - -#undef DELETE_EVAS_OBJECT -#define DELETE_EVAS_OBJECT(x) \ - do { \ - if (x != NULL) { \ - evas_object_del(x); \ - x = NULL; \ - } \ - } while (0) - -#undef DELETE_ECORE_TIMER -#define DELETE_ECORE_TIMER(x) \ - do { \ - if (x != NULL) { \ - ecore_timer_del(x); \ - x = NULL; \ - } \ - } while (0) - -#undef DELETE_ECORE_IDLE_ENTERER -#define DELETE_ECORE_IDLE_ENTERER(x) \ - do { \ - if (x != NULL) { \ - ecore_idle_enterer_del(x); \ - x = NULL; \ - } \ - } while (0) - -#undef DELETE_ELM_TRANSIT_HARD -#define DELETE_ELM_TRANSIT_HARD(x) \ - do { \ - if (x != NULL) { \ - elm_transit_del_cb_set(x, NULL, NULL); \ - elm_transit_del(x); \ - x = NULL; \ - } \ - } while (0) - -#undef DELETE_ELM_TRANSIT_SOFT -#define DELETE_ELM_TRANSIT_SOFT(x) \ - do { \ - if (x != NULL) { \ - elm_transit_del(x); \ - x = NULL; \ - } \ - } while (0) - -#undef STRING_EMPTY -#define STRING_EMPTY(x) !(x && x[0] != '\0') - -#endif /* __CALLUI_COMMON_DEFINES_H__ */ diff --git a/inc/callui-common-defines.h b/inc/callui-common-defines.h new file mode 100644 index 0000000..d7324d2 --- /dev/null +++ b/inc/callui-common-defines.h @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#ifndef __CALLUI_COMMON_DEFINES_H__ +#define __CALLUI_COMMON_DEFINES_H__ + +#define _DBUS_DISPLAY_DEVICE_TIMEOUT_ + +#ifndef CALLUI_EXPORT_API +#define CALLUI_EXPORT_API __attribute__ ((visibility("default"))) +#endif + +#define CALLUI_PACKAGE "org.tizen.call-ui" + +#define CALLUI_CALL_EDJ_NAME "/edje/call.edj" +#define CALLUI_CALL_THEME_EDJ_NAME "/edje/call_theme.edj" + +#define CALLUI_CALL_EDJ_PATH _callui_common_get_call_edj_path() +#define CALLUI_CALL_THEME_EDJ_PATH _callui_common_get_call_theme_path() + +#define CALLUI_GROUP_VIEW_MAIN_LY "view_main_ly" +#define CALLUI_GROUP_CALLER_INFO "caller_info" +#define CALLUI_GROUP_PART_SWALLOW_CALLER_INFO "swallow.caller_info" + +#define CALLUI_APP_CONTROL_OPERATION_DURING_CALL "http://tizen.org/appcontrol/oparation/during_call" +#define CALLUI_APP_CONTROL_OPERATION_END_CALL "http://tizen.org/appcontrol/operation/end_call" +#define CALLUI_APP_CONTROL_OPERATION_QP_RESUME "http://tizen.org/appcontrol/operation/qp_resume" + +#define CALLUI_KEY_SELECT "XF86Phone" +#define CALLUI_KEY_POWER "XF86PowerOff" + +#define CALLUI_REJ_MSG_MAX_LENGTH (210+1) +#define CALLUI_REJ_MSG_MAX_COUNT 6 + +#define CALLUI_BUFF_SIZE_HUG 512 +#define CALLUI_BUFF_SIZE_LAR 256 +#define CALLUI_BUFF_SIZE_BIG 128 +#define CALLUI_BUFF_SIZE_MID 64 +#define CALLUI_BUFF_SIZE_SML 32 +#define CALLUI_BUFF_SIZE_TINY 16 + +#undef SAFE_C_CAST +#define SAFE_C_CAST(type, value) ((type)(ptrdiff_t)value) + +#undef _EDJ +#define _EDJ(obj) elm_layout_edje_get(obj) + +#undef _ +#define _(s) gettext(s) + +#undef FREE +#define FREE(ptr) \ + do {\ + free(ptr);\ + ptr = NULL;\ + } while (0) + +#undef G_FREE +#define G_FREE(ptr) \ + do {\ + g_free(ptr);\ + ptr = NULL;\ + } while (0) + +#undef DELETE_EVAS_OBJECT +#define DELETE_EVAS_OBJECT(x) \ + do { \ + if (x != NULL) { \ + evas_object_del(x); \ + x = NULL; \ + } \ + } while (0) + +#undef DELETE_ECORE_TIMER +#define DELETE_ECORE_TIMER(x) \ + do { \ + if (x != NULL) { \ + ecore_timer_del(x); \ + x = NULL; \ + } \ + } while (0) + +#undef DELETE_ECORE_IDLE_ENTERER +#define DELETE_ECORE_IDLE_ENTERER(x) \ + do { \ + if (x != NULL) { \ + ecore_idle_enterer_del(x); \ + x = NULL; \ + } \ + } while (0) + +#undef DELETE_ELM_TRANSIT_HARD +#define DELETE_ELM_TRANSIT_HARD(x) \ + do { \ + if (x != NULL) { \ + elm_transit_del_cb_set(x, NULL, NULL); \ + elm_transit_del(x); \ + x = NULL; \ + } \ + } while (0) + +#undef DELETE_ELM_TRANSIT_SOFT +#define DELETE_ELM_TRANSIT_SOFT(x) \ + do { \ + if (x != NULL) { \ + elm_transit_del(x); \ + x = NULL; \ + } \ + } while (0) + +#undef STRING_EMPTY +#define STRING_EMPTY(x) !(x && x[0] != '\0') + +#endif /* __CALLUI_COMMON_DEFINES_H__ */ diff --git a/inc/callui-common.h b/inc/callui-common.h index 5f11a69..d966e1f 100644 --- a/inc/callui-common.h +++ b/inc/callui-common.h @@ -15,18 +15,17 @@ * */ -#ifndef __CALLUI_COMMON_H_ -#define __CALLUI_COMMON_H_ +#ifndef __CALLUI_COMMON_H__ +#define __CALLUI_COMMON_H__ -#include "callui-view-manager.h" #include "callui.h" #include "callui-common-types.h" -#include "callui-common-def.h" +#include "callui-common-defines.h" typedef enum { - LOCK_TYPE_UNLOCK = 1, - LOCK_TYPE_SWIPE_LOCK, - LOCK_TYPE_SECURITY_LOCK + CALLUI_LOCK_TYPE_UNLOCK = 1, + CALLUI_LOCK_TYPE_SWIPE_LOCK, + CALLUI_LOCK_TYPE_SECURITY_LOCK } callui_idle_lock_type_t; typedef void (*set_call_duration_time)(struct tm *cur_time, Evas_Object *obj, const char *part); @@ -262,9 +261,7 @@ struct tm *_callui_common_get_current_time_diff_in_tm(long time); /** * @brief Converts time_t time representation into a date string with consideration of system time format * @remark returned value is allocated memory so user must free it after use. - * * @param[in] last_update_time Time to convert - * * @return Date string on success or NULL otherwise */ char *_callui_common_get_date_string_representation(time_t last_update_time); diff --git a/inc/callui-view-caller-info-defines.h b/inc/callui-view-caller-info-defines.h deleted file mode 100644 index bc061be..0000000 --- a/inc/callui-view-caller-info-defines.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef _CALLUI_VIEW_CALLER_INFO_DEFINES_H_ -#define _CALLUI_VIEW_CALLER_INFO_DEFINES_H_ - -#define GROUP_MERGE_BTN "merge_btn" -#define GROUP_SWAP_BTN "swap_btn" -#define GROUP_ACTIVE_INFO "split_active_info" -#define GROUP_HOLD_INFO "split_hold_info" - -#define MERGE_SWAP_BTN_PART_TEXT "text" -#define PART_TEXT_STATUS "text.status" -#define PART_SWALLOW_CALLER_ID "swallow.caller_id" -#define PART_TEXT_MAIN "text.main" -#define PART_TEXT_SUB "text.sub" -#define SIGNAL_SHOW_ARROW "show_manage_calls_btn" -#define SIGNAL_HIDE_ARROW "hide_manage_calls_btn" - -#define PART_TOP_FIRST_BTN "top_first_button" -#define PART_TOP_SECOND_BTN "top_second_button" -#define PART_TOP_THIRD_BTN "top_third_button" -#define PART_BOTTOM_FIRST_BTN "bottom_first_button" -#define PART_BOTTOM_SECOND_BTN "bottom_second_button" -#define PART_BOTTOM_THIRD_BTN "bottom_third_button" - -#define PART_END_BTN "end_btn" - -#define GROUP_ONE_HOLD_IN_CONFERENCE "one_hold_in_conference" -#define PART_SWALLOW_HOLD_INFO "swallow.hold_info" -#define PART_SWALLOW_MERGE "swallow.merge" -#define PART_SWALLOW_SWAP "swallow.swap" -#define PART_SWALLOW_ACTIVE_INFO "swallow.active_info" - -#define GROUP_SPLIT "split" -#define PART_SWALLOW_CALL_INFO "swallow.call_info" -#define PART_TEXT_CALL_DURATION "call.duration" -#define PART_SWALLOW_TEXTBLOCK_AREA "textblock/textarea" -#define PART_SWALLOW_KEYPAD "keypad_region" -#define PART_SWALLOW_KEYPAD_LAYOUT_AREA "keypad_layout_area" - -#endif //_CALLUI_VIEW_CALLER_INFO_DEFINES_H_ diff --git a/inc/callui-view-elements-defines.h b/inc/callui-view-elements-defines.h deleted file mode 100644 index 2906f94..0000000 --- a/inc/callui-view-elements-defines.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef _CALLUI_VIEW_ELEMENTS_DEFINES_H_ -#define _CALLUI_VIEW_ELEMENTS_DEFINES_H_ - -#define GROUP_CALL_BTN_IC_SPLIT "call_btn_ic_split" -#define GROUP_CALL_BTN_IC_END "call_btn_ic_end" - -#define CALL_BTN_IC_BG_SIZE 98 -#define CALL_BTN_IC_SIZE 64 - -#endif //_CALLUI_VIEW_ELEMENTS_DEFINES_H_ diff --git a/inc/callui-view-elements.h b/inc/callui-view-elements.h index e284d0f..4f08b1b 100644 --- a/inc/callui-view-elements.h +++ b/inc/callui-view-elements.h @@ -21,7 +21,6 @@ #include #include "callui.h" -#include "callui-view-elements-defines.h" typedef enum { CALLUI_CID_TYPE_SINGLE, diff --git a/inc/callui-view-layout.h b/inc/callui-view-layout.h index 117f525..f7069f0 100755 --- a/inc/callui-view-layout.h +++ b/inc/callui-view-layout.h @@ -606,4 +606,7 @@ #define ACTIVE_NOTI_STROKE_H 1 #define ACTIVE_NOTI_RM_ITEM_HEIGHT 120 + +#define MULTI_LIST_LIST_ICON_BG_SIZE 98 + #endif /*_CALLUI_VIEW_LAYOUT_H_*/ diff --git a/inc/callui.h b/inc/callui.h index 872c252..948eca9 100755 --- a/inc/callui.h +++ b/inc/callui.h @@ -32,7 +32,7 @@ #include "callui-display.h" #include "callui-window.h" -#define APP_HANDLERS_COUNT 1 +#define CALLUI_APP_HANDLERS_COUNT 1 struct appdata { callui_window_h window; @@ -68,7 +68,7 @@ struct appdata { callui_call_data_t *end_call_data; - app_event_handler_h app_event_handlers[APP_HANDLERS_COUNT]; + app_event_handler_h app_event_handlers[CALLUI_APP_HANDLERS_COUNT]; msg_handle_t msg_handle; }; diff --git a/res/edje/call.edc b/res/edje/call.edc index 59323ab..9d42169 100644 --- a/res/edje/call.edc +++ b/res/edje/call.edc @@ -16,8 +16,6 @@ */ #include "../../inc/callui-view-layout.h" -#include "../../inc/callui-view-elements-defines.h" -#include "../../inc/callui-view-caller-info-defines.h" #include "../../edje_src/edc/callui-color-classes.edc" #include "../../edje_src/edc/callui-parts.edc" diff --git a/src/callui-action-bar.c b/src/callui-action-bar.c index e9ff897..3d3fa01 100644 --- a/src/callui-action-bar.c +++ b/src/callui-action-bar.c @@ -22,14 +22,21 @@ #include "callui-action-bar.h" #include "callui-common-types.h" #include "callui-debug.h" -#include "callui-view-elements.h" #include "callui-keypad.h" +#include "callui-view-elements.h" #include "callui-common.h" #include "callui-sound-manager.h" #include "callui-state-provider.h" -#include "callui-view-caller-info-defines.h" -#define PART_SWALLOW_ACTION_BAR "action_bar" +#define CALLUI_GROUP_BUTTON_LAYOUT "action_bar" + +#define CALLUI_PART_SWALLOW_TOP_FIRST "swallow.top_first_btn" +#define CALLUI_PART_SWALLOW_TOP_SECOND "swallow.top_second_btn" +#define CALLUI_PART_SWALLOW_TOP_THIRD "swallow.top_third_btn" +#define CALLUI_PART_SWALLOW_BOTTOM_FIRST "swallow.bottom_first_btn" +#define CALLUI_PART_SWALLOW_BOTTOM_SECOND "swallow.bottom_second_btn" +#define CALLUI_PART_SWALLOW_BOTTOM_THIRD "swallow.bottom_third_btn" +#define CALLUI_PART_SWALLOW_ACTION_BAR "swallow.action_bar" typedef enum { CALLUI_ACTION_BTN_SPEAKER = 0, @@ -84,7 +91,7 @@ static callui_result_e __update_contacts_btn(callui_action_bar_h action_bar); static __action_btn_params_t btn_params[CALLUI_ACTION_BTN_COUNT] = { { - "IDS_CALL_BUTTON_SPEAKER", PART_TOP_FIRST_BTN, + "IDS_CALL_BUTTON_SPEAKER", CALLUI_PART_SWALLOW_TOP_FIRST, __update_speaker_btn, __speaker_btn_click_cb, { "callui_action_btn_speaker", @@ -93,7 +100,7 @@ static __action_btn_params_t btn_params[CALLUI_ACTION_BTN_COUNT] = { } }, { - "IDS_CALL_SK3_KEYPAD", PART_TOP_SECOND_BTN, + "IDS_CALL_SK3_KEYPAD", CALLUI_PART_SWALLOW_TOP_SECOND, __update_keypad_btn, __keypad_btn_click_cb, { "callui_action_btn_keypad", @@ -102,7 +109,7 @@ static __action_btn_params_t btn_params[CALLUI_ACTION_BTN_COUNT] = { } }, { - "IDS_CALL_BUTTON_BLUETOOTH_ABB", PART_TOP_THIRD_BTN, + "IDS_CALL_BUTTON_BLUETOOTH_ABB", CALLUI_PART_SWALLOW_TOP_THIRD, __update_bluetooth_btn, __bluetooth_btn_click_cb, { "callui_action_btn_headset", @@ -111,7 +118,7 @@ static __action_btn_params_t btn_params[CALLUI_ACTION_BTN_COUNT] = { } }, { - "IDS_CALL_BUTTON_ADD_CALL", PART_BOTTOM_FIRST_BTN, + "IDS_CALL_BUTTON_ADD_CALL", CALLUI_PART_SWALLOW_BOTTOM_FIRST, __update_add_call_btn, __add_call_btn_click_cb, { "callui_action_btn_add", @@ -120,7 +127,7 @@ static __action_btn_params_t btn_params[CALLUI_ACTION_BTN_COUNT] = { } }, { - "IDS_CALL_BUTTON_MUTE_ABB", PART_BOTTOM_SECOND_BTN, + "IDS_CALL_BUTTON_MUTE_ABB", CALLUI_PART_SWALLOW_BOTTOM_SECOND, __update_mute_btn, __mute_btn_click_cb, { "callui_action_btn_mute", @@ -129,7 +136,7 @@ static __action_btn_params_t btn_params[CALLUI_ACTION_BTN_COUNT] = { } }, { - "IDS_CALL_BUTTON_CONTACTS", PART_BOTTOM_THIRD_BTN, + "IDS_CALL_BUTTON_CONTACTS", CALLUI_PART_SWALLOW_BOTTOM_THIRD, __update_contacts_btn, __contacts_btn_click_cb, { "callui_action_btn_contacts", @@ -384,7 +391,7 @@ static void __main_layout_del_cb(void *data, Evas *evas, Evas_Object *obj, void static Evas_Object *__create_main_layout(callui_action_bar_h action_bar, Evas_Object *parent) { - Evas_Object *layout = _callui_load_edj(parent, EDJ_NAME, GRP_BUTTON_LAYOUT); + Evas_Object *layout = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_BUTTON_LAYOUT); CALLUI_RETURN_NULL_IF_FAIL(layout); evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, __main_layout_del_cb, action_bar); @@ -582,7 +589,7 @@ void _callui_action_bar_show(callui_action_bar_h action_bar) CALLUI_RETURN_IF_FAIL(action_bar); __update_btns_txt(action_bar); - elm_object_part_content_set(_callui_vm_get_main_ly(action_bar->ad->view_manager), PART_SWALLOW_ACTION_BAR, action_bar->main_layout); + elm_object_part_content_set(_callui_vm_get_main_ly(action_bar->ad->view_manager), CALLUI_PART_SWALLOW_ACTION_BAR, action_bar->main_layout); evas_object_show(action_bar->main_layout); } @@ -590,7 +597,7 @@ void _callui_action_bar_hide(callui_action_bar_h action_bar) { CALLUI_RETURN_IF_FAIL(action_bar); - elm_object_part_content_unset(_callui_vm_get_main_ly(action_bar->ad->view_manager), PART_SWALLOW_ACTION_BAR); + elm_object_part_content_unset(_callui_vm_get_main_ly(action_bar->ad->view_manager), CALLUI_PART_SWALLOW_ACTION_BAR); evas_object_hide(action_bar->main_layout); } diff --git a/src/callui-color-box.c b/src/callui-color-box.c index 9c0b90c..e685ed1 100644 --- a/src/callui-color-box.c +++ b/src/callui-color-box.c @@ -17,7 +17,7 @@ #include "callui-color-box.h" #include "callui-debug.h" -#include "callui-common-def.h" +#include "callui-common-defines.h" #define CALLUI_COLOR_BOX_BG_PART_NAME "callui.swallow.bg" #define CALLUI_COLOR_BOX_TIMER_INTERVAL_SEC 0.067 diff --git a/src/callui-common.c b/src/callui-common.c index ef996de..27970c8 100755 --- a/src/callui-common.c +++ b/src/callui-common.c @@ -36,7 +36,6 @@ #include "callui-debug.h" #include "callui-view-elements.h" #include "callui.h" -#include "callui-view-caller-info-defines.h" #include "callui-sound-manager.h" #include "callui-state-provider.h" @@ -48,11 +47,6 @@ #define CALLUI_DATETIME_FORMAT_12 "yMdhm" #define CALLUI_DATETIME_FORMAT_24 "yMdHm" -#define CALLUI_BUFF_SIZE_BIG 128 -#define CALLUI_BUFF_SIZE_MID 64 -#define CALLUI_BUFF_SIZE_SML 32 -#define CALLUI_BUFF_SIZE_TINY 16 - #define CALLUI_BLUETOOTH_PKG "ug-bluetooth-efl" #define CALLUI_CONTACTS_PKG "org.tizen.contacts" @@ -136,7 +130,7 @@ callui_idle_lock_type_t _callui_common_get_idle_lock_type(void) int lock_state = -1; int lock_type = SETTING_SCREEN_LOCK_TYPE_NONE; int ret = 0; - callui_idle_lock_type_t ret_val = LOCK_TYPE_UNLOCK; + callui_idle_lock_type_t ret_val = CALLUI_LOCK_TYPE_UNLOCK; ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_LOCK_STATE, &lock_state); if (ret < 0) { @@ -151,12 +145,12 @@ callui_idle_lock_type_t _callui_common_get_idle_lock_type(void) if (lock_state == SYSTEM_SETTINGS_LOCK_STATE_LOCK) { if (lock_type == SETTING_SCREEN_LOCK_TYPE_SIMPLE_PASSWORD || lock_type == SETTING_SCREEN_LOCK_TYPE_PASSWORD) { - ret_val = LOCK_TYPE_SECURITY_LOCK; + ret_val = CALLUI_LOCK_TYPE_SECURITY_LOCK; } else { - ret_val = LOCK_TYPE_SWIPE_LOCK; + ret_val = CALLUI_LOCK_TYPE_SWIPE_LOCK; } } else { - ret_val = LOCK_TYPE_UNLOCK; + ret_val = CALLUI_LOCK_TYPE_UNLOCK; } info("Lock state : %d", ret_val); @@ -290,7 +284,7 @@ void _callui_common_reset_main_ly_text_fields(Evas_Object *contents) elm_object_part_text_set(contents, "call_txt_status", ""); elm_object_part_text_set(contents, "txt_timer", ""); - caller_info = elm_object_part_content_get(contents, "caller_info"); + caller_info = elm_object_part_content_get(contents, "swallow.caller_info"); if (caller_info) { elm_object_part_text_set(caller_info, "contact_name", ""); elm_object_part_text_set(caller_info, "phone_number", ""); @@ -349,7 +343,7 @@ int _callui_common_is_powerkey_mode_on(void) static void __lock_state_cb (system_settings_key_e key, void *user_data) { callui_app_data_t *ad = _callui_get_app_data(); - if (_callui_common_get_idle_lock_type() == LOCK_TYPE_UNLOCK) { + if (_callui_common_get_idle_lock_type() == CALLUI_LOCK_TYPE_UNLOCK) { _callui_window_set_top_level_priority(ad->window, false); } else { _callui_window_set_top_level_priority(ad->window, true); @@ -391,12 +385,12 @@ static const char *__get_resource(const char *res_name) const char *_callui_common_get_call_edj_path() { - return __get_resource(CALL_EDJ_NAME); + return __get_resource(CALLUI_CALL_EDJ_NAME); } const char *_callui_common_get_call_theme_path() { - return __get_resource(CALL_THEME_EDJ_NAME); + return __get_resource(CALLUI_CALL_THEME_EDJ_NAME); } static char *__vconf_get_str(const char *in_key) diff --git a/src/callui-display.c b/src/callui-display.c index 70eca86..fc04649 100644 --- a/src/callui-display.c +++ b/src/callui-display.c @@ -25,7 +25,7 @@ #include "callui.h" #include "callui-display.h" #include "callui-debug.h" -#include "callui-common-def.h" +#include "callui-common-defines.h" struct __callui_display { GDBusConnection *conn; @@ -34,15 +34,15 @@ struct __callui_display { }; typedef struct __callui_display __callui_display_t; -#define BUS_NAME "org.tizen.system.deviced" -#define OBJECT_PATH "/Org/Tizen/System/DeviceD" -#define INTERFACE_NAME BUS_NAME -#define DEVICED_PATH_DISPLAY OBJECT_PATH"/Display" -#define DEVICED_INTERFACE_DISPLAY INTERFACE_NAME".display" -#define METHOD_SET_DISPLAY_TIMEOUT "setlcdtimeout" +#define CALLUI_BUS_NAME "org.tizen.system.deviced" +#define CALLUI_OBJECT_PATH "/Org/Tizen/System/DeviceD" +#define CALLUI_INTERFACE_NAME CALLUI_BUS_NAME +#define CALLUI_DEVICED_PATH_DISPLAY CALLUI_OBJECT_PATH"/Display" +#define CALLUI_DEVICED_INTERFACE_DISPLAY CALLUI_INTERFACE_NAME".display" +#define CALLUI_METHOD_SET_DISPLAY_TIMEOUT "setlcdtimeout" -#define TIMEOUT_PARAMS_COUNT 3 -#define DBUS_REPLY_TIMEOUT (120 * 1000) +#define CALLUI_TIMEOUT_PARAMS_COUNT 3 +#define CALLUI_DBUS_REPLY_TIMEOUT (120 * 1000) static callui_result_e _callui_display_init(callui_display_h display, callui_app_data_t *appdata); static void _callui_display_deinit(callui_display_h display); @@ -132,10 +132,10 @@ static callui_result_e __send_gdbus_msg_async(callui_display_h display, int *par return CALLUI_RESULT_FAIL; } - GDBusMessage *msg = g_dbus_message_new_method_call(BUS_NAME, - DEVICED_PATH_DISPLAY, - DEVICED_INTERFACE_DISPLAY, - METHOD_SET_DISPLAY_TIMEOUT); + GDBusMessage *msg = g_dbus_message_new_method_call(CALLUI_BUS_NAME, + CALLUI_DEVICED_PATH_DISPLAY, + CALLUI_DEVICED_INTERFACE_DISPLAY, + CALLUI_METHOD_SET_DISPLAY_TIMEOUT); if (!msg) { err("g_dbus_message_new_method_call() failed"); return CALLUI_RESULT_FAIL; @@ -154,7 +154,7 @@ static callui_result_e __send_gdbus_msg_async(callui_display_h display, int *par display->conn, msg, G_DBUS_SEND_MESSAGE_FLAGS_NONE, - DBUS_REPLY_TIMEOUT, + CALLUI_DBUS_REPLY_TIMEOUT, NULL, display->cancel_obj, __gdbus_reply_msg_async_cb, @@ -181,7 +181,7 @@ callui_result_e _callui_display_set_timeout(callui_display_h display, callui_dis dbg("timeout type [%d], powerkeymode [%d]", timeout_type, powerkey_mode); - int timeout_params[TIMEOUT_PARAMS_COUNT] = { 0 }; + int timeout_params[CALLUI_TIMEOUT_PARAMS_COUNT] = { 0 }; timeout_params[2] = powerkey_mode; switch(timeout_type) { diff --git a/src/callui-keypad.c b/src/callui-keypad.c index 1a05669..dd4f1f9 100755 --- a/src/callui-keypad.c +++ b/src/callui-keypad.c @@ -24,11 +24,15 @@ #include "callui-common.h" #include "callui-view-elements.h" #include "callui-view-layout.h" -#include "callui-view-caller-info-defines.h" #include "callui-sound-manager.h" -#define VC_KEYPAD_ENTRY_FONT "%s" -#define VC_KEYAD_ENTRY_STYLE "DEFAULT='align=center color=#ffffffff font_size=76'" +#define CALLUI_GROUP_KEYPAD "keypad" +#define CALLUI_PART_SWALLOW_TEXT_AREA "swallow.textarea" +#define CALLUI_PART_SWALLOW_KEYPAD "swallow.keypad_region" +#define CALLUI_PART_SWALLOW_KEYPAD_LAYOUT_AREA "swallow.keypad_layout_area" + +#define CALLUI_KEYPAD_ENTRY_FONT "%s" +#define CALLUI_KEYAD_ENTRY_STYLE "DEFAULT='align=center color=#ffffffff font_size=76'" #define VC_AUTO_SPACING_TIMEOUT_SEC 5.0 @@ -76,15 +80,15 @@ static int __callui_keypad_init(callui_keypad_h keypad, callui_app_data_t *appda { keypad->ad = appdata; - keypad->main_layout = _callui_load_edj(_callui_vm_get_main_ly(appdata->view_manager), EDJ_NAME, "keypad_layout"); + keypad->main_layout = _callui_load_edj(_callui_vm_get_main_ly(appdata->view_manager), CALLUI_CALL_EDJ_PATH, "keypad_layout"); CALLUI_RETURN_VALUE_IF_FAIL(keypad->main_layout, CALLUI_RESULT_ALLOCATION_FAIL); elm_object_signal_callback_add(keypad->main_layout, "hide_completed", "*", __on_hide_completed, keypad); - keypad->btns_layout = _callui_load_edj(keypad->main_layout, EDJ_NAME, GRP_KEYPAD); + keypad->btns_layout = _callui_load_edj(keypad->main_layout, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_KEYPAD); CALLUI_RETURN_VALUE_IF_FAIL(keypad->btns_layout, CALLUI_RESULT_ALLOCATION_FAIL); - elm_object_part_content_set(keypad->main_layout, PART_SWALLOW_KEYPAD, keypad->btns_layout); + elm_object_part_content_set(keypad->main_layout, CALLUI_PART_SWALLOW_KEYPAD, keypad->btns_layout); int res = __create_gesture_layer(keypad); CALLUI_RETURN_VALUE_IF_FAIL(res == CALLUI_RESULT_OK, res); @@ -248,7 +252,7 @@ static void __on_hide_completed(void *data, Evas_Object *obj, const char *emissi DELETE_ECORE_TIMER(keypad->anim_timer); keypad->main_layout = elm_object_part_content_unset(main_ly, - PART_SWALLOW_KEYPAD_LAYOUT_AREA); + CALLUI_PART_SWALLOW_KEYPAD_LAYOUT_AREA); evas_object_hide(keypad->main_layout); @@ -322,7 +326,7 @@ static void __on_key_down_click_event(void *data, Evas_Object *obj, const char * free(disp_str); char tmp[NAME_MAX] = { 0 }; - snprintf(tmp, NAME_MAX, VC_KEYPAD_ENTRY_FONT, entry_dest); + snprintf(tmp, NAME_MAX, CALLUI_KEYPAD_ENTRY_FONT, entry_dest); elm_object_text_set(keypad->entry, tmp); @@ -377,7 +381,7 @@ static Evas_Object *__create_single_line_scrolled_entry(Evas_Object *content) evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_entry_text_style_user_push(en, VC_KEYAD_ENTRY_STYLE); + elm_entry_text_style_user_push(en, CALLUI_KEYAD_ENTRY_STYLE); evas_object_show(en); @@ -397,7 +401,7 @@ static int __create_entry(callui_keypad_h keypad) __clear_entry(keypad); - elm_object_part_content_set(keypad->main_layout, PART_SWALLOW_TEXTBLOCK_AREA, keypad->entry); + elm_object_part_content_set(keypad->main_layout, CALLUI_PART_SWALLOW_TEXT_AREA, keypad->entry); return CALLUI_RESULT_OK; } @@ -423,7 +427,7 @@ void _callui_keypad_show(callui_keypad_h keypad) __clear_entry(keypad); - elm_object_part_content_set(main_ly, PART_SWALLOW_KEYPAD_LAYOUT_AREA, keypad->main_layout); + elm_object_part_content_set(main_ly, CALLUI_PART_SWALLOW_KEYPAD_LAYOUT_AREA, keypad->main_layout); evas_object_show(keypad->main_layout); elm_object_signal_emit(keypad->btns_layout, "SHOW", "KEYPADBTN"); @@ -431,7 +435,7 @@ void _callui_keypad_show(callui_keypad_h keypad) elm_object_signal_emit(keypad->btns_layout, "init", "down_arrow"); elm_object_signal_emit(keypad->btns_layout, "start_animation", "down_arrow"); - elm_object_signal_emit(keypad->main_layout, "SHOW", "KEYPAD_BTN"); + elm_object_signal_emit(keypad->main_layout, "show", "keypad_btn"); keypad->is_keypad_show = EINA_TRUE; @@ -458,9 +462,9 @@ static void __hide_keypad(callui_keypad_h keypad, Eina_Bool is_immediately) keypad->is_keypad_show = EINA_FALSE; if (is_immediately) { - elm_object_signal_emit(keypad->main_layout, "QUICK_HIDE", "KEYPAD_BTN"); + elm_object_signal_emit(keypad->main_layout, "quick_hide", "keypad_btn"); } else { - elm_object_signal_emit(keypad->main_layout, "HIDE", "KEYPAD_BTN"); + elm_object_signal_emit(keypad->main_layout, "hide", "keypad_btn"); } } diff --git a/src/callui-proximity-lock-manager.c b/src/callui-proximity-lock-manager.c index 3d50f6e..1920921 100644 --- a/src/callui-proximity-lock-manager.c +++ b/src/callui-proximity-lock-manager.c @@ -21,7 +21,7 @@ #include "callui-debug.h" #include "callui-common.h" -#define SENSOR_INTERVAL 100 +#define CALLUI_SENSOR_INTERVAL 100 typedef enum { CALLUI_PLM_LCD_NONE, @@ -111,7 +111,7 @@ static int __callui_proximity_lock_manager_create_listener(proximity_lock_t *pro return ret; } sensor_listener_set_option(proximity_h->sensor_listener, SENSOR_OPTION_ALWAYS_ON); - sensor_listener_set_event_cb(proximity_h->sensor_listener, SENSOR_INTERVAL, __callui_proximity_lock_manager_cb, proximity_h); + sensor_listener_set_event_cb(proximity_h->sensor_listener, CALLUI_SENSOR_INTERVAL, __callui_proximity_lock_manager_cb, proximity_h); return ret; } diff --git a/src/callui-view-callend.c b/src/callui-view-callend.c index 5336ab2..136c533 100644 --- a/src/callui-view-callend.c +++ b/src/callui-view-callend.c @@ -26,12 +26,17 @@ #include "callui-manager.h" #include "callui-state-provider.h" -#define APP_CONTROL_MIME_CONTACT "application/vnd.tizen.contact" -#define OUTGOING_CALL_TIME_DURATION_STR "00:00" -#define ENDING_TIMER_INTERVAL 2.0 -#define BLINKING_TIMER_INTERVAL 0.5 -#define BLINKING_MAX_COUNT 5 -#define REPLY_BTNS_DIVIDER_WIDTH 2 +#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" + +#define CALLUI_ENDING_TIMER_INTERVAL 2.0 +#define CALLUI_BLINKING_TIMER_INTERVAL 0.5 +#define CALLUI_BLINKING_MAX_COUNT 5 +#define CALLUI_REPLY_BTNS_DIVIDER_WIDTH 2 #define AO016 217, 217, 217, 255 @@ -179,7 +184,7 @@ static callui_result_e __create_main_content(callui_view_callend_h vd, Evas_Obje { callui_app_data_t *ad = vd->base_view.ad; - vd->base_view.contents = _callui_load_edj(parent, EDJ_NAME, GRP_VIEW_MAIN_LY); + vd->base_view.contents = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_VIEW_MAIN_LY); CALLUI_RETURN_VALUE_IF_FAIL(vd->base_view.contents, CALLUI_RESULT_ALLOCATION_FAIL); elm_object_part_content_set(parent, "elm.swallow.content", vd->base_view.contents); @@ -190,9 +195,9 @@ static callui_result_e __create_main_content(callui_view_callend_h vd, Evas_Obje elm_object_signal_callback_add(vd->base_view.contents, "maximize.anim.finished", "view_main_ly", __maximize_anim_completed_cb, vd); - vd->caller_info = _callui_load_edj(vd->base_view.contents, EDJ_NAME, GRP_CALLER_INFO); + vd->caller_info = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_CALLER_INFO); CALLUI_RETURN_VALUE_IF_FAIL(vd->caller_info, CALLUI_RESULT_ALLOCATION_FAIL); - elm_object_part_content_set(vd->base_view.contents, "caller_info", vd->caller_info); + elm_object_part_content_set(vd->base_view.contents, "swallow.caller_info", vd->caller_info); _callui_action_bar_show(ad->action_bar); _callui_action_bar_set_disabled_state(ad->action_bar, true); @@ -206,7 +211,7 @@ static callui_result_e __create_main_content(callui_view_callend_h vd, Evas_Obje static Evas_Object *__create_call_back_btn(callui_view_callend_h vd) { - Evas_Object *button_call_back = _callui_load_edj(vd->reply_btns_box, EDJ_NAME, GRP_ENDCALL_CALL_BACK_BTN); + Evas_Object *button_call_back = _callui_load_edj(vd->reply_btns_box, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_CALL_BACK_BTN); CALLUI_RETURN_NULL_IF_FAIL(button_call_back); edje_object_signal_callback_add(_EDJ(button_call_back), "clicked", "edje", __call_back_btn_click_cb, vd); elm_object_translatable_part_text_set(button_call_back, "text", "IDS_CALL_BUTTON_CALL"); @@ -220,7 +225,7 @@ static Evas_Object *__create_call_back_btn(callui_view_callend_h vd) static Evas_Object *__create_message_btn(callui_view_callend_h vd) { - Evas_Object *button_message = _callui_load_edj(vd->reply_btns_box, EDJ_NAME, GRP_ENDCALL_MSG_BTN); + Evas_Object *button_message = _callui_load_edj(vd->reply_btns_box, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_MSG_BTN); CALLUI_RETURN_NULL_IF_FAIL(button_message); edje_object_signal_callback_add(_EDJ(button_message), "clicked", "edje", __msg_btn_click_cb, vd); elm_object_translatable_part_text_set(button_message, "text", "IDS_COM_BODY_MESSAGE"); @@ -237,7 +242,7 @@ 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, EDJ_NAME, GRP_ENDCALL_ADD_CONTACT_BTN); + 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); @@ -273,7 +278,7 @@ static Evas_Object *__create_reply_btns_divider(callui_view_callend_h vd) evas_object_size_hint_fill_set(divider, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_color_set(divider, AO016); - evas_object_size_hint_min_set(divider, ELM_SCALE_SIZE(REPLY_BTNS_DIVIDER_WIDTH), 0); + evas_object_size_hint_min_set(divider, ELM_SCALE_SIZE(CALLUI_REPLY_BTNS_DIVIDER_WIDTH), 0); evas_object_show(divider); return divider; @@ -347,8 +352,8 @@ static void __set_emergency_call_info(callui_view_callend_h vd, const callui_cal static void __set_conference_call_info(callui_view_callend_h vd, const callui_call_data_t *call_data) { char *status = _("IDS_CALL_BODY_WITH_PD_PEOPLE_M_CONFERENCE_CALL_ABB"); - char buf[CALLUI_BUF_MEMBER_SIZE] = { 0 }; - snprintf(buf, CALLUI_BUF_MEMBER_SIZE, status, call_data->conf_member_count); + char buf[CALLUI_BUFF_SIZE_HUG] = { 0 }; + snprintf(buf, CALLUI_BUFF_SIZE_HUG, status, call_data->conf_member_count); // maximized contact info elm_object_signal_emit(vd->caller_info, "2line", "caller_name"); @@ -363,7 +368,7 @@ static void __set_conference_call_info(callui_view_callend_h vd, const callui_ca static callui_result_e __set_ended_call_duration_sting(callui_view_callend_h vd, callui_call_data_t *call_data) { if (call_data->is_dialing) { - vd->time_string = strdup(OUTGOING_CALL_TIME_DURATION_STR); + vd->time_string = strdup(CALLUI_OUTGOING_CALL_TIME_DURATION_STR); } else { struct tm *call_time = _callui_common_get_current_time_diff_in_tm(call_data->start_time); CALLUI_RETURN_VALUE_IF_FAIL(call_time, CALLUI_RESULT_ALLOCATION_FAIL); @@ -474,7 +479,7 @@ static void __launch_contact_app(const char *operation, const char *call_number) err("app_control_create() is failed. ret[%d]", ret); } else if ((ret = app_control_set_operation(app_control, operation)) != APP_CONTROL_ERROR_NONE) { err("app_control_set_operation() is failed. ret[%d]", ret); - } else if ((ret = app_control_set_mime(app_control, APP_CONTROL_MIME_CONTACT)) != APP_CONTROL_ERROR_NONE) { + } else if ((ret = app_control_set_mime(app_control, CALLUI_APP_CONTROL_MIME_CONTACT)) != APP_CONTROL_ERROR_NONE) { err("app_control_set_mime() is failed. ret[%d]", ret); } else if ((ret = app_control_add_extra_data(app_control, APP_CONTROL_DATA_PHONE, call_number)) != APP_CONTROL_ERROR_NONE) { err("app_control_add_extra_data() is failed. ret[%d]", ret); @@ -602,12 +607,12 @@ static Eina_Bool __ending_timer_blink_cb(void *data) } vd->blink_cnt++; - if (vd->blink_cnt == BLINKING_MAX_COUNT) { + if (vd->blink_cnt == CALLUI_BLINKING_MAX_COUNT) { /* Run a timer of 2 sec for destroying the end selection menu */ DELETE_ECORE_TIMER(vd->ending_timer); elm_object_translatable_part_text_set(vd->base_view.contents, "call_txt_status", "IDS_CALL_BODY_CALL_ENDE_M_STATUS_ABB"); - vd->ending_timer = ecore_timer_add(ENDING_TIMER_INTERVAL, __ending_timer_expired_cb, vd); + vd->ending_timer = ecore_timer_add(CALLUI_ENDING_TIMER_INTERVAL, __ending_timer_expired_cb, vd); vd->blink_timer = NULL; return ECORE_CALLBACK_CANCEL; @@ -619,7 +624,7 @@ static callui_result_e __create_ending_timer(callui_view_callend_h vd) { vd->blink_cnt = 0; DELETE_ECORE_TIMER(vd->blink_timer); - vd->blink_timer = ecore_timer_add(BLINKING_TIMER_INTERVAL, __ending_timer_blink_cb, vd); + vd->blink_timer = ecore_timer_add(CALLUI_BLINKING_TIMER_INTERVAL, __ending_timer_blink_cb, vd); CALLUI_RETURN_VALUE_IF_FAIL(vd->blink_timer, CALLUI_RESULT_ALLOCATION_FAIL); return CALLUI_RESULT_OK; } diff --git a/src/callui-view-circle.c b/src/callui-view-circle.c index d5b7b3e..d9bdb04 100755 --- a/src/callui-view-circle.c +++ b/src/callui-view-circle.c @@ -22,7 +22,10 @@ #include "callui-common.h" #include "callui-state-provider.h" -#define CALLUI_CIRCLE_LAYOUT_DATA "VIEW_DATA" +#define CALLUI_GROUP_LOCK_ACCEPT "lock_accept" +#define CALLUI_GROUP_LOCK_REJECT "lock_reject" + +#define CALLUI_CIRCLE_LAYOUT_DATA "view_data" static void __callui_view_circle_mouse_down_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info); static void __callui_view_circle_multi_down_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info); @@ -58,7 +61,7 @@ static void __callui_view_circle_handle_accept(callui_app_data_t *ad) { dbg(".."); - if (_callui_common_get_idle_lock_type() == LOCK_TYPE_SWIPE_LOCK) { + if (_callui_common_get_idle_lock_type() == CALLUI_LOCK_TYPE_SWIPE_LOCK) { _callui_common_unlock_swipe_lock(); } @@ -375,7 +378,7 @@ callui_result_e _callui_view_circle_create_reject_layout(callui_app_data_t *ad, CALLUI_RETURN_VALUE_IF_FAIL(res == CALLUI_RESULT_OK, CALLUI_RESULT_FAIL); } - lock_reject = _callui_load_edj(parent, EDJ_NAME, GRP_LOCK_REJECT); + lock_reject = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_LOCK_REJECT); CALLUI_RETURN_VALUE_IF_FAIL(lock_reject, CALLUI_RESULT_ALLOCATION_FAIL); evas_object_resize(lock_reject, ad->root_w, ad->root_h); evas_object_move(lock_reject, 0, 0); @@ -433,7 +436,7 @@ callui_result_e _callui_view_circle_create_accept_layout(callui_app_data_t *ad, CALLUI_RETURN_VALUE_IF_FAIL(res == CALLUI_RESULT_OK, CALLUI_RESULT_FAIL); } - lock_accept = _callui_load_edj(parent, EDJ_NAME, GRP_LOCK_ACCEPT); + lock_accept = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_LOCK_ACCEPT); CALLUI_RETURN_VALUE_IF_FAIL(lock_accept, CALLUI_RESULT_ALLOCATION_FAIL); evas_object_resize(lock_accept, ad->root_w, ad->root_h); evas_object_move(lock_accept, 0, 0); diff --git a/src/callui-view-dialing.c b/src/callui-view-dialing.c index 97a1f64..e09cf50 100644 --- a/src/callui-view-dialing.c +++ b/src/callui-view-dialing.c @@ -23,7 +23,6 @@ #include "callui-view-elements.h" #include "callui-keypad.h" #include "callui-common.h" -#include "callui-view-caller-info-defines.h" #include "callui-state-provider.h" struct _callui_view_dialing { @@ -78,14 +77,14 @@ static callui_result_e __create_main_content(callui_view_dialing_h vd, Evas_Obje { callui_app_data_t *ad = vd->base_view.ad; - vd->base_view.contents = _callui_load_edj(parent, EDJ_NAME, GRP_VIEW_MAIN_LY); + vd->base_view.contents = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_VIEW_MAIN_LY); CALLUI_RETURN_VALUE_IF_FAIL(vd->base_view.contents, CALLUI_RESULT_ALLOCATION_FAIL); elm_object_part_content_set(parent, "elm.swallow.content", vd->base_view.contents); - vd->caller_info = _callui_load_edj(vd->base_view.contents, EDJ_NAME, GRP_CALLER_INFO); + vd->caller_info = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_CALLER_INFO); CALLUI_RETURN_VALUE_IF_FAIL(vd->caller_info, CALLUI_RESULT_ALLOCATION_FAIL); - elm_object_part_content_set(vd->base_view.contents, "caller_info", vd->caller_info); + elm_object_part_content_set(vd->base_view.contents, "swallow.caller_info", vd->caller_info); _callui_action_bar_show(ad->action_bar); @@ -179,8 +178,6 @@ static callui_result_e __update_displayed_data(callui_view_dialing_h vd) _callui_show_caller_info_status(ad, "IDS_CALL_POP_DIALLING"); - elm_object_signal_emit(vd->base_view.contents, "SHOW_EFFECT", "ALLBTN"); - evas_object_show(vd->base_view.contents); return CALLUI_RESULT_OK; @@ -191,8 +188,8 @@ static void __keypad_show_state_change_cd(void *data, Eina_Bool visibility) callui_view_dialing_h vd = (callui_view_dialing_h)data; if (visibility) { - elm_object_signal_emit(vd->base_view.contents, "SHOW", "KEYPAD_BTN"); + elm_object_signal_emit(vd->base_view.contents, "hide_caller_info", "view_main_ly"); } else { - elm_object_signal_emit(vd->base_view.contents, "HIDE", "KEYPAD_BTN"); + elm_object_signal_emit(vd->base_view.contents, "show_caller_info", "view_main_ly"); } } diff --git a/src/callui-view-elements.c b/src/callui-view-elements.c index 1afc6c2..5de9137 100755 --- a/src/callui-view-elements.c +++ b/src/callui-view-elements.c @@ -34,14 +34,13 @@ #include "callui-keypad.h" #include "callui-view-multi-call-conf.h" #include "callui-view-quickpanel.h" -#include "callui-view-caller-info-defines.h" #include "callui-proximity-lock-manager.h" #include "callui-manager.h" #include "callui-sound-manager.h" #include "callui-state-provider.h" -#define POPUP_LIST_W 300 -#define POPUP_LIST_ITEM_H 120 +#define CALLUI_POPUP_LIST_W 300 +#define CALLUI_POPUP_LIST_ITEM_H 120 #define CALLUI_CID_THUMBN_SIZE_DEFAULT 0 #define CALLUI_CID_THUMBN_SIZE_TINY 98 @@ -49,6 +48,8 @@ #define CALLUI_CID_THUMBN_SIZE_MEDIUM 168 #define CALLUI_CID_THUMBN_SIZE_BIG 348 +#define CALLUI_PART_SWALLOW_END_BTN "swallow.end_btn" + typedef struct { int index; char option_msg[512]; @@ -115,7 +116,7 @@ static Evas_Object *__callui_get_caller_info_layout(void *data) layout = elm_object_part_content_get(_callui_vm_get_main_ly(ad->view_manager), "elm.swallow.content"); CALLUI_RETURN_VALUE_IF_FAIL(layout, NULL); - caller_info = elm_object_part_content_get(layout, "caller_info"); + caller_info = elm_object_part_content_get(layout, "swallow.caller_info"); return caller_info; } @@ -124,15 +125,15 @@ Evas_Object *_callui_create_end_call_button(Evas_Object *parent, Evas_Smart_Cb c { CALLUI_RETURN_VALUE_IF_FAIL(parent != NULL, NULL); - Evas_Object *btn = elm_object_part_content_get(parent, PART_END_BTN); + Evas_Object *btn = elm_object_part_content_get(parent, CALLUI_PART_SWALLOW_END_BTN); if (!btn) { btn = elm_button_add(parent); elm_object_style_set(btn, "call_icon_only"); Evas_Object *icon = elm_image_add(btn); - elm_image_file_set(icon, EDJ_NAME, "call_button_icon_01.png"); + elm_image_file_set(icon, CALLUI_CALL_EDJ_PATH, "call_button_icon_01.png"); elm_object_part_content_set(btn, "elm.swallow.content", icon); - elm_object_part_content_set(parent, PART_END_BTN, btn); + elm_object_part_content_set(parent, CALLUI_PART_SWALLOW_END_BTN, btn); if (cb_func) { evas_object_smart_callback_add(btn, "clicked", cb_func, data); @@ -159,7 +160,7 @@ Evas_Object *_callui_create_cid_thumbnail_with_size(Evas_Object *parent, Evas_Object *layout = elm_layout_add(parent); CALLUI_RETURN_NULL_IF_FAIL(layout); - elm_layout_file_set(layout, EDJ_NAME, "caller_id"); + elm_layout_file_set(layout, CALLUI_CALL_EDJ_PATH, "caller_id"); evas_object_show(layout); Evas_Object *thumbnail = layout; @@ -741,7 +742,7 @@ void _callui_load_second_call_popup(callui_app_data_t *ad) evas_object_show(genlist); elm_genlist_item_class_free(itc); - evas_object_size_hint_min_set(box, ELM_SCALE_SIZE(POPUP_LIST_W), ELM_SCALE_SIZE(POPUP_LIST_ITEM_H * (item_data->index + 1))); + evas_object_size_hint_min_set(box, ELM_SCALE_SIZE(CALLUI_POPUP_LIST_W), ELM_SCALE_SIZE(CALLUI_POPUP_LIST_ITEM_H * (item_data->index + 1))); evas_object_show(box); elm_object_content_set(ad->second_call_popup, box); diff --git a/src/callui-view-incoming-call-noti.c b/src/callui-view-incoming-call-noti.c index bb29dfd..3bf87a0 100644 --- a/src/callui-view-incoming-call-noti.c +++ b/src/callui-view-incoming-call-noti.c @@ -33,12 +33,16 @@ #include "callui-sound-manager.h" #include "callui-color-box.h" +#define CALLUI_GROUP_REJ_MSG_ITEM "reject_msg_item" +#define CALLUI_GROUP_REJ_MSG_SCROLLER_BG "reject_msg_scroller_bg" +#define CALLUI_GROUP_MAIN_ACTIVE_NOTI_CALL "main_active_noti_call" + #define CALLUI_DURING_ICON "call_button_icon_03.png" #define CALLUI_END_ICON "call_button_icon_01.png" #define CALLUI_MOVE_TRANSITION_TIME_SEC 0.3 -#define CALLUI_REJ_MSG_GENLIST_DATA "VIEW_DATA" +#define CALLUI_REJ_MSG_GENLIST_DATA "view_data" #define CALLUI_REJ_MSG_ADD_BTN_SIZE 60 #define CALLUI_REJ_MSG_ADD_BTN_COLOR 255, 255, 255, 255 @@ -534,7 +538,7 @@ static void _rm_compose_item_clicked_cb(void *data, Evas_Object *obj, const char static void _rm_message_item_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source) { - int index = CALLUI_SAFE_C_CAST(int, data); + int index = SAFE_C_CAST(int, data); callui_view_incoming_call_noti_h vd = (callui_view_incoming_call_noti_h)evas_object_data_get(obj, CALLUI_REJ_MSG_GENLIST_DATA); CALLUI_RETURN_IF_FAIL(vd); @@ -565,12 +569,12 @@ static callui_result_e __rm_create_message_items(callui_view_incoming_call_noti_ CALLUI_RETURN_VALUE_IF_FAIL(res == CALLUI_RESULT_OK, -1); for (int i = 0; i < item_count; i++) { - Evas_Object *item_ly = _callui_load_edj(box, EDJ_NAME, "reject_msg_item"); + Evas_Object *item_ly = _callui_load_edj(box, CALLUI_CALL_EDJ_PATH, "reject_msg_item"); CALLUI_RETURN_VALUE_IF_FAIL(item_ly, CALLUI_RESULT_FAIL); evas_object_size_hint_weight_set(item_ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(item_ly, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_layout_signal_callback_add(item_ly, "cu,action,clicked", "main_active_noti_call", _rm_message_item_clicked_cb, CALLUI_SAFE_C_CAST(void *, i)); + elm_layout_signal_callback_add(item_ly, "cu,action,clicked", "main_active_noti_call", _rm_message_item_clicked_cb, SAFE_C_CAST(void *, i)); char *txt = _callui_common_get_reject_msg_by_index(i); elm_object_part_text_set(item_ly, "callui.text.main", txt); @@ -587,7 +591,7 @@ static callui_result_e __rm_create_message_items(callui_view_incoming_call_noti_ static callui_result_e __rm_create_compose_item(callui_view_incoming_call_noti_h vd, Evas_Object *box) { - Evas_Object *item_ly = _callui_load_edj(vd->box, EDJ_NAME, "reject_msg_item"); + Evas_Object *item_ly = _callui_load_edj(vd->box, CALLUI_CALL_EDJ_PATH, "reject_msg_item"); CALLUI_RETURN_VALUE_IF_FAIL(item_ly, CALLUI_RESULT_FAIL); evas_object_size_hint_weight_set(item_ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -619,7 +623,7 @@ static int __rm_fill_box(callui_view_incoming_call_noti_h vd, Evas_Object *box) static void __rm_create_content(callui_view_incoming_call_noti_h vd) { /* Reject message list background gradient color layout */ - vd->rm_scroller_bg = _callui_load_edj(vd->box, EDJ_NAME, "reject_msg_scroller_bg"); + vd->rm_scroller_bg = _callui_load_edj(vd->box, CALLUI_CALL_EDJ_PATH, "reject_msg_scroller_bg"); CALLUI_RETURN_IF_FAIL(vd->rm_scroller_bg); evas_object_show(vd->rm_scroller_bg); @@ -694,7 +698,7 @@ static void __call_action_btn_click_cb(void *data, Evas_Object *obj, void *event int ret; if ((ret = app_control_create(&app_control)) != APP_CONTROL_ERROR_NONE) { err("app_control_create() is failed. ret[%d]", ret); - } else if (app_control_set_app_id(app_control, PACKAGE) != APP_CONTROL_ERROR_NONE) { + } else if (app_control_set_app_id(app_control, CALLUI_PACKAGE) != APP_CONTROL_ERROR_NONE) { err("app_control_set_app_id() is failed. ret[%d]", ret); } else if ((ret = app_control_set_operation(app_control, key)) != APP_CONTROL_ERROR_NONE) { err("app_control_set_operation() is failed. ret[%d]", ret); @@ -759,7 +763,7 @@ static callui_result_e __create_main_content(callui_view_incoming_call_noti_h vd elm_box_horizontal_set(vd->box, EINA_FALSE); evas_object_show(vd->box); - vd->layout = _callui_load_edj(vd->box, EDJ_NAME, "main_active_noti_call"); + vd->layout = _callui_load_edj(vd->box, CALLUI_CALL_EDJ_PATH, "main_active_noti_call"); CALLUI_RETURN_VALUE_IF_FAIL(vd->layout, CALLUI_RESULT_ALLOCATION_FAIL); evas_object_size_hint_weight_set(vd->layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(vd->layout, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -770,12 +774,12 @@ static callui_result_e __create_main_content(callui_view_incoming_call_noti_h vd elm_box_pack_end(vd->box, vd->layout); Evas_Object *answer_btn = __create_btn(vd, "answer_call_noti", CALLUI_DURING_ICON, - NULL, __call_action_btn_click_cb, APP_CONTROL_OPERATION_DURING_CALL); + NULL, __call_action_btn_click_cb, CALLUI_APP_CONTROL_OPERATION_DURING_CALL); CALLUI_RETURN_VALUE_IF_FAIL(answer_btn, CALLUI_RESULT_ALLOCATION_FAIL); elm_object_part_content_set(vd->layout, "swallow.call_accept_btn", answer_btn); Evas_Object *reject_btn = __create_btn(vd, "reject_call_noti", CALLUI_END_ICON, - NULL, __call_action_btn_click_cb, APP_CONTROL_OPERATION_END_CALL); + NULL, __call_action_btn_click_cb, CALLUI_APP_CONTROL_OPERATION_END_CALL); CALLUI_RETURN_VALUE_IF_FAIL(reject_btn, CALLUI_RESULT_ALLOCATION_FAIL); elm_object_part_content_set(vd->layout, "swallow.call_reject_btn", reject_btn); @@ -805,7 +809,7 @@ static Evas_Object *__create_btn(callui_view_incoming_call_noti_h vd, if (icon_name) { Evas_Object *icon = elm_image_add(button); CALLUI_RETURN_NULL_IF_FAIL(icon); - elm_image_file_set(icon, EDJ_NAME, icon_name); + elm_image_file_set(icon, CALLUI_CALL_EDJ_PATH, icon_name); elm_object_part_content_set(button, "elm.swallow.content", icon); } if (txt) { diff --git a/src/callui-view-incoming-call.c b/src/callui-view-incoming-call.c index cf9b98b..482b2b7 100644 --- a/src/callui-view-incoming-call.c +++ b/src/callui-view-incoming-call.c @@ -29,10 +29,13 @@ #include "callui-state-provider.h" #include "callui-sound-manager.h" -#define CALLUI_REJ_MSG_GENLIST_DATA "reject_msg_genlist_data" -#define CALLUI_REJ_MSG_LIST_OPEN_STATUS_KEY "list_open_status_key" +#define CALLUI_GROUP_LOCK_REJECT_WITH_MSG "lock_reject_with_msg" +#define CALLUI_GROUP_DIMMING_LAYOUT "dimming_ly" -#define SCALE_SIZE(x, h) (((x) * (h)) / MAIN_SCREEN_H) +#define CALLUI_REJ_MSG_GENLIST_DATA "reject_msg_genlist_data" +#define CALLUI_REJ_MSG_LIST_OPEN_STATUS_KEY "list_open_status_key" + +#define CALLUI_SCALE_SIZE(x, h) (((x) * (h)) / MAIN_SCREEN_H) struct _callui_view_incoming_call { call_view_data_base_t base_view; @@ -175,7 +178,7 @@ static callui_result_e __callui_view_incoming_call_ondestroy(call_view_data_base static char *__callui_view_incoming_call_reject_msg_gl_label_get_msg(void *data, Evas_Object *obj, const char *part) { - int index = CALLUI_SAFE_C_CAST(int, data); + int index = SAFE_C_CAST(int, data); char *msg_str = NULL; if (!strcmp(part, "elm.text")) { @@ -194,7 +197,7 @@ static char *__callui_view_incoming_call_reject_msg_gl_label_get_msg(void *data, static void __reject_msg_gl_sel_msg(void *data, Evas_Object *obj, void *event_info) { - int index = CALLUI_SAFE_C_CAST(int, data); + int index = SAFE_C_CAST(int, data); dbg("index: %d", index); callui_view_incoming_call_h vd = (callui_view_incoming_call_h)evas_object_data_get(obj, CALLUI_REJ_MSG_GENLIST_DATA); @@ -262,8 +265,8 @@ static Elm_Object_Item *__reject_msg_genlist_append_item(Evas_Object *msg_glist, { Elm_Object_Item *item = NULL; item = elm_genlist_item_append(msg_glist, itc_reject_msg, - CALLUI_SAFE_C_CAST(void *, index), NULL, ELM_GENLIST_ITEM_NONE, - __reject_msg_gl_sel_msg, CALLUI_SAFE_C_CAST(void *, index)); + SAFE_C_CAST(void *, index), NULL, ELM_GENLIST_ITEM_NONE, + __reject_msg_gl_sel_msg, SAFE_C_CAST(void *, index)); return item; } @@ -648,9 +651,9 @@ static void __reject_msg_list_height_update(callui_view_incoming_call_h vd) _callui_window_get_screen_size(ad->window, NULL, NULL, NULL, &win_h); - vd->reject_msg_height = SCALE_SIZE((REJ_MSG_LIST_CREATE_MSG_BTN_H + ((ITEM_SIZE_H) * msg_cnt)), win_h);/* bottom btn height + (genlist item height * msg count) */ - if (vd->reject_msg_height > (SCALE_SIZE((MTLOCK_REJECT_MSG_LIST_HEIGHT + REJ_MSG_LIST_CREATE_MSG_BTN_H), win_h))) { - vd->reject_msg_height = SCALE_SIZE((MTLOCK_REJECT_MSG_LIST_HEIGHT + REJ_MSG_LIST_CREATE_MSG_BTN_H), win_h); + vd->reject_msg_height = CALLUI_SCALE_SIZE((REJ_MSG_LIST_CREATE_MSG_BTN_H + ((ITEM_SIZE_H) * msg_cnt)), win_h);/* bottom btn height + (genlist item height * msg count) */ + if (vd->reject_msg_height > (CALLUI_SCALE_SIZE((MTLOCK_REJECT_MSG_LIST_HEIGHT + REJ_MSG_LIST_CREATE_MSG_BTN_H), win_h))) { + vd->reject_msg_height = CALLUI_SCALE_SIZE((MTLOCK_REJECT_MSG_LIST_HEIGHT + REJ_MSG_LIST_CREATE_MSG_BTN_H), win_h); } } @@ -671,8 +674,8 @@ static void __create_reject_msg_genlist(callui_view_incoming_call_h vd) if (msg_cnt < 2) elm_object_signal_emit(vd->reject_msg_layout, "set_1item_list", ""); else if (msg_cnt <= CALLUI_REJ_MSG_MAX_COUNT) { - char signal[16] = { 0 }; - snprintf(signal, 16, "set_%ditems_list", msg_cnt); + char signal[CALLUI_BUFF_SIZE_SML] = { 0 }; + snprintf(signal, CALLUI_BUFF_SIZE_SML, "set_%ditems_list", msg_cnt); elm_object_signal_emit(vd->reject_msg_layout, signal, ""); } elm_object_tree_focus_allow_set(vd->reject_msg_genlist, EINA_FALSE); @@ -753,7 +756,7 @@ static void __create_reject_msg_layout(callui_view_incoming_call_h vd) { callui_app_data_t *ad = vd->base_view.ad; - vd->reject_msg_layout = _callui_load_edj(vd->base_view.contents, EDJ_NAME, GRP_LOCK_REJECT_WITH_MSG); + vd->reject_msg_layout = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_LOCK_REJECT_WITH_MSG); evas_object_resize(vd->reject_msg_layout, ad->root_w, ad->root_h); @@ -780,13 +783,13 @@ static callui_result_e __create_main_content(callui_view_incoming_call_h vd, Eva { callui_app_data_t *ad = vd->base_view.ad; - vd->base_view.contents = _callui_load_edj(parent, EDJ_NAME, GRP_VIEW_MAIN_LY); + vd->base_view.contents = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_VIEW_MAIN_LY); CALLUI_RETURN_VALUE_IF_FAIL(vd->base_view.contents, CALLUI_RESULT_ALLOCATION_FAIL); elm_object_part_content_set(parent, "elm.swallow.content", vd->base_view.contents); - vd->caller_info = _callui_load_edj(vd->base_view.contents, EDJ_NAME, GRP_CALLER_INFO); + vd->caller_info = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_CALLER_INFO); CALLUI_RETURN_VALUE_IF_FAIL(vd->caller_info, CALLUI_RESULT_ALLOCATION_FAIL); - elm_object_part_content_set(vd->base_view.contents, "caller_info", vd->caller_info); + elm_object_part_content_set(vd->base_view.contents, "swallow.caller_info", vd->caller_info); _callui_show_caller_info_status(ad, "IDS_CALL_BODY_INCOMING_CALL"); @@ -795,7 +798,7 @@ static callui_result_e __create_main_content(callui_view_incoming_call_h vd, Eva res = _callui_view_circle_create_reject_layout(ad, vd, vd->base_view.contents); CALLUI_RETURN_VALUE_IF_FAIL(res == CALLUI_RESULT_OK, res); - vd->dimming_ly = _callui_load_edj(vd->base_view.contents, EDJ_NAME, GRP_DIMMING_LAYOUT); + vd->dimming_ly = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_DIMMING_LAYOUT); CALLUI_RETURN_VALUE_IF_FAIL(vd->dimming_ly, CALLUI_RESULT_ALLOCATION_FAIL); evas_object_resize(vd->dimming_ly, ad->root_w, ad->root_h); evas_object_move(vd->dimming_ly, 0, 0); diff --git a/src/callui-view-lock-screen.c b/src/callui-view-lock-screen.c index fea971b..28dfe36 100755 --- a/src/callui-view-lock-screen.c +++ b/src/callui-view-lock-screen.c @@ -151,7 +151,7 @@ static Evas_Object *__callui_lock_screen_create_contents(Evas_Object *parent, ch Evas_Object *eo = NULL; /* load edje */ - eo = _callui_load_edj(parent, EDJ_NAME, grpname); + eo = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, grpname); if (eo == NULL) return NULL; return eo; diff --git a/src/callui-view-manager.c b/src/callui-view-manager.c index 1d9b9c5..c59f70e 100644 --- a/src/callui-view-manager.c +++ b/src/callui-view-manager.c @@ -31,6 +31,8 @@ #include "callui-manager.h" #include "callui-state-provider.h" +#define CALLUI_GROUP_APP_MAIN_LY "app_main_ly" + typedef call_view_data_base_t *(*new_view_data_cb) (); struct _callui_vm { @@ -134,7 +136,7 @@ static callui_result_e __auto_change_view(callui_vm_h vm, callui_call_data_t *ca if (incom) { callui_view_type_e type = CALLUI_VIEW_INCOMING_CALL; callui_view_type_e cur_type = _callui_vm_get_cur_view_type(ad->view_manager); - if (_callui_common_get_idle_lock_type() == LOCK_TYPE_UNLOCK && + if (_callui_common_get_idle_lock_type() == CALLUI_LOCK_TYPE_UNLOCK && active == NULL && held == NULL && (cur_type == CALLUI_VIEW_UNDEFINED || cur_type == CALLUI_VIEW_ENDCALL)) { @@ -235,7 +237,7 @@ static void __end_call_called_cb(void *user_data, unsigned int call_id, callui_c static Evas_Object *__create_eo_layout(Evas_Object *parent) { - Evas_Object *layout = _callui_load_edj(parent, EDJ_NAME, "app_main_ly"); + Evas_Object *layout = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_APP_MAIN_LY); elm_object_content_set(parent, layout); evas_object_show(layout); diff --git a/src/callui-view-multi-call-conf.c b/src/callui-view-multi-call-conf.c index 7684dd1..40cfd01 100755 --- a/src/callui-view-multi-call-conf.c +++ b/src/callui-view-multi-call-conf.c @@ -27,7 +27,7 @@ #include "callui-keypad.h" #include "callui-state-provider.h" -#define CALLUI_BUF_STATUS_SIZE 129 +#define CALLUI_GROUP_MANAGE_CALLS "manage_calls" struct _callui_view_mc_conf { call_view_data_base_t base_view; @@ -69,7 +69,7 @@ static callui_result_e __create_main_content(callui_view_mc_conf_h vd, Evas_Obje callui_app_data_t *ad = vd->base_view.ad; /* Main Layout */ - vd->base_view.contents = _callui_load_edj(parent, EDJ_NAME, GRP_VIEW_MAIN_LY); + vd->base_view.contents = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_VIEW_MAIN_LY); CALLUI_RETURN_VALUE_IF_FAIL(vd->base_view.contents, CALLUI_RESULT_ALLOCATION_FAIL); elm_object_part_content_set(parent, "elm.swallow.content", vd->base_view.contents); @@ -77,12 +77,12 @@ static callui_result_e __create_main_content(callui_view_mc_conf_h vd, Evas_Obje eext_object_event_callback_add(vd->base_view.contents, EEXT_CALLBACK_MORE, __more_btn_click_cb, ad); /* Caller info layout */ - vd->caller_info = _callui_load_edj(vd->base_view.contents, EDJ_NAME, GRP_CALLER_INFO); + vd->caller_info = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_CALLER_INFO); CALLUI_RETURN_VALUE_IF_FAIL(vd->caller_info, CALLUI_RESULT_ALLOCATION_FAIL); - elm_object_part_content_set(vd->base_view.contents, "caller_info", vd->caller_info); + elm_object_part_content_set(vd->base_view.contents, "swallow.caller_info", vd->caller_info); /* Manage button Layout */ - Evas_Object *manage_calls_ly = _callui_load_edj(vd->base_view.contents, EDJ_NAME, GRP_MANAGE_CALLS); + Evas_Object *manage_calls_ly = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_MANAGE_CALLS); CALLUI_RETURN_VALUE_IF_FAIL(manage_calls_ly, CALLUI_RESULT_ALLOCATION_FAIL); elm_object_part_content_set(vd->caller_info, "manage_calls_btn", manage_calls_ly); edje_object_signal_callback_add(_EDJ(manage_calls_ly), "mouse,clicked,1", "btn", __manage_calls_btn_clicked_cb, vd); @@ -116,7 +116,7 @@ static callui_result_e __callui_view_multi_call_conf_oncreate(call_view_data_bas static callui_result_e __update_nonetranslatable_elements(callui_view_mc_conf_h vd) { - char buf[CALLUI_BUF_MEMBER_SIZE] = { 0 }; + char buf[CALLUI_BUFF_SIZE_HUG] = { 0 }; callui_app_data_t *ad = vd->base_view.ad; const callui_call_data_t *call_data = @@ -127,7 +127,7 @@ static callui_result_e __update_nonetranslatable_elements(callui_view_mc_conf_h CALLUI_RETURN_VALUE_IF_FAIL(call_data, CALLUI_RESULT_FAIL); char *status = _("IDS_CALL_BODY_WITH_PD_PEOPLE_M_CONFERENCE_CALL_ABB"); - snprintf(buf, CALLUI_BUF_MEMBER_SIZE, status, call_data->conf_member_count); + snprintf(buf, CALLUI_BUFF_SIZE_HUG, status, call_data->conf_member_count); _callui_show_caller_info_number(ad, buf); return CALLUI_RESULT_OK; @@ -175,7 +175,7 @@ static callui_result_e __update_displayed_data(callui_view_mc_conf_h vd) { callui_app_data_t *ad = vd->base_view.ad; - char buf[CALLUI_BUF_MEMBER_SIZE] = { 0 }; + char buf[CALLUI_BUFF_SIZE_HUG] = { 0 }; Eina_Bool is_held = EINA_FALSE; @@ -209,7 +209,7 @@ static callui_result_e __update_displayed_data(callui_view_mc_conf_h vd) _callui_show_caller_info_name(ad, "IDS_CALL_BODY_CONFERENCE"); char *status = _("IDS_CALL_BODY_WITH_PD_PEOPLE_M_CONFERENCE_CALL_ABB"); - snprintf(buf, CALLUI_BUF_MEMBER_SIZE, status, call_data->conf_member_count); + snprintf(buf, CALLUI_BUFF_SIZE_HUG, status, call_data->conf_member_count); _callui_show_caller_info_number(ad, buf); CALLUI_RETURN_VALUE_IF_FAIL(_callui_show_caller_id(vd->caller_info, call_data), CALLUI_RESULT_FAIL); @@ -277,8 +277,8 @@ static void __keypad_show_state_change_cd(void *data, Eina_Bool visibility) callui_view_mc_conf_h vd = (callui_view_mc_conf_h)data; if (visibility) { - elm_object_signal_emit(vd->base_view.contents, "SHOW", "KEYPAD_BTN"); + elm_object_signal_emit(vd->base_view.contents, "hide_caller_info", "view_main_ly"); } else { - elm_object_signal_emit(vd->base_view.contents, "HIDE", "KEYPAD_BTN"); + elm_object_signal_emit(vd->base_view.contents, "show_caller_info", "view_main_ly"); } } diff --git a/src/callui-view-multi-call-list.c b/src/callui-view-multi-call-list.c index 98a4b86..f9747b2 100755 --- a/src/callui-view-multi-call-list.c +++ b/src/callui-view-multi-call-list.c @@ -26,7 +26,11 @@ #include "callui-view-layout.h" #include "callui-state-provider.h" -#define CALLUI_APP_DATA_NAME "multi_call_app_data" +#define CALLUI_GROUP_MULTICALL "multicall_list" +#define CALLUI_GROUP_CALL_BTN_IC_SPLIT "call_btn_ic_split" +#define CALLUI_GROUP_CALL_BTN_IC_END "call_btn_ic_end" + +#define CALLUI_APP_DATA_NAME "app_data" struct _callui_view_mc_list { call_view_data_base_t base_view; @@ -181,7 +185,7 @@ static callui_result_e __create_main_content(callui_view_mc_list_h vd, Evas_Obje { callui_app_data_t *ad = vd->base_view.ad; - vd->base_view.contents = _callui_load_edj(parent, EDJ_NAME, GRP_MULTICALL); + vd->base_view.contents = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_MULTICALL); CALLUI_RETURN_VALUE_IF_FAIL(vd->base_view.contents, CALLUI_RESULT_ALLOCATION_FAIL); elm_object_part_content_set(parent, "elm.swallow.content", vd->base_view.contents); @@ -243,8 +247,8 @@ static Evas_Object *__caller_genlist_content_cb(void *data, Evas_Object *obj, co Evas_Object *img = NULL; if ((strcmp(part, "elm.swallow.end") == 0)) { img = elm_image_add(obj); - elm_image_file_set(img, EDJ_NAME, GROUP_CALL_BTN_IC_END); - evas_object_size_hint_min_set(img, ELM_SCALE_SIZE(CALL_BTN_IC_BG_SIZE), ELM_SCALE_SIZE(CALL_BTN_IC_BG_SIZE)); + elm_image_file_set(img, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_CALL_BTN_IC_END); + evas_object_size_hint_min_set(img, ELM_SCALE_SIZE(MULTI_LIST_LIST_ICON_BG_SIZE), ELM_SCALE_SIZE(MULTI_LIST_LIST_ICON_BG_SIZE)); evas_object_propagate_events_set(img, EINA_FALSE); evas_object_smart_callback_add(img, "clicked", __end_call_btn_click_cb, call_data); evas_object_data_set(img, CALLUI_APP_DATA_NAME, ad); @@ -259,8 +263,8 @@ static Evas_Object *__caller_genlist_content_cb(void *data, Evas_Object *obj, co return NULL; } img = elm_image_add(obj); - elm_image_file_set(img, EDJ_NAME, GROUP_CALL_BTN_IC_SPLIT); - evas_object_size_hint_min_set(img, ELM_SCALE_SIZE(CALL_BTN_IC_BG_SIZE), ELM_SCALE_SIZE(CALL_BTN_IC_BG_SIZE)); + elm_image_file_set(img, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_CALL_BTN_IC_SPLIT); + evas_object_size_hint_min_set(img, ELM_SCALE_SIZE(MULTI_LIST_LIST_ICON_BG_SIZE), ELM_SCALE_SIZE(MULTI_LIST_LIST_ICON_BG_SIZE)); evas_object_propagate_events_set(img, EINA_FALSE); evas_object_smart_callback_add(img, "clicked", __split_call_btn_click_cb, call_data); evas_object_data_set(img, CALLUI_APP_DATA_NAME, ad); @@ -317,7 +321,6 @@ static callui_result_e __caller_genlist_add(callui_view_mc_list_h vd) vd->call_genlist = genlist; return CALLUI_RESULT_OK; - } static void __caller_genlist_clear(callui_view_mc_list_h vd) diff --git a/src/callui-view-multi-call-split.c b/src/callui-view-multi-call-split.c index 8c20af3..682d08a 100755 --- a/src/callui-view-multi-call-split.c +++ b/src/callui-view-multi-call-split.c @@ -22,11 +22,30 @@ #include "callui.h" #include "callui-keypad.h" #include "callui-common.h" -#include "callui-view-caller-info-defines.h" #include "callui-view-elements.h" #include "callui-state-provider.h" -#define BUF_SIZE 256 +#define CALLUI_GROUP_SPLIT "multi_call_split" +#define CALLUI_GROUP_MERGE_BTN "merge_btn" +#define CALLUI_GROUP_SWAP_BTN "swap_btn" +#define CALLUI_GROUP_ACTIVE_INFO "split_active_info" +#define CALLUI_GROUP_HOLD_INFO "split_hold_info" +#define CALLUI_GROUP_CALLERS_INFO "split_callers_info" + +#define CALLUI_PART_TEXT_MERGE_SWAP_BTN "text" +#define CALLUI_PART_TEXT_STATUS "text.status" +#define CALLUI_PART_TEXT_MAIN "text.main" +#define CALLUI_PART_TEXT_SUB "text.sub" +#define CALLUI_PART_TEXT_CALL_DURATION "call.duration" +#define CALLUI_PART_SWALLOW_CALLER_ID "swallow.caller_id" +#define CALLUI_PART_SWALLOW_HOLD_INFO "swallow.hold_info" +#define CALLUI_PART_SWALLOW_MERGE "swallow.merge" +#define CALLUI_PART_SWALLOW_SWAP "swallow.swap" +#define CALLUI_PART_SWALLOW_ACTIVE_INFO "swallow.active_info" +#define CALLUI_PART_SWALLOW_END_BTN "swallow.end_btn" +#define CALLUI_PART_SWALLOW_CALL_INFO "swallow.call_info" + +#define CALLUI_BUF_SIZE 256 struct _callui_view_mc_split { call_view_data_base_t base_view; @@ -88,17 +107,17 @@ static callui_result_e __update_nonetranslatable_elements(callui_view_mc_split_h const callui_call_data_t *held = _callui_stp_get_call_data(ad->state_provider, CALLUI_CALL_DATA_HELD); CALLUI_RETURN_VALUE_IF_FAIL(held, CALLUI_RESULT_FAIL); - char buffer[BUF_SIZE] = { 0 }; + char buff[CALLUI_BUFF_SIZE_LAR] = { 0 }; const char *fmt = _("IDS_CALL_BODY_WITH_PD_PEOPLE_M_CONFERENCE_CALL_ABB"); if (held->conf_member_count > 1) { - snprintf(buffer, BUF_SIZE, fmt, held->conf_member_count); - elm_object_part_text_set(vd->hold_layout, PART_TEXT_SUB, buffer); + snprintf(buff, CALLUI_BUFF_SIZE_LAR, fmt, held->conf_member_count); + elm_object_part_text_set(vd->hold_layout, CALLUI_PART_TEXT_SUB, buff); } if (active->conf_member_count > 1) { - snprintf(buffer, BUF_SIZE, fmt, active->conf_member_count); - elm_object_part_text_set(vd->active_layout, PART_TEXT_SUB, buffer); + snprintf(buff, CALLUI_BUFF_SIZE_LAR, fmt, active->conf_member_count); + elm_object_part_text_set(vd->active_layout, CALLUI_PART_TEXT_SUB, buff); } return CALLUI_RESULT_OK; @@ -168,18 +187,18 @@ static callui_result_e __create_main_content(callui_view_mc_split_h vd, Evas_Obj { callui_app_data_t *ad = vd->base_view.ad; - vd->base_view.contents = _callui_load_edj(parent, EDJ_NAME, GROUP_SPLIT); + vd->base_view.contents = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_SPLIT); CALLUI_RETURN_VALUE_IF_FAIL(vd->base_view.contents, CALLUI_RESULT_ALLOCATION_FAIL); elm_object_part_content_set(parent, "elm.swallow.content", vd->base_view.contents); - vd->caller_info = _callui_load_edj(vd->base_view.contents, EDJ_NAME, GROUP_ONE_HOLD_IN_CONFERENCE); + vd->caller_info = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_CALLERS_INFO); CALLUI_RETURN_VALUE_IF_FAIL(vd->caller_info, CALLUI_RESULT_ALLOCATION_FAIL); - elm_object_part_content_set(vd->base_view.contents, PART_SWALLOW_CALL_INFO, vd->caller_info); + elm_object_part_content_set(vd->base_view.contents, CALLUI_PART_SWALLOW_CALL_INFO, vd->caller_info); - vd->hold_layout = _callui_load_edj(vd->caller_info, EDJ_NAME, GROUP_HOLD_INFO); + vd->hold_layout = _callui_load_edj(vd->caller_info, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_HOLD_INFO); CALLUI_RETURN_VALUE_IF_FAIL(vd->hold_layout, CALLUI_RESULT_ALLOCATION_FAIL); - vd->active_layout = _callui_load_edj(vd->caller_info, EDJ_NAME, GROUP_ACTIVE_INFO); + vd->active_layout = _callui_load_edj(vd->caller_info, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_ACTIVE_INFO); CALLUI_RETURN_VALUE_IF_FAIL(vd->active_layout, CALLUI_RESULT_ALLOCATION_FAIL); callui_result_e res = __create_merge_swap_btns(vd->caller_info, ad); @@ -199,9 +218,9 @@ static callui_result_e __create_main_content(callui_view_mc_split_h vd, Evas_Obj static Evas_Object *__create_merge_swap_btn(Evas_Object *parent, const char *name, const char *text) { Evas_Object *layout = elm_layout_add(parent); - elm_layout_file_set(layout, EDJ_NAME, name); + elm_layout_file_set(layout, CALLUI_CALL_EDJ_PATH, name); - elm_object_translatable_part_text_set(layout, MERGE_SWAP_BTN_PART_TEXT, text); + elm_object_translatable_part_text_set(layout, CALLUI_PART_TEXT_MERGE_SWAP_BTN, text); return layout; } @@ -223,54 +242,54 @@ static void __fill_one_contact_layout(Evas_Object *parent, const callui_call_dat const char *sub_text = call_data->call_num; if (call_data->is_emergency) { - elm_object_translatable_part_text_set(parent, PART_TEXT_MAIN, "IDS_COM_BODY_EMERGENCY_NUMBER"); - elm_object_part_text_set(parent, PART_TEXT_SUB, ""); + elm_object_translatable_part_text_set(parent, CALLUI_PART_TEXT_MAIN, "IDS_COM_BODY_EMERGENCY_NUMBER"); + elm_object_part_text_set(parent, CALLUI_PART_TEXT_SUB, ""); } else if (!STRING_EMPTY(main_text)) { - elm_object_part_text_set(parent, PART_TEXT_MAIN, main_text); - elm_object_part_text_set(parent, PART_TEXT_SUB, sub_text); + elm_object_part_text_set(parent, CALLUI_PART_TEXT_MAIN, main_text); + elm_object_part_text_set(parent, CALLUI_PART_TEXT_SUB, sub_text); } else if (!STRING_EMPTY(sub_text)) { - elm_object_part_text_set(parent, PART_TEXT_MAIN, sub_text); - elm_object_part_text_set(parent, PART_TEXT_SUB, ""); + elm_object_part_text_set(parent, CALLUI_PART_TEXT_MAIN, sub_text); + elm_object_part_text_set(parent, CALLUI_PART_TEXT_SUB, ""); } else { - elm_object_translatable_part_text_set(parent, PART_TEXT_MAIN, "IDS_CALL_BODY_UNKNOWN"); - elm_object_part_text_set(parent, PART_TEXT_SUB, ""); + elm_object_translatable_part_text_set(parent, CALLUI_PART_TEXT_MAIN, "IDS_CALL_BODY_UNKNOWN"); + elm_object_part_text_set(parent, CALLUI_PART_TEXT_SUB, ""); } } static void __fill_conference_layout(Evas_Object *parent, const callui_call_data_t *call_data) { - elm_object_translatable_part_text_set(parent, PART_TEXT_MAIN, "IDS_CALL_BODY_CONFERENCE"); + elm_object_translatable_part_text_set(parent, CALLUI_PART_TEXT_MAIN, "IDS_CALL_BODY_CONFERENCE"); - char buffer[BUF_SIZE] = { 0 }; + char buffer[CALLUI_BUF_SIZE] = { 0 }; const char *fmt = _("IDS_CALL_BODY_WITH_PD_PEOPLE_M_CONFERENCE_CALL_ABB"); - snprintf(buffer, BUF_SIZE, fmt, call_data->conf_member_count); - elm_object_part_text_set(parent, PART_TEXT_SUB, buffer); + snprintf(buffer, CALLUI_BUF_SIZE, fmt, call_data->conf_member_count); + elm_object_part_text_set(parent, CALLUI_PART_TEXT_SUB, buffer); } static void __set_hold_info(Evas_Object *parent, Evas_Object *content) { elm_object_translatable_part_text_set(content, - PART_TEXT_STATUS, "IDS_CALL_BODY_ON_HOLD_ABB"); + CALLUI_PART_TEXT_STATUS, "IDS_CALL_BODY_ON_HOLD_ABB"); - elm_object_part_content_set(parent, PART_SWALLOW_HOLD_INFO, content); + elm_object_part_content_set(parent, CALLUI_PART_SWALLOW_HOLD_INFO, content); } static void __set_active_info(Evas_Object *parent, Evas_Object *content, callui_app_data_t *ad) { elm_object_translatable_part_text_set(content, - PART_TEXT_STATUS, "IDS_CALL_BODY_CONNECTED_M_STATUS_ABB"); + CALLUI_PART_TEXT_STATUS, "IDS_CALL_BODY_CONNECTED_M_STATUS_ABB"); - elm_object_part_content_set(parent, PART_SWALLOW_ACTIVE_INFO, content); + elm_object_part_content_set(parent, CALLUI_PART_SWALLOW_ACTIVE_INFO, content); const callui_call_data_t *active = _callui_stp_get_call_data(ad->state_provider, CALLUI_CALL_DATA_ACTIVE); if (active) { if (active->conf_member_count > 1) { - elm_object_signal_emit(content, SIGNAL_SHOW_ARROW, ""); + elm_object_signal_emit(content, "show_manage_calls_btn", ""); elm_object_signal_callback_add(content, "mouse,up,*", "arrow", __mng_callers_btn_click_cb, ad); } else { - elm_object_signal_emit(content, SIGNAL_HIDE_ARROW, ""); + elm_object_signal_emit(content, "hide_manage_calls_btn", ""); elm_object_signal_callback_del(content, "mouse,up,*", "arrow", __mng_callers_btn_click_cb); } } @@ -278,14 +297,14 @@ static void __set_active_info(Evas_Object *parent, Evas_Object *content, callui_ static callui_result_e __create_merge_swap_btns(Evas_Object *parent, callui_app_data_t *ad) { - Evas_Object *merge = __create_merge_swap_btn(parent, GROUP_MERGE_BTN, "IDS_CALL_BODY_MERGE_T_CALL"); + Evas_Object *merge = __create_merge_swap_btn(parent, CALLUI_GROUP_MERGE_BTN, "IDS_CALL_BODY_MERGE_T_CALL"); CALLUI_RETURN_VALUE_IF_FAIL(merge, CALLUI_RESULT_ALLOCATION_FAIL); - elm_object_part_content_set(parent, PART_SWALLOW_MERGE, merge); + elm_object_part_content_set(parent, CALLUI_PART_SWALLOW_MERGE, merge); elm_object_signal_callback_add(merge, "mouse,clicked,*", "*", __merge_btn_click_cb, ad); - Evas_Object *swap = __create_merge_swap_btn(parent, GROUP_SWAP_BTN, "IDS_CALL_SK_MULTICALL_SWAP"); + Evas_Object *swap = __create_merge_swap_btn(parent, CALLUI_GROUP_SWAP_BTN, "IDS_CALL_SK_MULTICALL_SWAP"); CALLUI_RETURN_VALUE_IF_FAIL(merge, CALLUI_RESULT_ALLOCATION_FAIL); - elm_object_part_content_set(parent, PART_SWALLOW_SWAP, swap); + elm_object_part_content_set(parent, CALLUI_PART_SWALLOW_SWAP, swap); elm_object_signal_callback_add(swap, "mouse,clicked,*", "*", __swap_btn_click_cb, ad); return CALLUI_RESULT_OK; @@ -315,8 +334,8 @@ static void __update_call_duration_time(callui_view_mc_split_h vd, struct tm *co char *tmp = _callui_common_get_duration_time_string(cur_time); - elm_object_part_text_set(vd->active_layout, PART_TEXT_STATUS, tmp); - elm_object_part_text_set(vd->base_view.contents, PART_TEXT_CALL_DURATION, tmp); + elm_object_part_text_set(vd->active_layout, CALLUI_PART_TEXT_STATUS, tmp); + elm_object_part_text_set(vd->base_view.contents, CALLUI_PART_TEXT_CALL_DURATION, tmp); free(tmp); } @@ -352,7 +371,7 @@ static callui_result_e __init_call_duration_timer(callui_view_mc_split_h vd) vd->base_view.call_duration_tm = _callui_stp_get_call_duration(ad->state_provider, CALLUI_CALL_DATA_ACTIVE); CALLUI_RETURN_VALUE_IF_FAIL(vd->base_view.call_duration_tm, CALLUI_RESULT_ALLOCATION_FAIL); - _callui_common_set_call_duration_time(vd->base_view.call_duration_tm, vd->active_layout, PART_TEXT_STATUS); + _callui_common_set_call_duration_time(vd->base_view.call_duration_tm, vd->active_layout, CALLUI_PART_TEXT_STATUS); vd->base_view.call_duration_timer = ecore_timer_add(0.1, __call_duration_timer_cb, vd); CALLUI_RETURN_VALUE_IF_FAIL(vd->base_view.call_duration_timer, CALLUI_RESULT_ALLOCATION_FAIL); @@ -415,8 +434,8 @@ static void __keypad_show_state_change_cd(void *data, Eina_Bool visibility) callui_view_mc_split_h vd = (callui_view_mc_split_h)data; if (visibility) { - elm_object_signal_emit(vd->base_view.contents, "SHOW", "KEYPAD_BTN"); + elm_object_signal_emit(vd->base_view.contents, "hide_callers_info", "multi_call_split"); } else { - elm_object_signal_emit(vd->base_view.contents, "HIDE", "KEYPAD_BTN"); + elm_object_signal_emit(vd->base_view.contents, "show_callers_info", "multi_call_split"); } } diff --git a/src/callui-view-quickpanel.c b/src/callui-view-quickpanel.c index 778626f..4681f36 100755 --- a/src/callui-view-quickpanel.c +++ b/src/callui-view-quickpanel.c @@ -29,9 +29,10 @@ #include "callui-sound-manager.h" #include "callui-state-provider.h" -#define TXT_TIMER_BUF_LEN 26 -#define CALL_NUMBER_ONE 1 -#define TIME_BUF_LEN 16 +#define CALLUI_GROUP_QUICKPANEL "quickpanel" + +#define CALLUI_BUF_TIMER_TXT_LEN 26 +#define CALLUI_CALL_NUMBER_ONE 1 typedef enum { CALLUI_QP_BTN_CALL = 0, @@ -292,9 +293,9 @@ static void __main_layout_mouse_up_cb(void *data, Evas *evas, Evas_Object *obj, int ret; if ((ret = app_control_create(&app_control)) != APP_CONTROL_ERROR_NONE) { err("app_control_create() is failed. ret[%d]", ret); - } else if ((ret = app_control_set_app_id(app_control, PACKAGE)) != APP_CONTROL_ERROR_NONE) { + } else if ((ret = app_control_set_app_id(app_control, CALLUI_PACKAGE)) != APP_CONTROL_ERROR_NONE) { err("app_control_set_app_id() is failed. ret[%d]", ret); - } else if ((ret = app_control_set_operation(app_control, APP_CONTROL_OPERATION_QP_RESUME)) != APP_CONTROL_ERROR_NONE) { + } else if ((ret = app_control_set_operation(app_control, CALLUI_APP_CONTROL_OPERATION_QP_RESUME)) != APP_CONTROL_ERROR_NONE) { err("app_control_set_operation() is failed. ret[%d]", ret); } else if ((ret = app_control_send_launch_request(app_control, NULL, NULL)) != APP_CONTROL_ERROR_NONE) { err("app_control_send_launch_request() is failed. ret[%d]", ret); @@ -363,17 +364,17 @@ static void __update_comp_status(callui_qp_mc_h qp, static void __set_split_call_duration_time(struct tm *time, Evas_Object *obj, const char *txt_part) { - char dur[TIME_BUF_LEN]; + char dur[CALLUI_BUFF_SIZE_TINY]; if (time->tm_hour > 0) { - snprintf(dur, TIME_BUF_LEN, "%02d:%02d:%02d", time->tm_hour, time->tm_min, time->tm_sec); + snprintf(dur, CALLUI_BUFF_SIZE_TINY, "%02d:%02d:%02d", time->tm_hour, time->tm_min, time->tm_sec); } else { - snprintf(dur, TIME_BUF_LEN, "%02d:%02d", time->tm_min, time->tm_sec); + snprintf(dur, CALLUI_BUFF_SIZE_TINY, "%02d:%02d", time->tm_min, time->tm_sec); } - char buf[TXT_TIMER_BUF_LEN] = {0}; - char buf_tmp[TXT_TIMER_BUF_LEN] = {0}; + char buf[CALLUI_BUF_TIMER_TXT_LEN] = {0}; + char buf_tmp[CALLUI_BUF_TIMER_TXT_LEN] = {0}; snprintf(buf_tmp, sizeof(buf_tmp), "%s / %s", dur, _("IDS_CALL_BODY_PD_ON_HOLD_M_STATUS_ABB")); - snprintf(buf, sizeof(buf), buf_tmp, CALL_NUMBER_ONE); + snprintf(buf, sizeof(buf), buf_tmp, CALLUI_CALL_NUMBER_ONE); elm_object_part_text_set(obj, txt_part, buf); } @@ -589,7 +590,7 @@ static callui_result_e __activate(callui_qp_mc_h qp) qp->rotate_angle = elm_win_rotation_get(qp->win_quickpanel); dbg("current rotate angle(%d)", qp->rotate_angle); - qp->quickpanel_layout = _callui_load_edj(qp->win_quickpanel, EDJ_NAME, GRP_QUICKPANEL); + qp->quickpanel_layout = _callui_load_edj(qp->win_quickpanel, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_QUICKPANEL); if (qp->quickpanel_layout == NULL) { err("__callui_qp_mc_create_contents() FAILED!"); return CALLUI_RESULT_FAIL; diff --git a/src/callui-view-single-call.c b/src/callui-view-single-call.c index 7859263..0e85652 100644 --- a/src/callui-view-single-call.c +++ b/src/callui-view-single-call.c @@ -24,12 +24,9 @@ #include "callui-view-elements.h" #include "callui-keypad.h" #include "callui-common.h" -#include "callui-view-caller-info-defines.h" #include "callui-state-provider.h" #include "callui-action-bar.h" -#define VIEW_SINGLE_CALL_STATUS_TXT_LEN 129 - struct _call_view_single_call { call_view_data_base_t base_view; @@ -214,8 +211,6 @@ static callui_result_e __update_displayed_data(call_view_single_call_h vd) CALLUI_RETURN_VALUE_IF_FAIL(_callui_show_caller_id(vd->caller_info, call_data), CALLUI_RESULT_FAIL); - elm_object_signal_emit(vd->base_view.contents, "SHOW_EFFECT", "ALLBTN"); - evas_object_show(vd->base_view.contents); return CALLUI_RESULT_OK; @@ -225,16 +220,16 @@ static callui_result_e __create_main_content(call_view_single_call_h vd, Evas_Ob { callui_app_data_t *ad = vd->base_view.ad; - vd->base_view.contents = _callui_load_edj(parent, EDJ_NAME, GRP_VIEW_MAIN_LY); + vd->base_view.contents = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_VIEW_MAIN_LY); CALLUI_RETURN_VALUE_IF_FAIL(vd->base_view.contents, CALLUI_RESULT_ALLOCATION_FAIL); elm_object_part_content_set(parent, "elm.swallow.content", vd->base_view.contents); // TODO: replace this into view manager in nearest future eext_object_event_callback_add(vd->base_view.contents, EEXT_CALLBACK_MORE, __more_btn_click_cb, ad); - vd->caller_info = _callui_load_edj(vd->base_view.contents, EDJ_NAME, GRP_CALLER_INFO); + vd->caller_info = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_CALLER_INFO); CALLUI_RETURN_VALUE_IF_FAIL(vd->caller_info, CALLUI_RESULT_ALLOCATION_FAIL); - elm_object_part_content_set(vd->base_view.contents, "caller_info", vd->caller_info); + elm_object_part_content_set(vd->base_view.contents, "swallow.caller_info", vd->caller_info); _callui_action_bar_show(ad->action_bar); @@ -249,11 +244,11 @@ static callui_result_e __create_main_content(call_view_single_call_h vd, Evas_Ob static void __keypad_show_state_change_cd(void *data, Eina_Bool visibility) { - call_view_single_call_h vd = (call_view_single_call_h)data; + call_view_single_call_h vd = (call_view_single_call_h)data; - if (visibility) { - elm_object_signal_emit(vd->base_view.contents, "SHOW", "KEYPAD_BTN"); - } else { - elm_object_signal_emit(vd->base_view.contents, "HIDE", "KEYPAD_BTN"); - } + if (visibility) { + elm_object_signal_emit(vd->base_view.contents, "hide_caller_info", "view_main_ly"); + } else { + elm_object_signal_emit(vd->base_view.contents, "show_caller_info", "view_main_ly"); + } } diff --git a/src/callui-window.c b/src/callui-window.c index 6803c10..c6372ae 100644 --- a/src/callui-window.c +++ b/src/callui-window.c @@ -19,7 +19,7 @@ #include "callui-window.h" #include "callui.h" -#include "callui-common-def.h" +#include "callui-common-defines.h" #include "callui-debug.h" #include "callui-view-layout.h" @@ -118,7 +118,7 @@ static void __eo_win_rotation_changed_cb(void *data, Evas_Object *obj, void *eve static Evas_Object *__create_eo_window(callui_window_h win_handler) { - Evas_Object *eo = elm_win_add(NULL, PACKAGE, ELM_WIN_NOTIFICATION); + Evas_Object *eo = elm_win_add(NULL, CALLUI_PACKAGE, ELM_WIN_NOTIFICATION); CALLUI_RETURN_NULL_IF_FAIL(eo); elm_win_aux_hint_add(eo, "wm.policy.win.user.geometry", "1"); diff --git a/src/callui.c b/src/callui.c index 52dfb89..2afe218 100755 --- a/src/callui.c +++ b/src/callui.c @@ -30,7 +30,13 @@ #include "callui-sound-manager.h" #include "callui-state-provider.h" -#define EARSET_KEY_LONG_PRESS_TIMEOUT 1.0 +#define CALLUI_KEY_BACK "XF86Back" +#define CALLUI_KEY_MEDIA "XF86AudioMedia" +#define CALLUI_KEY_HOME "XF86Home" +#define CALLUI_KEY_VOLUMEUP "XF86AudioRaiseVolume" +#define CALLUI_KEY_VOLUMEDOWN "XF86AudioLowerVolume" + +#define CALLUI_EARSET_KEY_LONG_PRESS_TIMEOUT 1.0 static bool __app_create(void *data); static void __app_terminate(void *data); @@ -126,7 +132,7 @@ static void __process_incoming_call(callui_app_data_t *ad) callui_view_type_e type = CALLUI_VIEW_INCOMING_CALL; callui_view_type_e cur_type = _callui_vm_get_cur_view_type(ad->view_manager); - if (_callui_common_get_idle_lock_type() == LOCK_TYPE_UNLOCK && + if (_callui_common_get_idle_lock_type() == CALLUI_LOCK_TYPE_UNLOCK && active == NULL && held == NULL && incom != NULL && @@ -264,16 +270,16 @@ static void __set_text_classes_params() static void __init_app_event_handlers(callui_app_data_t *ad) { - app_event_type_e events[APP_HANDLERS_COUNT] = { + app_event_type_e events[CALLUI_APP_HANDLERS_COUNT] = { APP_EVENT_LANGUAGE_CHANGED }; - app_event_cb cbs[APP_HANDLERS_COUNT] = { + app_event_cb cbs[CALLUI_APP_HANDLERS_COUNT] = { __app_lang_changed_cb }; int i = 0; - for (; i < APP_HANDLERS_COUNT; ++i) { + for (; i < CALLUI_APP_HANDLERS_COUNT; ++i) { int res = ui_app_add_event_handler(&ad->app_event_handlers[i], events[i], cbs[i], ad); if (res != APP_ERROR_NONE) { warn("ui_app_add_event_handler(%d) failed. res[%d]", events[i], res); @@ -305,7 +311,7 @@ static bool __app_init(callui_app_data_t *ad) __bt_init(); - elm_theme_extension_add(NULL, CALL_THEME); + elm_theme_extension_add(NULL, CALLUI_CALL_THEME_EDJ_PATH); ad->window = _callui_window_create(ad); CALLUI_RETURN_VALUE_IF_FAIL(ad->window, false); @@ -439,7 +445,7 @@ static void __app_deinit(callui_app_data_t *ad) ad->window = NULL; } - elm_theme_extension_del(NULL, CALL_THEME); + elm_theme_extension_del(NULL, CALLUI_CALL_THEME_EDJ_PATH); free(ad->end_call_data); @@ -547,20 +553,16 @@ static void __app_service(app_control_h app_control, void *data) } } else if (strcmp(operation, APP_CONTROL_OPERATION_DEFAULT) == 0) { warn("Unsupported operation type"); - } else if (strcmp(operation, APP_CONTROL_OPERATION_QP_RESUME) == 0) { + } else if (strcmp(operation, CALLUI_APP_CONTROL_OPERATION_QP_RESUME) == 0) { if (ad->view_manager && _callui_vm_get_cur_view_type(ad->view_manager) == CALLUI_VIEW_INCOMING_CALL_NOTI) { _callui_vm_change_view(ad->view_manager, CALLUI_VIEW_INCOMING_CALL); } - } else if (strcmp(operation, APP_CONTROL_OPERATION_DURING_CALL) == 0) { + } else if (strcmp(operation, CALLUI_APP_CONTROL_OPERATION_DURING_CALL) == 0) { ret = _callui_manager_answer_call(ad->call_manager, CALLUI_CALL_ANSWER_NORMAL); if (CALLUI_RESULT_OK != ret) { err("_callui_manager_answer_call() failed. ret[%d]", ret); } - } else if (strcmp(operation, APP_CONTROL_OPERATION_MESSAGE_REJECT) == 0) { - - /* TODO Implement reject with message button functionality */ - - } else if (strcmp(operation, APP_CONTROL_OPERATION_END_CALL) == 0) { + } else if (strcmp(operation, CALLUI_APP_CONTROL_OPERATION_END_CALL) == 0) { ret = _callui_manager_reject_call(ad->call_manager); if (CALLUI_RESULT_OK != ret) { err("_callui_manager_reject_call() failed. ret[%d]", ret); @@ -619,7 +621,7 @@ static Eina_Bool __hard_key_up_cb(void *data, int type, void *event) if (incom && !active && !held) { callui_view_type_e type = CALLUI_VIEW_INCOMING_CALL; callui_view_type_e cur_type = _callui_vm_get_cur_view_type(ad->view_manager); - if (_callui_common_get_idle_lock_type() == LOCK_TYPE_UNLOCK && + if (_callui_common_get_idle_lock_type() == CALLUI_LOCK_TYPE_UNLOCK && (cur_type == CALLUI_VIEW_UNDEFINED || cur_type == CALLUI_VIEW_ENDCALL)) { type = CALLUI_VIEW_INCOMING_CALL_NOTI; } @@ -657,7 +659,7 @@ static Eina_Bool __hard_key_up_cb(void *data, int type, void *event) _callui_manager_answer_call(ad->call_manager, CALLUI_CALL_ANSWER_NORMAL); - if (_callui_common_get_idle_lock_type() == LOCK_TYPE_SWIPE_LOCK) { + if (_callui_common_get_idle_lock_type() == CALLUI_LOCK_TYPE_SWIPE_LOCK) { _callui_common_unlock_swipe_lock(); } } else if (ad->second_call_popup == NULL) { @@ -719,7 +721,7 @@ static Eina_Bool __hard_key_down_cb(void *data, int type, void *event) } if (!strcmp(ev->keyname, CALLUI_KEY_MEDIA)) { - ad->earset_key_longpress_timer = ecore_timer_add(EARSET_KEY_LONG_PRESS_TIMEOUT, + ad->earset_key_longpress_timer = ecore_timer_add(CALLUI_EARSET_KEY_LONG_PRESS_TIMEOUT, __earset_key_longpress_timer_cb, ad); } else if (!strcmp(ev->keyname, CALLUI_KEY_SELECT)) { /*todo*/ -- 2.7.4