From 6744e81f4a35ca6ad9076b4b7e98545b322f6581 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 5 Jul 2019 16:38:35 +0200 Subject: [PATCH 1/3] remove swipe-to-archive and swipe-to-unarchive --- res/drawable-hdpi/ic_unarchive_white_36dp.png | Bin 354 -> 0 bytes res/drawable-mdpi/ic_unarchive_white_36dp.png | Bin 258 -> 0 bytes .../ic_unarchive_white_36dp.png | Bin 391 -> 0 bytes .../ic_unarchive_white_36dp.png | Bin 600 -> 0 bytes .../ic_archive_white_36dp.png | Bin 1102 -> 0 bytes .../ic_unarchive_white_36dp.png | Bin 753 -> 0 bytes .../securesms/ConversationListFragment.java | 139 ------------------ 7 files changed, 139 deletions(-) delete mode 100644 res/drawable-hdpi/ic_unarchive_white_36dp.png delete mode 100644 res/drawable-mdpi/ic_unarchive_white_36dp.png delete mode 100644 res/drawable-xhdpi/ic_unarchive_white_36dp.png delete mode 100644 res/drawable-xxhdpi/ic_unarchive_white_36dp.png delete mode 100644 res/drawable-xxxhdpi/ic_archive_white_36dp.png delete mode 100644 res/drawable-xxxhdpi/ic_unarchive_white_36dp.png diff --git a/res/drawable-hdpi/ic_unarchive_white_36dp.png b/res/drawable-hdpi/ic_unarchive_white_36dp.png deleted file mode 100644 index 3c6ea892a929f3b0476690e02ee7405849871e52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmV-o0iFJdP)t&BS{v1SGA0HH%08ZD+7k9Ly?zmAt{ zLh;U7z-PJK_D6>S$?<>=wti#XZ62ubR&h_eId;dU-8RK;0GP3hIX>bIfa@mM2_^8( zA?Ey?5-2(T4ePQ1;Dzx9zXGtJ`!n`LWRGZ!J!1Qyqp>rhJJnbsx|Feu{WCUU5|1fr z=j%y0CMd%+=f@PKIX5OK!3AJ~5?lZ#D8V@}K?yDZ6O`ZrFhL2bd0p&(P6+jH(ZvX%Q07*qoM6N<$f~}yA AK>z>% diff --git a/res/drawable-mdpi/ic_unarchive_white_36dp.png b/res/drawable-mdpi/ic_unarchive_white_36dp.png deleted file mode 100644 index 18730f12f8b7a94fc49b26a916aa877091d3a9c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 258 zcmV+d0sa1oP)&JQp zm*xkIOkLACniS#=UAm>$D(CP);GQF^cC>4buxhJZg0$ntc##tO*11-DT24+#+IO9Q zzh?2&)W~TY&&!&|UA_h3|*nY@Hy z!WqLL29IYFnhYw%JtC||eNJ5rlJ2TI8%z59KCw$4?_AOhW%Vv;zGLZD#LD^KGR7mI zN$5#PlhBj}`ioYXUN8>qHNBu2*lTjZYQ2le(&dd@(R)}5*hEA_A|AJJnx0;fcBVtl imEBd(5#+G2och=Q?sSz#RHy+1n8DN4&t;ucLK6T>dYn`M diff --git a/res/drawable-xxhdpi/ic_unarchive_white_36dp.png b/res/drawable-xxhdpi/ic_unarchive_white_36dp.png deleted file mode 100644 index fefcb36e846bfd62024e43ab3730713f5e4c92ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 600 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=esd5Fv)wmIEGX(zP)0YJvmV1*vHwb zx0KjiA3b9iaB)Al^3j8+werekLJJSy=6)1(B>%$EgN`el?Hya*@cH#kU6kG8wkYG@ zt`j$VY%8np8Qc6%-~XZcw5FHl(kVe+D^(2>x@EH-lvSK?J@qoo;_NS*bT{$2AA0^p z9=ulJKD{^6o;#x7yyPz9-fxM#lB;qL%WZg&&uyle7@gjM)i}ifB+1G?$>H8+N;ahlX?&Ph< zS0Bjx(7dMh`7Ze~k7s;)Hmv@mRBXTVQM0X5^=!Kv!JEDxVZW_fz1uEAwK~+`Ad`@f z!9gVu!7|(UJpbnn@BZJku|0E8OJuQXn`MOCY2M-uJ=3J0B}nR;pE+n0l{cd~b;}(C z_R|?V6ZxiHEIKTsv-l}UVRtL*h8{6)ZlFRju>(d?Iyw!hTOuMDPG@Y~z%cD%QX-?y z;-iO{a44*pv9T$Waf9L4`P!$qKWQywICJs;ff!D;83|3CY7q=;^y0N5YJkic34JWW zYZR+{`M3FgbF;f)yJ`Ew=CvQEp7FJO-Ygn7X{T+Mc-c(-l(#b)<->LyHa9YRY<860 z_*VL+(i|Q8H3gmGJ|{0tvHjf=H{-2Mx#YzF>zKnGyt`ZKBK|=w1KT(wc|W7X;tj!7 TT1nS{DTcw*)z4*}Q$iB}C@uul diff --git a/res/drawable-xxxhdpi/ic_archive_white_36dp.png b/res/drawable-xxxhdpi/ic_archive_white_36dp.png deleted file mode 100644 index 5e1e2af8235fb22a7d1c0b371a71890cfa5f7166..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1102 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ(J6g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO>_%)r1c48n{Iv*t)J zFfbqUba4!+xb^mKe1>14%<+%klYdUOcXjghNnWY@?wX!kqS&LhO)ZmL3!Rtz(YzTW z(6vKJJbL1q9R&+7=4@@#5nnP*Kzy_7?ulYqXC5D7J%9MwoacY)fav)1>hFK_=2gZ0 zJ@@n9zWbkl+p14?HH=DOQBh#z^l)Gjn$W2sBt)IThQ4Y zqdvyem(T6OGkV!Xc~{Iy(~{lqw(I7(&nXRI1>Gm*?zpi<`d9yP=&pRg%6~w8+6R-k z1(G()jx0{O;;qX3k+FB_+@{;RUa*;*;#~ppvWsRp^q(zpRJWh~ub)9Ubjg(>Tod6AkdRnx;eTo`^mi}Aka zQj@$!bHNrn=~Eoga77AY6sD8?%ClS;YTP>9q=fVwq%EF(7$V7p~)4q`ukTH$gy8@{3sxL>hTe$i*|tzZTi+Mc`M}l zuyEOx4elbn#}`JO;R_6rTizA=+2vxT%<5-ng=Rh|Tz5CI?*vbO^IrvHmt_@ma%Q-y z8y$a~;ch53(NiuxdR?pV%%_Dr)MF(kX38y}{q14rna>vgLX>4D^2$Bm{(x0|)8WSl z<&Gw}Y^&IF1#Izun-jw(0cai*_&f3*UV9F-!U9e3x&PHn%h9 zdyBC5m%9tr2_8NC_+e!4e3!zH6_qoV3MM_im?;lWiokHX$tK11Y5nqhM+F}HGJa+M zc|Yd;qJGO|4Ywj@IxX0}#*DROhOj1!)rrhthtCyfXH5CX6YRBKQz2uaUaG_O8$ucv zSy{9ewtH$ml3X&!ZnDFM*43I!w_LmrEDh=~eZY8bNsIcC?i+{p+GQJ0-&1M)?1cFB za|<@B+X$R_DpGncZA)U5#gW?qS3MY0!#HP0I9eJ@KKBhYbl{hb;h%J4G4tPWMMTC? kQD}u{9H9x1w*O$PIzL4~`gl1vFq<=Yy85}Sb4q9e05=ZRFaQ7m diff --git a/res/drawable-xxxhdpi/ic_unarchive_white_36dp.png b/res/drawable-xxxhdpi/ic_unarchive_white_36dp.png deleted file mode 100644 index 5e4dd3ddf162b288b3259117988cfe2c46bd1d2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 753 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFzxVkaSW+oe0$f>dwQVA@sHd| z#e$|TnGt~^F1)>tB8^|zTBH`O)f6~Xz;RBS<5trG&CZT8?+gL1ThdA#+=fz0kJgL5 zy1(!2dC4f7^N)-5_P>A68)J7`)<5v>(kVe+no#1ARI$!R*Za4UI+yzdm2ErZS2pYW zm%Zh4Zs{&Ky=Kxv#_%%c7dop`GJA_-nPnev&-``jpkAX}q)K%D&C9YEl4s=>O}w=F z?Q`aR>amP>50=lqv|IL(@xGUO4eN}S+*J0`H$TXAw#{c7Z%Na9ljxKwmoCqJ$bPo2 zaFg$Xy)`|*WUX$ovYGrovTs|1+l=Km^UnoW?eqS#@MgB#EygMbUE3Vy7iy-Z+EOnh zUSGLlCA`r=f8|>7i4MnqdgtaE3$mBYmzv$nT;<%WdxWue`LTUR8F^Q3Tx+qwOL#&9 zi;4mxr-uWR5Q6D74aav?!)RV%^Jr24+Tg(=GtNf$G9$@2d6KE5_B0b@X#wem=`~(K_xG!nQjwg-{RD(dz?`>Ao+8l!{#eDd}J;JZd9-BV(4eyMs&kVOE&fieWc7A4Y>0j^R z!gn9LQq4|WVmp1t_;AFNUT0s2I;4P|g%sG|_)l!;ZRyh5><3KB44$rjF6*2UngDh= BJ(>Uj diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 5269732dd..2cf147404 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -39,7 +39,6 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.view.ActionMode; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; @@ -140,8 +139,6 @@ public class ConversationListFragment extends Fragment list.setLayoutManager(new LinearLayoutManager(getActivity())); list.setItemAnimator(new DeleteItemAnimator()); - new ItemTouchHelper(new ArchiveListenerCallback()).attachToRecyclerView(list); - return view; } @@ -176,17 +173,6 @@ public class ConversationListFragment extends Fragment return (ConversationListAdapter) list.getAdapter(); } - public void setQueryFilter(String query) { - this.queryFilter = query; - getLoaderManager().restartLoader(0, null, this); - } - - public void resetQueryFilter() { - if (!TextUtils.isEmpty(this.queryFilter)) { - setQueryFilter(""); - } - } - private void initializeFabClickListener() { Intent intent = new Intent(getActivity(), NewConversationActivity.class); if (isRelayingMessageContent(getActivity())) { @@ -361,7 +347,6 @@ public class ConversationListFragment extends Fragment } - boolean forceListRedraw; @Override public void onLoadFinished(Loader arg0, DcChatlist chatlist) { if (chatlist.getCnt() <= 0 && TextUtils.isEmpty(queryFilter) && !archive) { @@ -381,16 +366,6 @@ public class ConversationListFragment extends Fragment fab.stopPulse(); } - // this hack is needed as otherwise, for whatever reason, - // swiped contact request show an empty item if there pops up a new contact request imediately. - // anyone who wants to invesigate to this is very welcome :) - if (forceListRedraw) { - list.setLayoutManager(null); - list.getRecycledViewPool().clear(); - list.setLayoutManager(new LinearLayoutManager(getActivity())); - forceListRedraw = false; - } - getListAdapter().changeData(chatlist); } @@ -512,120 +487,6 @@ public class ConversationListFragment extends Fragment actionMode = null; } - private class ArchiveListenerCallback extends ItemTouchHelper.SimpleCallback { - - ArchiveListenerCallback() { - super(0, ItemTouchHelper.RIGHT); - } - - @Override - public boolean onMove(RecyclerView recyclerView, - RecyclerView.ViewHolder viewHolder, - RecyclerView.ViewHolder target) - { - return false; - } - - @Override - public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) { - if (viewHolder.itemView instanceof ConversationListItemAction) { - return 0; - } - - if (actionMode != null) { - return 0; - } - - return super.getSwipeDirs(recyclerView, viewHolder); - } - - @SuppressLint("StaticFieldLeak") - @Override - public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) { - if (viewHolder.itemView instanceof ConversationListItemInboxZero) return; - final long chatId = ((ConversationListItem)viewHolder.itemView).getChatId(); - final DcContext dcContext = DcHelper.getContext(getActivity()); - - if (archive) { - new SnackbarAsyncTask(getView(), - getResources().getQuantityString(R.plurals.chat_unarchived, 1, 1), - getString(R.string.undo), - Snackbar.LENGTH_LONG, false) - { - @Override - protected void executeAction(@Nullable Long parameter) { - dcContext.archiveChat((int) chatId, 0); - } - - @Override - protected void reverseAction(@Nullable Long parameter) { - dcContext.archiveChat((int) chatId, 1); - } - }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, chatId); - } else { - if (chatId == DcChat.DC_CHAT_ID_DEADDROP) { - int contactId = ((ConversationListItem)viewHolder.itemView).getContactId(); - dcContext.marknoticedContact(contactId); - forceListRedraw = true; - return; - } - - new SnackbarAsyncTask(getView(), - getResources().getQuantityString(R.plurals.chat_archived, 1, 1), - getString(R.string.undo), - Snackbar.LENGTH_LONG, false) - { - @Override - protected void executeAction(@Nullable Long parameter) { - dcContext.archiveChat((int) chatId, 1); - } - - @Override - protected void reverseAction(@Nullable Long parameter) { - dcContext.archiveChat((int) chatId, 0); - } - }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, chatId); - } - } - - @Override - public void onChildDraw(Canvas c, RecyclerView recyclerView, - RecyclerView.ViewHolder viewHolder, - float dX, float dY, int actionState, - boolean isCurrentlyActive) - { - if (viewHolder.itemView instanceof ConversationListItemInboxZero) return; - if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) { - View itemView = viewHolder.itemView; - Paint p = new Paint(); - float alpha = 1.0f - Math.abs(dX) / (float) viewHolder.itemView.getWidth(); - - if (dX > 0) { - Bitmap icon; - - if (archive) icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_unarchive_white_36dp); - else icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_archive_white_36dp); - - if (alpha > 0) p.setColor(getResources().getColor(DynamicTheme.isDarkTheme(getActivity())? R.color.gray95 : R.color.delta_primary)); - else p.setColor(DynamicTheme.isDarkTheme(getActivity())? Color.BLACK : Color.WHITE); - - c.drawRect((float) itemView.getLeft(), (float) itemView.getTop(), dX, - (float) itemView.getBottom(), p); - - c.drawBitmap(icon, - (float) itemView.getLeft() + getResources().getDimension(R.dimen.conversation_list_fragment_archive_padding), - (float) itemView.getTop() + ((float) itemView.getBottom() - (float) itemView.getTop() - icon.getHeight())/2, - p); - } - - viewHolder.itemView.setAlpha(alpha); - viewHolder.itemView.setTranslationX(dX); - } else { - super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive); - } - } - } - @Override public void handleEvent(int eventId, Object data1, Object data2) { getLoaderManager().restartLoader(0,null,this); From ad11db6889435368ab6d0ed594348b506333cfab Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 5 Jul 2019 18:19:22 +0200 Subject: [PATCH 2/3] not-now in contact-request removes request (tap outside cancels) --- .../securesms/ConversationListFragment.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 2cf147404..47eb624a2 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -20,11 +20,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.content.res.TypedArray; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Canvas; import android.graphics.Color; -import android.graphics.Paint; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; @@ -385,7 +381,6 @@ public class ConversationListFragment extends Fragment int msgId = item.getMsgId(); int contactId = item.getContactId(); DcContact contact = dcContext.getContact(contactId); - //TODO: check if forward messages new AlertDialog.Builder(getActivity()) .setMessage(getActivity().getString(R.string.ask_start_chat_with, contact.getNameNAddr())) .setPositiveButton(android.R.string.ok, (dialog, which) -> { @@ -394,8 +389,10 @@ public class ConversationListFragment extends Fragment handleCreateConversation(belongingChatId); } }) - .setNegativeButton(R.string.not_now, null) - .setNeutralButton(R.string.never, (dialog, which) -> { + .setNegativeButton(R.string.not_now, (dialog, which) -> { + dcContext.marknoticedContact(contactId); + }) + .setNeutralButton(R.string.menu_block_contact, (dialog, which) -> { dcContext.blockContact(contactId, 1); }) .show(); From a50beb6754785134209d72684cfd0d90f1106fbd Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 5 Jul 2019 18:34:16 +0200 Subject: [PATCH 3/3] unify start-chat dialogs --- src/org/thoughtcrime/securesms/ConversationItem.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index e459bcd1f..770daa3c8 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -625,6 +625,9 @@ public class ConversationItem extends LinearLayout } }) .setNegativeButton(android.R.string.cancel, null) + .setNeutralButton(R.string.menu_block_contact, (dialog, which) -> { + dcContext.blockContact(messageRecord.getFromId(), 1); + }) .setMessage(context.getString(R.string.ask_start_chat_with, dcContext.getContact(messageRecord.getFromId()).getDisplayName())) .show(); }