From e6b9374abc4d18c60e3deb301e4fcf7425f8b2b6 Mon Sep 17 00:00:00 2001 From: Igor Olshevskyi Date: Mon, 26 Sep 2016 12:46:39 +0300 Subject: [PATCH] TizenRefApp-7286 [Call UI] Refactor edc file names Change-Id: Ia17f42601453a92e6e9c3f7800365a497a88dffc --- CMake/CMakeLists.txt | 16 +- ...iew-button-layout.edc => callui-action-bar.edc} | 0 ...{edc_image_macro.edc => callui-image-macro.edc} | 0 ..._view_end_call.edc => callui-view-end-call.edc} | 0 ...tive.edc => callui-view-incoming-call-noti.edc} | 0 ...ming-lock.edc => callui-view-incoming-call.edc} | 246 --------------------- ...erence.edc => callui-view-multi-call-split.edc} | 0 ...creen.edc => callui-view-touch-lock-screen.edc} | 0 res/edje/call.edc | 14 +- 9 files changed, 15 insertions(+), 261 deletions(-) rename edje_src/edc/call_edc/{callui-view-button-layout.edc => callui-action-bar.edc} (100%) rename edje_src/edc/call_edc/{edc_image_macro.edc => callui-image-macro.edc} (100%) rename edje_src/edc/call_edc/{callui_view_end_call.edc => callui-view-end-call.edc} (100%) rename edje_src/edc/call_edc/{callui_view_incoming_active.edc => callui-view-incoming-call-noti.edc} (100%) rename edje_src/edc/call_edc/{callui-view-incoming-lock.edc => callui-view-incoming-call.edc} (70%) rename edje_src/edc/call_edc/{callui-view-one-hold-in-conference.edc => callui-view-multi-call-split.edc} (100%) rename edje_src/edc/call_edc/{callui-view-lock-screen.edc => callui-view-touch-lock-screen.edc} (100%) diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt index 9877094..7b4023d 100755 --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt @@ -77,18 +77,18 @@ ADD_CUSTOM_COMMAND( ${EDC_SRC_DIR}/callui-color-classes.edc ${EDC_SRC_DIR}/callui-parts.edc ${EDC_SRC_DIR}/callui-common-utils.edc - ${EDC_SRC_DIR}/call_edc/edc_image_macro.edc - ${EDC_SRC_DIR}/call_edc/callui-view-button-layout.edc + ${EDC_SRC_DIR}/call_edc/callui-image-macro.edc + ${EDC_SRC_DIR}/call_edc/callui-action-bar.edc + ${EDC_SRC_DIR}/call_edc/callui-keypad.edc ${EDC_SRC_DIR}/call_edc/callui-view-caller-info.edc - ${EDC_SRC_DIR}/call_edc/callui-view-incoming-lock.edc + ${EDC_SRC_DIR}/call_edc/callui-view-incoming-call.edc ${EDC_SRC_DIR}/call_edc/callui-view-multi-call-list.edc - ${EDC_SRC_DIR}/call_edc/callui-keypad.edc ${EDC_SRC_DIR}/call_edc/callui-view-main-layout.edc - ${EDC_SRC_DIR}/call_edc/callui_view_end_call.edc - ${EDC_SRC_DIR}/call_edc/callui-view-lock-screen.edc + ${EDC_SRC_DIR}/call_edc/callui-view-end-call.edc + ${EDC_SRC_DIR}/call_edc/callui-view-touch-lock-screen.edc ${EDC_SRC_DIR}/call_edc/callui-view-quick-pannel.edc - ${EDC_SRC_DIR}/call_edc/callui_view_incoming_active.edc - ${EDC_SRC_DIR}/call_edc/callui-view-one-hold-in-conference.edc + ${EDC_SRC_DIR}/call_edc/callui-view-incoming-call-noti.edc + ${EDC_SRC_DIR}/call_edc/callui-view-multi-call-split.edc ${EDC_SRC_DIR}/call_edc/callui-view-elements.edc ) diff --git a/edje_src/edc/call_edc/callui-view-button-layout.edc b/edje_src/edc/call_edc/callui-action-bar.edc similarity index 100% rename from edje_src/edc/call_edc/callui-view-button-layout.edc rename to edje_src/edc/call_edc/callui-action-bar.edc diff --git a/edje_src/edc/call_edc/edc_image_macro.edc b/edje_src/edc/call_edc/callui-image-macro.edc similarity index 100% rename from edje_src/edc/call_edc/edc_image_macro.edc rename to edje_src/edc/call_edc/callui-image-macro.edc diff --git a/edje_src/edc/call_edc/callui_view_end_call.edc b/edje_src/edc/call_edc/callui-view-end-call.edc similarity index 100% rename from edje_src/edc/call_edc/callui_view_end_call.edc rename to edje_src/edc/call_edc/callui-view-end-call.edc diff --git a/edje_src/edc/call_edc/callui_view_incoming_active.edc b/edje_src/edc/call_edc/callui-view-incoming-call-noti.edc similarity index 100% rename from edje_src/edc/call_edc/callui_view_incoming_active.edc rename to edje_src/edc/call_edc/callui-view-incoming-call-noti.edc diff --git a/edje_src/edc/call_edc/callui-view-incoming-lock.edc b/edje_src/edc/call_edc/callui-view-incoming-call.edc similarity index 70% rename from edje_src/edc/call_edc/callui-view-incoming-lock.edc rename to edje_src/edc/call_edc/callui-view-incoming-call.edc index d07fc96..9cfd669 100644 --- a/edje_src/edc/call_edc/callui-view-incoming-lock.edc +++ b/edje_src/edc/call_edc/callui-view-incoming-call.edc @@ -118,24 +118,6 @@ styles { } \ } \ -#define CREATE_INNER_CIRCLE_SIMPLE_IMAGE_R(part_name, lpos, tpos, rpos, bpos, icon_name, color_code) \ - part { name: part_name; \ - type: IMAGE; \ - mouse_events: 0; \ - repeat_events: 1; \ - scale: 1; \ - description { state: "default" 0.0; \ - rel1 { relative: lpos tpos; } \ - rel2 { relative: rpos bpos; } \ - image.normal: IMG_SRC_DIR/icon_name; \ - color_class: color_code; \ - } \ - description { state: "hide" 0.0; \ - inherit: "default" 0.0; \ - visible: 0; \ - } \ - } \ - #define CREATE_INNER_CIRCLE(part_name, lpos, tpos, rpos, bpos, icon_name, color_code) \ part { name: part_name; \ type: IMAGE; \ @@ -150,26 +132,6 @@ styles { color_class: color_code; \ aspect_preference: SOURCE; \ } \ - description { state: "dim" 0.0; \ - inherit: "default" 0.0; \ - color_class: color_code; \ - color: COLOR_OPACITY_80; \ - } \ - description { state: "dim" 0.1; \ - inherit: "default" 0.0; \ - color_class: color_code; \ - color: COLOR_OPACITY_60; \ - } \ - description { state: "dim" 0.2; \ - inherit: "default" 0.0; \ - color_class: color_code; \ - color: COLOR_OPACITY_40; \ - } \ - description { state: "hide" 0.0; \ - inherit: "default" 0.0; \ - color_class: color_code; \ - color: COLOR_OPACITY_40; \ - } \ description { state: "pressed" 0.0; \ inherit: "default" 0.0; \ color_class: color_code"P"; \ @@ -201,75 +163,6 @@ styles { } \ } -#define CREATE_ICON(part_name, lpos, tpos, rpos, bpos, normal_icon_name, dim_icon_name) \ - part { name: part_name; \ - type: IMAGE; \ - mouse_events: 1; \ - repeat_events: 1; \ - scale: 1; \ - description { state: "default" 0.0; \ - rel1 { relative: lpos tpos; } \ - rel2 { relative: rpos bpos; } \ - image.normal: IMG_SRC_DIR/normal_icon_name; \ - color: COLOR_OPACITY_100; \ - } \ - description { state: "dim" 0.0; \ - inherit: "default" 0.0; \ - image { \ - normal: IMG_SRC_DIR/dim_icon_name; \ - } \ - } \ - } - -#define CREATE_ARROW_ICON(part_name, lpos, tpos, rpos, bpos, shift_value, icon_name, color_code, opacity_1, opacity_2, opacity_3, opacity_4, opacity_5) \ - part { name: part_name; \ - type: IMAGE; \ - mouse_events: 1; \ - repeat_events: 1; \ - scale: 1; \ - description { state: "default" 0.0; \ - rel1 { relative: lpos tpos; } \ - rel2 { relative: rpos bpos; } \ - image.normal: icon_name; \ - color_class: color_code; \ - color: opacity_1; \ - visible: 1; \ - } \ - description { state: "init" 0.0; \ - inherit: "default" 0.0; \ - rel1 { relative: lpos+shift_value tpos; } \ - rel2 { relative: rpos+shift_value bpos; } \ - } \ - description { state: "flicker" 0.0; \ - inherit: "default" 0.0; \ - color: opacity_2; \ - } \ - description { state: "flicker" 0.1; \ - inherit: "default" 0.0; \ - color: opacity_3; \ - } \ - description { state: "flicker" 0.2; \ - inherit: "default" 0.0; \ - color: opacity_4; \ - } \ - description { state: "flicker" 0.3; \ - inherit: "default" 0.0; \ - color: opacity_5; \ - } \ - description { state: "hide" 0.0; \ - inherit: "default" 0.0; \ - visible: 0; \ - } \ - } - -#define CREATE_PROGRAM(prog_name, signal_name, source_name, state_name, target_name) \ - program { name: prog_name; \ - signal: signal_name; \ - source: source_name; \ - action: STATE_SET state_name 0.0; \ - target: target_name; \ - } - #define CREATE_PROGRAM_IN_TRANSITION(prog_name, signal_name, source_name, state_name, state_ver, target_name) \ program { name: prog_name; \ signal: signal_name; \ @@ -279,144 +172,6 @@ styles { transition: LINEAR 0.2; \ } -#define CREATE_ARROW_ANIMATION(prog_1, prog_2, prog_3, prog_4, prog_5, target_1, target_2, target_3, target_4, signal_name, source_name) \ - program { name: prog_1; \ - signal: signal_name; \ - source: source_name; \ - action: STATE_SET "default" 0.0; \ - target: target_1; \ - target: target_2; \ - target: target_3; \ - target: target_4; \ - transition: LINEAR 0.5; \ - after: prog_2; \ - } \ - program { name: prog_2; \ - signal: signal_name; \ - source: source_name; \ - action: STATE_SET "flicker" 0.0; \ - target: target_1; \ - target: target_2; \ - target: target_3; \ - target: target_4; \ - transition: LINEAR 0.3; \ - after: prog_3; \ - } \ - program { name: prog_3; \ - signal: signal_name; \ - source: source_name; \ - action: STATE_SET "flicker" 0.1; \ - target: target_1; \ - target: target_2; \ - target: target_3; \ - target: target_4; \ - transition: LINEAR 0.3; \ - after: prog_4; \ - } \ - program { name: prog_4; \ - signal: signal_name; \ - source: source_name; \ - action: STATE_SET "flicker" 0.2; \ - target: target_1; \ - target: target_2; \ - target: target_3; \ - target: target_4; \ - transition: LINEAR 0.3; \ - after: prog_5; \ - } \ - program { name: prog_5; \ - signal: signal_name; \ - source: source_name; \ - action: STATE_SET "flicker" 0.3; \ - target: target_1; \ - target: target_2; \ - target: target_3; \ - target: target_4; \ - transition: LINEAR 0.3; \ - after: prog_1; \ - } - -#define CREATE_EASY_ARROW_ANIMATION(prog_1, prog_2, prog_3, prog_4, prog_5, target_1, target_2, target_3, target_4, target_5, signal_name, source_name) \ - program { name: prog_1; \ - signal: signal_name; \ - source: source_name; \ - action: STATE_SET "default" 0.0; \ - target: target_1; \ - target: target_2; \ - target: target_3; \ - target: target_4; \ - target: target_5; \ - transition: LINEAR 0.5; \ - after: prog_2; \ - } \ - program { name: prog_2; \ - signal: signal_name; \ - source: source_name; \ - action: STATE_SET "flicker" 0.0; \ - target: target_1; \ - target: target_2; \ - target: target_3; \ - target: target_4; \ - target: target_5; \ - transition: LINEAR 0.3; \ - after: prog_3; \ - } \ - program { name: prog_3; \ - signal: signal_name; \ - source: source_name; \ - action: STATE_SET "flicker" 0.1; \ - target: target_1; \ - target: target_2; \ - target: target_3; \ - target: target_4; \ - target: target_5; \ - transition: LINEAR 0.3; \ - after: prog_4; \ - } \ - program { name: prog_4; \ - signal: signal_name; \ - source: source_name; \ - action: STATE_SET "flicker" 0.2; \ - target: target_1; \ - target: target_2; \ - target: target_3; \ - target: target_4; \ - target: target_5; \ - transition: LINEAR 0.3; \ - after: prog_5; \ - } \ - program { name: prog_5; \ - signal: signal_name; \ - source: source_name; \ - action: STATE_SET "flicker" 0.3; \ - target: target_1; \ - target: target_2; \ - target: target_3; \ - target: target_4; \ - target: target_5; \ - transition: LINEAR 0.3; \ - after: prog_1; \ - } - -#define CREATE_PROGRAM_EXPAND_ANIMATION(prog_name, target_name) \ - program { name: prog_name; \ - signal: "outer_circle,expand"; \ - source: "outer-circle"; \ - action: STATE_SET "bright" 0.0; \ - transition: LINEAR 0.5; \ - target: target_name; \ - } - -#define CREATE_PROGRAM_CONTRACT_ANIMATION(prog_name, target_name, after_prog_name) \ - program { name: prog_name; \ - signal: "outer_circle,contract"; \ - source: "outer-circle"; \ - action: STATE_SET "default" 0.0; \ - transition: LINEAR 0.5; \ - target: target_name; \ - after: after_prog_name; \ - } - group { name: "lock_accept"; images { image: IMG_SRC_DIR/"call_button_bg_line_accept_reject.png" COMP; @@ -478,7 +233,6 @@ group { } } - group { name: "lock_reject_with_msg"; images { image: IMG_SRC_DIR/"call_inline_btn_open.png" COMP; diff --git a/edje_src/edc/call_edc/callui-view-one-hold-in-conference.edc b/edje_src/edc/call_edc/callui-view-multi-call-split.edc similarity index 100% rename from edje_src/edc/call_edc/callui-view-one-hold-in-conference.edc rename to edje_src/edc/call_edc/callui-view-multi-call-split.edc diff --git a/edje_src/edc/call_edc/callui-view-lock-screen.edc b/edje_src/edc/call_edc/callui-view-touch-lock-screen.edc similarity index 100% rename from edje_src/edc/call_edc/callui-view-lock-screen.edc rename to edje_src/edc/call_edc/callui-view-touch-lock-screen.edc diff --git a/res/edje/call.edc b/res/edje/call.edc index 393592d..df4edc4 100644 --- a/res/edje/call.edc +++ b/res/edje/call.edc @@ -21,7 +21,7 @@ #include "../../edje_src/edc/callui-parts.edc" #include "../../edje_src/edc/callui-common-utils.edc" -#include "../../edje_src/edc/call_edc/edc_image_macro.edc" +#include "../../edje_src/edc/call_edc/callui-image-macro.edc" #define IMG_SRC_DIR "call_edc" @@ -36,16 +36,16 @@ collections { } } - #include "../../edje_src/edc/call_edc/callui_view_end_call.edc" - #include "../../edje_src/edc/call_edc/callui-view-button-layout.edc" - #include "../../edje_src/edc/call_edc/callui-view-incoming-lock.edc" + #include "../../edje_src/edc/call_edc/callui-view-end-call.edc" + #include "../../edje_src/edc/call_edc/callui-action-bar.edc" + #include "../../edje_src/edc/call_edc/callui-view-incoming-call.edc" #include "../../edje_src/edc/call_edc/callui-keypad.edc" #include "../../edje_src/edc/call_edc/callui-view-caller-info.edc" #include "../../edje_src/edc/call_edc/callui-view-main-layout.edc" #include "../../edje_src/edc/call_edc/callui-view-multi-call-list.edc" - #include "../../edje_src/edc/call_edc/callui-view-lock-screen.edc" + #include "../../edje_src/edc/call_edc/callui-view-touch-lock-screen.edc" #include "../../edje_src/edc/call_edc/callui-view-quick-pannel.edc" - #include "../../edje_src/edc/call_edc/callui_view_incoming_active.edc" - #include "../../edje_src/edc/call_edc/callui-view-one-hold-in-conference.edc" + #include "../../edje_src/edc/call_edc/callui-view-incoming-call-noti.edc" + #include "../../edje_src/edc/call_edc/callui-view-multi-call-split.edc" #include "../../edje_src/edc/call_edc/callui-view-elements.edc" } -- 2.7.4