mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Tweak archive animation scaling, use new unarchive icon.

fork-5.53.8
Greyson Parrelli 2021-11-05 15:35:46 -04:00
rodzic 782217a73d
commit ed3f992b83
2 zmienionych plików z 6 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
Wyświetl plik

@ -106,7 +106,7 @@ public class ConversationListArchiveFragment extends ConversationListFragment im
@Override @Override
protected @DrawableRes int getArchiveIconRes() { protected @DrawableRes int getArchiveIconRes() {
return R.drawable.ic_unarchive_white_36dp; return R.drawable.ic_unarchive_24;
} }
@Override @Override

9
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
Wyświetl plik

@ -1354,7 +1354,8 @@ public class ConversationListFragment extends MainFragment implements ActionMode
private class ArchiveListenerCallback extends ItemTouchHelper.SimpleCallback { private class ArchiveListenerCallback extends ItemTouchHelper.SimpleCallback {
private static final float MIN_ICON_SCALE = 0.75f; private static final float MIN_ICON_SCALE = 0.85f;
private static final float MAX_ICON_SCALE = 1.25f;
private final int archiveColorStart; private final int archiveColorStart;
private final int archiveColorEnd; private final int archiveColorEnd;
@ -1410,15 +1411,15 @@ public class ConversationListFragment extends MainFragment implements ActionMode
float percentDx = Math.abs(dX) / viewHolder.itemView.getWidth(); float percentDx = Math.abs(dX) / viewHolder.itemView.getWidth();
int color = ArgbEvaluatorCompat.getInstance().evaluate(Math.min(1f, percentDx * (1 / 0.25f)), archiveColorStart, archiveColorEnd); int color = ArgbEvaluatorCompat.getInstance().evaluate(Math.min(1f, percentDx * (1 / 0.25f)), archiveColorStart, archiveColorEnd);
float scaleStartPoint = DimensionUnit.DP.toPixels(48f); float scaleStartPoint = DimensionUnit.DP.toPixels(48f);
float scaleEndPoint = DimensionUnit.DP.toPixels(112f); float scaleEndPoint = DimensionUnit.DP.toPixels(96f);
float scale; float scale;
if (dX < scaleStartPoint) { if (dX < scaleStartPoint) {
scale = MIN_ICON_SCALE; scale = MIN_ICON_SCALE;
} else if (dX > scaleEndPoint) { } else if (dX > scaleEndPoint) {
scale = 1f; scale = MAX_ICON_SCALE;
} else { } else {
scale = Math.min(1f, MIN_ICON_SCALE + ((dX - scaleStartPoint) / (scaleEndPoint - scaleStartPoint)) * (1f - MIN_ICON_SCALE)); scale = Math.min(MAX_ICON_SCALE, MIN_ICON_SCALE + ((dX - scaleStartPoint) / (scaleEndPoint - scaleStartPoint)) * (MAX_ICON_SCALE - MIN_ICON_SCALE));
} }
if (dX > 0) { if (dX > 0) {