Merge branch 'protected/bottomappbar' into 'master'

wip bottom appbar

See merge request tt-rss/tt-rss-android!30

4 files changed, 43 insertions, 31 deletions

diff --git a/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
index 35981c01..ccd2c266 100644
--- a/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
+++ b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
@@ -4,7 +4,7 @@
         android:id="@+id/selection_toggle_unread"
         app:showAsAction="always"
         app:iconTint="?attr/colorControlNormal"
-        android:icon="@drawable/baseline_mark_as_unread_24"
+        android:icon="@drawable/baseline_mark_email_unread_24"
         android:title="@string/selection_toggle_unread"/>
 
     <item
diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml
index 68dec353..1650f366 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml
@@ -58,40 +58,14 @@
                 android:id="@+id/toggle_published"
                 android:icon="@drawable/baseline_rss_feed_24"
                 app:iconTint="?attr/colorControlNormal"
-                android:title="@string/article_toggle_published"/>
-            <item
-                android:id="@+id/toggle_unread"
-                android:icon="@drawable/baseline_email_24"
-                app:iconTint="?attr/colorControlNormal"
                 app:showAsAction="ifRoom"
-                android:title="@string/article_toggle_unread"/>
-            <item
-                android:id="@+id/toggle_attachments"
-                android:icon="@drawable/baseline_attach_file_24"
-                app:showAsAction=""
-                android:title="@string/attachments_prompt"/>
+                android:title="@string/article_toggle_published"/>
             <item
                 android:id="@+id/share_article"
                 android:icon="@drawable/baseline_share_24"
                 app:iconTint="?attr/colorControlNormal"
                 app:showAsAction="ifRoom"
                 android:title="@string/share_article"/>
-            <item
-                android:id="@+id/set_labels"
-                app:showAsAction=""
-                android:title="@string/article_set_labels"/>
-            <item
-                android:id="@+id/article_set_note"
-                app:showAsAction=""
-                android:title="@string/article_set_note"/>
-            <item
-                android:id="@+id/article_set_score"
-                app:showAsAction=""
-                android:title="@string/set_score"/>
-
-            <item
-                android:id="@+id/catchup_above"
-                android:title="@string/article_mark_read_above"/>
 
         </group>
 
diff --git a/org.fox.ttrss/src/main/res/menu/bottombar_detail.xml b/org.fox.ttrss/src/main/res/menu/bottombar_detail.xml
new file mode 100644
index 00000000..744ae79b
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/bottombar_detail.xml
@@ -0,0 +1,38 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/article_set_score"
+        app:showAsAction="always"
+        app:iconTint="?attr/colorControlNormal"
+        android:icon="@drawable/baseline_trending_flat_24"
+        android:title="@string/set_score"/>
+
+    <item
+        android:id="@+id/toggle_unread"
+        android:icon="@drawable/baseline_email_24"
+        app:iconTint="?attr/colorControlNormal"
+        app:showAsAction="always"
+        android:title="@string/article_toggle_unread"/>
+
+    <item
+        android:id="@+id/article_set_labels"
+        app:showAsAction="always"
+        android:icon="@drawable/baseline_new_label_24"
+        app:iconTint="?attr/colorControlNormal"
+        android:title="@string/article_set_labels"/>
+
+    <item
+        android:id="@+id/article_edit_note"
+        app:showAsAction="always"
+        android:icon="@drawable/baseline_note_add_24"
+        app:iconTint="?attr/colorControlNormal"
+        android:title="@string/article_edit_note"/>
+
+    <item
+        android:id="@+id/toggle_attachments"
+        android:icon="@drawable/baseline_attachment_24"
+        app:iconTint="?attr/colorControlNormal"
+        app:showAsAction="always"
+        android:title="@string/attachments_prompt"/>
+
+</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/context_headlines.xml b/org.fox.ttrss/src/main/res/menu/context_headlines.xml
index dffc9e47..e5a892ab 100644
--- a/org.fox.ttrss/src/main/res/menu/context_headlines.xml
+++ b/org.fox.ttrss/src/main/res/menu/context_headlines.xml
@@ -18,12 +18,12 @@
         app:showAsAction=""
         android:title="@string/article_mark_read_above"/>
     <item
-        android:id="@+id/set_labels"
+        android:id="@+id/article_set_labels"
         android:title="@string/article_set_labels"/>
     <item
-        android:id="@+id/article_set_note"
+        android:id="@+id/article_edit_note"
         app:showAsAction=""
-        android:title="@string/article_set_note"/>
+        android:title="@string/article_edit_note"/>
     <item
         android:id="@+id/headlines_article_unread"
         app:showAsAction=""