From 7f30e9d874b5a468186d821166cb9e5b319a63ac Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 28 May 2021 10:36:26 +0200 Subject: [PATCH] Forward message UI improvements --- .../chat/adapters/ChatRoomsListAdapter.kt | 9 ++ .../chat/fragments/DetailChatRoomFragment.kt | 2 +- .../chat/fragments/MasterChatRoomsFragment.kt | 16 +- ...efault.png => forward_message_default.png} | Bin .../res/drawable-xhdpi/menu_add_contact.png | Bin 0 -> 12078 bytes app/src/main/res/drawable/cancel.xml | 9 ++ app/src/main/res/drawable/cancel_edit.xml | 15 -- app/src/main/res/drawable/cancel_shape.xml | 35 +++++ .../main/res/layout-land/about_fragment.xml | 2 +- .../main/res/layout-land/dialer_fragment.xml | 4 +- .../layout-land/history_detail_fragment.xml | 2 +- .../layout-sw533dp-land/dialer_fragment.xml | 4 +- .../history_detail_fragment.xml | 2 +- .../layout-sw533dp-land/settings_fragment.xml | 2 +- .../chat_room_master_fragment.xml | 139 +++++++++++------- .../contact_master_fragment.xml | 4 +- .../res/layout-sw533dp/dialer_fragment.xml | 4 +- .../history_master_fragment.xml | 4 +- .../res/layout-sw533dp/settings_fragment.xml | 2 +- app/src/main/res/layout/about_fragment.xml | 2 +- .../res/layout/assistant_top_bar_fragment.xml | 2 +- .../res/layout/call_incoming_activity.xml | 2 +- .../res/layout/call_outgoing_activity.xml | 2 +- .../main/res/layout/chat_bubble_activity.xml | 2 +- .../layout/chat_room_creation_fragment.xml | 2 +- .../res/layout/chat_room_detail_fragment.xml | 4 +- .../res/layout/chat_room_devices_fragment.xml | 2 +- .../layout/chat_room_ephemeral_fragment.xml | 2 +- .../layout/chat_room_group_info_fragment.xml | 2 +- .../res/layout/chat_room_imdn_fragment.xml | 2 +- .../main/res/layout/chat_room_list_cell.xml | 17 ++- .../res/layout/chat_room_master_fragment.xml | 139 +++++++++++------- .../res/layout/contact_detail_fragment.xml | 2 +- .../res/layout/contact_editor_fragment.xml | 8 +- .../res/layout/contact_master_fragment.xml | 4 +- app/src/main/res/layout/dialer_fragment.xml | 2 +- .../layout/file_config_viewer_fragment.xml | 2 +- .../layout/file_viewer_top_bar_fragment.xml | 2 +- .../res/layout/history_detail_fragment.xml | 2 +- .../res/layout/history_master_fragment.xml | 4 +- .../res/layout/list_edit_top_bar_fragment.xml | 6 +- .../main/res/layout/recordings_fragment.xml | 4 +- .../res/layout/settings_account_fragment.xml | 2 +- .../res/layout/settings_advanced_fragment.xml | 2 +- .../res/layout/settings_audio_fragment.xml | 2 +- .../res/layout/settings_call_fragment.xml | 2 +- .../res/layout/settings_chat_fragment.xml | 2 +- .../res/layout/settings_contacts_fragment.xml | 2 +- app/src/main/res/layout/settings_fragment.xml | 2 +- .../res/layout/settings_network_fragment.xml | 2 +- .../res/layout/settings_tunnel_fragment.xml | 2 +- .../res/layout/settings_video_fragment.xml | 2 +- app/src/main/res/menu/chat_message_menu.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 6 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/dimen.xml | 1 + app/src/main/res/values/strings.xml | 6 +- 60 files changed, 314 insertions(+), 200 deletions(-) rename app/src/main/res/drawable-xhdpi/{forward_message_dialog_default.png => forward_message_default.png} (100%) create mode 100644 app/src/main/res/drawable-xhdpi/menu_add_contact.png create mode 100644 app/src/main/res/drawable/cancel.xml delete mode 100644 app/src/main/res/drawable/cancel_edit.xml create mode 100644 app/src/main/res/drawable/cancel_shape.xml diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt index d270314ca..78d7e4d49 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt @@ -42,6 +42,8 @@ class ChatRoomsListAdapter( MutableLiveData>() } + private var isForwardPending = false + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val binding: ChatRoomListCellBinding = DataBindingUtil.inflate( LayoutInflater.from(parent.context), @@ -54,6 +56,11 @@ class ChatRoomsListAdapter( (holder as ViewHolder).bind(getItem(position)) } + fun forwardPending(pending: Boolean) { + isForwardPending = pending + notifyDataSetChanged() + } + inner class ViewHolder( private val binding: ChatRoomListCellBinding ) : RecyclerView.ViewHolder(binding.root) { @@ -70,6 +77,8 @@ class ChatRoomsListAdapter( position = adapterPosition }) + forwardPending = isForwardPending + setClickListener { if (selectionViewModel.isEditionEnabled.value == true) { selectionViewModel.onToggleSelect(adapterPosition) diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt index 56f91a5a7..4f84859ef 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt @@ -462,7 +462,7 @@ class DetailChatRoomFragment : MasterFragmentXs9deqwmtc zFMM3|x8%=RPXK^QJiySzTOaBRboX?#LpZ~M-u~`zAlwgO2LSlZ)ny`lSS384-mX(h zVxDb?n=Fr$cn1YX_S@E&*gkrMFmx8IVPUDduyNf~uesgoNWA3#Rg_j1T{^MgS^qPZ zS9ICm;QLACa>q#T_4zNNlhcgr)8@;IPA|^wk*z0AA&a-|`?9!xR+0x}Z^L$+fMOvx zc^{`QP6y>Hqr;89`qx-t)lJKH$uTuf18!#1hRf4N&8e^bgJo{h!ydnp+j4n%+!}Oq zYf`nOIdr#mxeI6TG1FR2Xx?Lc#Vzf%O0rZs7l+nI%qL>l=Vk=Bmm@l7>n^IC_rJ}lK}p!lwd@MO#(vIC z1ahA>bB?!z*2Ke(+0H_654Iz}x;55CIwITW(=Vr-zlzv#Kh&~UKp{qlioNAT+8 zb@UtW^2oKe%BGRgs*Khj!WTsNw3EL`pF&= zLcdM_tktVNWF`jb{{Uz3#nz8kE$&fL2jZI3od>yp@yKaqpFtuL~dUae3_gp+Ve*GkHq#t=pFiO+3k2iX=-{96-Z|G7?vKgR` z;CM49f926#u{d2(aF+OZxZ}Drmu$j*XAfD?Mz+fUP4f`^#pN|ek16#%uSuimfXc>{ zkHTR=?%F&3bDw&hi|fP=XWdohTVa&zsZ=?{2_KoZj(cV{>s=|~FFa-KRM$Rz7jkq% z-6VkIA?;%-FLq`u`xNP?>fZQ~-x2S@Q!;HP=IUz0k*d;Ep-1LDw>E7-3+uBd#Ffyw zXswVLWAT@>_eHvky3zv^U_O`9u4I+Fm4j35vZ0VxyP=9#Nc+9G5A3nYzV#l_x+H_| zJvxjAxL*QHHiRD^TS?96izOy*EN%dcvL!6uDNBV}$UxKANQ<}9!KwhEr*Ca=F6H> zLdd9CS#m$PixswjXeoMM^=K*h)YD8#iPOMGyl&Pq&grZ6su!Y@MmE+p4)Gn?u*_A5A_AMNI@~_Xr zJZHbNhBu_r7}MZR=uWg`94E*UyG4H=(^&2)9@t?=NZ)_mZQ4WDT2Ss77BOHY7+p)( zWvdx|sY>ssC>-DYRFkRkaky!jK!8!L7UtHT?({6_MUujzqs!6HVTEyd5?qgURVPr+ zwEDoKgLQp2ccrqqPvS{CYu8o~-HiFUCSk{2j&i+(v-d~JYZFkfsV2aiY|OiX1&3Mn z1{JpokZqFD5Z z%?mesE%x>)mZQUO33O=NnBxspm`N0$HRDLoSkLhwnsqsW!FPldy)u-yZLWK*4aTXc zz6lQHngdW@6&#LAr;n2i%K59O;KlO`}~O^0%J{?85rWgQtXpo*HGAW~4(Z zaE(>l^&;%IXzxu!o7_E0VejAT6Q)$uDu~H`ddY#&9FwgoA-8$VQUQ)8++=r;UcJNq zpk`~jVC|K$e0huZm6iKRc0b$bZn%WGCRUw3$MRL}^la6NdRU!=KX6Q^wGA4sC;Dua z?D@LQCl|Gs(?^Rf-6N*l%1|7;6J-27W&+Z$)rNt~^&PJxoz-4QY5!7`#OK1S(N$3` zvu8E$Eu`Oy7<#~tDUO=_p6^jI|HK0LshP0d*rp{*23Mj>aeQCsmK+}}+GTylJI#(m zCHPdBamHirTGxnp>&p#UZeC)u*tv)4S&MOpmjQ1?mV8^Mb%};f8HoJ3p`{H;rwZ{Y zOx4PSjJk_YeuUmdKO9UClxY)(_|6sXqC(DQ6JCm{2xBZyV=}ub@jew=GyxEMGSNwY zxlNk<%w#h5tPT}p_wXk(YONf!9CAq5VzE|-YxU@+H|SH!(cZOsDPK5aXmJoD7Hflh zW{}Evpg5-|ZN!Jhn^WC!lT^6=z}=#|C&1gtdwXGDR^Th~1UM!x-4LyHDti7zw#eAK z2KhF&4JKMXElad7pTw}9gb3kYhIZ)|iG@>$`3-&ua<1SMdu`au{-Y%xp5HvFLpaEm zAGP}>e(bHQBZr9^PGLgsHjuo`r}PO{lP0!yO{c5GyOj?N3Mr{E;zU}}f*otZ9v^Z+ z3OFZ`TP|Q3UhyQXG$mdYWivrQ5J-$O?VA?rGw^kZIXT>sGL$J56jdv86Z7gG1;PG; zg9qqg2}wP^SBnDRm_8|<{A#*yC|LQ?hup@&=i^c>CQs#lT5}6DDnXUC?vgf@RWaYu z>y+nIFnh5vnbER-)c2mUe!akD9x&W`;G=T6?e`KDym8%tnqQ|$AYDqh|!HA`_L4*=oXFw;+|U04Bridco(|;UMoQrlIFm>iueU&+}{q#Mu3M z+AoxJ1ASvgbdPnB^pvld3#fFmX;TtK`5+Ck;R2$z(s`o&m-j+d@aIr;=lqTA*7%uo z-Qv%(ZsjnOZ0(me0fzRhiruX1`231qgRM?`pOKp4oFzzFV(r`F zm>}$6`Dn(~%30OkeIAB8g1ZTzQQWC%i^H^+28eLv8h$IO+5I3omeL62IK%pJKgB3w zevaX)x8`FWZtGJDBBN;XD|>7502Q5>e*aPzGB2dg59gQIJq}ochgzT1xb}w=tHOs# zwfjItO6h4Yp5E+B-1KTGsK1Y`mh8@8nO%?+R~RmK;7ivO(j5+onE~)|3@1r`=5@WO zUr?}DA5hiddx(uc5gp&|A_jAB$_7|}5Y;RzOv+^P2`ZNXM}C7sy9rSF@<~CvFsc-Y z(`T6GHAh2QzI27`GlN$l8`}ER1qz%(rER*RFEe53jde=otg^l ztMHO3Wn`5^jKjoy7pFVlGxNnmXL)>9ZGWM)P4$EvY0f#H?-!RbJjwMp3Ea}SB}^{)<{g^D%TdVgq8an zg}vfODAiXjsc9NX+waU3*>$H31p)Peu8KJZJnCL->D$cEP9TclO=EK?5S(!jMuC}NjP2L8MsSaW83r1@V)%im~g=M z1U`y`4^;S~)EVzSJ7Tl9B=na@6-j54fr7j`?jeFOOL-3hbECkEpXKSLKYVXOcUX-y z(rbG|s&`}zC>fAy7?N`m4b^i~G+TO_Vxsans@Wd9nZk5QKh=^J*H$C>{b6o`-0HS? zVpUpRVweS~DFeB43bmG1xp`74-g5R=FtQuL%8n9S0uYNIPK|Z>_83W!+y( z7OYh2khWt*o6E8eu#&QNsV+WdKZT9!LzNGt;D-fT-Xczv1zYm*37McCq14Pfp(9TfP`=HR zpID~DO^6-09+}m4@|~t*3dMLBx_)52WU51M{ zEgF0|Z4WeO>$<+$9_#o_&Yox&#dH*%W2%gLw7oEe-vuOYRa?@&0jh&Vx0jxMOT0H> z7w`3Ya@A*eVg1*n8`I6&IVm#gbv2P8lfQgZqoVrFv&_5^;)&0baZ09rwf(6^xIM4> z6{|~X4bqa88DehEY&Ppi$uX630C!_PyoFlJtL)9)*S}+Ty;f{`}U#HWJ-zo5L4Ya@3#1&(272PkSW9HZ7oK{^C3b~ zI7Tk^CuPm&GZ=-84F0r-`J!1@>%o|Kn~9IAqF9;k%poPRbJI!gpXQ|KsdawSk~2S~ zBw)E`<-N2eo&P!-6e3VXsu`2EbRSN9qZE?Gj(wW4≫oX7kce(BV>>IW~U6+G*uLja1PF^3pI+)kL;S<3li{0PTKm#);HN~WJH?oCCVyguU1M1W!|YC0_J)lNrl zGNS<{gl?T(68K95G+JZ0UtJqz7?N z=F+BZ4YF%U^E3c?&^etq0Z0h|p+IeMh1%VZ6iCc%z$de|5sBg49LXRy-0~r79lSir zpM=Am6=~!!Jy-8uY#UhXz)%lIbA0NZnVp($ois%b!aJ+}I&0L0-w76ttv@*`@??9x zJD`-ziIGxiNEJJm#*a#8c*yQ}MZL3HNPy&_fccgx)Gc@Y*b1HOE{ba4DAF<<-W`9< ze9l2*DQq^O5Qw0}ZPd_nv*k(Fn}0zbE_cTWe=_ndfXwsF2DX7kNh!;bQCQPUQPa?> zPeG*5bNN&mQOzI3T%K^o&z&8I8CsF=TFug~6vL{X#!%&+J&aOL;eu7; zZ-kyq1TALSgX1+1g9I|eL2s1LCa(H9G{JNzHZ6+`wR}G{-`z| z)Vv(wRKy5G$-K}Le-&=bO#ShjunVt9fmoRX2h^+$FXr?t_AX&^ zoOi>CFAc?cf%pMMyW8LgciD!ZzVYK{fjjT#PvG_q5a)zI*TB=5^{f4^%j<~8xk68_ zR;IUxIzq^uzfiHKUJZ0ikEoaf2*@{iX7P7=@gF>NM(;DYOR@vE=ujv+f<=ghb+%hB=w9qyz$s_hUw1O<9^jTEiUy zZ!_M~f-yA8Pv7y&UjPx#S#ll$&hHz$9dc!R{ZB_7m80rf+<{gK0C9DOpz10oBNG?7SrS^B}hx{oA66kq^_f3n%(S5$m~QH+S)%9LDc!5*T$i#(avsY7iPX83tN;mZ`?u!@?{B`y ztKogap1#El)enQdV>ZhM05BpDN=mvKN=pAYLq?w*X9Xw8sCUcLe|&84P=$-shy2@% zd`VOCd*4bR9E#6$xodZPq~GiioYLAgu@oUSO9j|b9u||{1NV;^-(@w3JJm@#Ex+sl>rcFT)u+~ zcMzf9x}NbcW0yaqX&jUK70>qKCu`f6FKcR@oucj@i(gV?Ry^^j0|adie2ReD`G%NF zquZ|uJ6Cu=H|(5FE%klFdhw=0P^`0y8EjU(Cz9)X?sI;2km2)0&eqg3Uurvj1AWv_ zi$EXgn`moE!rWZ=ptf!{a6Ug5cl41z`siQI&m9VLf_npP;Pwbt8PGvX2MCC;l>r%x zXoI!gmEaBt^#D(}L4b}SEWimSVGELzC6xA)L<6|My`exq7iU*5Nk19TA6!ZF^Y3PU z5b%$Px04LWL|YfA&i&zOw4y5a>4(kQXh%>*eq24fW%7^h(7ZXg>J;pzizvd|-YT7yf_O@bXsiL4*A5(EnA# z%Mks`2){nu%MIxXgRA(!UAK5J%7UacSq3b|HS3_ujM;I-otu3kS21EXK zPeWM-^xM9qts4wsEBWUUW-BNl0R_W&Mc`mTUSYVnIIn~R*p}B;L_*wF6biGog$w^1 zl!mL9H`Emd{|$u(=R=@zglt5h!nR_i1ck(TZ3JL~HgLG8ga}Oh z50ouTQq|4V1&U55!Ubv%=XZCt|I_iCa7hJS4H=LiANXG_y3SB4GxThDo5`SX~fcXUfBII{kB+$<)gF!>-+vd>KiU!hmt+ZpZET>Twj#Vj za3LXHVK7*nSKQ9dju$K-E)13sg^3CO&G0|bz1-})eW9Lk1$%U)=xERd^d}l1#~&&= z|I-&=2l#KEz=8t2U=dzHaYL|#q==}bkRUf$P!bFV@&6q#|L;-#kBFuD|392a{}K4N zX#lPFR~veILC;qF|D3M==Il3({|`TZ=i>jN1vK>kjQm&p{*SKz(e+<3@Lvi4ue$z6 z*MG&peiYkUF2a9pc;K$+Rgf=wJ5!~J-+9RWd2mQp$agcxYgFbu=)iyE zWId3Sc(96iFo{P$S|hGwZa1_$4S7D3}fhIvwnk;&1LrTdls!3;H9j6p4>z%eMwTzZBgh3(+>)A@bEf5(Zn;?((ByZlKtk^;G zYvTLcmm>>JUTqe9VqDte86Zz7_iBdcn4?$iPZYeoyyjnEImZcfF4I?4Vm?k>7vE80 zdK0=E=9Il-qP(f5H(^T9`3pL-XF_y_ZC*!E61#qp(f(t6ZfyaC-hADBre zNhPz=fYR-eC7VHHacP4wA6H^g_xdog#-1xf9~ zZk=wbEX6j13`YRUrNe!=6gdYmcym)VyHe7K6_p!)K%egW0QAW}I5uFZi5d;o3`ww{|DU60sbXvre zZ509ouh-uhm5+rKJqLN>R4r1mNA=&-*bN_F=MM;d*Z-A&>| znMv6Vr5h+0Ql(=C4U8$%G2?{m7A?p7e5cnZB>q3|ay z@nuAo?$n1k{BRl>qJIGL#p;uIXy^K<3QE1%4W@UA`*hylm}!W_JxngAC0L+{glgvk z=wO?%{bmqLV*1^(Ti(uaRt-j3i&{jcm5x|$HVzF<)GfxTM)F=?u~vqlis7lRXwG9= z?5>c^Ox91kogd{li$@G5pB)T3;3$C2ltVBrzP!1?wKi2#>&r%yMEk;_pV|xKF#RO^ zahhh4Q$X^M-t?ED_qUh6_}vqiN?5PAx@x&|QOE0QJgL#76q*eLJ;59CK`mpq6G@Zz zd0YeV7+4sp=7X0XQ}(?-tKO8M@E|z|W7|JZxF^+lEUfM3 zj6nD|DP|-)=^ePby6$h=Tm16LEWWJ`J?Xq`!V1mC5tgLUdmZ%?98+M9+jR9j(&@*ap8Y9R)uLMo$Lz`MRHh_>6axD&bBN)3J}FEg?)k zo%@tYxRBsX!k8_8i59k+T6et8I2s{k2cXoy_>NC@k%?8Kev%ixAC=N9Z9*70MBl^RBY8^3nK24X}59#XjY9 z@sr~tm=qvLVA zgyDIE(L;ddfX!hlW5)Cvw`wHvtgjej)@sDObCeqUNcvzj!I2g=)O7Q0^!&yk?4*X; zQaR^rFOCm6w|GzG%U}dXqb`Rt*1j*wl^{H?`4v+QUH{az4kUPVPgGd=>)^(*=W`l= zo`m)LGO!`+v+r!Rr8~UD1yTKXUhiU3Q#3(;{k*(Z(buD_i&n?Cz~j+MwsqtGId5a# z%-dd$nzm*8>D+haQkB1+r$MQ*+YSDiiV7Ju3hprBsecY_WQ{5CdAo=!wUo2#QwUdI z&_08=A9SQ($WD8#JtF(MX(Cts_9MuX?GPbVPX{?IXl`zH3(RQ{O<1pe)wp~j?UspJ zQa$G^(E7y+nl^ufS+lb$>_j_RM(qhv@i9-RHmgC)&q(np@k5#wVf7yN`A zyB$^BejtZJ-KE#uUg;uPUPr=>u;_HZgV@h;dgKF<<92-LXuz^0thtk=<^j#+Zf! z>ElyR2g?C~tm9GbYyMWxQB*Rc+!#fQ`JXF;7bLtkFD`>*bBhtFQE`9-qe(BB(buJ@ zlTd@bC6D&|FbM9xd4uaBb01JtQUWU-DwOg<>Fy5|>$h!lp^KeH52;(>Z|VxhW!>;n zCAs{|P>lAMTQB#V8DN8bQmj4s7keFmc+hd>c}*ZkTZvA5l!XJtPH>TZKk`E}A142J z8_`h;N*0~RT#_>Sr-pZz&)*r=X+rt}a_*ycv|g*`IG8?fos6Wvk&CgYuhn@47l`rB zT@BKQpe1uP$7{P!T1U`GP!IL3=a5*MAx+I?5G_*5UsLG2SqI literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/cancel.xml b/app/src/main/res/drawable/cancel.xml new file mode 100644 index 000000000..67bd03f05 --- /dev/null +++ b/app/src/main/res/drawable/cancel.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/app/src/main/res/drawable/cancel_edit.xml b/app/src/main/res/drawable/cancel_edit.xml deleted file mode 100644 index cc01397c9..000000000 --- a/app/src/main/res/drawable/cancel_edit.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/cancel_shape.xml b/app/src/main/res/drawable/cancel_shape.xml new file mode 100644 index 000000000..fef6bb93a --- /dev/null +++ b/app/src/main/res/drawable/cancel_shape.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/about_fragment.xml b/app/src/main/res/layout-land/about_fragment.xml index 1e86c4661..ca69f55be 100644 --- a/app/src/main/res/layout-land/about_fragment.xml +++ b/app/src/main/res/layout-land/about_fragment.xml @@ -26,7 +26,7 @@ diff --git a/app/src/main/res/layout-land/dialer_fragment.xml b/app/src/main/res/layout-land/dialer_fragment.xml index b6f80f35b..d27f6e17c 100644 --- a/app/src/main/res/layout-land/dialer_fragment.xml +++ b/app/src/main/res/layout-land/dialer_fragment.xml @@ -21,7 +21,7 @@ @@ -63,7 +63,7 @@ android:id="@+id/controls" android:layout_alignParentBottom="true" android:layout_width="match_parent" - android:layout_height="60dp"> + android:layout_height="@dimen/main_activity_top_bar_size"> diff --git a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml b/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml index d5a591bc3..1e3e79a4c 100644 --- a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml +++ b/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml @@ -62,7 +62,7 @@ @@ -104,7 +104,7 @@ android:id="@+id/controls" android:layout_alignParentBottom="true" android:layout_width="match_parent" - android:layout_height="60dp"> + android:layout_height="@dimen/main_activity_top_bar_size"> diff --git a/app/src/main/res/layout-sw533dp-land/settings_fragment.xml b/app/src/main/res/layout-sw533dp-land/settings_fragment.xml index f547c8936..30c78816c 100644 --- a/app/src/main/res/layout-sw533dp-land/settings_fragment.xml +++ b/app/src/main/res/layout-sw533dp-land/settings_fragment.xml @@ -25,7 +25,7 @@ diff --git a/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml b/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml index 63bb0f46f..7d2ea0a6f 100644 --- a/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml +++ b/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml @@ -42,69 +42,94 @@ + android:orientation="vertical"> - + - + - + - + - + - + + + + + + + + + @@ -112,7 +137,7 @@ android:id="@+id/list_edit_top_bar_fragment" android:name="org.linphone.activities.main.fragments.ListTopBarFragment" android:layout_width="match_parent" - android:layout_height="60dp" + android:layout_height="@dimen/main_activity_top_bar_size" android:layout_alignTop="@id/top_bar" tools:layout="@layout/list_edit_top_bar_fragment" /> diff --git a/app/src/main/res/layout-sw533dp/contact_master_fragment.xml b/app/src/main/res/layout-sw533dp/contact_master_fragment.xml index fdfcbd0b7..8b36fd95b 100644 --- a/app/src/main/res/layout-sw533dp/contact_master_fragment.xml +++ b/app/src/main/res/layout-sw533dp/contact_master_fragment.xml @@ -39,7 +39,7 @@ @@ -124,7 +124,7 @@ android:id="@+id/list_edit_top_bar_fragment" android:name="org.linphone.activities.main.fragments.ListTopBarFragment" android:layout_width="match_parent" - android:layout_height="60dp" + android:layout_height="@dimen/main_activity_top_bar_size" android:layout_alignTop="@id/top_bar" tools:layout="@layout/list_edit_top_bar_fragment" /> diff --git a/app/src/main/res/layout-sw533dp/dialer_fragment.xml b/app/src/main/res/layout-sw533dp/dialer_fragment.xml index 3a388b4a1..102226c20 100644 --- a/app/src/main/res/layout-sw533dp/dialer_fragment.xml +++ b/app/src/main/res/layout-sw533dp/dialer_fragment.xml @@ -62,7 +62,7 @@ @@ -104,7 +104,7 @@ android:id="@+id/controls" android:layout_alignParentBottom="true" android:layout_width="match_parent" - android:layout_height="60dp"> + android:layout_height="@dimen/main_activity_top_bar_size"> @@ -110,7 +110,7 @@ android:id="@+id/list_edit_top_bar_fragment" android:name="org.linphone.activities.main.fragments.ListTopBarFragment" android:layout_width="match_parent" - android:layout_height="60dp" + android:layout_height="@dimen/main_activity_top_bar_size" android:layout_alignTop="@id/top_bar" tools:layout="@layout/list_edit_top_bar_fragment" /> diff --git a/app/src/main/res/layout-sw533dp/settings_fragment.xml b/app/src/main/res/layout-sw533dp/settings_fragment.xml index f547c8936..30c78816c 100644 --- a/app/src/main/res/layout-sw533dp/settings_fragment.xml +++ b/app/src/main/res/layout-sw533dp/settings_fragment.xml @@ -25,7 +25,7 @@ diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml index 46340435f..871b85cfe 100644 --- a/app/src/main/res/layout/about_fragment.xml +++ b/app/src/main/res/layout/about_fragment.xml @@ -26,7 +26,7 @@ diff --git a/app/src/main/res/layout/assistant_top_bar_fragment.xml b/app/src/main/res/layout/assistant_top_bar_fragment.xml index 8509d4c68..326e83e3a 100644 --- a/app/src/main/res/layout/assistant_top_bar_fragment.xml +++ b/app/src/main/res/layout/assistant_top_bar_fragment.xml @@ -11,7 +11,7 @@ diff --git a/app/src/main/res/layout/call_incoming_activity.xml b/app/src/main/res/layout/call_incoming_activity.xml index 5d799a13a..664053c96 100644 --- a/app/src/main/res/layout/call_incoming_activity.xml +++ b/app/src/main/res/layout/call_incoming_activity.xml @@ -27,7 +27,7 @@ diff --git a/app/src/main/res/layout/call_outgoing_activity.xml b/app/src/main/res/layout/call_outgoing_activity.xml index d45bebfad..7e807f974 100644 --- a/app/src/main/res/layout/call_outgoing_activity.xml +++ b/app/src/main/res/layout/call_outgoing_activity.xml @@ -30,7 +30,7 @@ diff --git a/app/src/main/res/layout/chat_bubble_activity.xml b/app/src/main/res/layout/chat_bubble_activity.xml index 50c239f25..05479e6df 100644 --- a/app/src/main/res/layout/chat_bubble_activity.xml +++ b/app/src/main/res/layout/chat_bubble_activity.xml @@ -28,7 +28,7 @@ diff --git a/app/src/main/res/layout/chat_room_creation_fragment.xml b/app/src/main/res/layout/chat_room_creation_fragment.xml index 047a45d69..cacff8ba5 100644 --- a/app/src/main/res/layout/chat_room_creation_fragment.xml +++ b/app/src/main/res/layout/chat_room_creation_fragment.xml @@ -29,7 +29,7 @@ diff --git a/app/src/main/res/layout/chat_room_detail_fragment.xml b/app/src/main/res/layout/chat_room_detail_fragment.xml index 4e5e0c789..393f9cc4b 100644 --- a/app/src/main/res/layout/chat_room_detail_fragment.xml +++ b/app/src/main/res/layout/chat_room_detail_fragment.xml @@ -44,7 +44,7 @@ @@ -135,7 +135,7 @@ android:id="@+id/list_edit_top_bar_fragment" android:name="org.linphone.activities.main.fragments.ListTopBarFragment" android:layout_width="match_parent" - android:layout_height="60dp" + android:layout_height="@dimen/main_activity_top_bar_size" android:layout_alignTop="@id/top_bar" tools:layout="@layout/list_edit_top_bar_fragment" /> diff --git a/app/src/main/res/layout/chat_room_devices_fragment.xml b/app/src/main/res/layout/chat_room_devices_fragment.xml index 16b88fd4e..61635b7f3 100644 --- a/app/src/main/res/layout/chat_room_devices_fragment.xml +++ b/app/src/main/res/layout/chat_room_devices_fragment.xml @@ -19,7 +19,7 @@ diff --git a/app/src/main/res/layout/chat_room_ephemeral_fragment.xml b/app/src/main/res/layout/chat_room_ephemeral_fragment.xml index fa8cc82a3..c528c63bb 100644 --- a/app/src/main/res/layout/chat_room_ephemeral_fragment.xml +++ b/app/src/main/res/layout/chat_room_ephemeral_fragment.xml @@ -22,7 +22,7 @@ diff --git a/app/src/main/res/layout/chat_room_group_info_fragment.xml b/app/src/main/res/layout/chat_room_group_info_fragment.xml index 5ef4b0f81..db45dd1bb 100644 --- a/app/src/main/res/layout/chat_room_group_info_fragment.xml +++ b/app/src/main/res/layout/chat_room_group_info_fragment.xml @@ -34,7 +34,7 @@ diff --git a/app/src/main/res/layout/chat_room_imdn_fragment.xml b/app/src/main/res/layout/chat_room_imdn_fragment.xml index 8d3baf10d..b170cc8a3 100644 --- a/app/src/main/res/layout/chat_room_imdn_fragment.xml +++ b/app/src/main/res/layout/chat_room_imdn_fragment.xml @@ -20,7 +20,7 @@ diff --git a/app/src/main/res/layout/chat_room_list_cell.xml b/app/src/main/res/layout/chat_room_list_cell.xml index d53643a43..0fd742fc8 100644 --- a/app/src/main/res/layout/chat_room_list_cell.xml +++ b/app/src/main/res/layout/chat_room_list_cell.xml @@ -14,6 +14,9 @@ + @@ -63,7 +66,8 @@ @@ -83,6 +87,8 @@ android:layout_height="wrap_content" android:layout_above="@+id/lastMessage" android:layout_alignParentRight="true" + android:layout_marginRight="5dp" + android:layout_marginLeft="5dp" android:gravity="center" android:orientation="horizontal"> @@ -133,6 +139,15 @@ + + diff --git a/app/src/main/res/layout/chat_room_master_fragment.xml b/app/src/main/res/layout/chat_room_master_fragment.xml index 63e461bad..d2a1d9e73 100644 --- a/app/src/main/res/layout/chat_room_master_fragment.xml +++ b/app/src/main/res/layout/chat_room_master_fragment.xml @@ -31,69 +31,94 @@ + android:orientation="vertical"> - + - + - + - + - + - + + + + + + + + + @@ -101,7 +126,7 @@ android:id="@+id/list_edit_top_bar_fragment" android:name="org.linphone.activities.main.fragments.ListTopBarFragment" android:layout_width="match_parent" - android:layout_height="60dp" + android:layout_height="@dimen/main_activity_top_bar_size" android:layout_alignTop="@id/top_bar" tools:layout="@layout/list_edit_top_bar_fragment" /> diff --git a/app/src/main/res/layout/contact_detail_fragment.xml b/app/src/main/res/layout/contact_detail_fragment.xml index e306904b9..1bcfe850b 100644 --- a/app/src/main/res/layout/contact_detail_fragment.xml +++ b/app/src/main/res/layout/contact_detail_fragment.xml @@ -26,7 +26,7 @@ diff --git a/app/src/main/res/layout/contact_editor_fragment.xml b/app/src/main/res/layout/contact_editor_fragment.xml index 4a4b58e0c..0301fceba 100644 --- a/app/src/main/res/layout/contact_editor_fragment.xml +++ b/app/src/main/res/layout/contact_editor_fragment.xml @@ -26,20 +26,20 @@ + android:padding="10dp" + android:src="@drawable/cancel" /> @@ -113,7 +113,7 @@ android:id="@+id/list_edit_top_bar_fragment" android:name="org.linphone.activities.main.fragments.ListTopBarFragment" android:layout_width="match_parent" - android:layout_height="60dp" + android:layout_height="@dimen/main_activity_top_bar_size" android:layout_alignTop="@id/top_bar" tools:layout="@layout/list_edit_top_bar_fragment" /> diff --git a/app/src/main/res/layout/dialer_fragment.xml b/app/src/main/res/layout/dialer_fragment.xml index 2738446ae..d00733ab2 100644 --- a/app/src/main/res/layout/dialer_fragment.xml +++ b/app/src/main/res/layout/dialer_fragment.xml @@ -22,7 +22,7 @@ diff --git a/app/src/main/res/layout/file_config_viewer_fragment.xml b/app/src/main/res/layout/file_config_viewer_fragment.xml index 6730f97e2..44208d5b4 100644 --- a/app/src/main/res/layout/file_config_viewer_fragment.xml +++ b/app/src/main/res/layout/file_config_viewer_fragment.xml @@ -22,7 +22,7 @@ diff --git a/app/src/main/res/layout/file_viewer_top_bar_fragment.xml b/app/src/main/res/layout/file_viewer_top_bar_fragment.xml index 855d8885f..3f8a4ce72 100644 --- a/app/src/main/res/layout/file_viewer_top_bar_fragment.xml +++ b/app/src/main/res/layout/file_viewer_top_bar_fragment.xml @@ -14,7 +14,7 @@ diff --git a/app/src/main/res/layout/history_detail_fragment.xml b/app/src/main/res/layout/history_detail_fragment.xml index 48d8e9401..d92e5400f 100644 --- a/app/src/main/res/layout/history_detail_fragment.xml +++ b/app/src/main/res/layout/history_detail_fragment.xml @@ -26,7 +26,7 @@ diff --git a/app/src/main/res/layout/history_master_fragment.xml b/app/src/main/res/layout/history_master_fragment.xml index 4c42f899a..237d35176 100644 --- a/app/src/main/res/layout/history_master_fragment.xml +++ b/app/src/main/res/layout/history_master_fragment.xml @@ -25,7 +25,7 @@ @@ -100,7 +100,7 @@ android:id="@+id/list_edit_top_bar_fragment" android:name="org.linphone.activities.main.fragments.ListTopBarFragment" android:layout_width="match_parent" - android:layout_height="60dp" + android:layout_height="@dimen/main_activity_top_bar_size" android:layout_alignTop="@id/top_bar" tools:layout="@layout/list_edit_top_bar_fragment" /> diff --git a/app/src/main/res/layout/list_edit_top_bar_fragment.xml b/app/src/main/res/layout/list_edit_top_bar_fragment.xml index e88de8fdb..a72935b70 100644 --- a/app/src/main/res/layout/list_edit_top_bar_fragment.xml +++ b/app/src/main/res/layout/list_edit_top_bar_fragment.xml @@ -22,7 +22,7 @@ @@ -34,8 +34,8 @@ android:layout_height="match_parent" android:layout_weight="0.2" android:background="?attr/button_background_drawable" - android:padding="15dp" - android:src="@drawable/cancel_edit" /> + android:padding="10dp" + android:src="@drawable/cancel" /> @@ -70,7 +70,7 @@ android:id="@+id/list_edit_top_bar_fragment" android:name="org.linphone.activities.main.fragments.ListTopBarFragment" android:layout_width="match_parent" - android:layout_height="60dp" + android:layout_height="@dimen/main_activity_top_bar_size" android:layout_alignTop="@id/top_bar" tools:layout="@layout/list_edit_top_bar_fragment" /> diff --git a/app/src/main/res/layout/settings_account_fragment.xml b/app/src/main/res/layout/settings_account_fragment.xml index b8c6be990..de9dc871d 100644 --- a/app/src/main/res/layout/settings_account_fragment.xml +++ b/app/src/main/res/layout/settings_account_fragment.xml @@ -21,7 +21,7 @@ diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml index f650443fe..20166266f 100644 --- a/app/src/main/res/layout/settings_advanced_fragment.xml +++ b/app/src/main/res/layout/settings_advanced_fragment.xml @@ -20,7 +20,7 @@ diff --git a/app/src/main/res/layout/settings_audio_fragment.xml b/app/src/main/res/layout/settings_audio_fragment.xml index e425d461b..b90c07f0c 100644 --- a/app/src/main/res/layout/settings_audio_fragment.xml +++ b/app/src/main/res/layout/settings_audio_fragment.xml @@ -20,7 +20,7 @@ diff --git a/app/src/main/res/layout/settings_call_fragment.xml b/app/src/main/res/layout/settings_call_fragment.xml index d316ea818..d0527ed9a 100644 --- a/app/src/main/res/layout/settings_call_fragment.xml +++ b/app/src/main/res/layout/settings_call_fragment.xml @@ -20,7 +20,7 @@ diff --git a/app/src/main/res/layout/settings_chat_fragment.xml b/app/src/main/res/layout/settings_chat_fragment.xml index 5bac60282..0ca8256f9 100644 --- a/app/src/main/res/layout/settings_chat_fragment.xml +++ b/app/src/main/res/layout/settings_chat_fragment.xml @@ -20,7 +20,7 @@ diff --git a/app/src/main/res/layout/settings_contacts_fragment.xml b/app/src/main/res/layout/settings_contacts_fragment.xml index a401618d7..9da63cbe3 100644 --- a/app/src/main/res/layout/settings_contacts_fragment.xml +++ b/app/src/main/res/layout/settings_contacts_fragment.xml @@ -19,7 +19,7 @@ diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml index 2f4f62199..472febcc8 100644 --- a/app/src/main/res/layout/settings_fragment.xml +++ b/app/src/main/res/layout/settings_fragment.xml @@ -20,7 +20,7 @@ diff --git a/app/src/main/res/layout/settings_network_fragment.xml b/app/src/main/res/layout/settings_network_fragment.xml index a4db656b5..164554c02 100644 --- a/app/src/main/res/layout/settings_network_fragment.xml +++ b/app/src/main/res/layout/settings_network_fragment.xml @@ -20,7 +20,7 @@ diff --git a/app/src/main/res/layout/settings_tunnel_fragment.xml b/app/src/main/res/layout/settings_tunnel_fragment.xml index 2616d6582..35b84bc97 100644 --- a/app/src/main/res/layout/settings_tunnel_fragment.xml +++ b/app/src/main/res/layout/settings_tunnel_fragment.xml @@ -20,7 +20,7 @@ diff --git a/app/src/main/res/layout/settings_video_fragment.xml b/app/src/main/res/layout/settings_video_fragment.xml index 511929d7c..e1d08a581 100644 --- a/app/src/main/res/layout/settings_video_fragment.xml +++ b/app/src/main/res/layout/settings_video_fragment.xml @@ -20,7 +20,7 @@ diff --git a/app/src/main/res/menu/chat_message_menu.xml b/app/src/main/res/menu/chat_message_menu.xml index 56cf13849..491a0ef2c 100644 --- a/app/src/main/res/menu/chat_message_menu.xml +++ b/app/src/main/res/menu/chat_message_menu.xml @@ -28,7 +28,7 @@ \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index feaf7a026..e5ff31cd6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -166,7 +166,7 @@ Entra en una conversación encriptada Editar contacto Borrar contacto - Descartar los cambios + Descartar los cambios Guardar los cambios Cambiar foto de contacto Cambiar mi propia foto diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5fd9d4798..025b2baed 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -448,7 +448,7 @@ Rejoindre la conversation chiffrée Editer le contact Supprimer le contact - Annuler les modifications + Annuler les modifications Sauvegarder les modifications Modifier la photo du contact Modifier ma photo @@ -596,4 +596,8 @@ Temporairement indisponible Erreur : %s Mettre en pause les appels quand le focus audio est perdu + Annuler le transfert de message + Annuler le partage + Sélectionnez une conversation ou créez-en une nouvelle + Sélectionnez une conversation ou créez-en une nouvelle \ No newline at end of file diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4f1f1f129..adba52333 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -365,7 +365,7 @@ Névjegy szerkesztése Névjegy törlése Változtatások mentése - Változtatások elvetése + Változtatások elvetése Névjegyfénykép módosítása Saját névjegyfénykép módosítása Hívásirány diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1b9706c10..471046739 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -236,7 +236,7 @@ 进入加密对话 编辑联系人 删除联系人 - 放弃更改 + 放弃更改 保存更改 更改联系人图片 更改自己的图像 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 16d50f536..fde6defa7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -331,7 +331,7 @@ 通過選定值更改「閱後即焚」信息的時效 可在加密的對話中邀請聯絡人 進入加密對話 - 放棄更改 + 放棄更改 取消選擇所有項目 播放或暫停錄音 只顯示未接來電 diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 019ec8e24..f94b98273 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -13,6 +13,7 @@ 200dp 50dp 60dp + 60dp 40dp 5dp 5dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fbb10ecb2..89b108822 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -177,6 +177,8 @@ Do you want to forward the message in this room? dummy subject Select a conversation or create a new one + Select a conversation or create a new one + Select a conversation or create a new one Can\'t open file, no application available for this format. File not found Chat room creation failed @@ -646,7 +648,7 @@ Go into encrypted conversation Edit contact Delete contact - Discard changes + Discard changes Save changes Change contact picture Change own picture @@ -702,4 +704,6 @@ Close notification bubble Open conversation in app instead of bubble Open file in third-party app + Cancel message forward + Cancel sharing