remove additional buttons from article header, limit buttons to toolbar

2 files changed, 11 insertions, 34 deletions

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index e78ab258..990ede49 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -43,35 +43,9 @@
                         android:textAlignment="viewStart"
                         android:textColor="?colorPrimary"
                         tools:text="Unreasonably long article title blah blah blah blah blah blah"
-                        android:textSize="16sp"
+                        android:textSize="18sp"
                         android:gravity="start" />
 
-                    <com.google.android.material.button.MaterialButton
-                        style="?attr/materialIconButtonStyle"
-                        android:id="@+id/score"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        app:icon="?ic_action_trending_flat"
-                        android:layout_gravity="center_vertical|end" />
-
-                    <com.google.android.material.button.MaterialButton
-                        style="?attr/materialIconButtonStyle"
-                        android:id="@+id/attachments"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        app:icon="?ic_attachment_vert"
-                        android:layout_gravity="center_vertical|end" />
-
-                    <com.google.android.material.button.MaterialButton
-                        style="?attr/materialIconButtonStyle"
-                        android:id="@+id/share"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        app:icon="?ic_share"
-                        android:layout_gravity="center_vertical|end" />
                 </LinearLayout>
 
                 <TextView
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 21676f17..f983e224 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml
@@ -64,18 +64,17 @@
                 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
+            <item
                 android:id="@+id/toggle_attachments"
-                android:icon="@drawable/ic_attachment"
+                android:icon="@drawable/baseline_attach_file_24"
                 app:showAsAction=""
-                android:title="@string/attachments_prompt"/> -->
-            <!-- <item
+                android:title="@string/attachments_prompt"/>
+            <item
                 android:id="@+id/share_article"
-                android:icon="@drawable/ic_share"
+                android:icon="@drawable/baseline_share_24"
                 app:showAsAction="ifRoom"
-                android:title="@string/share_article"/> -->
+                android:title="@string/share_article"/>
             <item
                 android:id="@+id/set_labels"
                 app:showAsAction=""
@@ -84,6 +83,10 @@
                 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"