diff --git a/art/render.rb b/art/render.rb index 386366a42..2ab3e94fc 100755 --- a/art/render.rb +++ b/art/render.rb @@ -4,6 +4,7 @@ resolutions={ 'hdpi' => 1.5, 'xhdpi' => 2, 'xxhdpi' => 3, + 'xxxhdpi' => 4, } images = { 'conversations_baloon.svg' => ['ic_launcher', 48], diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index 894af421a..2ea0904f3 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 7aa48c0c2..299fb848a 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; @@ -296,8 +297,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 new file mode 100644 index 000000000..72cedcad4 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_add_white_48dp.png differ 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 new file mode 100644 index 000000000..7256ca3d4 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png new file mode 100644 index 000000000..794b7b780 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png new file mode 100644 index 000000000..64c8a6ab0 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png new file mode 100644 index 000000000..faa409f80 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_chat_white_48dp.png b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png new file mode 100644 index 000000000..71cac75af Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png differ 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 new file mode 100644 index 000000000..bd2c60b86 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_delete_white_48dp.png b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png new file mode 100644 index 000000000..0e95e9b1d Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_edit_black_48dp.png b/src/main/res/drawable-hdpi/ic_edit_black_48dp.png new file mode 100644 index 000000000..827b68480 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_black_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png new file mode 100644 index 000000000..f8970cb25 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_edit_white_48dp.png b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png new file mode 100644 index 000000000..34ec7092f Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png differ 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 new file mode 100644 index 000000000..46aeab458 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png differ 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 new file mode 100644 index 000000000..a0a112dc5 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png differ 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 new file mode 100644 index 000000000..a5ad0a29d Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_group_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_white_48dp.png new file mode 100644 index 000000000..a6ed594f7 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_group_white_48dp.png differ 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 new file mode 100644 index 000000000..c34970372 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png differ 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 new file mode 100644 index 000000000..b90a59805 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png differ 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 new file mode 100644 index 000000000..d0c25290b Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png differ 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 new file mode 100644 index 000000000..074db2d30 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png new file mode 100644 index 000000000..72128fe69 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png new file mode 100644 index 000000000..aeb1cea9a Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_search_white_18dp.png b/src/main/res/drawable-hdpi/ic_search_white_18dp.png new file mode 100644 index 000000000..9ad0bfe35 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_search_white_18dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_search_white_48dp.png b/src/main/res/drawable-hdpi/ic_search_white_48dp.png new file mode 100644 index 000000000..0bbeab150 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_search_white_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png new file mode 100644 index 000000000..cff84744f Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_warning_white_36dp.png b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png new file mode 100644 index 000000000..c8b7140a9 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_add_white_48dp.png new file mode 100644 index 000000000..67042105d Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_add_white_48dp.png differ 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 new file mode 100644 index 000000000..db23fd651 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png new file mode 100644 index 000000000..df332ef3c Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png new file mode 100644 index 000000000..794b7b780 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png new file mode 100644 index 000000000..e9e9c7a53 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_chat_white_48dp.png b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png new file mode 100644 index 000000000..526ebec6d Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png differ 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 new file mode 100644 index 000000000..5592d5c80 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_delete_white_48dp.png b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png new file mode 100644 index 000000000..cdb230c2f Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_edit_black_48dp.png b/src/main/res/drawable-mdpi/ic_edit_black_48dp.png new file mode 100644 index 000000000..aa7748add Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_black_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png new file mode 100644 index 000000000..b5f88c80a Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_edit_white_48dp.png b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png new file mode 100644 index 000000000..7f0ea51bf Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png differ 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 new file mode 100644 index 000000000..e089466de Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png differ 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 new file mode 100644 index 000000000..46aeab458 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png differ 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 new file mode 100644 index 000000000..6055325e8 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_group_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_white_48dp.png new file mode 100644 index 000000000..0c5fd333e Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_group_white_48dp.png differ 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 new file mode 100644 index 000000000..fb82f4208 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png differ 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 new file mode 100644 index 000000000..6e1321e43 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png differ 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 new file mode 100644 index 000000000..2d2c9417d Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png differ 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 new file mode 100644 index 000000000..c402e8f0a Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png new file mode 100644 index 000000000..5f89fc257 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png new file mode 100644 index 000000000..efc9560ed Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_search_white_18dp.png b/src/main/res/drawable-mdpi/ic_search_white_18dp.png new file mode 100644 index 000000000..d113cdcb5 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_search_white_18dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_search_white_48dp.png b/src/main/res/drawable-mdpi/ic_search_white_48dp.png new file mode 100644 index 000000000..043759acd Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_search_white_48dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png new file mode 100644 index 000000000..20d2b66e0 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_warning_white_36dp.png b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png new file mode 100644 index 000000000..30eee6c4e Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_add_white_48dp.png new file mode 100644 index 000000000..2bef05958 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_add_white_48dp.png differ 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 new file mode 100644 index 000000000..caaee37af Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png new file mode 100644 index 000000000..e9e9c7a53 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png new file mode 100644 index 000000000..faa409f80 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png new file mode 100644 index 000000000..b9b6c0b3d Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png new file mode 100644 index 000000000..1230ab392 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png differ 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 new file mode 100644 index 000000000..2fdbbea13 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png new file mode 100644 index 000000000..ccf8c7162 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png new file mode 100644 index 000000000..d3c4ccef2 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png new file mode 100644 index 000000000..6ed4351ca Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png new file mode 100644 index 000000000..9380370f4 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png differ 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 new file mode 100644 index 000000000..990dfb82b Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png differ 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 new file mode 100644 index 000000000..95502de3f Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png differ 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 new file mode 100644 index 000000000..0ac3d4a80 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xhdpi/ic_group_white_48dp.png new file mode 100644 index 000000000..a62b56772 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_group_white_48dp.png differ 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 new file mode 100644 index 000000000..06b27ea19 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png differ 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 new file mode 100644 index 000000000..8f35034c9 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png differ 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 new file mode 100644 index 000000000..3de35f9b9 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png differ 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 new file mode 100644 index 000000000..4e2121e53 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png new file mode 100644 index 000000000..d271d8e03 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png new file mode 100644 index 000000000..3d5136fef Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xhdpi/ic_search_white_18dp.png new file mode 100644 index 000000000..a2fc5b2e7 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_search_white_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xhdpi/ic_search_white_48dp.png new file mode 100644 index 000000000..70c21baf7 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_search_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png new file mode 100644 index 000000000..6a70402b4 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png new file mode 100644 index 000000000..3f401317e Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png new file mode 100644 index 000000000..b12e040e0 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png differ 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 new file mode 100644 index 000000000..b50e51612 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png new file mode 100644 index 000000000..faa409f80 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png new file mode 100644 index 000000000..e3a7884c2 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png new file mode 100644 index 000000000..215c3b386 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png new file mode 100644 index 000000000..bb39d1573 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png differ 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 new file mode 100644 index 000000000..72b3474b0 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png new file mode 100644 index 000000000..a8d8ca84d Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png new file mode 100644 index 000000000..74f0c795b Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png new file mode 100644 index 000000000..21b617a9f Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png new file mode 100644 index 000000000..fe5bd13fb Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png differ 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 new file mode 100644 index 000000000..95502de3f Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png differ 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 new file mode 100644 index 000000000..368dc49cb Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png differ 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 new file mode 100644 index 000000000..7ff60d6f4 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png new file mode 100644 index 000000000..fffa6a6a2 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png differ 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 new file mode 100644 index 000000000..cabd50c05 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png differ 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 new file mode 100644 index 000000000..031eb06e2 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png differ 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 new file mode 100644 index 000000000..f57082d8b Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png differ 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 new file mode 100644 index 000000000..ba2424876 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png new file mode 100644 index 000000000..87ab2d640 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png new file mode 100644 index 000000000..4b1003db0 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png new file mode 100644 index 000000000..c57219778 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png new file mode 100644 index 000000000..75d9aa69f Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png new file mode 100644 index 000000000..d47d042e6 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png new file mode 100644 index 000000000..a6e5788ba Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png new file mode 100644 index 000000000..cd32f0a82 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png differ 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 new file mode 100644 index 000000000..55464b7eb Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png new file mode 100644 index 000000000..b9b6c0b3d Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png new file mode 100644 index 000000000..215c3b386 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png new file mode 100644 index 000000000..bef7e17fe Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png new file mode 100644 index 000000000..68f14af6d Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png differ 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 new file mode 100644 index 000000000..435c087ab Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png new file mode 100644 index 000000000..47fef5aab Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png new file mode 100644 index 000000000..0429e7e1a Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png new file mode 100644 index 000000000..1361eedcd Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png new file mode 100644 index 000000000..736806495 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png differ 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 new file mode 100644 index 000000000..a57e72f7d Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png differ 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 new file mode 100644 index 000000000..e261f9a87 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png differ 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 new file mode 100644 index 000000000..7e9d67f63 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png new file mode 100644 index 000000000..2a27316be Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png differ 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 new file mode 100644 index 000000000..ea80bc00a Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..b6dcb0b9f Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_launcher.png differ 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 new file mode 100644 index 000000000..f7652e609 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png differ 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 new file mode 100644 index 000000000..440070a11 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_notification.png b/src/main/res/drawable-xxxhdpi/ic_notification.png new file mode 100644 index 000000000..ee2f3a432 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notification.png differ 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 new file mode 100644 index 000000000..89c1aef24 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png new file mode 100644 index 000000000..86db9890c Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png new file mode 100644 index 000000000..fe0ae13aa Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png new file mode 100644 index 000000000..524cc0a09 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png new file mode 100644 index 000000000..0bbeab150 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png new file mode 100644 index 000000000..7caf6c9b7 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png new file mode 100644 index 000000000..8fea47f60 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png new file mode 100644 index 000000000..abc5c7a5f Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png differ diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 0093f032d..750c28e0b 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"/> diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 332ac2a90..36873654e 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"/> + android:src="?attr/icon_settings"/> \ 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 e39091b38..c025d00f8 100644 --- a/src/main/res/menu/choose_contact.xml +++ b/src/main/res/menu/choose_contact.xml @@ -4,7 +4,7 @@ diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml index ba8889d8c..bd81b6d49 100644 --- a/src/main/res/menu/contact_details.xml +++ b/src/main/res/menu/contact_details.xml @@ -3,13 +3,13 @@ diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index d68c1436e..4c724d27d 100644 --- a/src/main/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml @@ -2,19 +2,19 @@ @@ -25,7 +25,7 @@ android:title="@string/action_contact_details"/> diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index 5b04484ff..f8a30ff7b 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -3,7 +3,7 @@ diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml index cbd15c119..bc51f4625 100644 --- a/src/main/res/menu/share_with.xml +++ b/src/main/res/menu/share_with.xml @@ -3,7 +3,7 @@ diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml index 3dd09e90d..a89d71ffd 100644 --- a/src/main/res/menu/start_conversation.xml +++ b/src/main/res/menu/start_conversation.xml @@ -4,17 +4,17 @@ 12sp 14sp 20sp + + @drawable/ic_group_add_white_48dp + @drawable/ic_person_add_white_48dp + @drawable/ic_cancel_white_24dp + @drawable/ic_chat_white_48dp + @drawable/ic_content_copy_grey600_36dp + @drawable/ic_delete_white_48dp + @drawable/ic_file_download_white_24dp + @drawable/ic_edit_white_48dp + @drawable/ic_edit_grey600_36dp + @drawable/ic_group_white_48dp + @drawable/ic_add_white_48dp + @drawable/ic_attach_file_white_48dp + @drawable/ic_lock_open_white_48dp + @drawable/ic_refresh_white_48dp + @drawable/ic_remove_grey600_36dp + @drawable/ic_search_white_48dp + @drawable/ic_lock_outline_white_48dp + @drawable/ic_settings_grey600_36dp + @drawable/ic_import_export_white_48dp + \ No newline at end of file diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 2354a5e8c..e314f752f 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -5,4 +5,24 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3d3d69a3e..ae8dcd678 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) Quiet Hours Start time diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index fa7973d20..80f2bfe65 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -8,6 +8,27 @@ 12sp 14sp 20sp + + @drawable/ic_action_add_group + @drawable/ic_action_add_person + @drawable/ic_action_cancel + @drawable/ic_action_chat + @drawable/ic_action_copy + @drawable/ic_action_discard + @drawable/ic_action_download + @drawable/ic_action_edit + @drawable/ic_action_edit_dark + + @drawable/ic_action_group + @drawable/ic_action_new + @drawable/ic_action_new_attachment + @drawable/ic_action_not_secure + @drawable/ic_action_refresh + @drawable/ic_action_remove + @drawable/ic_action_search + @drawable/ic_action_secure + @drawable/ic_action_settings + @drawable/ic_stat_communication_import_export