Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Push bubbled conversation onto back stack.

Browse Source
This commit is contained in:
Nicholas Tinsley
2023-05-17 11:37:41 -04:00
committed by Greyson Parrelli
parent c5317370c8
commit c76002663f
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@@ -2028,6 +2028,11 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
@Override @Override
public void goToMediaPreview(ConversationItem parent, View sharedElement, MediaIntentFactory.MediaPreviewArgs args) { public void goToMediaPreview(ConversationItem parent, View sharedElement, MediaIntentFactory.MediaPreviewArgs args) {
if (listener.isInBubble()) { if (listener.isInBubble()) {
Intent intent = ConversationIntents.createBuilder(requireActivity(), recipient.getId(), threadId)
.withStartingPosition(list.getChildAdapterPosition(parent))
.build();
requireActivity().startActivity(intent);
requireActivity().startActivity(MediaIntentFactory.create(requireActivity(), args.skipSharedElementTransition(true))); requireActivity().startActivity(MediaIntentFactory.create(requireActivity(), args.skipSharedElementTransition(true)));
return; return;
} }
@@ -2046,15 +2051,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
requireActivity().setExitSharedElementCallback(new MaterialContainerTransformSharedElementCallback()); requireActivity().setExitSharedElementCallback(new MaterialContainerTransformSharedElementCallback());
ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(requireActivity(), sharedElement, MediaPreviewV2Activity.SHARED_ELEMENT_TRANSITION_NAME); ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(requireActivity(), sharedElement, MediaPreviewV2Activity.SHARED_ELEMENT_TRANSITION_NAME);
final Intent mediaPreviewIntent = MediaIntentFactory.create(requireActivity(), args); requireActivity().startActivity(MediaIntentFactory.create(requireActivity(), args), options.toBundle());
if (listener.isInBubble()) {
mediaPreviewIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP |
Intent.FLAG_ACTIVITY_NEW_TASK |
Intent.FLAG_ACTIVITY_SINGLE_TOP);
}
requireActivity().startActivity(mediaPreviewIntent, options.toBundle());
} }
@Override @Override