From bc5fd208926c779a1ae912c10b3f446cc2629bea Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sat, 10 May 2025 20:47:24 +0300
Subject: wip bottom appbar

---
 org.fox.ttrss/src/main/res/menu/activity_main.xml  | 28 +---------------
 .../src/main/res/menu/bottombar_detail.xml         | 38 ++++++++++++++++++++++
 .../src/main/res/menu/context_headlines.xml        |  6 ++--
 3 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/menu/bottombar_detail.xml

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

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=""
-- 
cgit v1.2.3-54-g00ecf


From 39e558a040bc308b14fb89b4955817f2d1bcc914 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 11 May 2025 10:42:56 +0300
Subject: adjust mark unread icon

---
 org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java        | 2 +-
 org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml   | 5 -----
 .../src/main/res/drawable/baseline_mark_email_unread_24.xml          | 5 +++++
 org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml            | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml
 create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_mark_email_unread_24.xml

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

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 6500c0d7..c9da82da 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
@@ -219,7 +219,7 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
 						menu.findItem(R.id.article_set_score).setIcon(R.drawable.baseline_trending_flat_24);
 					}
 
-					menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.baseline_mark_as_unread_24 :
+					menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.baseline_mark_email_unread_24 :
 							R.drawable.baseline_email_24);
 
 					menu.findItem(R.id.toggle_attachments).setVisible(article.attachments != null && article.attachments.size() > 0);
diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml
deleted file mode 100644
index 94381df3..00000000
--- a/org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M18.83,7h-2.6L10.5,4 4,7.4L4,17c-1.1,0 -2,-0.9 -2,-2L2,7.17c0,-0.53 0.32,-1.09 0.8,-1.34L10.5,2l7.54,3.83c0.43,0.23 0.73,0.7 0.79,1.17zM20,8L7,8c-1.1,0 -2,0.9 -2,2v9c0,1.1 0.9,2 2,2h13c1.1,0 2,-0.9 2,-2v-9c0,-1.1 -0.9,-2 -2,-2zM20,11.67L13.5,15 7,11.67L7,10l6.5,3.33L20,10v1.67z"/>
-    
-</vector>
diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_mark_email_unread_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_mark_email_unread_24.xml
new file mode 100644
index 00000000..929f5ece
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable/baseline_mark_email_unread_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M22,8.98V18c0,1.1 -0.9,2 -2,2H4c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2h10.1C14.04,4.32 14,4.66 14,5c0,1.48 0.65,2.79 1.67,3.71L12,11L4,6v2l8,5l5.3,-3.32C17.84,9.88 18.4,10 19,10C20.13,10 21.16,9.61 22,8.98zM16,5c0,1.66 1.34,3 3,3s3,-1.34 3,-3s-1.34,-3 -3,-3S16,3.34 16,5z"/>
+    
+</vector>
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
-- 
cgit v1.2.3-54-g00ecf