diff options
Diffstat (limited to 'src/main/res')
25 files changed, 34 insertions, 18 deletions
diff --git a/src/main/res/drawable-hdpi/ic_attach_videocam.png b/src/main/res/drawable-hdpi/ic_attach_videocam.png Binary files differnew file mode 100644 index 000000000..f95861633 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_videocam.png diff --git a/src/main/res/drawable-hdpi/ic_send_videocam_away.png b/src/main/res/drawable-hdpi/ic_send_videocam_away.png Binary files differnew file mode 100644 index 000000000..950db9d9e --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_videocam_away.png diff --git a/src/main/res/drawable-hdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-hdpi/ic_send_videocam_dnd.png Binary files differnew file mode 100644 index 000000000..8a3588678 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_videocam_dnd.png diff --git a/src/main/res/drawable-hdpi/ic_send_videocam_online.png b/src/main/res/drawable-hdpi/ic_send_videocam_online.png Binary files differnew file mode 100644 index 000000000..ac5af607f --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_videocam_online.png diff --git a/src/main/res/drawable-mdpi/ic_attach_videocam.png b/src/main/res/drawable-mdpi/ic_attach_videocam.png Binary files differnew file mode 100644 index 000000000..66aa2fe49 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_videocam.png diff --git a/src/main/res/drawable-mdpi/ic_send_videocam_away.png b/src/main/res/drawable-mdpi/ic_send_videocam_away.png Binary files differnew file mode 100644 index 000000000..55399ac8d --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_send_videocam_away.png diff --git a/src/main/res/drawable-mdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-mdpi/ic_send_videocam_dnd.png Binary files differnew file mode 100644 index 000000000..608947d59 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_send_videocam_dnd.png diff --git a/src/main/res/drawable-mdpi/ic_send_videocam_online.png b/src/main/res/drawable-mdpi/ic_send_videocam_online.png Binary files differnew file mode 100644 index 000000000..90a152504 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_send_videocam_online.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_videocam.png b/src/main/res/drawable-xhdpi/ic_attach_videocam.png Binary files differnew file mode 100644 index 000000000..5f6054b81 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_videocam.png diff --git a/src/main/res/drawable-xhdpi/ic_send_videocam_away.png b/src/main/res/drawable-xhdpi/ic_send_videocam_away.png Binary files differnew file mode 100644 index 000000000..69e340800 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_send_videocam_away.png diff --git a/src/main/res/drawable-xhdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-xhdpi/ic_send_videocam_dnd.png Binary files differnew file mode 100644 index 000000000..e7f784d8b --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_send_videocam_dnd.png diff --git a/src/main/res/drawable-xhdpi/ic_send_videocam_online.png b/src/main/res/drawable-xhdpi/ic_send_videocam_online.png Binary files differnew file mode 100644 index 000000000..7cda9e6f0 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_send_videocam_online.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_videocam.png b/src/main/res/drawable-xxhdpi/ic_attach_videocam.png Binary files differnew file mode 100644 index 000000000..e74d2a776 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_videocam.png diff --git a/src/main/res/drawable-xxhdpi/ic_send_videocam_away.png b/src/main/res/drawable-xxhdpi/ic_send_videocam_away.png Binary files differnew file mode 100644 index 000000000..ce04c7790 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_send_videocam_away.png diff --git a/src/main/res/drawable-xxhdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_videocam_dnd.png Binary files differnew file mode 100644 index 000000000..24890da09 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_send_videocam_dnd.png diff --git a/src/main/res/drawable-xxhdpi/ic_send_videocam_online.png b/src/main/res/drawable-xxhdpi/ic_send_videocam_online.png Binary files differnew file mode 100644 index 000000000..079cdef19 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_send_videocam_online.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_videocam.png b/src/main/res/drawable-xxxhdpi/ic_attach_videocam.png Binary files differnew file mode 100644 index 000000000..02fddb640 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_videocam.png diff --git a/src/main/res/drawable-xxxhdpi/ic_send_videocam_away.png b/src/main/res/drawable-xxxhdpi/ic_send_videocam_away.png Binary files differnew file mode 100644 index 000000000..7e517e6be --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_send_videocam_away.png diff --git a/src/main/res/drawable-xxxhdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_videocam_dnd.png Binary files differnew file mode 100644 index 000000000..3077ee233 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_send_videocam_dnd.png diff --git a/src/main/res/drawable-xxxhdpi/ic_send_videocam_online.png b/src/main/res/drawable-xxxhdpi/ic_send_videocam_online.png Binary files differnew file mode 100644 index 000000000..0baef17f4 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_send_videocam_online.png diff --git a/src/main/res/menu/choose_attachment.xml b/src/main/res/menu/choose_attachment.xml index ae6f47a95..a9a57404d 100644 --- a/src/main/res/menu/choose_attachment.xml +++ b/src/main/res/menu/choose_attachment.xml @@ -14,7 +14,12 @@ <item android:id="@+id/attach_take_picture" android:icon="?attr/ic_attach_camera" - android:title="@string/attach_take_from_camera" /> + android:title="@string/action_take_photo" /> + + <item + android:id="@+id/attach_record_video" + android:icon="?attr/ic_attach_videocam" + android:title="@string/action_take_video" /> <item android:id="@+id/attach_record_voice" android:icon="?attr/ic_attach_record" diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml index 197dc8137..088501bcb 100644 --- a/src/main/res/menu/fragment_conversation.xml +++ b/src/main/res/menu/fragment_conversation.xml @@ -5,8 +5,8 @@ android:id="@+id/action_security" android:icon="?attr/icon_not_secure" android:orderInCategory="20" - app:showAsAction="always" - android:title="@string/action_secure" > + android:title="@string/action_secure" + app:showAsAction="always"> <menu> <group android:checkableBehavior="single"> <item @@ -28,8 +28,8 @@ android:id="@+id/action_attach_file" android:icon="?attr/icon_new_attachment" android:orderInCategory="30" - app:showAsAction="always" - android:title="@string/attach_file" > + android:title="@string/attach_file" + app:showAsAction="always"> <menu> <item @@ -45,7 +45,13 @@ <item android:id="@+id/attach_take_picture" android:icon="?attr/ic_attach_camera" - android:title="@string/attach_take_from_camera" /> + android:title="@string/action_take_photo" /> + + <item + android:id="@+id/attach_record_video" + android:icon="?attr/ic_attach_videocam" + android:title="@string/action_take_video" /> + <item android:id="@+id/attach_record_voice" android:icon="?attr/ic_attach_record" @@ -60,33 +66,33 @@ <item android:id="@+id/action_invite" android:orderInCategory="45" - app:showAsAction="never" - android:title="@string/invite_contact" /> + android:title="@string/invite_contact" + app:showAsAction="never" /> <item android:id="@+id/action_clear_history" android:orderInCategory="50" - app:showAsAction="never" - android:title="@string/action_clear_history" /> + android:title="@string/action_clear_history" + app:showAsAction="never" /> <item android:id="@+id/action_archive_chat" android:orderInCategory="60" - app:showAsAction="never" - android:title="@string/action_end_conversation" /> + android:title="@string/action_end_conversation" + app:showAsAction="never" /> <item android:id="@+id/action_create_issue" android:orderInCategory="100" - app:showAsAction="never" - android:title="@string/create_issue" /> + android:title="@string/create_issue" + app:showAsAction="never" /> <item android:id="@+id/action_group_details" + android:icon="@drawable/ic_group_white_24dp" android:orderInCategory="100" android:title="@string/action_group_details" - android:icon="@drawable/ic_group_white_24dp" app:showAsAction="always" /> <item android:id="@+id/action_contact_details" + android:icon="@drawable/ic_contact_white_24dp" android:orderInCategory="100" android:title="@string/action_contact_details" - android:icon="@drawable/ic_contact_white_24dp" app:showAsAction="always" /> </menu>
\ No newline at end of file diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index ff36fe0ae..93da9bac4 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -37,7 +37,8 @@ <string-array name="quick_actions"> <item>@string/none</item> <item>@string/recently_used</item> - <item>@string/attach_take_from_camera</item> + <item>@string/action_take_photo</item> + <item>@string/action_take_video</item> <item>@string/attach_choose_picture</item> <item>@string/attach_record_voice</item> <item>@string/send_location</item> @@ -46,7 +47,8 @@ <string-array name="quick_action_values"> <item>none</item> <item>recent</item> - <item>TAKE_FROM_CAMERA</item> + <item>TAKE_PHOTO</item> + <item>RECORD_VIDEO</item> <item>CHOOSE_PICTURE</item> <item>RECORD_VOICE</item> <item>SEND_LOCATION</item> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index c8ccec47a..672cb00fb 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -93,6 +93,7 @@ <attr name="ic_attach_photo" format="reference" /> <attr name="ic_attach_record" format="reference" /> <attr name="ic_attach_video" format="reference" /> + <attr name="ic_attach_videocam" format="reference" /> <attr name="ic_file_apk" format="reference" /> <attr name="ic_file_pdf" format="reference" /> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 0d2eab4fe..50cf8e93a 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -119,6 +119,7 @@ <item name="delete_icon_alpha" type="float">0.70</item> <item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera</item> + <item type="reference" name="ic_attach_videocam">@drawable/ic_attach_videocam</item> <item name="ic_attach_document" type="reference">@drawable/ic_attach_document</item> <item name="ic_attach_location" type="reference">@drawable/ic_attach_location</item> <item name="ic_attach_photo" type="reference">@drawable/ic_attach_photo</item> @@ -221,6 +222,7 @@ </item> <item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera_white</item> + <item name="ic_attach_videocam" type="reference">@drawable/ic_attach_videocam_white</item> <item name="ic_attach_video" type="reference">@drawable/ic_attach_videocam_white</item> <item name="ic_attach_document" type="reference">@drawable/ic_attach_document_white</item> <item name="ic_attach_location" type="reference">@drawable/ic_attach_location_white</item> |
