From 382b741adfa29104223dfed32799b5883db9110a Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sat, 4 Mar 2017 18:05:37 +0100 Subject: Added icons for the attach options according to material design guidlines --- .../pixart/messenger/ui/ConversationActivity.java | 22 +++++++++++++++++++++ src/main/res/drawable-hdpi/ic_attach_camera.png | Bin 0 -> 395 bytes .../res/drawable-hdpi/ic_attach_camera_white.png | Bin 0 -> 390 bytes src/main/res/drawable-hdpi/ic_attach_document.png | Bin 0 -> 236 bytes .../res/drawable-hdpi/ic_attach_document_white.png | Bin 0 -> 253 bytes src/main/res/drawable-hdpi/ic_attach_location.png | Bin 0 -> 463 bytes .../res/drawable-hdpi/ic_attach_location_white.png | Bin 0 -> 509 bytes src/main/res/drawable-hdpi/ic_attach_photo.png | Bin 0 -> 340 bytes .../res/drawable-hdpi/ic_attach_photo_white.png | Bin 0 -> 367 bytes src/main/res/drawable-hdpi/ic_attach_record.png | Bin 0 -> 436 bytes .../res/drawable-hdpi/ic_attach_record_white.png | Bin 0 -> 479 bytes src/main/res/drawable-hdpi/ic_attach_video.png | Bin 0 -> 213 bytes src/main/res/drawable-mdpi/ic_attach_camera.png | Bin 0 -> 236 bytes .../res/drawable-mdpi/ic_attach_camera_white.png | Bin 0 -> 249 bytes src/main/res/drawable-mdpi/ic_attach_document.png | Bin 0 -> 152 bytes .../res/drawable-mdpi/ic_attach_document_white.png | Bin 0 -> 163 bytes src/main/res/drawable-mdpi/ic_attach_location.png | Bin 0 -> 261 bytes .../res/drawable-mdpi/ic_attach_location_white.png | Bin 0 -> 280 bytes src/main/res/drawable-mdpi/ic_attach_photo.png | Bin 0 -> 190 bytes .../res/drawable-mdpi/ic_attach_photo_white.png | Bin 0 -> 198 bytes src/main/res/drawable-mdpi/ic_attach_record.png | Bin 0 -> 235 bytes .../res/drawable-mdpi/ic_attach_record_white.png | Bin 0 -> 256 bytes src/main/res/drawable-mdpi/ic_attach_video.png | Bin 0 -> 133 bytes src/main/res/drawable-xhdpi/ic_attach_camera.png | Bin 0 -> 445 bytes .../res/drawable-xhdpi/ic_attach_camera_white.png | Bin 0 -> 491 bytes src/main/res/drawable-xhdpi/ic_attach_document.png | Bin 0 -> 240 bytes .../drawable-xhdpi/ic_attach_document_white.png | Bin 0 -> 255 bytes src/main/res/drawable-xhdpi/ic_attach_location.png | Bin 0 -> 506 bytes .../drawable-xhdpi/ic_attach_location_white.png | Bin 0 -> 549 bytes src/main/res/drawable-xhdpi/ic_attach_photo.png | Bin 0 -> 337 bytes .../res/drawable-xhdpi/ic_attach_photo_white.png | Bin 0 -> 369 bytes src/main/res/drawable-xhdpi/ic_attach_record.png | Bin 0 -> 460 bytes .../res/drawable-xhdpi/ic_attach_record_white.png | Bin 0 -> 502 bytes src/main/res/drawable-xhdpi/ic_attach_video.png | Bin 0 -> 194 bytes src/main/res/drawable-xxhdpi/ic_attach_camera.png | Bin 0 -> 741 bytes .../res/drawable-xxhdpi/ic_attach_camera_white.png | Bin 0 -> 859 bytes .../res/drawable-xxhdpi/ic_attach_document.png | Bin 0 -> 373 bytes .../drawable-xxhdpi/ic_attach_document_white.png | Bin 0 -> 414 bytes .../res/drawable-xxhdpi/ic_attach_location.png | Bin 0 -> 867 bytes .../drawable-xxhdpi/ic_attach_location_white.png | Bin 0 -> 980 bytes src/main/res/drawable-xxhdpi/ic_attach_photo.png | Bin 0 -> 595 bytes .../res/drawable-xxhdpi/ic_attach_photo_white.png | Bin 0 -> 650 bytes src/main/res/drawable-xxhdpi/ic_attach_record.png | Bin 0 -> 796 bytes .../res/drawable-xxhdpi/ic_attach_record_white.png | Bin 0 -> 884 bytes src/main/res/drawable-xxhdpi/ic_attach_video.png | Bin 0 -> 299 bytes src/main/res/drawable-xxxhdpi/ic_attach_camera.png | Bin 0 -> 1790 bytes .../drawable-xxxhdpi/ic_attach_camera_white.png | Bin 0 -> 894 bytes .../res/drawable-xxxhdpi/ic_attach_document.png | Bin 0 -> 1276 bytes .../drawable-xxxhdpi/ic_attach_document_white.png | Bin 0 -> 378 bytes .../res/drawable-xxxhdpi/ic_attach_location.png | Bin 0 -> 1872 bytes .../drawable-xxxhdpi/ic_attach_location_white.png | Bin 0 -> 869 bytes src/main/res/drawable-xxxhdpi/ic_attach_photo.png | Bin 0 -> 1454 bytes .../res/drawable-xxxhdpi/ic_attach_photo_white.png | Bin 0 -> 570 bytes src/main/res/drawable-xxxhdpi/ic_attach_record.png | Bin 0 -> 1703 bytes .../drawable-xxxhdpi/ic_attach_record_white.png | Bin 0 -> 819 bytes src/main/res/drawable-xxxhdpi/ic_attach_video.png | Bin 0 -> 528 bytes .../res/drawable-xxxhdpi/ic_attach_video_white.png | Bin 0 -> 545 bytes src/main/res/menu/attachment_choices.xml | 18 +++++++++++------ src/main/res/values-v21/themes.xml | 7 +++++++ src/main/res/values/attrs.xml | 12 ++++++++--- src/main/res/values/dimens.xml | 1 + src/main/res/values/themes.xml | 7 +++++++ 62 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_attach_camera.png create mode 100644 src/main/res/drawable-hdpi/ic_attach_camera_white.png create mode 100644 src/main/res/drawable-hdpi/ic_attach_document.png create mode 100644 src/main/res/drawable-hdpi/ic_attach_document_white.png create mode 100644 src/main/res/drawable-hdpi/ic_attach_location.png create mode 100644 src/main/res/drawable-hdpi/ic_attach_location_white.png create mode 100644 src/main/res/drawable-hdpi/ic_attach_photo.png create mode 100644 src/main/res/drawable-hdpi/ic_attach_photo_white.png create mode 100644 src/main/res/drawable-hdpi/ic_attach_record.png create mode 100644 src/main/res/drawable-hdpi/ic_attach_record_white.png create mode 100644 src/main/res/drawable-hdpi/ic_attach_video.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_camera.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_camera_white.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_document.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_document_white.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_location.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_location_white.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_photo.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_photo_white.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_record.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_record_white.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_video.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_camera.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_camera_white.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_document.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_document_white.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_location.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_location_white.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_photo.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_photo_white.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_record.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_record_white.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_video.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_camera.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_camera_white.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_document.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_document_white.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_location.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_location_white.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_photo.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_photo_white.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_record.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_record_white.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_video.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_camera.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_camera_white.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_document.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_document_white.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_location.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_location_white.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_photo.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_photo_white.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_record.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_record_white.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_video.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_video_white.png (limited to 'src/main') diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java index a1e2a344b..7864c9e12 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java @@ -18,6 +18,7 @@ import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Typeface; +import android.graphics.drawable.Drawable; import android.media.ExifInterface; import android.net.Uri; import android.os.Build; @@ -28,6 +29,8 @@ import android.provider.MediaStore; import android.provider.Settings; import android.support.v4.widget.SlidingPaneLayout; import android.support.v4.widget.SlidingPaneLayout.PanelSlideListener; +import android.text.SpannableStringBuilder; +import android.text.style.ImageSpan; import android.util.Log; import android.util.Pair; import android.view.Gravity; @@ -911,6 +914,24 @@ public class ConversationActivity extends XmppActivity builder.create().show(); } + /** + * Moves icons from the PopupMenu's MenuItems' icon fields into the menu title as a Spannable with the icon and title text. + */ + public static void insertMenuItemIcons(Context context, PopupMenu popupMenu) { + Menu menu = popupMenu.getMenu(); + for (int i = 0; i < menu.size(); i++) { + MenuItem menuItem = menu.getItem(i); + Drawable icon = menuItem.getIcon(); + int iconSize = context.getResources().getDimensionPixelSize(R.dimen.menu_item_icon_size); + icon.setBounds(0, 0, iconSize, iconSize); + ImageSpan imageSpan = new ImageSpan(icon); + SpannableStringBuilder ssb = new SpannableStringBuilder(" " + menuItem.getTitle()); + ssb.setSpan(imageSpan, 0, 1, 0); + menuItem.setTitle(ssb); + menuItem.setIcon(null); + } + } + protected void attachFileDialog() { View menuAttachFile = findViewById(R.id.action_attach_file); if (menuAttachFile == null) { @@ -951,6 +972,7 @@ public class ConversationActivity extends XmppActivity return false; } }); + insertMenuItemIcons(getApplicationContext(), attachFilePopup); attachFilePopup.show(); } diff --git a/src/main/res/drawable-hdpi/ic_attach_camera.png b/src/main/res/drawable-hdpi/ic_attach_camera.png new file mode 100644 index 000000000..e47b10b17 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_camera.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_camera_white.png b/src/main/res/drawable-hdpi/ic_attach_camera_white.png new file mode 100644 index 000000000..e92055f6c Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_camera_white.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_document.png b/src/main/res/drawable-hdpi/ic_attach_document.png new file mode 100644 index 000000000..08bd6296b Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_document.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_document_white.png b/src/main/res/drawable-hdpi/ic_attach_document_white.png new file mode 100644 index 000000000..749d0dab6 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_document_white.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_location.png b/src/main/res/drawable-hdpi/ic_attach_location.png new file mode 100644 index 000000000..b085607ca Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_location.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_location_white.png b/src/main/res/drawable-hdpi/ic_attach_location_white.png new file mode 100644 index 000000000..e354ed9c0 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_location_white.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_photo.png b/src/main/res/drawable-hdpi/ic_attach_photo.png new file mode 100644 index 000000000..c4d1cd872 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_photo.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_photo_white.png b/src/main/res/drawable-hdpi/ic_attach_photo_white.png new file mode 100644 index 000000000..c969b06b3 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_photo_white.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_record.png b/src/main/res/drawable-hdpi/ic_attach_record.png new file mode 100644 index 000000000..0cb48e90d Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_record.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_record_white.png b/src/main/res/drawable-hdpi/ic_attach_record_white.png new file mode 100644 index 000000000..b7f8f882a Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_record_white.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_video.png b/src/main/res/drawable-hdpi/ic_attach_video.png new file mode 100644 index 000000000..820d208aa Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_video.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_camera.png b/src/main/res/drawable-mdpi/ic_attach_camera.png new file mode 100644 index 000000000..6e351cbfb Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_camera.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_camera_white.png b/src/main/res/drawable-mdpi/ic_attach_camera_white.png new file mode 100644 index 000000000..588835534 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_camera_white.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_document.png b/src/main/res/drawable-mdpi/ic_attach_document.png new file mode 100644 index 000000000..623de5969 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_document.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_document_white.png b/src/main/res/drawable-mdpi/ic_attach_document_white.png new file mode 100644 index 000000000..5b607e7a9 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_document_white.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_location.png b/src/main/res/drawable-mdpi/ic_attach_location.png new file mode 100644 index 000000000..e6570e527 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_location.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_location_white.png b/src/main/res/drawable-mdpi/ic_attach_location_white.png new file mode 100644 index 000000000..df35e92a7 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_location_white.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_photo.png b/src/main/res/drawable-mdpi/ic_attach_photo.png new file mode 100644 index 000000000..fe4d3b254 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_photo.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_photo_white.png b/src/main/res/drawable-mdpi/ic_attach_photo_white.png new file mode 100644 index 000000000..a408691a4 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_photo_white.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_record.png b/src/main/res/drawable-mdpi/ic_attach_record.png new file mode 100644 index 000000000..3aab59bd0 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_record.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_record_white.png b/src/main/res/drawable-mdpi/ic_attach_record_white.png new file mode 100644 index 000000000..b814b040e Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_record_white.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_video.png b/src/main/res/drawable-mdpi/ic_attach_video.png new file mode 100644 index 000000000..36581178c Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_video.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_camera.png b/src/main/res/drawable-xhdpi/ic_attach_camera.png new file mode 100644 index 000000000..b548130e9 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_camera.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_camera_white.png b/src/main/res/drawable-xhdpi/ic_attach_camera_white.png new file mode 100644 index 000000000..6f01563b8 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_camera_white.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_document.png b/src/main/res/drawable-xhdpi/ic_attach_document.png new file mode 100644 index 000000000..ed9fa7b06 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_document.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_document_white.png b/src/main/res/drawable-xhdpi/ic_attach_document_white.png new file mode 100644 index 000000000..684005c68 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_document_white.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_location.png b/src/main/res/drawable-xhdpi/ic_attach_location.png new file mode 100644 index 000000000..649fefde5 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_location.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_location_white.png b/src/main/res/drawable-xhdpi/ic_attach_location_white.png new file mode 100644 index 000000000..3a6b2f3c5 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_location_white.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_photo.png b/src/main/res/drawable-xhdpi/ic_attach_photo.png new file mode 100644 index 000000000..d954b3e7c Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_photo.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_photo_white.png b/src/main/res/drawable-xhdpi/ic_attach_photo_white.png new file mode 100644 index 000000000..62a7ebb4d Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_photo_white.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_record.png b/src/main/res/drawable-xhdpi/ic_attach_record.png new file mode 100644 index 000000000..b7993397d Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_record.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_record_white.png b/src/main/res/drawable-xhdpi/ic_attach_record_white.png new file mode 100644 index 000000000..147a4affa Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_record_white.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_video.png b/src/main/res/drawable-xhdpi/ic_attach_video.png new file mode 100644 index 000000000..88ac09b3f Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_video.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_camera.png b/src/main/res/drawable-xxhdpi/ic_attach_camera.png new file mode 100644 index 000000000..ee4320639 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_camera.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_camera_white.png b/src/main/res/drawable-xxhdpi/ic_attach_camera_white.png new file mode 100644 index 000000000..de872220b Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_camera_white.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_document.png b/src/main/res/drawable-xxhdpi/ic_attach_document.png new file mode 100644 index 000000000..c617b49ce Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_document.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_document_white.png b/src/main/res/drawable-xxhdpi/ic_attach_document_white.png new file mode 100644 index 000000000..3df35ba59 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_document_white.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_location.png b/src/main/res/drawable-xxhdpi/ic_attach_location.png new file mode 100644 index 000000000..d587d0c18 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_location.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_location_white.png b/src/main/res/drawable-xxhdpi/ic_attach_location_white.png new file mode 100644 index 000000000..8d0d988d0 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_location_white.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_photo.png b/src/main/res/drawable-xxhdpi/ic_attach_photo.png new file mode 100644 index 000000000..aa2c5ac08 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_photo.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_photo_white.png b/src/main/res/drawable-xxhdpi/ic_attach_photo_white.png new file mode 100644 index 000000000..5ab46aac7 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_photo_white.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_record.png b/src/main/res/drawable-xxhdpi/ic_attach_record.png new file mode 100644 index 000000000..374e27264 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_record.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_record_white.png b/src/main/res/drawable-xxhdpi/ic_attach_record_white.png new file mode 100644 index 000000000..33d869325 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_record_white.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_video.png b/src/main/res/drawable-xxhdpi/ic_attach_video.png new file mode 100644 index 000000000..7c23db0f0 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_video.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_camera.png b/src/main/res/drawable-xxxhdpi/ic_attach_camera.png new file mode 100644 index 000000000..566cba549 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_camera.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_camera_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_camera_white.png new file mode 100644 index 000000000..777658e95 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_camera_white.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_document.png b/src/main/res/drawable-xxxhdpi/ic_attach_document.png new file mode 100644 index 000000000..0831e0e96 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_document.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_document_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_document_white.png new file mode 100644 index 000000000..f89ffeb30 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_document_white.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_location.png b/src/main/res/drawable-xxxhdpi/ic_attach_location.png new file mode 100644 index 000000000..9c21f9d19 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_location.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_location_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_location_white.png new file mode 100644 index 000000000..8bcb6f620 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_location_white.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_photo.png b/src/main/res/drawable-xxxhdpi/ic_attach_photo.png new file mode 100644 index 000000000..a0129784b Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_photo.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_photo_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_photo_white.png new file mode 100644 index 000000000..2ffdb55f2 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_photo_white.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_record.png b/src/main/res/drawable-xxxhdpi/ic_attach_record.png new file mode 100644 index 000000000..966d4e005 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_record.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_record_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_record_white.png new file mode 100644 index 000000000..2f1e60c55 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_record_white.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_video.png b/src/main/res/drawable-xxxhdpi/ic_attach_video.png new file mode 100644 index 000000000..88b0ab5f1 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_video.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_video_white.png b/src/main/res/drawable-xxxhdpi/ic_attach_video_white.png new file mode 100644 index 000000000..103cd61a3 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_video_white.png differ diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml index e56a9fa07..652d27647 100644 --- a/src/main/res/menu/attachment_choices.xml +++ b/src/main/res/menu/attachment_choices.xml @@ -3,26 +3,32 @@ + android:title="@string/send_location" + android:icon="?attr/ic_attach_location"/> + android:title="@string/attach_record_voice" + android:icon="?attr/ic_attach_record"/> + android:title="@string/attach_take_picture" + android:icon="?attr/ic_attach_camera"/> + android:title="@string/attach_choose_picture" + android:icon="?attr/ic_attach_photo"/> + android:title="@string/attach_choose_video" + android:icon="?attr/ic_attach_video"/> + android:title="@string/choose_file" + android:icon="?attr/ic_attach_document"/> \ No newline at end of file diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index 785820217..d85c4582a 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -40,6 +40,13 @@ @drawable/ic_share_white_24dp @drawable/ic_barcode_scan_white_24dp + @drawable/ic_attach_camera + @drawable/ic_attach_document + @drawable/ic_attach_location + @drawable/ic_attach_photo + @drawable/ic_attach_video + @drawable/ic_attach_record + \ No newline at end of file diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 93aa76544..3babeff54 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -18,8 +18,8 @@ - - + + @@ -27,7 +27,7 @@ - + @@ -37,4 +37,10 @@ + + + + + + \ No newline at end of file diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 9ef329aa8..5a03787ba 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -5,4 +5,5 @@ 16dp 8dp 64dp + 24dp diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 38698e061..c028df7a7 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -35,6 +35,13 @@ @drawable/ic_barcode_scan_white_24dp 16dp 16dp + + @drawable/ic_attach_camera + @drawable/ic_attach_document + @drawable/ic_attach_location + @drawable/ic_attach_photo + @drawable/ic_attach_video + @drawable/ic_attach_record