Merge branch 'master' into 454-replay-to-comments

# Conflicts:
#	app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
#	app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java
#	app/src/main/res/layout/fragment_card_edit_tab_comments.xml
#	app/src/main/res/layout/item_comment.xml
#	app/src/main/res/values/strings.xml

2 files changed, 4 insertions, 14 deletions

diff --git a/app/src/main/res/menu/list_menu.xml b/app/src/main/res/menu/list_menu.xml
index f80ce762d..bf47a26b3 100644
--- a/app/src/main/res/menu/list_menu.xml
+++ b/app/src/main/res/menu/list_menu.xml
@@ -7,6 +7,10 @@
         android:title="@string/archive_cards"
         app:showAsAction="never" />
     <item
+        android:id="@+id/add_list"
+        android:title="@string/add_list"
+        app:showAsAction="never" />
+    <item
         android:id="@+id/rename_list"
         android:title="@string/rename_list"
         app:showAsAction="never" />
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
deleted file mode 100644
index 5e42c30f4..000000000
--- a/app/src/main/res/menu/main_menu.xml
+++ /dev/null
@@ -1,14 +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">
-    <item
-        android:id="@+id/filter"
-        android:icon="@drawable/ic_filter_list_white_24dp"
-        android:title="@string/simple_filter"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/archived_cards"
-        android:icon="@drawable/ic_archive_white_24dp"
-        android:title="@string/action_archived_cards"
-        app:showAsAction="ifRoom" />
-</menu>