From 4d3d31b90a91d159b0e4580079489f6591997c95 Mon Sep 17 00:00:00 2001 From: Igor Olshevskyi Date: Wed, 30 Aug 2017 15:02:39 +0300 Subject: [PATCH] TizenRefApp-9220 [Call UI] Modify code according to latest GUI changes Change-Id: Ie793779db21a6614faf94f9ab7c1a2b52e1cbdfd --- call-ui/presenters/misc/CallInfoPresenter.cpp | 25 +---------------- edc/buttons.edc | 2 +- edc/call_info.edc | 26 +----------------- edc/color_classes.edc | 2 +- edc/images/w_outgoing_icon_gear_02.png | Bin 0 -> 2257 bytes edc/images/w_outgoing_icon_towatch_02.png | Bin 1826 -> 0 bytes 6 files changed, 4 insertions(+), 51 deletions(-) create mode 100644 edc/images/w_outgoing_icon_gear_02.png delete mode 100644 edc/images/w_outgoing_icon_towatch_02.png diff --git a/call-ui/presenters/misc/CallInfoPresenter.cpp b/call-ui/presenters/misc/CallInfoPresenter.cpp index b8176e8..002254f 100644 --- a/call-ui/presenters/misc/CallInfoPresenter.cpp +++ b/call-ui/presenters/misc/CallInfoPresenter.cpp @@ -46,8 +46,6 @@ namespace callui { namespace { namespace impl { constexpr EdjeSignal SIGN_CID_ENABLE {"caller_id_enable"}; constexpr EdjeSignal SIGN_CID_DISABLE {"caller_id_disable"}; constexpr EdjeSignal SIGN_EMERGENCY {"emergency"}; - constexpr EdjeSignal SIGN_EMERGENCY_BIG_TXT {"big_txt_emergency"}; - constexpr EdjeSignal SIGN_BIG_TXT {"big_txt"}; constexpr EdjeSignal SIGN_CENTRE_1LINE {"centre_1line"}; constexpr EdjeSignal SIGN_CENTRE_2LINE {"centre_2line"}; constexpr EdjeSignal SIGN_INCOMING {"incoming"}; @@ -548,29 +546,8 @@ namespace callui { m_widget->emit(impl::SIGN_CENTRE_2LINE, impl::SRC_TOP_PAD); } return; - } else if (m_mode == CallMode::END) { - if (info->isEmergency() - || info->getContactInfo() - || (info->getConferenceMemberCount() > 1)) { - // Font size and color - if (info->isEmergency()) { - m_widget->emit(impl::SIGN_EMERGENCY_BIG_TXT, - impl::SRC_TXT_1LINE); - } else { - m_widget->emit(impl::SIGN_BIG_TXT, impl::SRC_TXT_1LINE); - } - // Info text top padding - if (impl::getTextWidth(*m_widget, - impl::CU_BIG_FONT_STYLE, - impl::CU_BIG_FONT_SIZE, - text) <= impl::SUB_TXT_WIDTH) { - m_widget->emit(impl::SIGN_CENTRE_1LINE, impl::SRC_TOP_PAD); - } else { - m_widget->emit(impl::SIGN_CENTRE_2LINE, impl::SRC_TOP_PAD); - } - return; - } } + // Font size and color if (info->isEmergency()) { m_widget->emit(impl::SIGN_EMERGENCY, impl::SRC_TXT_1LINE); diff --git a/edc/buttons.edc b/edc/buttons.edc index 8b1ef39..5f92973 100644 --- a/edc/buttons.edc +++ b/edc/buttons.edc @@ -1281,7 +1281,7 @@ CU_BTN_VOLUME_CONTROL("callui/plus", "b_slider_icon_plus.png") CU_BTN_ACCESSORY("callui/volume", "w_outgoing_icon_volume_02.png") CU_BTN_ACCESSORY("callui/mute", "w_outgoing_icon_mute_02.png") -CU_BTN_ACCESSORY_TOGGLE_ICON("callui/bluetooth", "w_outgoing_icon_towatch_02.png", +CU_BTN_ACCESSORY_TOGGLE_ICON("callui/bluetooth", "w_outgoing_icon_gear_02.png", "w_outgoing_icon_headset_02.png") CU_BTN_ACCESSORY("callui/add_contact", "w_outgoing_icon_contact_add_02.png") diff --git a/edc/call_info.edc b/edc/call_info.edc index f6b7e39..9ff3dab 100644 --- a/edc/call_info.edc +++ b/edc/call_info.edc @@ -29,7 +29,7 @@ styles { } style { name: "main_text_emergency"; - base: "font=Tizen font_weight=Regular font_width=Condensed font_size=24 align=center valign=center color=#FF870F ellipsis=1.0"; + base: "font=Tizen font_weight=Regular font_width=Condensed font_size=24 align=center valign=center color=#FF4E47 ellipsis=1.0"; } style { name: "main_text_big"; @@ -39,10 +39,6 @@ styles { name: "main_text_big_photo"; base: "font=Tizen font_weight=Regular font_width=Condensed font_size=40 align=center valign=center color=#FFFFFF wrap=mixed ellipsis=1.0"; } - style { - name: "main_text_big_emergency"; - base: "font=Tizen font_weight=Regular font_width=Condensed font_size=40 align=center valign=center color=#FF870F wrap=mixed ellipsis=1.0"; - } } @@ -251,10 +247,6 @@ group { "elm/layout/callui/call_info"; inherit: "default"; text.style: "main_text_big_photo"; } - desc { "big_emergency"; - inherit: "default"; - text.style: "main_text_big_emergency"; - } } rect { "ao_text_1line"; mouse; @@ -501,22 +493,6 @@ group { "elm/layout/callui/call_info"; set_state(PART:"text_info", "default", 0.0); } } - program { - signal: "big_txt"; - source: "text_1line"; - script { - set_state(PART:"text_1line", "big", 0.0); - set_state(PART:"text_info", "default", 0.0); - } - } - program { - signal: "big_txt_emergency"; - source: "text_1line"; - script { - set_state(PART:"text_1line", "big_emergency", 0.0); - set_state(PART:"text_info", "default", 0.0); - } - } program { signal: "default"; source: "text_2line"; diff --git a/edc/color_classes.edc b/edc/color_classes.edc index 308a4de..1f65902 100644 --- a/edc/color_classes.edc +++ b/edc/color_classes.edc @@ -108,7 +108,7 @@ color_classes { color: 255 255 255 255; } color_class { name: "AO012"; - color: 0 149 255 255; + color: 77 207 255 255; } color_class { name: "AO012D"; color: 255 255 255 77; diff --git a/edc/images/w_outgoing_icon_gear_02.png b/edc/images/w_outgoing_icon_gear_02.png new file mode 100644 index 0000000000000000000000000000000000000000..ae4cbbc745214a4cddc6b4e54aea113e07bbc6f5 GIT binary patch literal 2257 zcmaJ@X;c&E8b%aCSw!%vpe%6|6f}E6GLhv#!lniRS)xTHnVCRIDp6`5wTFVJ{$>!6Wlz z93);Glp#kpW`smQ8Ho@G13un(&onkhAVHJ@e3~Rls$i#i0q=R)*xn!}0r>YS%0w^V zgHwE7D4v7L5j=zFL4YU}3Z4lPDGU~k%2{O!gk zwG|QRGK3V4D9~g%gw;c|YzBN8uoz~8 z0+7j~Lo|X&$PyChOuCRDfIyHygFQqv0UZ>G=->>`r||w1T7X{w*Uy7XWl<>pOprk% zgB&iM!=cj{EGBaX8!S~Q1yTr^u`R}IPh)-m70c$x5rGnwN1$lZOc#X4qe@f}kIL{I z&ikt4S4NAaFq*1xGnDB=)LcX^PC?)RIV!=w&of*62_NVn=mC3xWCF~BLuzc!;J&^mlT5!GexiVjecQ0etTf*scP_QR@~Zz zgoKtaVC$o}7F*r^ey$9d(AMW{VV%=x@|IsX7vb*qGs{dfC)FX$K2_%utL0>k4$-zs zy6dB_&r5z~8gGpAwTL%~)EeE9>0gK_iZDR_oEhy4@T5qep1*%Om?;MwX^I z{yr;iAgaQ7*6fwQgYrr>7;9R6{&+B>4!2D`eBJu-{LsbvkYCTZMD1}hU8Acp5?T$X z=ZNRF<#e0KJT=#pi$ZZJyI&hm9cc@6+|g8D>|~a*%hz7Ryl||%KEW@pVaUdQYe9Qn zSdy*&m*xEI!UrcR_1`>E*-T!Tu+uwTzBSfB*`)j%Gb^}7(lHKhqi^n@I<%0|RINOjj>afd) zq~(F={mm!3Ym=_5svXTzFL?ei{m-Xfk8GW4*CP?O`MH961L z3rU$1;#-GuLQSlr^gG+MJ+T(=a-Z$^&#_$o*UO%NxBAvOBsE!eckp3Z|CYB|xi)zL zDFO2dUx)kmsitDW^%Y^}ovTV#ZF<#ps=3D29Ef^>=0Abq$jv@i6L-;>m)?lODi(5U zy4GnISM;l@yR!OCvJ*9mP2CI05^<5|9`}hVw$mX_?~)jrkJZjQOSfz)3RxYY!+E&^ zu7P*69#eXLYvxp`$E%>B0(R+0&FPLI|g86`hbL!_wKO0n?1S9ScPjJ zjPXy9jIa64>&w+j4#z#p%Sh)}XIJWVU(K6ScM8o6s`*mobuhfht=~5JjpTgi$?k7{ z7x&p7ABuan)ahpH&iwOtOmV`lvMZU9;z@1mqRj=dM_v=g$}=7Xo?7@wzNM`COOr<> zVyHqKvg$ zs)3(kR>HmMcICQpH1@Log{Df~m`5AYu&ZPX1{GfUOjWlqIj>Z`sIyux&0cNebLp1P}j=n0HXGW;;)`V zN6vD|FRPxOjy1ozqP2BiSID{-b8}px8}ht)4t=uTsKfly`8r~6R78=AS7sJ6XN7vc fZhON!6FZ~q$)(5FACEa|_{j+N58-P3V%7f#BS53K literal 0 HcmV?d00001 diff --git a/edc/images/w_outgoing_icon_towatch_02.png b/edc/images/w_outgoing_icon_towatch_02.png deleted file mode 100644 index 36bc29a3e83d5abad1893828d3205c2821f42d39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1826 zcmV+-2i^FIP)`{Q0}V9LKm!dl(7<^@DpHxG9|ITGprQ>}Z)U%(7vWNY zWZwb24VYY`s#_)f$;`UzLAa?vUGE=;tOLh@zXAt=;mE83X4cEXO$AwZ3GmwZ*$?~& zcswSd!_1n@tliA!o7u%?HaR9|3GfBrFTg-d48R8@HILgpEa_fg9dH=y|Vr zh`kDUb<}%-PVMu+9cK2Zq*Sz(Ya#mzN#B>`xpKFp%Op)1K|V>k zP|_+%&*XF*ll1O!&FAxBxz-i?B68K zlT_=u@D&ZBtap#3*0Cl$L(<-yWf#_{bE>3?QGZxcf9O6d>5F4Ywn@^5a@Jj2qt3aK zc1rq2Y!#DqAftc3q1(^B3&z62@5f{w3c>I=h7J@4`GTQc?iW_DnRc3m+ccL9BpzHDZF8L|%siJQ#qks)+E z77%1pS%Cc-8Z=V^m-9)%@FRA^pR1>PLcGuq-&}qdbzvr^y;wJ-B)I0 z+uXfW6zQ`;xKGlidQ7aluXOj*IZ^}e{*t?QyL*qj_vhaCxci2X-|X%Si#nzE0E;3N zd`%t5UJY!?B@q4v>;j&RG}1I+UZjI&N0{3R-0ALD0yjilU5JG@XO{J@qFlZp`$~8J zUCwe(y88-uZ?4e(jqd(H?CCrf7e)Ar4B;M0A1sjYow>pP!rf<&ATz<;H&sjcTs*Da zk&!6-)vMxjQ!Ck7z_po#UpKHmrS$hI#9OM(=9~**0olW9Ik39cI5_rVd+2xIdnu*8 zBTQ0L1Q{O=zu-(17|f3slhcYk))V0x0-OY{H?y5JSa@3GxSGRads0frMv!R@|GFBI=~&A^mcAx*%Elv1H7-m>@ftqNJoE#+8PQqwTO104(|>B~3-Y)mQbAA#%?1}_2T$D`9j9a^WpWd znL)2|_anJ)>4Q~nhc!7@bE~_*yj}st3Q4P@zDUwNxdhyBj9I&**jB{Bg`d(nE8ib`_&{VZ?=!RKB(+7*J~c{foWQ3d1=ML~ zN5Wb+GkC}RNnk0kG1tu*;6$7QB?j-Br{>!H0JtrsbhO@SpXHJc#WGbS=AV}IX-Uf@ z&CGgYk$1ja(u&OTyu{rviF(Q1*T(X!26Fe$yZgkteTOTM-ogLg0``YRvwvqO_nUwh z%&epAK%|sB=Qhp)?f~A-;Pq-AoxmUCB!8-|jz14K&a|0}V9L!1%;}0oXzy85o0l QxBvhE07*qoM6N<$g245BmjD0& -- 2.34.1