about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorfox <fox@fakecake.org>2026-02-15 11:27:30 +0300
committerfox <fox@fakecake.org>2026-02-15 11:27:30 +0300
commit8468c326fb2f68f825223197f15a7cfacabbe2d3 (patch)
treedf485895f074341df8f2fdc554d4b40be0d562ce
parent6e468351ab08f6418b9df735fa34d45bbef56a94 (diff)
parent0ff85113051473a41323921b12c7f3c11b70ff41 (diff)
downloadtt-rss-android-8468c326fb2f68f825223197f15a7cfacabbe2d3.tar.gz
tt-rss-android-8468c326fb2f68f825223197f15a7cfacabbe2d3.tar.xz
Merge branch 'dev' into 'master' 26.02-8468c326-signed
add tiny feed icon to article fragment

See merge request git/tt-rss/tt-rss-android!67
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java22
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/fragment_article.xml11
2 files changed, 33 insertions, 0 deletions
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 3a3f6424..8bed4c4a 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
@@ -21,13 +21,19 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebView.HitTestResult;
 import android.webkit.WebViewClient;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.core.text.HtmlCompat;
 import androidx.preference.PreferenceManager;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.target.DrawableImageViewTarget;
+
 import org.fox.ttrss.types.Article;
 import org.fox.ttrss.types.Attachment;
+import org.fox.ttrss.types.Feed;
 import org.jsoup.helper.StringUtil;
 
 import java.net.MalformedURLException;
@@ -222,6 +228,22 @@ public class ArticleFragment extends androidx.fragment.app.Fragment {
             }
         }
 
+        ImageView feedIcon = view.findViewById(R.id.feed_icon);
+
+        if (feedIcon != null) {
+            if (m_article.feed_id != Feed.ARCHIVED) {
+                String ttrssUrl = m_prefs.getString("ttrss_url", "").trim();
+                String feedIconUri = ttrssUrl + "/public.php?op=feed_icon&id=" + m_article.feed_id;
+
+                Glide.with(this)
+                        .load(feedIconUri)
+                        .diskCacheStrategy(DiskCacheStrategy.DATA)
+                        .into(new DrawableImageViewTarget(feedIcon));
+            } else {
+                feedIcon.setVisibility(View.GONE);
+            }
+        }
+
         m_web = view.findViewById(R.id.article_content);
 
         m_web.setWebViewClient(new WebViewClient() {
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 0fe8163b..2f01fc34 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -88,6 +88,7 @@
                     android:ellipsize="middle"
                     android:textAlignment="viewStart"
                     android:singleLine="true"
+                    android:textStyle="italic"
                     android:fontFamily="sans-serif-light"
                     android:textColor="?colorSecondary"
                     android:textSize="12sp" />
@@ -104,6 +105,16 @@
                     android:textColor="?colorSecondary"
                     android:textSize="12sp" />
 
+                <ImageView
+                    android:id="@+id/feed_icon"
+                    android:layout_width="12dp"
+                    android:layout_height="12dp"
+                    android:layout_weight="0"
+                    android:layout_marginLeft="8dp"
+                    android:scaleType="fitXY"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/baseline_rss_feed_24" />
+
             </LinearLayout>
 
             <LinearLayout