From 2ee7833ca1b401b76a04c88820589ddd527de09b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 6 May 2025 21:51:19 +0300
Subject: reimport most material icons as uptodate vector resources

---
 .../src/main/res/menu/action_mode_headlines.xml    |  7 +++--
 .../src/main/res/menu/activity_logcat.xml          |  4 +--
 org.fox.ttrss/src/main/res/menu/activity_main.xml  | 33 ++++++++++++----------
 .../src/main/res/menu/activity_offline.xml         | 16 +++++------
 org.fox.ttrss/src/main/res/menu/activity_share.xml |  2 +-
 .../src/main/res/menu/activity_youtube_player.xml  | 19 -------------
 .../src/main/res/menu/content_gallery_entry.xml    |  9 ++++--
 7 files changed, 39 insertions(+), 51 deletions(-)
 delete mode 100644 org.fox.ttrss/src/main/res/menu/activity_youtube_player.xml

(limited to 'org.fox.ttrss/src/main/res/menu')

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 b3afdafc..0e0f5792 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
@@ -3,18 +3,19 @@
     <item
         android:id="@+id/selection_toggle_unread"
         app:showAsAction="always"
-        android:icon="@drawable/ic_email_open"
+
+        android:icon="@drawable/baseline_mark_as_unread_24"
         android:title="@string/selection_toggle_unread"/>
 
     <item
         android:id="@+id/selection_toggle_marked"
-        android:icon="@drawable/ic_star_outline"
+        android:icon="@drawable/baseline_star_outline_24"
         app:showAsAction="always"
         android:title="@string/selection_toggle_marked"/>
 
     <item
         android:id="@+id/selection_toggle_published"
-        android:icon="@drawable/ic_rss_box"
+        android:icon="@drawable/baseline_rss_feed_24"
         app:showAsAction="always"
         android:title="@string/selection_toggle_published"/>
 
diff --git a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
index 52ee9b26..1241f72f 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
@@ -2,13 +2,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/logcat_refresh"
-        android:icon="@drawable/ic_refresh"
+        android:icon="@drawable/baseline_refresh_24"
         app:showAsAction="ifRoom"
         android:title="@string/logcat_refresh"/>
 
     <item
         android:id="@+id/logcat_copy"
-        android:icon="@drawable/ic_content_copy"
+        android:icon="@drawable/baseline_content_copy_24"
         app:showAsAction="ifRoom"
         android:title="@string/logcat_copy"/>
 
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 d2ef27a0..21676f17 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml
@@ -12,22 +12,27 @@
         <group android:id="@+id/menu_group_headlines" >
             <item
                 android:id="@+id/search"
-                android:icon="@drawable/ic_search"
+                android:icon="@drawable/baseline_search_24"
+                app:iconTint="?attr/colorControlNormal"
                 app:showAsAction="ifRoom"
                 android:title="@string/search"/>
             <item
                 android:id="@+id/headlines_mark_as_read"
                 app:showAsAction=""
+                app:iconTint="?attr/colorControlNormal"
+                android:icon="@drawable/baseline_mark_email_read_24"
                 android:title="@string/headlines_mark_as_read"/>
             <item
                 android:id="@+id/headlines_select"
                 app:showAsAction="ifRoom"
-                android:icon="@drawable/ic_select"
+                app:iconTint="?attr/colorControlNormal"
+                android:icon="@drawable/baseline_select_all_24"
                 android:title="@string/headlines_select"/>
 
             <item
                 android:id="@+id/headlines_toggle_sort_order"
-                android:icon="@drawable/ic_sort"
+                app:iconTint="?attr/colorControlNormal"
+                android:icon="@drawable/baseline_sort_by_alpha_24"
                 app:showAsAction="ifRoom"
                 android:title="@string/toggle_sort_order"/>
 
@@ -45,17 +50,20 @@
         <group android:id="@+id/menu_group_article" >
             <item
                 android:id="@+id/toggle_marked"
-                android:icon="@drawable/ic_star_outline"
+                android:icon="@drawable/baseline_star_outline_24"
+                app:iconTint="?attr/colorControlNormal"
                 app:showAsAction="ifRoom"
                 android:title="@string/article_toggle_marked"/>
             <item
                 android:id="@+id/toggle_published"
-                android:icon="@drawable/ic_rss_box"
+                android:icon="@drawable/baseline_rss_feed_24"
+                app:iconTint="?attr/colorControlNormal"
                 app:showAsAction="ifRoom"
                 android:title="@string/article_toggle_published"/>
             <item
                 android:id="@+id/toggle_unread"
-                android:icon="@drawable/ic_email"
+                android:icon="@drawable/baseline_email_24"
+                app:iconTint="?attr/colorControlNormal"
                 app:showAsAction="ifRoom"
                 android:title="@string/article_toggle_unread"/>
             <!-- <item
@@ -83,26 +91,21 @@
 
         </group>
 
-        <!-- <item
-            android:orderInCategory="999"
-            android:id="@+id/preferences"
-            android:icon="@drawable/ic_settings"
-            app:showAsAction=""
-            android:title="@string/preferences"/> -->
-
     </group>
 
     <group android:id="@+id/menu_group_logged_out" >
         <item
             android:id="@+id/login"
-            android:icon="@drawable/ic_login"
+            android:icon="@drawable/baseline_login_24"
+            app:iconTint="?attr/colorControlNormal"
             app:showAsAction="ifRoom"
             android:title="@string/login_login"/>
 
         <item
             android:orderInCategory="999"
             android:id="@+id/preferences"
-            android:icon="@drawable/ic_settings"
+            android:icon="@drawable/baseline_settings_24"
+            app:iconTint="?attr/colorControlNormal"
             app:showAsAction="ifRoom"
             android:title="@string/preferences"/>
 
diff --git a/org.fox.ttrss/src/main/res/menu/activity_offline.xml b/org.fox.ttrss/src/main/res/menu/activity_offline.xml
index c533ae75..09dbf194 100644
--- a/org.fox.ttrss/src/main/res/menu/activity_offline.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_offline.xml
@@ -5,22 +5,22 @@
     <group android:id="@+id/menu_group_headlines" >
         <item
             android:id="@+id/search"
-            app:showAsAction="ifRoom"
-            android:icon="@drawable/ic_search"
-            android:title="@string/search"/>
+            android:icon="@drawable/baseline_search_24"
+            android:title="@string/search"
+            app:showAsAction="ifRoom" />
         <item
             android:id="@+id/headlines_mark_as_read"
             app:showAsAction=""
             android:title="@string/headlines_mark_as_read"/>
         <item
             android:id="@+id/headlines_select"
-            android:icon="@drawable/ic_select"
+            android:icon="@drawable/baseline_select_all_24"
             app:showAsAction="ifRoom"
             android:title="@string/headlines_select"/>
 
         <item
             android:id="@+id/headlines_toggle_sort_order"
-            android:icon="@drawable/ic_sort"
+            android:icon="@drawable/baseline_sort_24"
             app:showAsAction="ifRoom"
             android:title="@string/toggle_sort_order"/>
 
@@ -32,17 +32,17 @@
     <group android:id="@+id/menu_group_article" >
         <item
             android:id="@+id/toggle_marked"
-            android:icon="@drawable/ic_star_outline"
+            android:icon="@drawable/baseline_star_outline_24"
             app:showAsAction="ifRoom"
             android:title="@string/article_toggle_marked"/>
         <item
             android:id="@+id/toggle_published"
-            android:icon="@drawable/ic_rss_box"
+            android:icon="@drawable/baseline_rss_feed_24"
             app:showAsAction="ifRoom"
             android:title="@string/article_toggle_published"/>
         <item
             android:id="@+id/toggle_unread"
-            android:icon="@drawable/ic_email"
+            android:icon="@drawable/baseline_email_24"
             app:showAsAction="ifRoom"
             android:title="@string/article_toggle_unread"/>
         <!-- <item
diff --git a/org.fox.ttrss/src/main/res/menu/activity_share.xml b/org.fox.ttrss/src/main/res/menu/activity_share.xml
index 40bb9237..2722f68b 100644
--- a/org.fox.ttrss/src/main/res/menu/activity_share.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_share.xml
@@ -2,7 +2,7 @@
 
     <item
         android:id="@+id/preferences"
-        android:icon="@drawable/ic_settings"
+        android:icon="@drawable/baseline_settings_24"
         app:showAsAction=""
         android:title="@string/preferences"/>
 
diff --git a/org.fox.ttrss/src/main/res/menu/activity_youtube_player.xml b/org.fox.ttrss/src/main/res/menu/activity_youtube_player.xml
deleted file mode 100644
index acce1d3a..00000000
--- a/org.fox.ttrss/src/main/res/menu/activity_youtube_player.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<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">
-
-    <item
-        android:id="@+id/article_vid_open"
-        app:showAsAction=""
-        android:title="@string/open_with"/>
-    <item
-        android:id="@+id/article_vid_copy"
-        app:showAsAction=""
-        android:icon="@drawable/ic_content_copy"
-        android:title="@string/article_link_copy"/>
-    <item
-        android:id="@+id/article_vid_share"
-        android:icon="@drawable/ic_share"
-        app:showAsAction="ifRoom"
-        android:title="@string/video_player_share"/>
-</menu>
diff --git a/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml b/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml
index 70e2bdfb..12bc5c20 100755
--- a/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml
+++ b/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml
@@ -7,16 +7,19 @@
     <item
         android:id="@+id/article_img_copy"
         app:showAsAction=""
-        android:icon="@drawable/ic_content_copy"
+        app:iconTint="?attr/colorControlNormal"
+        android:icon="@drawable/baseline_content_copy_24"
         android:title="@string/article_link_copy"/>
     <item
         android:id="@+id/article_img_share"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/baseline_share_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction=""
         android:title="@string/img_share_image"/>
     <item
         android:id="@+id/article_img_share_url"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/baseline_share_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction=""
         android:title="@string/img_share_url"/>
     <item
-- 
cgit v1.2.3-54-g00ecf


From d1f120f246fbc51bacd7c7b751b80f8526174277 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 6 May 2025 21:57:17 +0300
Subject: set color control normal on some missed menu icons

---
 org.fox.ttrss/src/main/res/layout/fragment_article.xml    | 1 +
 org.fox.ttrss/src/main/res/layout/toolbar.xml             | 1 +
 org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml | 4 +++-
 org.fox.ttrss/src/main/res/menu/activity_logcat.xml       | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'org.fox.ttrss/src/main/res/menu')

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 8bc80d28..db407a22 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -18,6 +18,7 @@
         <com.google.android.material.appbar.AppBarLayout
             android:elevation="0dp"
             app:elevation="0dp"
+            android:backgroundTint="?colorSurfaceContainerLow"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml
index 2937cde6..c256e587 100755
--- a/org.fox.ttrss/src/main/res/layout/toolbar.xml
+++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml
@@ -8,4 +8,5 @@
     app:titleTextAppearance="?attr/textAppearanceTitleMedium"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
+    android:background="?colorSurfaceContainerLow"
     android:minHeight="?attr/actionBarSize"/>
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 0e0f5792..35981c01 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
@@ -3,19 +3,21 @@
     <item
         android:id="@+id/selection_toggle_unread"
         app:showAsAction="always"
-
+        app:iconTint="?attr/colorControlNormal"
         android:icon="@drawable/baseline_mark_as_unread_24"
         android:title="@string/selection_toggle_unread"/>
 
     <item
         android:id="@+id/selection_toggle_marked"
         android:icon="@drawable/baseline_star_outline_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="always"
         android:title="@string/selection_toggle_marked"/>
 
     <item
         android:id="@+id/selection_toggle_published"
         android:icon="@drawable/baseline_rss_feed_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="always"
         android:title="@string/selection_toggle_published"/>
 
diff --git a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
index 1241f72f..66734665 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
@@ -3,12 +3,14 @@
     <item
         android:id="@+id/logcat_refresh"
         android:icon="@drawable/baseline_refresh_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom"
         android:title="@string/logcat_refresh"/>
 
     <item
         android:id="@+id/logcat_copy"
         android:icon="@drawable/baseline_content_copy_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom"
         android:title="@string/logcat_copy"/>
 
-- 
cgit v1.2.3-54-g00ecf


From 20c4ac9393faa5cd6318e8644864e8b6195288bb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 8 May 2025 17:02:50 +0300
Subject: remove additional buttons from article header, limit buttons to
 toolbar

---
 .../main/java/org/fox/ttrss/ArticleFragment.java   | 81 ----------------------
 .../main/java/org/fox/ttrss/DetailActivity.java    |  4 +-
 .../main/java/org/fox/ttrss/OnlineActivity.java    | 66 ++++++++++++++----
 .../org/fox/ttrss/offline/OfflineActivity.java     | 11 ++-
 .../fox/ttrss/offline/OfflineArticleFragment.java  |  5 +-
 .../src/main/res/layout/fragment_article.xml       | 28 +-------
 org.fox.ttrss/src/main/res/menu/activity_main.xml  | 17 +++--
 7 files changed, 74 insertions(+), 138 deletions(-)

(limited to 'org.fox.ttrss/src/main/res/menu')

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 7344480f..128d0484 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -224,87 +224,6 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
 
         }
 
-        final MaterialButton scoreView = view.findViewById(R.id.score);
-
-        if (scoreView != null) {
-            setScoreImage(scoreView, m_article.score);
-
-            if (m_activity.getApiLevel() >= 16) {
-                scoreView.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        final EditText edit = new EditText(getActivity());
-                        edit.setText(String.valueOf(m_article.score));
-
-                        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext())
-                                .setTitle(R.string.score_for_this_article)
-                                .setPositiveButton(R.string.set_score,
-                                        new DialogInterface.OnClickListener() {
-
-                                            @Override
-                                            public void onClick(DialogInterface dialog,
-                                                                int which) {
-
-                                                try {
-                                                    int newScore = Integer.parseInt(edit.getText().toString());
-
-                                                    m_article.score = newScore;
-
-                                                    m_activity.saveArticleScore(m_article);
-
-                                                    setScoreImage(scoreView, newScore);
-                                                } catch (NumberFormatException e) {
-                                                    m_activity.toast(R.string.score_invalid);
-                                                    e.printStackTrace();
-                                                }
-                                            }
-                                        })
-                                .setNegativeButton(getString(R.string.cancel),
-                                        new DialogInterface.OnClickListener() {
-
-                                            @Override
-                                            public void onClick(DialogInterface dialog,
-                                                                int which) {
-
-                                                //
-
-                                            }
-                                        }).setView(edit);
-
-                        Dialog dialog = builder.create();
-                        dialog.show();
-                    }
-                });
-            }
-        }
-
-        MaterialButton attachments = view.findViewById(R.id.attachments);
-
-        if (attachments != null) {
-            if (m_article.attachments != null && m_article.attachments.size() > 0) {
-                attachments.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        m_activity.displayAttachments(m_article);
-                    }
-                });
-
-            } else {
-                attachments.setVisibility(View.GONE);
-            }
-        }
-
-        MaterialButton share = view.findViewById(R.id.share);
-
-        if (share != null) {
-            share.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    m_activity.shareArticle(m_article);
-                }
-            });
-        }
-
         TextView comments = view.findViewById(R.id.comments);
 
         if (comments != null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
index eda894dc..0edd6c10 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
@@ -212,12 +212,12 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
 					/* if (!isCompatMode() && (isSmallScreen() || !isPortrait())) {
 						m_menu.findItem(R.id.toggle_attachments).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 					} */
-					//m_menu.findItem(R.id.toggle_attachments).setVisible(true);
+					m_menu.findItem(R.id.toggle_attachments).setVisible(true);
 				} else {
 					/* if (!isCompatMode()) {
 						m_menu.findItem(R.id.toggle_attachments).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
 					} */
-					//m_menu.findItem(R.id.toggle_attachments).setVisible(false);
+					m_menu.findItem(R.id.toggle_attachments).setVisible(false);
 				}
 			}
 			
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index b8680c71..3af78ddf 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -531,18 +531,16 @@ public class OnlineActivity extends CommonActivity {
 
         int itemId = item.getItemId();
         if (itemId == R.id.subscribe_to_feed) {
-            Intent subscribe = new Intent(OnlineActivity.this, SubscribeActivity.class);
-            startActivityForResult(subscribe, 0);
-            return true;
-		/*case R.id.toggle_attachments:
-			if (true) {
-				Article article = ap.getSelectedArticle();
+			Intent subscribe = new Intent(OnlineActivity.this, SubscribeActivity.class);
+			startActivityForResult(subscribe, 0);
+			return true;
+		} else if (itemId ==  R.id.toggle_attachments) {
+			Article article = ap.getSelectedArticle();
 
-				if (article != null) {
-					displayAttachments(article);
-				}
+			if (article != null) {
+				displayAttachments(article);
 			}
-			return true; */
+			return true;
 		/*case R.id.logout:
 			logout();
 			return true;*/
@@ -748,11 +746,16 @@ public class OnlineActivity extends CommonActivity {
                 dialog.show();
             }
             return true;
-		/* case R.id.share_article:
+		} else if (itemId == R.id.share_article) {
 			if (ap != null) {
 				shareArticle(ap.getSelectedArticle());
 			}
-			return true; */
+			return true;
+		} else if (itemId == R.id.article_set_score) {
+			if (ap != null) {
+				setArticleScore(ap.getSelectedArticle());
+			}
+			return true;
         } else if (itemId == R.id.toggle_marked) {
             if (ap != null && ap.getSelectedArticle() != null) {
                 Article a = ap.getSelectedArticle();
@@ -1231,6 +1234,45 @@ public class OnlineActivity extends CommonActivity {
 		}
 	}
 
+	public void setArticleScore(Article article) {
+		final EditText edit = new EditText(this);
+		edit.setText(String.valueOf(article.score));
+
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
+				.setTitle(R.string.score_for_this_article)
+				.setPositiveButton(R.string.set_score,
+						new DialogInterface.OnClickListener() {
+
+							@Override
+							public void onClick(DialogInterface dialog,
+												int which) {
+
+								try {
+                                    article.score = Integer.parseInt(edit.getText().toString());
+
+									saveArticleScore(article);
+								} catch (NumberFormatException e) {
+									toast(R.string.score_invalid);
+									e.printStackTrace();
+								}
+							}
+						})
+				.setNegativeButton(getString(R.string.cancel),
+						new DialogInterface.OnClickListener() {
+
+							@Override
+							public void onClick(DialogInterface dialog,
+												int which) {
+
+								//
+
+							}
+						}).setView(edit);
+
+		Dialog dialog = builder.create();
+		dialog.show();
+	}
+
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {		
 		ArticlePager ap = (ArticlePager) getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index d7f487a1..96e0ee34 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -421,13 +421,12 @@ public class OfflineActivity extends CommonActivity {
                 }
             }
             return true;
-		/* case R.id.share_article:
-			if (true) {
-				int articleId = oap.getSelectedArticleId();
+        } else if (itemId == R.id.share_article) {
+            int articleId = oap.getSelectedArticleId();
 
-				shareArticle(articleId);
-			}
-			return true; */
+            shareArticle(articleId);
+
+			return true;
         } else if (itemId == R.id.toggle_marked) {
             if (oap != null) {
                 int articleId = oap.getSelectedArticleId();
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index 3b199d2a..5483cf60 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -235,7 +235,7 @@ public class OfflineArticleFragment extends Fragment {
 
 			}
 
-			MaterialButton score = view.findViewById(R.id.score);
+			/* MaterialButton score = view.findViewById(R.id.score);
 
 			if (score != null) {
 				score.setVisibility(View.GONE);
@@ -256,8 +256,7 @@ public class OfflineArticleFragment extends Fragment {
 						m_activity.shareArticle(m_articleId);
 					}
 				});
-			}
-
+			} */
 
 			TextView comments = view.findViewById(R.id.comments);
 			
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"
-- 
cgit v1.2.3-54-g00ecf