From e79a34b651a626b93686b8c578280b77c54b6138 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Wed, 16 Jul 2014 12:34:09 +0200 Subject: [PATCH] redesigned muc details a little bit --- res/drawable-hdpi/ic_action_edit_dark.png | Bin 0 -> 884 bytes res/drawable-mdpi/ic_action_edit_dark.png | Bin 0 -> 587 bytes res/drawable-xhdpi/ic_action_edit_dark.png | Bin 0 -> 1179 bytes res/drawable-xxhdpi/ic_action_edit_dark.png | Bin 0 -> 1670 bytes res/layout/activity_muc_details.xml | 259 ++++++++-------- res/layout/edit_contact_name.xml | 28 -- res/layout/quickedit.xml | 18 ++ res/menu/muc_details.xml | 6 + res/values/colors.xml | 2 + res/values/strings.xml | 2 + res/values/styles.xml | 4 +- res/values/themes.xml | 4 +- .../conversations/entities/MucOptions.java | 28 +- .../ui/ContactDetailsActivity.java | 18 +- .../ui/ConversationFragment.java | 28 -- .../conversations/ui/MucDetailsActivity.java | 291 +++++++++++------- .../siacs/conversations/ui/XmppActivity.java | 31 +- 17 files changed, 374 insertions(+), 345 deletions(-) create mode 100644 res/drawable-hdpi/ic_action_edit_dark.png create mode 100644 res/drawable-mdpi/ic_action_edit_dark.png create mode 100644 res/drawable-xhdpi/ic_action_edit_dark.png create mode 100644 res/drawable-xxhdpi/ic_action_edit_dark.png delete mode 100644 res/layout/edit_contact_name.xml create mode 100644 res/layout/quickedit.xml diff --git a/res/drawable-hdpi/ic_action_edit_dark.png b/res/drawable-hdpi/ic_action_edit_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..5f7c6eff38c2a503c1cfc2c4794850ad2c06d23f GIT binary patch literal 884 zcmV-)1B?8LP)%qHdNgg7?rJr+8F6bBgDqJXES!0PfUkwTBqa zF{?w2eS)kfkhongmouvbIE$k9=h6VaDms^7#dw18QA{lSH4yM^OXw~GQw62Oz&VH= zQ{xwCi!B{{^ zFyE0F5J}F^dHbf`%g3y0Z2?3A1bg1af{kP z#xpOg>jEzyYce{~fXR&ZIaZ6=iV~C6`J5|qKkgls48ix9=bwsfII}az;G;IX4l~aU zHQu2oZYd>^*E@XYw^0HF-wx$*AyO6H6P$Rz!F!KzZJ^6WQYJo6asB7IcU264*G<43 z0oYdnn`(ev@eq1ntnS)Oxz~D`j_Z{wceUsqRcwm!7 zOC3(VHU)m41Y{@mjaex$S~%p_a@b zW+u2~K@5Rlh>7VL%q$lE1uV0(rw~J8Fo(dL*^(IqGZP~jW`cRZI-b0sc zlU7z=axKk1V6_WHT<&X@J+1rHssn%vNDFF1SIX=i2BO%CSb@jZf)H>4IDqb;7w8xY z2#r{;(jl=$U7Ui26$c2fGtf?<2_30Y;@G{jE@nLf{7oOn-4ZU%=W-u04wl@ONOk~x zY#OUz0j^rWSr3>6N6-`C)1>iSi*RXeF28`zSHUx-;*@Y{eSo7h9o-z@4v(T^#eogr zA!a|a;sD@fLq1;zkF&&8VNHe;=lc=5hYp!qt-)71fSc_cMU%(r8+za|^Am#Zd6S&t zuDRW$wYU{GYI32)X(K+h1H9ezYzs0ki6E&g_H zZtn8-_O=&yV#N~KFN*h5UOEUDUOzTD0AbK%0@O86LSf%30+eJ|6Gv9>2nbJUN7uKR zkPIL5fn58^nj8?y^oZqIaaZDbP2885z7zLl|CDXBN%=s|_2inq6$HqGKF9-K$?gNe zO)D|IDs403U37DD?kRq2D4}f)0VJU(ej(saNWi?(46sX30LT*W$bLOW2?&9oPyN@F zf&F}+asQiD-J!IhxY<^^!8$Yi4hxy?ZYoS~F;(KT}ngAp=0dP(NYD(Ng)(vU&0NGw1_>Fj{(`2yxDf`oY_MG}DUS>^FPoq6>LM=YRvH0^tQ1Cqy+yI2_6fi zz+7&RIQemJBmo)0t0a6-#`ODP$qVpKR`4SyASZaWhiDP3&pAJbvd?W5!@&pEM9gy^ zVX%)kKa3ksSO8vYX2%!>j0ikzc@!_JVhQ+>S;Z3Y_bi5nZWFeE*IDE!gaDht=MDh@ zzhN`@+@nDmd38B%hdn5h6jp%G6#^(vqe@V!qGbd4%mgSixTwl*co?&|KI`^x8HcCO z3O-K`XcC~yx7`Y6XQ+x@8^C8GfNwaeDr+f2S19AVGKryM2hR;Ys{)o|(#hLC05?MxkgT)Hd-uS2qK;?H%;Ma}?Hl-o| zhDP%9ndH1Yixj3RU@fLC(-+#-5WvNVg$SAd3WmRq<(8xXwd)JM-13|;vLpgrj^?aM tYC|)WzDZwNmsVP7rIl8i-S$_20RXOO5G<352)Y0O002ovPDHLkV1kOuAU*&9 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_action_edit_dark.png b/res/drawable-xxhdpi/ic_action_edit_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..f2b2078b0787cf6f5722033b5b794cb5fdcba000 GIT binary patch literal 1670 zcmV;126_33P)mMdBG5BtRs>(%|z-Jayzec#NEWNGgrec!$x`*v3e0)apv5C{YUfj}S-2z)|KC|Je8!NEQ~ zbg6atrAuzp^Yimi1SpsI=hRvW-6qsVB*at%uuJ}c$mTUeA4!Cz#DMkF&w+(l0E{Uf3`Ky|VB6!#)GRJ_ zq<#?KC}kdy1uwEr*lM1T|ClQSEVI`;37A5?A|Mt0;-vs^B}CXy z$n~ksiHMsBA>g0)Sd7$JEsKCT!+yq(@h0nBpza#^9CV*@gAjYv0)x-|Gn++w&O7Qx4t_@1e6QjMfCs05K8y)W3L3TKz^DC z7~$r^NtgQRZfC-eLtZ2BLja59CyEf`iu#5Cxi?-_G6fOajm zvH(5nX|Uf{ZD3ddb|jqnO1^ag*zF{pqw1Nii4Qc}s>g&?BEJj^=x6A291#y-1;e1& zS}d-8RVDHPtJ_lA?ePdpN0I>BEMW!c>y^19%k&`i4j5V z<)5+;O_#~HDgcr8ELc6%kSYQnj<_*|2>H-m*Jbjp#efXKHz{L!Y3xYWvl*w!w;6={ z1+Im7C;WpM9fM$}$+szhjf!X2xX;XW@~sHK!Piz%t)r!;iwHO56#2F+z-GO_Yiu7M zxlDdx0SW})B>bp7zu?)eljPg5fPM*|X<)dap{wK$m41kip6)y8N?pdGpDkE%=5S@#1DSXaOL9C_z;q5C{YUfj}S-2m}H_etZ*P04TpsYf3?Y QLjV8(07*qoM6N<$f`u#-@c;k- literal 0 HcmV?d00001 diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml index 15f09c7c5..d47c6b6ef 100644 --- a/res/layout/activity_muc_details.xml +++ b/res/layout/activity_muc_details.xml @@ -2,147 +2,128 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + android:background="@color/primarybackground" > - - - -