From 77491039097734ce746b5b46791464bd236d4703 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 5 Apr 2014 12:49:43 +0200 Subject: [PATCH] added attach file action --- res/drawable-hdpi/ic_action_new_attachment.png | Bin 0 -> 648 bytes res/drawable-mdpi/ic_action_new_attachment.png | Bin 0 -> 468 bytes res/drawable-xhdpi/ic_action_new_attachment.png | Bin 0 -> 789 bytes res/drawable-xxhdpi/ic_action_new_attachment.png | Bin 0 -> 1112 bytes res/menu/conversations.xml | 7 +++++++ res/values/strings.xml | 1 + .../conversations/ui/ConversationActivity.java | 4 ++++ 7 files changed, 12 insertions(+) create mode 100644 res/drawable-hdpi/ic_action_new_attachment.png create mode 100644 res/drawable-mdpi/ic_action_new_attachment.png create mode 100644 res/drawable-xhdpi/ic_action_new_attachment.png create mode 100644 res/drawable-xxhdpi/ic_action_new_attachment.png diff --git a/res/drawable-hdpi/ic_action_new_attachment.png b/res/drawable-hdpi/ic_action_new_attachment.png new file mode 100644 index 0000000000000000000000000000000000000000..28507da2dfdbc96ca1dd0e676bb64c18b8268fe2 GIT binary patch literal 648 zcmV;30(bq1P)^eIB{~;($TfiXfz6;8G;@`lkIk!o&^B_9zZh%4Nj&K&=nBL>U{r71Naxv8_u*3 zIvxxLU;F(&uewK91Nc4;y@RzMp?wC8ag5B(tUCb?c;YIbqyyIe15Lp4#C=Iz_|V_M z*sm2QAOOGNEL}7G$O;!K0p5dgl8tI-qHf#Z$v9{vSWh$4!6*S4cpQI%{+P4g!@96D zMnD04Um-gkjTEvH;HBe6DzOdVD-*Bxbb~KCfmG$bY7%@A0qXlcfV(fK7e>HK380Hm5EBsz95(`9 zr4o}Ecw@3mh9{F_Y(z}3tE9@IV5UuNysFQyfGKjC19K-cIRM>#OTwaZgB)0flDXQvjj)X i6iO#foLrLp3orl{$FIqR{iFZ@0000~q4U4lEvC%|7DT9?3re1j4!tpq%ZTw4N=#|5%C zSL9`TKz>MyyZKm$9D#&@e~$p+Fq7o;K{*g{oyfm|ewBcZVW#HFk(=74y($AD!khGo zYyjer*>IAV36Q7RL={25r<~*_Z76Rz9$hrNk_{JY>K)RFcylUZ?W}SS2m(0Wk<(BS zvc_DhS<+SBQ_VNM7qA-w_yI;v?}QxI2X`G6Y{SgMefP3<4}qllREWrCWQu?r3lClQg%x z-j9BsYrD7aMUhA(5{X1htCBAbX*Qc1*wj&Kbm$FbJRA<+3vU46Ti6_;Y-p+nDAzFJ zvycV=zJpE6aGHWYg9$ILpTFW6yaIhtT_0tW^@uf;y=t}kFqurg3Soc-UcKEO-ts*l zpHS`qtYCMU2{jxa1aH6;__O3V2kbLUP?KPT4pp%Kh~pow+EVrvJ{FD-=$u#$m+dM0 z4A1n)epiAtAOrkDRrUcM^>xE7c>Q}&23WwW`Yr`Sy6X=T28@C+z!E;L?_j?%B|?lf zb{!0rJ%Nww#|ijOqW(OHPc|G zOQ|hY?tF%~9Rgexg9&Q#yU~nWFX3%_0H5IY=Lns>g|{_;PkeQYj~KzgTNyxqHM|#e z2rPK`G?UIqcW^Bq3bYETo^MKsfoSPxOajYRO2Cdg6OucwFu`i67AOnJn# z%VC`fCRx9E+`p?aFN@Ttw7#=AfI#{Y`-C;?;VLfhvD;^f1L8@sPu;bZ80SC3V$Kw{ z%{BGJvohVU6a^+2f5Bcx?rVXLPy{a=;M8XOQsZ#$%F_7)DJ%?HsMP1_is21pG*0jG&@@< z=kzfkf*(`3n}bKCUsj>0JA{IOP_u;C#5BZB!o8A&DlkwQeJ{f552 zrSKwgnE&3Q<;Rn*;nsa~_45$HqLU*VEdhl6o<9iGP>Vt19@sAq$+;joHoIjLfvmEK~ zT53Rq8c-fSpU0fCr$~7Eiw7O$-6w zp3IikVfMA{rcMgn?^9mu`lq;_5r4v zB}|w}`+6p$s-~^Oa~*!!8W35AldUCc#LQRtWetdP4oyqT7x-1x0M;(x*JOaS-{!2h zP2h%rU*9O`!V)(UfPlYh1LRd-wnzQ<%b4IR{AK3>$Ch#Y+=O8P_(NaevzEOj$*ZCt zQVvgLtRI=fOu0M8*E0Nen!$C#r{8p7EVG=`|36!61LTM2d0doh%KYUR+d=l5NtS|7 zzv;75f#$+?SnE=RfXZ5AYf0(qWx(e&4qb0{Dm6e%;9==U%kZ>__}cM0yvwsrRrazD zY3C<$my6#}ILLV^m-b8Fz*p7>ENF-4%}!T3+IFII=5V_z=yKzys0PM>APS1VLFJ)n z^BD$^>L{oI^bT~w5Db6;5Db6;5Db6;5Db6;5Da)W+601sGWR<@00{&^5ClOG1VIo4 eL5}H<00RJ%rkx4V&X!OB0000 + + Unable to connect to account Unable to connect to multiple accounts Touch here to manage your accounts + Attach file diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index f47e8a8cd..41ee6336d 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -234,6 +234,7 @@ public class ConversationActivity extends XmppActivity { MenuItem menuMucDetails = (MenuItem) menu.findItem(R.id.action_muc_details); MenuItem menuContactDetails = (MenuItem) menu.findItem(R.id.action_contact_details); MenuItem menuInviteContacts = (MenuItem) menu.findItem(R.id.action_invite); + MenuItem menuAttach = (MenuItem) menu.findItem(R.id.action_attach_file); if ((spl.isOpen()&&(spl.isSlideable()))) { menuArchive.setVisible(false); @@ -241,6 +242,7 @@ public class ConversationActivity extends XmppActivity { menuContactDetails.setVisible(false); menuSecure.setVisible(false); menuInviteContacts.setVisible(false); + menuAttach.setVisible(false); } else { ((MenuItem) menu.findItem(R.id.action_add)).setVisible(!spl.isSlideable()); if (this.getSelectedConversation()!=null) { @@ -249,10 +251,12 @@ public class ConversationActivity extends XmppActivity { menuContactDetails.setVisible(false); menuSecure.setVisible(false); menuInviteContacts.setVisible(true); + menuAttach.setVisible(false); } else { menuContactDetails.setVisible(true); menuMucDetails.setVisible(false); menuInviteContacts.setVisible(false); + menuAttach.setVisible(true); if (this.getSelectedConversation().getLatestMessage().getEncryption() != Message.ENCRYPTION_NONE) { menuSecure.setIcon(R.drawable.ic_action_secure); }