diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-05-05 22:28:32 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-05-05 22:28:32 +0200 |
| commit | ac70233fa49c8fb2477a5b3d8752aa126791e372 (patch) | |
| tree | 29883656ecb813c3145ad57c3c16029bd5cdec56 /src/main/java/de/pixart/messenger/ui/ConversationFragment.java | |
| parent | 89cca15e77130eae3b1c79b054b72de01debeb57 (diff) | |
add animators for more activities
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 8e79d0acb..a7163af5d 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -185,6 +185,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC); intent.putExtra("uuid", conversation.getUuid()); startActivity(intent); + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } }; private OnClickListener leaveMuc = new OnClickListener() { @@ -388,6 +389,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke intent.putExtra(VerifyOTRActivity.EXTRA_ACCOUNT, conversation.getAccount().getJid().asBareJid().toString()); intent.putExtra("mode", VerifyOTRActivity.MODE_ANSWER_QUESTION); startActivity(intent); + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } }; @@ -1714,6 +1716,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE); startActivityForResult(intent, attachmentChoice); + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); }); builder.setPositiveButton(getString(R.string.action_take_video), (dialog, which) -> { @@ -1721,6 +1724,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.setAction(MediaStore.ACTION_VIDEO_CAPTURE); startActivityForResult(intent, attachmentChoice); + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); }); builder.create().show(); break; @@ -1732,9 +1736,11 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke break; case ATTACHMENT_CHOICE_RECORD_VOICE: startActivityForResult(new Intent(getActivity(), RecordingActivity.class), attachmentChoice); + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); break; case ATTACHMENT_CHOICE_LOCATION: startActivityForResult(new Intent(getActivity(), ShareLocationActivity.class), attachmentChoice); + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); break; } if (intent.resolveActivity(getActivity().getPackageManager()) != null) { |