diff options
Diffstat (limited to '')
144 files changed, 104 insertions, 25 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index 894af421..2ea0904f 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -270,7 +270,8 @@ public class NotificationService { } if ((message = getFirstDownloadableMessage(messages)) != null) { mBuilder.addAction( - R.drawable.ic_action_download, + Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? + R.drawable.ic_file_download_white_24dp : R.drawable.ic_action_download, mXmppConnectionService.getResources().getString(R.string.download_x_file, UIHelper.getFileDescriptionString(mXmppConnectionService, message)), createDownloadIntent(message) @@ -446,18 +447,24 @@ public class NotificationService { public Notification createForegroundNotification() { final NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(mXmppConnectionService); - mBuilder.setSmallIcon(R.drawable.ic_stat_communication_import_export); + mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service)); mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_open_conversations)); - mBuilder.addAction(R.drawable.ic_action_cancel, - mXmppConnectionService.getString(R.string.disable_foreground_service), - createDisableForeground()); mBuilder.setContentIntent(createOpenConversationsIntent()); mBuilder.setWhen(0); mBuilder.setPriority(NotificationCompat.PRIORITY_MIN); + final int cancelIcon; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { mBuilder.setCategory(Notification.CATEGORY_SERVICE); + mBuilder.setSmallIcon(R.drawable.ic_import_export_white_48dp); + cancelIcon = R.drawable.ic_cancel_white_24dp; + } else { + mBuilder.setSmallIcon(R.drawable.ic_stat_communication_import_export); + cancelIcon = R.drawable.ic_action_cancel; } + mBuilder.addAction(cancelIcon, + mXmppConnectionService.getString(R.string.disable_foreground_service), + createDisableForeground()); setNotificationColor(mBuilder); return mBuilder.build(); } @@ -487,7 +494,11 @@ public class NotificationService { } mBuilder.setOngoing(true); //mBuilder.setLights(0xffffffff, 2000, 4000); - mBuilder.setSmallIcon(R.drawable.ic_stat_alert_warning); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + mBuilder.setSmallIcon(R.drawable.ic_warning_white_36dp); + } else { + mBuilder.setSmallIcon(R.drawable.ic_stat_alert_warning); + } final TaskStackBuilder stackBuilder = TaskStackBuilder.create(mXmppConnectionService); stackBuilder.addParentStack(ConversationActivity.class); diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 79cc6d12..0a55c6b5 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -10,6 +10,7 @@ import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.IntentSender.SendIntentException; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.SystemClock; import android.provider.MediaStore; @@ -300,8 +301,12 @@ public class ConversationActivity extends XmppActivity if (this.getSelectedConversation() != null) { if (this.getSelectedConversation().getLatestMessage() .getEncryption() != Message.ENCRYPTION_NONE) { - menuSecure.setIcon(R.drawable.ic_action_secure); - } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + menuSecure.setIcon(R.drawable.ic_lock_outline_white_48dp); + } else { + menuSecure.setIcon(R.drawable.ic_action_secure); + } + } if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) { menuContactDetails.setVisible(false); menuAttach.setVisible(false); diff --git a/src/main/res/drawable-hdpi/ic_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..72cedcad --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_add_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png Binary files differnew file mode 100644 index 00000000..7256ca3d --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 00000000..794b7b78 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png Binary files differnew file mode 100644 index 00000000..64c8a6ab --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png Binary files differnew file mode 100644 index 00000000..faa409f8 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_chat_white_48dp.png b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png Binary files differnew file mode 100644 index 00000000..71cac75a --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..bd2c60b8 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png diff --git a/src/main/res/drawable-hdpi/ic_delete_white_48dp.png b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png Binary files differnew file mode 100644 index 00000000..0e95e9b1 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_edit_black_48dp.png b/src/main/res/drawable-hdpi/ic_edit_black_48dp.png Binary files differnew file mode 100644 index 00000000..827b6848 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_edit_black_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..f8970cb2 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png diff --git a/src/main/res/drawable-hdpi/ic_edit_white_48dp.png b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png Binary files differnew file mode 100644 index 00000000..34ec7092 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png Binary files differnew file mode 100644 index 00000000..46aeab45 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png Binary files differnew file mode 100644 index 00000000..a0a112dc --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png diff --git a/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..a5ad0a29 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_group_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_white_48dp.png Binary files differnew file mode 100644 index 00000000..a6ed594f --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_group_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png Binary files differnew file mode 100644 index 00000000..c3497037 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png Binary files differnew file mode 100644 index 00000000..b90a5980 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png Binary files differnew file mode 100644 index 00000000..d0c25290 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..074db2d3 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png Binary files differnew file mode 100644 index 00000000..72128fe6 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..aeb1cea9 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png diff --git a/src/main/res/drawable-hdpi/ic_search_white_18dp.png b/src/main/res/drawable-hdpi/ic_search_white_18dp.png Binary files differnew file mode 100644 index 00000000..9ad0bfe3 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_search_white_18dp.png diff --git a/src/main/res/drawable-hdpi/ic_search_white_48dp.png b/src/main/res/drawable-hdpi/ic_search_white_48dp.png Binary files differnew file mode 100644 index 00000000..0bbeab15 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_search_white_48dp.png diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..cff84744 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png diff --git a/src/main/res/drawable-hdpi/ic_warning_white_36dp.png b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png Binary files differnew file mode 100644 index 00000000..c8b7140a --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png diff --git a/src/main/res/drawable-mdpi/ic_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..67042105 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_add_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png Binary files differnew file mode 100644 index 00000000..db23fd65 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 00000000..df332ef3 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png Binary files differnew file mode 100644 index 00000000..794b7b78 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png Binary files differnew file mode 100644 index 00000000..e9e9c7a5 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_chat_white_48dp.png b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png Binary files differnew file mode 100644 index 00000000..526ebec6 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..5592d5c8 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png diff --git a/src/main/res/drawable-mdpi/ic_delete_white_48dp.png b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png Binary files differnew file mode 100644 index 00000000..cdb230c2 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_edit_black_48dp.png b/src/main/res/drawable-mdpi/ic_edit_black_48dp.png Binary files differnew file mode 100644 index 00000000..aa7748ad --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_edit_black_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..b5f88c80 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png diff --git a/src/main/res/drawable-mdpi/ic_edit_white_48dp.png b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png Binary files differnew file mode 100644 index 00000000..7f0ea51b --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png Binary files differnew file mode 100644 index 00000000..e089466d --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png Binary files differnew file mode 100644 index 00000000..46aeab45 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png diff --git a/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..6055325e --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_group_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_white_48dp.png Binary files differnew file mode 100644 index 00000000..0c5fd333 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_group_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png Binary files differnew file mode 100644 index 00000000..fb82f420 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png Binary files differnew file mode 100644 index 00000000..6e1321e4 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png Binary files differnew file mode 100644 index 00000000..2d2c9417 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..c402e8f0 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png Binary files differnew file mode 100644 index 00000000..5f89fc25 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..efc9560e --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png diff --git a/src/main/res/drawable-mdpi/ic_search_white_18dp.png b/src/main/res/drawable-mdpi/ic_search_white_18dp.png Binary files differnew file mode 100644 index 00000000..d113cdcb --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_search_white_18dp.png diff --git a/src/main/res/drawable-mdpi/ic_search_white_48dp.png b/src/main/res/drawable-mdpi/ic_search_white_48dp.png Binary files differnew file mode 100644 index 00000000..043759ac --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_search_white_48dp.png diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..20d2b66e --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png diff --git a/src/main/res/drawable-mdpi/ic_warning_white_36dp.png b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png Binary files differnew file mode 100644 index 00000000..30eee6c4 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png diff --git a/src/main/res/drawable-xhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..2bef0595 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_add_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png Binary files differnew file mode 100644 index 00000000..caaee37a --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 00000000..e9e9c7a5 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png Binary files differnew file mode 100644 index 00000000..faa409f8 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png Binary files differnew file mode 100644 index 00000000..b9b6c0b3 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png Binary files differnew file mode 100644 index 00000000..1230ab39 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..2fdbbea1 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png diff --git a/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png Binary files differnew file mode 100644 index 00000000..ccf8c716 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png Binary files differnew file mode 100644 index 00000000..d3c4ccef --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..6ed4351c --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png diff --git a/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png Binary files differnew file mode 100644 index 00000000..9380370f --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png Binary files differnew file mode 100644 index 00000000..990dfb82 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png Binary files differnew file mode 100644 index 00000000..95502de3 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png diff --git a/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..0ac3d4a8 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xhdpi/ic_group_white_48dp.png Binary files differnew file mode 100644 index 00000000..a62b5677 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_group_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png Binary files differnew file mode 100644 index 00000000..06b27ea1 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png Binary files differnew file mode 100644 index 00000000..8f35034c --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png Binary files differnew file mode 100644 index 00000000..3de35f9b --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..4e2121e5 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png Binary files differnew file mode 100644 index 00000000..d271d8e0 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..3d5136fe --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png diff --git a/src/main/res/drawable-xhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xhdpi/ic_search_white_18dp.png Binary files differnew file mode 100644 index 00000000..a2fc5b2e --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_search_white_18dp.png diff --git a/src/main/res/drawable-xhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xhdpi/ic_search_white_48dp.png Binary files differnew file mode 100644 index 00000000..70c21baf --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_search_white_48dp.png diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..6a70402b --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png diff --git a/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png Binary files differnew file mode 100644 index 00000000..3f401317 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..b12e040e --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png Binary files differnew file mode 100644 index 00000000..b50e5161 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 00000000..faa409f8 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png Binary files differnew file mode 100644 index 00000000..e3a7884c --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png Binary files differnew file mode 100644 index 00000000..215c3b38 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png Binary files differnew file mode 100644 index 00000000..bb39d157 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..72b3474b --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png Binary files differnew file mode 100644 index 00000000..a8d8ca84 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png Binary files differnew file mode 100644 index 00000000..74f0c795 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..21b617a9 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png Binary files differnew file mode 100644 index 00000000..fe5bd13f --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png Binary files differnew file mode 100644 index 00000000..95502de3 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png Binary files differnew file mode 100644 index 00000000..368dc49c --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..7ff60d6f --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png Binary files differnew file mode 100644 index 00000000..fffa6a6a --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png Binary files differnew file mode 100644 index 00000000..cabd50c0 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png Binary files differnew file mode 100644 index 00000000..031eb06e --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png Binary files differnew file mode 100644 index 00000000..f57082d8 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..ba242487 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png Binary files differnew file mode 100644 index 00000000..87ab2d64 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..4b1003db --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png Binary files differnew file mode 100644 index 00000000..c5721977 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png Binary files differnew file mode 100644 index 00000000..75d9aa69 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..d47d042e --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png Binary files differnew file mode 100644 index 00000000..a6e5788b --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..cd32f0a8 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png Binary files differnew file mode 100644 index 00000000..55464b7e --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 00000000..b9b6c0b3 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png Binary files differnew file mode 100644 index 00000000..215c3b38 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png Binary files differnew file mode 100644 index 00000000..bef7e17f --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png Binary files differnew file mode 100644 index 00000000..68f14af6 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..435c087a --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png Binary files differnew file mode 100644 index 00000000..47fef5aa --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png Binary files differnew file mode 100644 index 00000000..0429e7e1 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..1361eedc --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png Binary files differnew file mode 100644 index 00000000..73680649 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png Binary files differnew file mode 100644 index 00000000..a57e72f7 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png Binary files differnew file mode 100644 index 00000000..e261f9a8 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..7e9d67f6 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png Binary files differnew file mode 100644 index 00000000..2a27316b --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png Binary files differnew file mode 100644 index 00000000..ea80bc00 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 00000000..b6dcb0b9 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png Binary files differnew file mode 100644 index 00000000..f7652e60 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png Binary files differnew file mode 100644 index 00000000..440070a1 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_notification.png b/src/main/res/drawable-xxxhdpi/ic_notification.png Binary files differnew file mode 100644 index 00000000..ee2f3a43 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_notification.png diff --git a/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..89c1aef2 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png Binary files differnew file mode 100644 index 00000000..86db9890 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png Binary files differnew file mode 100644 index 00000000..fe0ae13a --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..524cc0a0 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png Binary files differnew file mode 100644 index 00000000..0bbeab15 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png Binary files differnew file mode 100644 index 00000000..7caf6c9b --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..8fea47f6 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png Binary files differnew file mode 100644 index 00000000..abc5c7a5 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 0093f032..750c28e0 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -338,7 +338,7 @@ android:layout_centerVertical="true" android:background="?android:selectableItemBackground" android:padding="8dp" - android:src="@drawable/ic_action_copy" + android:src="?attr/icon_copy" android:visibility="visible" android:contentDescription="@string/copy_otr_clipboard_description"/> </RelativeLayout> diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 332ac2a9..36873654 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -76,7 +76,7 @@ android:layout_centerVertical="true" android:background="?android:selectableItemBackground" android:padding="8dp" - android:src="@drawable/ic_action_edit_dark"/> + android:src="?attr/icon_edit_dark"/> </RelativeLayout> <RelativeLayout @@ -103,7 +103,7 @@ android:layout_centerVertical="true" android:background="?android:selectableItemBackground" android:padding="8dp" - android:src="@drawable/ic_action_settings"/> + android:src="?attr/icon_settings"/> </RelativeLayout> <TextView diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index 7053857f..75572877 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -35,7 +35,7 @@ android:layout_centerVertical="true" android:background="?android:selectableItemBackground" android:padding="8dp" - android:src="@drawable/ic_action_remove" + android:src="?attr/icon_remove" android:visibility="invisible" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml index e39091b3..c025d00f 100644 --- a/src/main/res/menu/choose_contact.xml +++ b/src/main/res/menu/choose_contact.xml @@ -4,7 +4,7 @@ <item android:id="@+id/action_search" android:actionLayout="@layout/actionview_search" - android:icon="@drawable/ic_action_search" + android:icon="?attr/icon_search" android:showAsAction="collapseActionView|always" android:title="@string/search"/> diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml index ba8889d8..bd81b6d4 100644 --- a/src/main/res/menu/contact_details.xml +++ b/src/main/res/menu/contact_details.xml @@ -3,13 +3,13 @@ <item android:id="@+id/action_edit_contact" - android:icon="@drawable/ic_action_edit" + android:icon="?attr/icon_edit" android:orderInCategory="10" android:showAsAction="always" android:title="@string/action_edit_contact"/> <item android:id="@+id/action_delete_contact" - android:icon="@drawable/ic_action_discard" + android:icon="?attr/icon_discard" android:orderInCategory="10" android:showAsAction="always" android:title="@string/action_delete_contact"/> diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index d68c1436..4c724d27 100644 --- a/src/main/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml @@ -2,19 +2,19 @@ <item android:id="@+id/action_add" - android:icon="@drawable/ic_action_new" + android:icon="?attr/icon_new" android:orderInCategory="10" android:showAsAction="always" android:title="@string/action_add"/> <item android:id="@+id/action_security" - android:icon="@drawable/ic_action_not_secure" + android:icon="?attr/icon_not_secure" android:orderInCategory="20" android:showAsAction="always" android:title="@string/action_secure"/> <item android:id="@+id/action_attach_file" - android:icon="@drawable/ic_action_new_attachment" + android:icon="?attr/icon_new_attachment" android:orderInCategory="30" android:showAsAction="always" android:title="@string/attach_file"/> @@ -25,7 +25,7 @@ android:title="@string/action_contact_details"/> <item android:id="@+id/action_muc_details" - android:icon="@drawable/ic_action_group" + android:icon="?attr/icon_group" android:orderInCategory="40" android:showAsAction="ifRoom" android:title="@string/action_muc_details"/> diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index 5b04484f..f8a30ff7 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -3,7 +3,7 @@ <item android:id="@+id/action_add_account" - android:icon="@drawable/ic_action_add_person" + android:icon="?attr/icon_add_person" android:showAsAction="always" android:title="@string/action_add_account"/> <item diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index 7587e55c..51de4e75 100644 --- a/src/main/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml @@ -3,7 +3,7 @@ <item android:id="@+id/action_edit_subject" - android:icon="@drawable/ic_action_edit" + android:icon="?attr/icon_edit" android:orderInCategory="10" android:showAsAction="always" android:title="@string/action_edit_subject"/> diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml index cbd15c11..bc51f462 100644 --- a/src/main/res/menu/share_with.xml +++ b/src/main/res/menu/share_with.xml @@ -3,7 +3,7 @@ <item android:id="@+id/action_add" - android:icon="@drawable/ic_action_new" + android:icon="?attr/icon_new" android:orderInCategory="10" android:showAsAction="always" android:title="@string/action_add"/> diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml index 3dd09e90..a89d71ff 100644 --- a/src/main/res/menu/start_conversation.xml +++ b/src/main/res/menu/start_conversation.xml @@ -4,17 +4,17 @@ <item android:id="@+id/action_search" android:actionLayout="@layout/actionview_search" - android:icon="@drawable/ic_action_search" + android:icon="?attr/icon_search" android:showAsAction="collapseActionView|always" android:title="@string/search" /> <item android:id="@+id/action_create_contact" - android:icon="@drawable/ic_action_add_person" + android:icon="?attr/icon_add_person" android:showAsAction="always" android:title="@string/create_contact" /> <item android:id="@+id/action_join_conference" - android:icon="@drawable/ic_action_add_group" + android:icon="?attr/icon_add_group" android:showAsAction="always" android:title="@string/join_conference" /> <item diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index fddab466..75539533 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -9,6 +9,27 @@ <item name="TextSizeInfo">12sp</item> <item name="TextSizeBody">14sp</item> <item name="TextSizeHeadline">20sp</item> + + <item name="attr/icon_add_group">@drawable/ic_group_add_white_48dp</item> + <item name="attr/icon_add_person">@drawable/ic_person_add_white_48dp</item> + <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item> + <item name="attr/icon_chat">@drawable/ic_chat_white_48dp</item> + <item name="attr/icon_copy">@drawable/ic_content_copy_grey600_36dp</item> + <item name="attr/icon_discard">@drawable/ic_delete_white_48dp</item> + <item name="attr/icon_download">@drawable/ic_file_download_white_24dp</item> + <item name="attr/icon_edit">@drawable/ic_edit_white_48dp</item> + <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_36dp</item> + <item name="attr/icon_group">@drawable/ic_group_white_48dp</item> + <item name="attr/icon_new">@drawable/ic_add_white_48dp</item> + <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_48dp</item> + <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_48dp</item> + <item name="attr/icon_refresh">@drawable/ic_refresh_white_48dp</item> + <item name="attr/icon_remove">@drawable/ic_remove_grey600_36dp</item> + <item name="attr/icon_search">@drawable/ic_search_white_48dp</item> + <item name="attr/icon_secure">@drawable/ic_lock_outline_white_48dp</item> + <item name="attr/icon_settings">@drawable/ic_settings_grey600_36dp</item> + <item name="attr/icon_import_export">@drawable/ic_import_export_white_48dp</item> + </style> </resources>
\ No newline at end of file diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 2354a5e8..e314f752 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -5,4 +5,24 @@ <attr name="TextSizeBody" format="dimension" /> <attr name="TextSizeHeadline" format="dimension" /> + <attr name="icon_add_group" format="reference"/> + <attr name="icon_add_person" format="reference"/> + <attr name="icon_cancel" format="reference"/> + <attr name="icon_chat" format="reference"/> + <attr name="icon_copy" format="reference"/> + <attr name="icon_discard" format="reference"/> + <attr name="icon_download" format="reference"/> + <attr name="icon_edit" format="reference"/> + <attr name="icon_edit_dark" format="reference"/> + <attr name="icon_group" format="reference"/> + <attr name="icon_new" format="reference"/> + <attr name="icon_new_attachment" format="reference"/> + <attr name="icon_not_secure" format="reference"/> + <attr name="icon_refresh" format="reference"/> + <attr name="icon_remove" format="reference"/> + <attr name="icon_search" format="reference"/> + <attr name="icon_secure" format="reference"/> + <attr name="icon_settings" format="reference"/> + <attr name="icon_import_export" format="reference"/> + </resources>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3d3d69a3..ae8dcd67 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -296,6 +296,7 @@ \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0) \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) + \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) </string> <string name="title_pref_quiet_hours">Quiet Hours</string> <string name="title_pref_quiet_hours_start_time">Start time</string> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index fa7973d2..80f2bfe6 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -8,6 +8,27 @@ <item name="TextSizeInfo">12sp</item> <item name="TextSizeBody">14sp</item> <item name="TextSizeHeadline">20sp</item> + + <item name="attr/icon_add_group">@drawable/ic_action_add_group</item> + <item name="attr/icon_add_person">@drawable/ic_action_add_person</item> + <item name="attr/icon_cancel">@drawable/ic_action_cancel</item> + <item name="attr/icon_chat">@drawable/ic_action_chat</item> + <item name="attr/icon_copy">@drawable/ic_action_copy</item> + <item name="attr/icon_discard">@drawable/ic_action_discard</item> + <item name="attr/icon_download">@drawable/ic_action_download</item> + <item name="attr/icon_edit">@drawable/ic_action_edit</item> + <item name="attr/icon_edit_dark">@drawable/ic_action_edit_dark</item> + + <item name="attr/icon_group">@drawable/ic_action_group</item> + <item name="attr/icon_new">@drawable/ic_action_new</item> + <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item> + <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item> + <item name="attr/icon_refresh">@drawable/ic_action_refresh</item> + <item name="attr/icon_remove">@drawable/ic_action_remove</item> + <item name="attr/icon_search">@drawable/ic_action_search</item> + <item name="attr/icon_secure">@drawable/ic_action_secure</item> + <item name="attr/icon_settings">@drawable/ic_action_settings</item> + <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item> </style> <style name="ConversationsTheme.LargerText" parent="ConversationsTheme"> |
