diff options
| author | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-03-22 18:24:50 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-03-22 18:24:50 +0100 |
| commit | f9b453d8790c1c0c37151d2304c0ff94c8b1805a (patch) | |
| tree | d5cb9b8e93dea09da089bdb5fd13b62f2bee06dc | |
| parent | e431d3d092c0a832aff6c4df3dc360385d73c81b (diff) | |
add choose video from file to attachments menu
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 6 | ||||
| -rw-r--r-- | src/main/res/menu/choose_attachment.xml | 5 | ||||
| -rw-r--r-- | src/main/res/menu/fragment_conversation.xml | 5 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
4 files changed, 17 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 7df639222..82b3cfca1 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -632,6 +632,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke popup.setOnMenuItemClickListener(attachmentItem -> { switch (attachmentItem.getItemId()) { case R.id.attach_choose_picture: + case R.id.attach_choose_video: case R.id.attach_take_picture: case R.id.attach_record_video: case R.id.attach_choose_file: @@ -996,6 +997,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke case ATTACHMENT_CHOICE_CHOOSE_FILE: case ATTACHMENT_CHOICE_RECORD_VIDEO: case ATTACHMENT_CHOICE_RECORD_VOICE: + case ATTACHMENT_CHOICE_CHOOSE_VIDEO: final Attachment.Type type = requestCode == ATTACHMENT_CHOICE_RECORD_VOICE ? Attachment.Type.RECORDING : Attachment.Type.FILE; final List<Attachment> fileUris = Attachment.extractAttachments(getActivity(), data, type); mediaPreviewAdapter.addMediaPreviews(fileUris); @@ -1434,6 +1436,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke handleEncryptionSelection(item); break; case R.id.attach_choose_picture: + case R.id.attach_choose_video: case R.id.attach_take_picture: case R.id.attach_record_video: case R.id.attach_choose_file: @@ -1494,6 +1497,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke case R.id.attach_choose_picture: attachFile(ATTACHMENT_CHOICE_CHOOSE_IMAGE); break; + case R.id.attach_choose_video: + attachFile(ATTACHMENT_CHOICE_CHOOSE_VIDEO); + break; case R.id.attach_take_picture: attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO); break; diff --git a/src/main/res/menu/choose_attachment.xml b/src/main/res/menu/choose_attachment.xml index a9a57404d..96e540f59 100644 --- a/src/main/res/menu/choose_attachment.xml +++ b/src/main/res/menu/choose_attachment.xml @@ -12,6 +12,11 @@ android:title="@string/attach_choose_picture" /> <item + android:id="@+id/attach_choose_video" + android:icon="?attr/ic_attach_video" + android:title="@string/attach_choose_video" /> + + <item android:id="@+id/attach_take_picture" android:icon="?attr/ic_attach_camera" android:title="@string/action_take_photo" /> diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml index 8858d941d..ac7d8a1d2 100644 --- a/src/main/res/menu/fragment_conversation.xml +++ b/src/main/res/menu/fragment_conversation.xml @@ -43,6 +43,11 @@ android:title="@string/attach_choose_picture" /> <item + android:id="@+id/attach_choose_video" + android:icon="?attr/ic_attach_video" + android:title="@string/attach_choose_video" /> + + <item android:id="@+id/attach_take_picture" android:icon="?attr/ic_attach_camera" android:title="@string/action_take_photo" /> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 280eeaceb..7fa728f54 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1004,4 +1004,5 @@ <string name="show_videos_images_only">Only images/videos</string> <string name="show_avatar">Show avatar</string> <string name="action_delete">Delete</string> + <string name="attach_choose_video">Choose video</string> </resources> |