Merge branch 'master' into api-v1

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java
#	app/src/main/res/values/strings.xml

4 files changed, 7 insertions, 19 deletions

diff --git a/app/src/main/res/menu/menu_list_context_multiple.xml b/app/src/main/res/menu/menu_list_context_multiple.xml
index b31ae774..9e44a799 100644
--- a/app/src/main/res/menu/menu_list_context_multiple.xml
+++ b/app/src/main/res/menu/menu_list_context_multiple.xml
@@ -11,14 +11,14 @@
 
     <item
         android:id="@+id/menu_delete"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_grey600_24dp"
         android:orderInCategory="100"
         android:title="@string/menu_delete"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/menu_move"
-        android:icon="@drawable/ic_send_white_24dp"
+        android:icon="@drawable/ic_send_grey600_24dp"
         android:orderInCategory="110"
         android:title="@string/simple_move"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_list_view.xml b/app/src/main/res/menu/menu_list_view.xml
deleted file mode 100644
index 70103414..00000000
--- a/app/src/main/res/menu/menu_list_view.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.example.owncloudnotes.NotesListViewActivity">
-    <item
-        android:id="@+id/search"
-        android:title="@string/action_search"
-        android:icon="@drawable/ic_search_white_24dp"
-        app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="collapseActionView|always" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_note_activity.xml b/app/src/main/res/menu/menu_note_activity.xml
index 311c5108..967bb4f0 100644
--- a/app/src/main/res/menu/menu_note_activity.xml
+++ b/app/src/main/res/menu/menu_note_activity.xml
@@ -3,13 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_preview"
-        android:icon="@drawable/ic_eye_white_24dp"
+        android:icon="@drawable/ic_eye_grey600_24dp"
         android:orderInCategory="60"
         android:title="@string/menu_preview"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_edit"
-        android:icon="@drawable/ic_edit_white_24dp"
+        android:icon="@drawable/ic_edit_grey600_24dp"
         android:orderInCategory="60"
         android:title="@string/simple_edit"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_note_fragment.xml b/app/src/main/res/menu/menu_note_fragment.xml
index 14d8db0e..97cfad95 100644
--- a/app/src/main/res/menu/menu_note_fragment.xml
+++ b/app/src/main/res/menu/menu_note_fragment.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/search"
         android:title="@string/action_search"
-        android:icon="@drawable/ic_search_white_24dp"
+        android:icon="@drawable/ic_search_grey600_24dp"
         android:orderInCategory="50"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="ifRoom|collapseActionView" />
@@ -36,7 +36,7 @@
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_move"
-        android:icon="@drawable/ic_send_white_24dp"
+        android:icon="@drawable/ic_send_grey600_24dp"
         android:orderInCategory="120"
         android:title="@string/simple_move"
         app:showAsAction="never" />
@@ -48,7 +48,7 @@
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_delete"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_grey600_24dp"
         android:orderInCategory="140"
         android:title="@string/menu_delete"
         app:showAsAction="never" />