From b7c9792ada57c2fcc398c95320bfbb57ae59fb35 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 20 Jun 2012 14:16:24 +0400
Subject: various layout and code updates to support feed_title in virtual
 feeds (requires API 3)

---
 src/org/fox/ttrss/ArticleFragment.java   |  4 +++-
 src/org/fox/ttrss/HeadlinesFragment.java | 11 +++++++++++
 src/org/fox/ttrss/types/Article.java     |  4 ++++
 3 files changed, 18 insertions(+), 1 deletion(-)

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

diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 00823f60..7b1128aa 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -281,7 +281,9 @@ public class ArticleFragment extends Fragment {
 			TextView tagv = (TextView)view.findViewById(R.id.tags);
 						
 			if (tagv != null) {
-				if (m_article.tags != null) {
+				if (m_article.feed_title != null) {
+					tagv.setText(m_article.feed_title);
+				} else if (m_article.tags != null) {
 					String tagsStr = "";
 				
 					for (String tag : m_article.tags)
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index da50a917..58b68e75 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -399,6 +399,17 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 				}
 			}
 
+			TextView ft = (TextView)v.findViewById(R.id.feed_title);
+			
+			if (ft != null) {
+				if (article.feed_title != null && (m_feed.is_cat || m_feed.id < 0)) {
+					ft.setText(article.feed_title);					
+				} else {
+					ft.setVisibility(View.GONE);
+				}
+				
+			}
+			
 			ImageView marked = (ImageView)v.findViewById(R.id.marked);
 			
 			if (marked != null) {
diff --git a/src/org/fox/ttrss/types/Article.java b/src/org/fox/ttrss/types/Article.java
index 28e54d51..2ad86e91 100644
--- a/src/org/fox/ttrss/types/Article.java
+++ b/src/org/fox/ttrss/types/Article.java
@@ -21,6 +21,7 @@ public class Article implements Parcelable {
 	public List<Attachment> attachments;
 	public String content;
 	public List<List<String>> labels;
+	public String feed_title;
 	
 	public Article(Parcel in) {
 		readFromParcel(in);
@@ -52,6 +53,7 @@ public class Article implements Parcelable {
 		out.writeStringList(tags);
 		out.writeString(content);
 		out.writeList(attachments);
+		out.writeString(feed_title);
 	}
 	
 	public void readFromParcel(Parcel in) {
@@ -72,6 +74,8 @@ public class Article implements Parcelable {
 		
 		attachments = new ArrayList<Attachment>();
 		in.readList(attachments, Attachment.class.getClassLoader());
+		
+		feed_title = in.readString();
 	}
 	
 	@SuppressWarnings("rawtypes")
-- 
cgit v1.2.3-54-g00ecf