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

Disable shared element transitions from bubble.

Browse source
This commit is contained in:
Alex Hart 2023-02-15 12:03:33 -04:00 • committed by Greyson Parrelli
parent a88410faaf
commit 2bff2d3a30
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View file

@ -1490,6 +1490,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
void onRegisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver); void onRegisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver);
void onUnregisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver); void onUnregisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver);
void onInviteToSignal(); void onInviteToSignal();
boolean isInBubble();
} }
private class ConversationScrollListener extends OnScrollListener { private class ConversationScrollListener extends OnScrollListener {
@ -2109,6 +2110,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()) {
requireActivity().startActivity(MediaIntentFactory.create(requireActivity(), args));
return;
}
if (args.isVideoGif()) { if (args.isVideoGif()) {
int adapterPosition = list.getChildAdapterPosition(parent); int adapterPosition = list.getChildAdapterPosition(parent);
GiphyMp4ProjectionPlayerHolder holder = giphyMp4ProjectionRecycler.getCurrentHolder(adapterPosition); GiphyMp4ProjectionPlayerHolder holder = giphyMp4ProjectionRecycler.getCurrentHolder(adapterPosition);

3
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View file

@ -2267,7 +2267,8 @@ public class ConversationParentFragment extends Fragment
callback.onInitializeToolbar(toolbar); callback.onInitializeToolbar(toolbar);
} }
protected boolean isInBubble() { @Override
public boolean isInBubble() {
return callback.isInBubble(); return callback.isInBubble();
} }