Merge pull request #923 from SamWhited/material-design-icons

Daniel Gultsch created 

Start experimenting with material design icons

Change summary

art/render.rb                                                          |  1 
src/main/java/eu/siacs/conversations/services/NotificationService.java | 23 
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java      |  9 
src/main/res/drawable-hdpi/ic_add_white_48dp.png                       |  0 
src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png               |  0 
src/main/res/drawable-hdpi/ic_cancel_white_24dp.png                    |  0 
src/main/res/drawable-hdpi/ic_cancel_white_36dp.png                    |  0 
src/main/res/drawable-hdpi/ic_cancel_white_48dp.png                    |  0 
src/main/res/drawable-hdpi/ic_chat_white_48dp.png                      |  0 
src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png            |  0 
src/main/res/drawable-hdpi/ic_delete_white_48dp.png                    |  0 
src/main/res/drawable-hdpi/ic_edit_black_48dp.png                      |  0 
src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png                    |  0 
src/main/res/drawable-hdpi/ic_edit_white_48dp.png                      |  0 
src/main/res/drawable-hdpi/ic_file_download_white_24dp.png             |  0 
src/main/res/drawable-hdpi/ic_file_download_white_36dp.png             |  0 
src/main/res/drawable-hdpi/ic_group_add_white_48dp.png                 |  0 
src/main/res/drawable-hdpi/ic_group_white_48dp.png                     |  0 
src/main/res/drawable-hdpi/ic_import_export_white_48dp.png             |  0 
src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png                 |  0 
src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png              |  0 
src/main/res/drawable-hdpi/ic_person_add_white_48dp.png                |  0 
src/main/res/drawable-hdpi/ic_refresh_white_48dp.png                   |  0 
src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png                  |  0 
src/main/res/drawable-hdpi/ic_search_white_18dp.png                    |  0 
src/main/res/drawable-hdpi/ic_search_white_48dp.png                    |  0 
src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png                |  0 
src/main/res/drawable-hdpi/ic_warning_white_36dp.png                   |  0 
src/main/res/drawable-mdpi/ic_add_white_48dp.png                       |  0 
src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png               |  0 
src/main/res/drawable-mdpi/ic_cancel_white_24dp.png                    |  0 
src/main/res/drawable-mdpi/ic_cancel_white_36dp.png                    |  0 
src/main/res/drawable-mdpi/ic_cancel_white_48dp.png                    |  0 
src/main/res/drawable-mdpi/ic_chat_white_48dp.png                      |  0 
src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png            |  0 
src/main/res/drawable-mdpi/ic_delete_white_48dp.png                    |  0 
src/main/res/drawable-mdpi/ic_edit_black_48dp.png                      |  0 
src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png                    |  0 
src/main/res/drawable-mdpi/ic_edit_white_48dp.png                      |  0 
src/main/res/drawable-mdpi/ic_file_download_white_24dp.png             |  0 
src/main/res/drawable-mdpi/ic_file_download_white_36dp.png             |  0 
src/main/res/drawable-mdpi/ic_group_add_white_48dp.png                 |  0 
src/main/res/drawable-mdpi/ic_group_white_48dp.png                     |  0 
src/main/res/drawable-mdpi/ic_import_export_white_48dp.png             |  0 
src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png                 |  0 
src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png              |  0 
src/main/res/drawable-mdpi/ic_person_add_white_48dp.png                |  0 
src/main/res/drawable-mdpi/ic_refresh_white_48dp.png                   |  0 
src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png                  |  0 
src/main/res/drawable-mdpi/ic_search_white_18dp.png                    |  0 
src/main/res/drawable-mdpi/ic_search_white_48dp.png                    |  0 
src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png                |  0 
src/main/res/drawable-mdpi/ic_warning_white_36dp.png                   |  0 
src/main/res/drawable-xhdpi/ic_add_white_48dp.png                      |  0 
src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png              |  0 
src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png                   |  0 
src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png                   |  0 
src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png                   |  0 
src/main/res/drawable-xhdpi/ic_chat_white_48dp.png                     |  0 
src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png           |  0 
src/main/res/drawable-xhdpi/ic_delete_white_48dp.png                   |  0 
src/main/res/drawable-xhdpi/ic_edit_black_48dp.png                     |  0 
src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png                   |  0 
src/main/res/drawable-xhdpi/ic_edit_white_48dp.png                     |  0 
src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png            |  0 
src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png            |  0 
src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png                |  0 
src/main/res/drawable-xhdpi/ic_group_white_48dp.png                    |  0 
src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png            |  0 
src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png                |  0 
src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png             |  0 
src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png               |  0 
src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png                  |  0 
src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png                 |  0 
src/main/res/drawable-xhdpi/ic_search_white_18dp.png                   |  0 
src/main/res/drawable-xhdpi/ic_search_white_48dp.png                   |  0 
src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png               |  0 
src/main/res/drawable-xhdpi/ic_warning_white_36dp.png                  |  0 
src/main/res/drawable-xxhdpi/ic_add_white_48dp.png                     |  0 
src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png             |  0 
src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png                  |  0 
src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png                  |  0 
src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png                  |  0 
src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png                    |  0 
src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png          |  0 
src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png                  |  0 
src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png                    |  0 
src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png                  |  0 
src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png                    |  0 
src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png           |  0 
src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png           |  0 
src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png               |  0 
src/main/res/drawable-xxhdpi/ic_group_white_48dp.png                   |  0 
src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png           |  0 
src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png               |  0 
src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png            |  0 
src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png              |  0 
src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png                 |  0 
src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png                |  0 
src/main/res/drawable-xxhdpi/ic_search_white_18dp.png                  |  0 
src/main/res/drawable-xxhdpi/ic_search_white_48dp.png                  |  0 
src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png              |  0 
src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png                 |  0 
src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png                    |  0 
src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png            |  0 
src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png                 |  0 
src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png                 |  0 
src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png                 |  0 
src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png                   |  0 
src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png         |  0 
src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png                 |  0 
src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png                   |  0 
src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png                 |  0 
src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png                   |  0 
src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png          |  0 
src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png          |  0 
src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png              |  0 
src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png                  |  0 
src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png          |  0 
src/main/res/drawable-xxxhdpi/ic_launcher.png                          |  0 
src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png              |  0 
src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png           |  0 
src/main/res/drawable-xxxhdpi/ic_notification.png                      |  0 
src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png             |  0 
src/main/res/drawable-xxxhdpi/ic_received_indicator.png                |  0 
src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png                |  0 
src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png               |  0 
src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png                 |  0 
src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png                 |  0 
src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png             |  0 
src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png                |  0 
src/main/res/layout/activity_edit_account.xml                          |  2 
src/main/res/layout/activity_muc_details.xml                           |  4 
src/main/res/layout/contact_key.xml                                    |  2 
src/main/res/menu/choose_contact.xml                                   |  2 
src/main/res/menu/contact_details.xml                                  |  4 
src/main/res/menu/conversations.xml                                    |  8 
src/main/res/menu/manageaccounts.xml                                   |  2 
src/main/res/menu/muc_details.xml                                      |  2 
src/main/res/menu/share_with.xml                                       |  2 
src/main/res/menu/start_conversation.xml                               |  6 
src/main/res/values-v21/themes.xml                                     | 21 
src/main/res/values/attrs.xml                                          | 20 
src/main/res/values/strings.xml                                        |  1 
src/main/res/values/themes.xml                                         | 21 
145 files changed, 105 insertions(+), 25 deletions(-)

Detailed changes

art/render.rb 🔗 

@@ -4,6 +4,7 @@ resolutions={
 	'hdpi' => 1.5,
 	'xhdpi' => 2,
 	'xxhdpi' => 3,
+	'xxxhdpi' => 4,
 	}
 images = {
 	'conversations_baloon.svg' => ['ic_launcher', 48],

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);

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);

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>

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

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>

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"/>

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"/>

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"/>

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

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"/>

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"/>

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

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>

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>

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>

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">