From 6579ac8cf134324fb2f062cf736fcbab767f4e01 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Thu, 13 Apr 2017 17:50:39 +0100
Subject: [PATCH] View/EditCollection: Add icons to menu operations

---
 app/src/main/res/drawable/ic_delete_dark.xml  |  5 +++++
 app/src/main/res/drawable/ic_edit_dark.xml    |  5 +++++
 app/src/main/res/drawable/ic_save_dark.xml    |  5 +++++
 .../res/menu/activity_create_collection.xml   | 13 +++++++------
 .../res/menu/activity_edit_collection.xml     | 19 +++++++++++--------
 .../res/menu/activity_view_collection.xml     |  5 +++--
 6 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_delete_dark.xml
 create mode 100644 app/src/main/res/drawable/ic_edit_dark.xml
 create mode 100644 app/src/main/res/drawable/ic_save_dark.xml

diff --git a/app/src/main/res/drawable/ic_delete_dark.xml b/app/src/main/res/drawable/ic_delete_dark.xml
new file mode 100644
index 00000000..f02567cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete_dark.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.54" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_edit_dark.xml b/app/src/main/res/drawable/ic_edit_dark.xml
new file mode 100644
index 00000000..522f6180
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit_dark.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.54" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_save_dark.xml b/app/src/main/res/drawable/ic_save_dark.xml
new file mode 100644
index 00000000..a13ea252
--- /dev/null
+++ b/app/src/main/res/drawable/ic_save_dark.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.54" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z"/>
+</vector>
diff --git a/app/src/main/res/menu/activity_create_collection.xml b/app/src/main/res/menu/activity_create_collection.xml
index d979fcab..3ff73c97 100644
--- a/app/src/main/res/menu/activity_create_collection.xml
+++ b/app/src/main/res/menu/activity_create_collection.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
   ~ All rights reserved. This program and the accompanying materials
   ~ are made available under the terms of the GNU Public License v3.0
@@ -8,10 +7,12 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:title="@string/create_collection_create"
-          android:onClick="onCreateCollection"
-          app:showAsAction="always"/>
+    <item
+        android:icon="@drawable/ic_save_dark"
+        android:onClick="onCreateCollection"
+        android:title="@string/create_collection_create"
+        app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_edit_collection.xml b/app/src/main/res/menu/activity_edit_collection.xml
index 4821aa7a..152d594d 100644
--- a/app/src/main/res/menu/activity_edit_collection.xml
+++ b/app/src/main/res/menu/activity_edit_collection.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
   ~ All rights reserved. This program and the accompanying materials
   ~ are made available under the terms of the GNU Public License v3.0
@@ -8,15 +7,19 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:title="@string/delete_collection"
-          android:onClick="onDeleteCollection"
-          app:showAsAction="always"/>
+    <item
+        android:icon="@drawable/ic_delete_dark"
+        android:onClick="onDeleteCollection"
+        android:title="@string/delete_collection"
+        app:showAsAction="always" />
 
 
-    <item android:title="@string/create_collection_create"
+    <item
+        android:icon="@drawable/ic_save_dark"
         android:onClick="onCreateCollection"
-        app:showAsAction="always"/>
+        android:title="@string/create_collection_create"
+        app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_view_collection.xml b/app/src/main/res/menu/activity_view_collection.xml
index bf15fecf..2a83d62a 100644
--- a/app/src/main/res/menu/activity_view_collection.xml
+++ b/app/src/main/res/menu/activity_view_collection.xml
@@ -11,8 +11,9 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:title="@string/view_collection_edit"
-          android:onClick="onEditCollection"
-          app:showAsAction="always"/>
+        android:icon="@drawable/ic_edit_dark"
+        android:onClick="onEditCollection"
+        app:showAsAction="always" />
 
     <item android:title="@string/view_collection_import"
         android:onClick="onImport"