diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index afd56b528c05b9846ebd761d7bf4839d80fe90c7..6c612239fc2612833932b9626dd23bb25cef38af 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -7,11 +7,13 @@ import android.app.FragmentTransaction; import android.app.PendingIntent; import android.content.ActivityNotFoundException; import android.content.ClipData; +import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.IntentSender.SendIntentException; import android.content.pm.PackageManager; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -20,6 +22,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; @@ -775,6 +779,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) { @@ -812,6 +834,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 0000000000000000000000000000000000000000..a11c823577e9a12b4fea95eb4e3d3afcf34fddec 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 0000000000000000000000000000000000000000..497c88ca82b139d8523f62d272569b97777cdec7 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 0000000000000000000000000000000000000000..e0dfc2bf600b3a109004d5d83d86d7058d5ec1fa 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 0000000000000000000000000000000000000000..e8f96367c8751a93a9e21dd2cf0e0f99b833641a 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 0000000000000000000000000000000000000000..53ba4eca4cf4bf277f5cff9da1a4d40955e6061f 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 0000000000000000000000000000000000000000..7c281c3f52a13ac89d34337cddbe47c904b8b19c 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 0000000000000000000000000000000000000000..3ccd77022c7e7266ce78cbbc72e239a45ea7be78 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 0000000000000000000000000000000000000000..25a9576ddd920f235d3f1391477aed6697c8ca03 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 0000000000000000000000000000000000000000..8c12041cadf365ecc303bd85823ee8a3963254ed 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 0000000000000000000000000000000000000000..f316b84b7f2e1c2a26d56b9be4b78dfebd642ea9 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_send_file_offline.png b/src/main/res/drawable-hdpi/ic_send_file_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..9a192bcab342070474e9789fd920b51fef0627b8 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_file_offline.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_file_offline_white.png b/src/main/res/drawable-hdpi/ic_send_file_offline_white.png new file mode 100644 index 0000000000000000000000000000000000000000..79228c9c8b842810889c8d4ff921e75f932dcec6 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_file_offline_white.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 0000000000000000000000000000000000000000..4f9c27db145e6ed58e753c347fceb5f5cd7dea4e 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 0000000000000000000000000000000000000000..e830522008b0a1b1f39fdde1156ff1bae3f955e5 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 0000000000000000000000000000000000000000..0ccf7dd6868b54f0b4b5413ee89944afe0add7e4 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 0000000000000000000000000000000000000000..2f36ec3979ad5936f280b33f589af092b7186700 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 0000000000000000000000000000000000000000..dbdabfa49cd6fd30fc5e2c6acaa72df71dab6dcb 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 0000000000000000000000000000000000000000..933eb5148faeabee4ef4ad40ee14a4d6b0c08f5b 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 0000000000000000000000000000000000000000..6155579777571bac639b05d4fcab498678ef269a 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 0000000000000000000000000000000000000000..d474bd577d00d2aa045685f38b1729e4b2c314e2 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 0000000000000000000000000000000000000000..8dc527d4caccbad5914f9820464807b0e1b28158 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 0000000000000000000000000000000000000000..87319a6cc14d49f09a81633d7a4de810175f5d3b 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_send_file_offline.png b/src/main/res/drawable-mdpi/ic_send_file_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..ab46a6802595bf910b7fe304fddd19e6ff0f7bda Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_file_offline.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_file_offline_white.png b/src/main/res/drawable-mdpi/ic_send_file_offline_white.png new file mode 100644 index 0000000000000000000000000000000000000000..1e30c5a93fd1884c90f7ca53a5ac63d80de8c67a Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_file_offline_white.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 0000000000000000000000000000000000000000..0fb33537d0a985a5cbb8411592465b2892abe225 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 0000000000000000000000000000000000000000..be9fb226a53ce5ee4008cfafa0754f42284d51b3 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 0000000000000000000000000000000000000000..4d6053c10ed171c9ea1840c97af06179becb29ef 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 0000000000000000000000000000000000000000..53083487f1450fc4cf91c419338eb930bc03a1df 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 0000000000000000000000000000000000000000..43c43f3a09e4b089fce09e0bdbf340aae979503e 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 0000000000000000000000000000000000000000..814ca8ddc442ae97d8a78693c841e33141f96759 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 0000000000000000000000000000000000000000..6da919287212b5f2eaef525c36e89b42b911fa90 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 0000000000000000000000000000000000000000..2642b9e09ec00be308649f62d9323f22ae2b6c6c 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 0000000000000000000000000000000000000000..6af0b11c248e92f5cd3e9e4f2f0aaec5f2c1fea2 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 0000000000000000000000000000000000000000..9f44db5d21785d6d92316645fe5bf23ae994b77e 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_send_file_offline.png b/src/main/res/drawable-xhdpi/ic_send_file_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..59edcde2f47fdcc991e2b29af69c93c1cbf44fa8 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_file_offline.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_file_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_file_offline_white.png new file mode 100644 index 0000000000000000000000000000000000000000..b24d1232355a10a1daa2785c83bf4b958ca67a67 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_file_offline_white.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 0000000000000000000000000000000000000000..2829a36ecfb63c979095d0b9dc1ce5e399602a4b 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 0000000000000000000000000000000000000000..c8e69dcebb98d43695027fcc7e39a339c84dda51 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 0000000000000000000000000000000000000000..49edf9509f84bb1bc7f15998baea6ad46b9251be 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 0000000000000000000000000000000000000000..9b7071b710e270543eef0565af39a9702c3729e8 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 0000000000000000000000000000000000000000..1360bd5f88a1dd8a5fb124ec9e8d92b5ce9d7253 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 0000000000000000000000000000000000000000..078b10d4fb334b98e6a51010ca48513017046656 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 0000000000000000000000000000000000000000..f2925e4efd96a72dc7333bff033ad73227b69945 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 0000000000000000000000000000000000000000..f9f1defa6df89b5a7a68df6787a4ba799d3bd3b2 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 0000000000000000000000000000000000000000..9f2d6ca9e2e70cc8430f4e9af861070ebc4aa0ac 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 0000000000000000000000000000000000000000..b0389382e4ef99837d898958cc880a77151a8bdb 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_send_file_offline.png b/src/main/res/drawable-xxhdpi/ic_send_file_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..a1ddb8ec223364cf16d165c0008a5718e7fd0087 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_file_offline.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_file_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_file_offline_white.png new file mode 100644 index 0000000000000000000000000000000000000000..3c3114999fa53b574a5672585bcae0383d80bccc Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_file_offline_white.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 0000000000000000000000000000000000000000..566cba54964d04c6820f28e7439b287238bdb1bc 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 0000000000000000000000000000000000000000..777658e95515ca47c9852d00621e2e6d45abc5c7 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 0000000000000000000000000000000000000000..0831e0e967ba843689e2d0d9344fbeb914801126 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 0000000000000000000000000000000000000000..f89ffeb30b15061225d9c74d4f01db83c405bdc1 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 0000000000000000000000000000000000000000..9c21f9d191fd80c0c1b116b0493d71866fa1eece 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 0000000000000000000000000000000000000000..8bcb6f620d5eef21f9322626451aedf0e83cb510 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 0000000000000000000000000000000000000000..a0129784ba062592008fd177d035a1fa1890bfd1 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 0000000000000000000000000000000000000000..2ffdb55f264ecd3610f90890f8202f93c00f72e1 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 0000000000000000000000000000000000000000..966d4e0055af1487f13381009efb22d52d0f8e24 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 0000000000000000000000000000000000000000..2f1e60c55db59ab6460005a84c2e5fdf8c380dd7 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_record_white.png differ diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml index 6e8fc51d33a27d5f4f3edd37cc60687e20b9d43c..28372c0a3b4d87669ac1cba3a5c9827551105c30 100644 --- a/src/main/res/menu/attachment_choices.xml +++ b/src/main/res/menu/attachment_choices.xml @@ -3,22 +3,27 @@ + 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/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 f7ab3e92ea0ee290f78f846081df5be8730e3001..bd57274032e95d65bbebf316c8a90f89c8484d09 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -29,6 +29,12 @@ @drawable/ic_send_text_offline @drawable/ic_send_voice_offline + @drawable/ic_attach_camera + @drawable/ic_attach_document + @drawable/ic_attach_location + @drawable/ic_attach_photo + @drawable/ic_attach_record + @drawable/message_bubble_received_white @drawable/message_bubble_sent @drawable/message_bubble_received @@ -97,6 +103,12 @@ @drawable/ic_send_text_offline_white @drawable/ic_send_voice_offline_white + @drawable/ic_attach_camera_white + @drawable/ic_attach_document_white + @drawable/ic_attach_location_white + @drawable/ic_attach_photo_white + @drawable/ic_attach_record_white + @drawable/message_bubble_received_grey @drawable/message_bubble_sent_grey @drawable/message_bubble_received_dark diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 39787f3625a4dcb4dfc98199880c67512253e133..4a6ce8a12331c1e5ddf265b820a28566d157e065 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -19,6 +19,12 @@ + + + + + + diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 4ce44f2247f3a80b71d2083e08bb6f48c35f5bf6..bd749a0178e26021a8fa438fee47781cd3183f8e 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -6,4 +6,5 @@ 288dp 8dp 11sp + 24dp diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 8ac3793b40636bd8025ec4c49ecdb7601818b4f9..1e3c013ed640abe74114f43d5553d86dff7b38c7 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -25,6 +25,12 @@ @drawable/ic_send_text_offline @drawable/ic_send_voice_offline + @drawable/ic_attach_camera + @drawable/ic_attach_document + @drawable/ic_attach_location + @drawable/ic_attach_photo + @drawable/ic_attach_record + @drawable/ic_action_add_group @drawable/ic_action_add_person @drawable/ic_action_cancel @@ -90,6 +96,12 @@ @drawable/ic_send_text_offline_white @drawable/ic_send_voice_offline_white + @drawable/ic_attach_camera_white + @drawable/ic_attach_document_white + @drawable/ic_attach_location_white + @drawable/ic_attach_photo_white + @drawable/ic_attach_record_white + @drawable/message_bubble_received_grey @drawable/message_bubble_sent_grey @drawable/message_bubble_received_dark