empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix payments banner causing weird conversation list animations.

Browse source
This commit is contained in:
Greyson Parrelli 2021-11-15 11:21:45 -05:00
parent dce8fde195
commit 18bb876d1b
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
View file

@ -315,6 +315,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
updateReminders();
EventBus.getDefault().register(this);
itemAnimator.disable();
if (Util.isDefaultSmsProvider(requireContext())) {
InsightsLauncher.showInsightsModal(requireContext(), requireFragmentManager());
@ -355,6 +356,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
super.onStart();
ConversationFragment.prepare(requireContext());
ApplicationDependencies.getAppForegroundObserver().addListener(appForegroundObserver);
itemAnimator.disable();
}
@Override
@ -695,30 +697,18 @@ public class ConversationListFragment extends MainFragment implements ActionMode
}
private void animatePaymentUnreadStatusIn() {
animatePaymentUnreadStatus(ConstraintSet.VISIBLE);
paymentNotificationView.get().setVisibility(View.VISIBLE);
unreadPaymentsDot.animate().alpha(1);
}
private void animatePaymentUnreadStatusOut() {
if (paymentNotificationView.resolved()) {
animatePaymentUnreadStatus(ConstraintSet.GONE);
paymentNotificationView.get().setVisibility(View.GONE);
}
unreadPaymentsDot.animate().alpha(0);
}
private void animatePaymentUnreadStatus(int constraintSetVisibility) {
paymentNotificationView.get();
TransitionManager.beginDelayedTransition(constraintLayout);
ConstraintSet currentLayout = new ConstraintSet();
currentLayout.clone(constraintLayout);
currentLayout.setVisibility(R.id.payments_notification, constraintSetVisibility);
currentLayout.applyTo(constraintLayout);
}
private void onSearchResultChanged(@Nullable SearchResult result) {
result = result != null ? result : SearchResult.EMPTY;
searchAdapter.updateResults(result);

8
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItemAnimator.java
View file

@ -27,8 +27,14 @@ public class ConversationListItemAnimator extends DefaultItemAnimator {
shouldDisable = false;
}
@MainThread
public void disable() {
setMoveDuration(0);
}
/**
* We need to reasonable ensure that the animation has started before we disable things here, so we add a slight delay.
* We need to reasonably ensure that the animation has started before we disable things here, so we add a slight delay.
*/
@MainThread
public void postDisable(Handler handler) {