From 471404bfb1d01616f91037ea42fea72296f0652a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 7 May 2025 07:18:20 +0300
Subject: drop linkColor & fix article header padding

---
 org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java      | 6 +++---
 .../src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java | 6 +++---
 org.fox.ttrss/src/main/res/layout/fragment_article.xml              | 2 +-
 org.fox.ttrss/src/main/res/values-night/themes.xml                  | 1 -
 org.fox.ttrss/src/main/res/values/attrs.xml                         | 1 -
 org.fox.ttrss/src/main/res/values/themes.xml                        | 1 -
 6 files changed, 7 insertions(+), 10 deletions(-)

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

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 86a68d5b..729aa7fd 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
@@ -485,10 +485,10 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
 
         String cssOverride = "body { color : "+textColor+"; }";
 
-        TypedValue tvLinkColor = new TypedValue();
-        getActivity().getTheme().resolveAttribute(R.attr.linkColor, tvLinkColor, true);
+        TypedValue tvColorPrimary = new TypedValue();
+        getActivity().getTheme().resolveAttribute(R.attr.colorPrimary, tvColorPrimary, true);
 
-        String linkHexColor = String.format("#%06X", (0xFFFFFF & tvLinkColor.data));
+        String linkHexColor = String.format("#%06X", (0xFFFFFF & tvColorPrimary.data));
         cssOverride += " a:link {color: "+linkHexColor+";} a:visited { color: "+linkHexColor+";}";
 
         String articleContent = m_article.content != null ? m_article.content : "";
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 465c461d..aac19b51 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
@@ -333,10 +333,10 @@ public class OfflineArticleFragment extends Fragment {
 
                 String cssOverride = "body { color : "+textColor+"; }";
 
-                TypedValue tvLinkColor = new TypedValue();
-                getActivity().getTheme().resolveAttribute(R.attr.linkColor, tvLinkColor, true);
+                TypedValue tvColorPrimary = new TypedValue();
+                getActivity().getTheme().resolveAttribute(R.attr.colorPrimary, tvColorPrimary, true);
 
-                String linkHexColor = String.format("#%06X", (0xFFFFFF & tvLinkColor.data));
+                String linkHexColor = String.format("#%06X", (0xFFFFFF & tvColorPrimary.data));
                 cssOverride += " a:link {color: "+linkHexColor+";} a:visited { color: "+linkHexColor+";}";
 
 				String articleContent = m_cursor.getString(m_cursor.getColumnIndex("content"));
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 f71ab5cc..ea244873 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -26,7 +26,7 @@
                 app:layout_scrollFlags="scroll|enterAlways"
                 android:paddingTop="0dp"
                 android:paddingStart="16dp"
-                android:paddingEnd="0dp"
+                android:paddingEnd="8dp"
                 android:paddingBottom="8dp"
                 android:id="@+id/article_header"
                 android:layout_width="match_parent"
diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml
index e5f738e1..a84ed131 100644
--- a/org.fox.ttrss/src/main/res/values-night/themes.xml
+++ b/org.fox.ttrss/src/main/res/values-night/themes.xml
@@ -29,7 +29,6 @@
         <item name="feedlistTextColor">@android:color/white</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
         <item name="headlineHeaderBackground">#99000000</item>
-        <item name="linkColor">#2d92c8</item>
         <item name="articleNoteTextColor">#bebebe</item>
         <item name="articleNoteBackground">#303030</item>
         <item name="parentBtnBackground">#101010</item>
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index d0886639..f5fac361 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -5,7 +5,6 @@
     <attr name="feedlistSelectedTextColor" format="reference|color" />
     <attr name="headlineHeaderBackground" format="reference|color" />
     <attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" />
-    <attr name="linkColor" format="reference|color" />
     <attr name="articleNoteBackground" format="reference|color" />
     <attr name="articleNoteTextColor" format="reference|color" />
     <attr name="parentBtnBackground" format="reference|color" />
diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml
index 54613ad9..1e348393 100644
--- a/org.fox.ttrss/src/main/res/values/themes.xml
+++ b/org.fox.ttrss/src/main/res/values/themes.xml
@@ -28,7 +28,6 @@
         <item name="feedlistTextColor">@android:color/black</item>
         <item name="feedlistSelectedTextColor">@android:color/black</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
-        <item name="linkColor">?colorPrimary</item>
         <item name="articleNoteTextColor">#9a8c59</item>
         <item name="articleNoteBackground">#fff7d5</item>
         <item name="parentBtnBackground">#dddddd</item>
-- 
cgit v1.2.3-54-g00ecf