From 0a30ebdc5bb94022328247e163f78bf71a51bd29 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 12 Feb 2020 00:43:28 +0100 Subject: [PATCH] basic pin/unpin chat functionality --- res/drawable-hdpi/ic_pin_white.png | Bin 0 -> 633 bytes res/drawable-hdpi/ic_unpin_white.png | Bin 0 -> 1020 bytes res/drawable-mdpi/ic_pin_white.png | Bin 0 -> 505 bytes res/drawable-mdpi/ic_unpin_white.png | Bin 0 -> 712 bytes res/drawable-xhdpi/ic_pin_white.png | Bin 0 -> 922 bytes res/drawable-xhdpi/ic_unpin_white.png | Bin 0 -> 1538 bytes res/drawable-xxhdpi/ic_pin_white.png | Bin 0 -> 1316 bytes res/drawable-xxhdpi/ic_unpin_white.png | Bin 0 -> 2153 bytes res/drawable-xxxhdpi/ic_pin_white.png | Bin 0 -> 2037 bytes res/drawable-xxxhdpi/ic_unpin_white.png | Bin 0 -> 3403 bytes res/menu/conversation_list_batch_pin.xml | 10 ++++ res/values/strings.xml | 8 ++++ .../securesms/ConversationListFragment.java | 43 +++++++++++++++++- 13 files changed, 60 insertions(+), 1 deletion(-) create mode 100755 res/drawable-hdpi/ic_pin_white.png create mode 100755 res/drawable-hdpi/ic_unpin_white.png create mode 100755 res/drawable-mdpi/ic_pin_white.png create mode 100755 res/drawable-mdpi/ic_unpin_white.png create mode 100755 res/drawable-xhdpi/ic_pin_white.png create mode 100755 res/drawable-xhdpi/ic_unpin_white.png create mode 100755 res/drawable-xxhdpi/ic_pin_white.png create mode 100755 res/drawable-xxhdpi/ic_unpin_white.png create mode 100755 res/drawable-xxxhdpi/ic_pin_white.png create mode 100755 res/drawable-xxxhdpi/ic_unpin_white.png create mode 100644 res/menu/conversation_list_batch_pin.xml diff --git a/res/drawable-hdpi/ic_pin_white.png b/res/drawable-hdpi/ic_pin_white.png new file mode 100755 index 0000000000000000000000000000000000000000..e10d8ec3985a7312cd27d111327ca2de23b812e6 GIT binary patch literal 633 zcmV-<0*3vGP)Px%Gf6~2R9Fe^l|4%xK@^7X-o#HtP*ji@8$}TO6Swdu2q|s!57-DM!9rAo6p}JF zHiBA+_*Ge?)J8091@Ws&NTnj;`n<$}z3aL=&Ujsfd*EU2%$zyry=OkQP^en90{<%z zhG7kiLPzd3K|~RLz#W`Gf3Bhs&<^Kd?2sRQxrriq7yL779@{h8&MZ;IECR-lhQ_Ll`d&TS*r}M(XU#X$(C;#Aj z3 z#wr3g!y4GyCXS66Vg05_ph~S+D7wU_*DsspY7*%k+D;LrC!yOioSPd70vLlikRY)N zNv3zI&MlM0DuPSQL?rW^meJSt=}aYkI_51xzubjn5;FPx&wn;=mR9FecmrF=hQ51&N> zHXjBDT{JyyCvBCpiPEyJ2oh1&WZ2?h1RR22;N$_F$_(QG1@^^o8|0@M@&n9+r&v4` zj)Rp~3`&Dn_ReCv)hzx=e}3<5j2;eD;QQboIC)HGb{Kcq=}onw+H484*4G9H3QC!> z$EQLs1K%THt^oE!y2wuxq^=p?&HW}=TnGoi%4-Img^qqCoP_V-C0|fB`Rx}E`mK~h8ZG1Ss$M=brkGosX|9z0xuz~sHW;6^+2JrV~tp>dn*0- zUZAUkQxH}3_BGo*Libsy3~hwv&<=mVNf(_OxaJfQ+74_dgbu_RvZx$Xke{FdPJ@+? z3>rZ-6jqeoscw%*EenUhdiV<6sir*vf5C||wF<5}g-3fIT@_S9VWc3ujB&CCbX+RR z#c&yHP#+jqz!gZB_b4WM`Hii^p=zlazJWH^MRyFWNZ$hIt&;wd*c%5e#Bn}s0$qN} zlma{hw$R@&UI;oq-8(yid}ckz2Kqd#00pFMErRqy*9%Y!%2xc(Mc8QBM1{T%6p&Cs z9|2oaZy6`T`iy1A2Krv@fnqtJRZz;5j%*pU_w;GHMK|~qh<_{lMT*n0a08Tud!Qd; zD)g10n$mr=6qG3|s;L@3zp?Z<90TXfF8b=vkTY7<)Mijn3U)QLfimahIi0zXeWq|S z3T}dvA9QBfCu6L)Pj#fD)0?Gx>MU4!#~{+rVY^3n9|z+=b>Y7BD&V>dLlo$Bd}~2A zpJ4&Cf?G>B*$MG}(y~yQxdcvB3;q6I!$u$CyD%OUH75X$!2TbVIz7B4Ij;X=ZIHnSRI?ioirHeshhD(&? z#!AODC&Op}6!=w8t)REjiGHJ3^l^`3GCb=ctD5QK*kiyRI==1TMD;Yu!!&m)0#K&5 qz*895PfOg#AP{A0blmkhS@$3Rgx~9j4CreB0000Px$vq?ljR7efomA@}TQ547fs2Wwmpk)#w1|b+a`3JC(SV*n@1VbaSSgaO<(O?n` z5+?oy5($Yk8l#Ax6|K+r#d~>@+vBzAAWrhhd+(lezW3aF?rjr^ziicNwM|$xwpdQf zhj0@A3QY5!vSJ(ZAvy&QZ~-&W+K^DKBn0O{R)HeqYQ@$yj!+85L6t}Co{tpeumHZrBEG zmCH&D<{@mXOUE1|xf3?w6{4n|tV7xqu$&}kpz!_FB+-?q@gr8g=_5G{r=Z(f0IfvZ z74$?aS~W#nPLezrgguamCh^ZcPxT~d{5$V!pgR-aNa%-McmhqL3ltjPI$c|!domU} z;=GX13;Xa4nqU~E4 v(Ilv9Phf$ot}EX>qv8&jfS%^5{s*NmLa7_k>C@Jp00000NkvXXu0mjff5P3; literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_unpin_white.png b/res/drawable-mdpi/ic_unpin_white.png new file mode 100755 index 0000000000000000000000000000000000000000..d4bfefdb8f8adce4e19400af3a5e8d96fb697ed7 GIT binary patch literal 712 zcmV;(0yq7MP)Px%f=NU{R7ef2)Ln?qSsVv&&tPUEOq&vs61F5-33u*Yh|T6DHW%#8URcW8g&Rtm z3lc?KkdnCAq%Cnl-nO=ABZgToE!wq9BvE2se7?goo|$=`c^>7|r~m()|2gM(-u`F6 z0I9RHvz{gfCI2;3olXbqa1lqCCqM9O2FU1#vWNHFVnHnd)cc0|s&!S$ET-`rZ9HT# zg-VTm8^K97(NL*gcezRhzU2}fJmCk*22sA6c3!ZKEOYgw;v}w;#`joAkH+#j5E*$f zJ@fJtjnyNlq2ff&l09kRd+O5IGfVR$_bE;P%OpsT!Bh;W;uNyR3DU|UMzWQED3>ym zELTl?GDyX_Tp)Y$FIzZGe<^#ik?#MgYwBgDGDcZ5*JxohYxtW#sg!akS__3jTcrwJ z7{tqD4ziu5-i>R`YdfCfiTS8xrSd-rqlG9tE1hm+VKI9rGoglbiHf<0000Px&R7pfZRA>e5m|aU2K^TTz%`C`3(TEJ>tuPJx0f9w=bzqc9fd~D7I*On_&|&9A z6x0u}NK&Fs>p=9NgXqgXw8J0*A_G@OId!CtRW_O#K z3M(Q|M4%xND3{BfFb+Kp5s<_wqTAsztimL0OVVEEbrC!UUm>(9PWmzz;_48w5*#(% z+waV=KhJRu zlA1=MJ8av_kp?Ar3?74~#z(jT`=A6@VFi4d5_^X)@f&IEEJ(Czzqpu#2k_l|;Nkoe zZH)Trfadj*2T`_7Jg49p*b?o)hUg8;>p9BJ!iZ)0xW!hea0$9#5gx%p5Cm%+{TR_` z1MQkVl9XoFO)Jj@KPv0Af}>uz4Zh~P+PMy$bzJ*DO+9{_ct-bg5Eccl|b%T^H}!6)D;+=8v3dnM3ISS_37 z;a*Eu{)^#ULXW^}(EGb0u1>Ven~tC;S2HEArcm}P4^Aci5WIlU)CrBmU>GjWwK^%W ztL+n?dA2DmpUDx25wF&(?8-R zM)yEF_8o}6JI!#<^`$aiUvVTM`iRk-H%%jP5dITydf<64=-W6neNQMDHS3veIG@W2 zD8dV1nqC18gOv!%=`B`?y#)Hj(&{YAwjxd>eh6NHX`1t~BS;-3_AzL))!+J4Q~&?~07*qoM6N<$f(8_yGynhq literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_unpin_white.png b/res/drawable-xhdpi/ic_unpin_white.png new file mode 100755 index 0000000000000000000000000000000000000000..b9dcdc6d48636565d13c8d7630ffb3f3ba033ded GIT binary patch literal 1538 zcmV+d2L1VoP)Px)yh%hsRA>d&m}`htRTO|H$Hyd;ia{?8Gb)7~HL(QA9#&%yNKNf&hL~kV_Am*| zq=!^L`qAHtD1rz=OMG19V$q9$UDcu zYKY}8Iwq#PlCKM;CiWa~m123Dj-gQU$}zSdybo!zpU$b!C!f{P+bA@#Z-KPLZlvFY zESeLHF?`N|Rp2hBi6L8+#C9jHg>Rx+HRK%_2L+w*S?icLxc&`=M19*qCn~-Z=7d`u zJ7Gea69qpzc;@HHCJ4z(v!LjNJ25p1hWxiE4T-%oW%>{3Ym?aAyYhEH6J!;4>LMsP z$4c@Lg}q@md=0TQ(qWyig+XA+JOJg&K3=rMR{WeWCvJw{AQpFG0$c}ai64(Ic5ldf z*cCjn3npI&TQZ1eTVNsVjmDkF{gcoWUWEOSM^548C2$!|sI#49asVYNTnewicW@sh zolxI7umD!UQ;=8opuo8fL|^O;c02|rmTgTKqGD@?(EB~}AB!o~0q#PT>DmHma*k@4Y~lfqp13EYXjFa_>` zknA)M%Qjl|umnt2PwC}Q`B)D|7P~UJIbmY|2+DRaycR*46F$EZ9)=Y#tk@h?e~uA4 zaXVOP+zG?Qn7}B*pgJ&FJvBdpQLRq66NZyH;ZA7y z47e9e_E_AB;m~tNCLX51n#|4PYV< zB!7qpIY{F<7!Y=owocp%A+a~pHnHbHniC(=KM|^z)F|%M!0)J7*3nT9`4bx@{oz4~jenIs zf8dlPj5Q}b*xrM2zQnZ`=){*0%cpc)0OjWdFAsz#AZfg@`aGOilI4j(yrUDRC%VGf zF^T@qAt{E_8n_g)JHbn?ykChPMnMc4jV~HDNh6E3(bog~QjMK(zO`^ZlpanDHs%*Y z^4r~nT?Qu=GpL;B=+%h^*b1?HMn`Fh&A?;81IKC+MB`V$kaCPG^&RwEv8+y;AeIeu zjD^C79S=3$Ln>*!+i1d8)%f5f^XSB6*bK3(r{fYx&j}ukhET6*w*26Dfor=%Doj|7 zEA!QYr?RV_6eHmyFzMSnLFahb2a1DVf|5&RC7oejbK*iU{*z)vtb{hztYvOGM}mip z2g$Q=M2rs$!Tcey%?Zn@vJ2)w=l_NdhGn^8sNv+N$41xM8DSP(f|Me07*qoM6N<$f^$^VYybcN literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_pin_white.png b/res/drawable-xxhdpi/ic_pin_white.png new file mode 100755 index 0000000000000000000000000000000000000000..5028e5684622262f5839a06797e5fa4296d3ebe0 GIT binary patch literal 1316 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 TKY}5F00000NkvXXu0mjf!r;DR literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/ic_unpin_white.png b/res/drawable-xxxhdpi/ic_unpin_white.png new file mode 100755 index 0000000000000000000000000000000000000000..be980d6ce997c4e7561b7bb1215f5d582084e10d GIT binary patch literal 3403 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 literal 0 HcmV?d00001 diff --git a/res/menu/conversation_list_batch_pin.xml b/res/menu/conversation_list_batch_pin.xml new file mode 100644 index 000000000..36236cfc0 --- /dev/null +++ b/res/menu/conversation_list_batch_pin.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index a4b8f7009..d609cdd35 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -183,6 +183,14 @@ Messages in this chat are generated locally by your Delta Chat app. Its makers use it to inform about app updates and problems during usage. Welcome to Delta Chat! – Delta Chat looks and feels like other popular messenger apps, but does not involve centralized control, tracking or selling you, friends, colleagues or family out to large organizations.\n\nTechnically, Delta Chat is an email application with a modern chat interface. Email in a new dress if you will 👻\n\nUse Delta Chat with anyone out of billions of people: just use their e-mail address. Recipients don\'t need to install Delta Chat, visit websites or sign up anywhere - however, of course, if they like, you may point them to 👉 https://get.delta.chat Edit contact + + Pin chat + + Unpin chat + + Pin + + Unpin Mute for 1 hour Mute for 2 hours diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 73cf039b1..0b4a5dabb 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -214,6 +214,19 @@ public class ConversationListFragment extends Fragment getLoaderManager().restartLoader(0, null, this); } + private void handlePinAllSelected() { + final DcContext dcContext = DcHelper.getContext(getActivity()); + final Set selectedConversations = new HashSet<>(getListAdapter().getBatchSelections()); + boolean doPin = areSomeSelectedChatsUnpinned(); + for (long chatId : selectedConversations) { + dcContext.archiveChat((int)chatId, doPin? 2 : 0); + } + if (actionMode != null) { + actionMode.finish(); + actionMode = null; + } + } + @SuppressLint("StaticFieldLeak") private void handleArchiveAllSelected() { final DcContext dcContext = DcHelper.getContext(getActivity()); @@ -405,6 +418,7 @@ public class ConversationListFragment extends Fragment if (adapter.getBatchSelections().size() == 0) { actionMode.finish(); } else { + updateActionModeItems(actionMode.getMenu()); actionMode.setTitle(String.valueOf(getListAdapter().getBatchSelections().size())); } @@ -419,6 +433,7 @@ public class ConversationListFragment extends Fragment getListAdapter().initializeBatchMode(true); getListAdapter().toggleThreadInBatchSet(item.getChatId()); getListAdapter().notifyDataSetChanged(); + updateActionModeItems(actionMode.getMenu()); } @Override @@ -429,7 +444,30 @@ public class ConversationListFragment extends Fragment public interface ConversationSelectedListener { void onCreateConversation(int chatId); void onSwitchToArchive(); -} + } + + private boolean areSomeSelectedChatsUnpinned() { + ApplicationDcContext dcContext = DcHelper.getContext(getActivity()); + final Set selectedChats = getListAdapter().getBatchSelections(); + for (long chatId : selectedChats) { + DcChat dcChat = dcContext.getChat((int)chatId); + if (dcChat.getArchived()!=2) { + return true; + } + } + return false; + } + + private void updateActionModeItems(Menu menu) { + MenuItem pinItem = menu.findItem(R.id.menu_pin_selected); + if (areSomeSelectedChatsUnpinned()) { + pinItem.setIcon(R.drawable.ic_pin_white); + pinItem.setTitle(R.string.pin_chat); + } else { + pinItem.setIcon(R.drawable.ic_unpin_white); + pinItem.setTitle(R.string.unpin_chat); + } + } @Override public boolean onCreateActionMode(ActionMode mode, Menu menu) { @@ -439,6 +477,8 @@ public class ConversationListFragment extends Fragment MenuInflater inflater = getActivity().getMenuInflater(); + inflater.inflate(R.menu.conversation_list_batch_pin, menu); + if (archive) inflater.inflate(R.menu.conversation_list_batch_unarchive, menu); else inflater.inflate(R.menu.conversation_list_batch_archive, menu); @@ -463,6 +503,7 @@ public class ConversationListFragment extends Fragment switch (item.getItemId()) { case R.id.menu_select_all: handleSelectAllThreads(); return true; case R.id.menu_delete_selected: handleDeleteAllSelected(); return true; + case R.id.menu_pin_selected: handlePinAllSelected(); return true; case R.id.menu_archive_selected: handleArchiveAllSelected(); return true; }