From 5792022b559eb3ac886f363f76b6f3857efb8d29 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sat, 30 Mar 2013 19:30:47 +0400
Subject: support showing article author (requires api 5) bump version

---
 src/org/fox/ttrss/ArticleFragment.java                | 12 +++++++++++-
 src/org/fox/ttrss/HeadlinesFragment.java              |  8 ++++++++
 src/org/fox/ttrss/offline/OfflineArticleFragment.java |  8 +++++++-
 src/org/fox/ttrss/types/Article.java                  |  3 +++
 4 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index c2763436..cb2c94f4 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -291,7 +291,17 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl
 				} else {
 					tagv.setVisibility(View.GONE);
 				}
-			}			
+			}
+			
+			TextView author = (TextView)view.findViewById(R.id.author);
+
+			if (author != null) {
+				if (m_article.author != null && m_article.author.length() > 0) {
+					author.setText(m_article.author);				
+				} else {
+					author.setVisibility(View.GONE);
+				}
+			}
 		} 
 		
 		return view;    	
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 8c2b8aa8..924f3b52 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -664,6 +664,14 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 				}
 			}       	
 			
+			String articleAuthor = article.author != null ? article.author : "";
+			
+			TextView author = (TextView)v.findViewById(R.id.author);
+			
+			if (author != null) {
+				author.setText(articleAuthor);
+			}
+			
 			/* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
 			
 			if (separator != null && m_onlineServices.isSmallScreen()) {
diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
index 5a2803ff..22d1ae02 100644
--- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -279,7 +279,13 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector.
 					String tagsStr = m_cursor.getString(m_cursor.getColumnIndex("tags"));
 					tagv.setText(tagsStr);
 				}
-			}			
+			}	
+			
+			TextView author = (TextView)view.findViewById(R.id.author);
+
+			if (author != null) {
+				author.setVisibility(View.GONE);
+			}
 		} 
 		
 		return view;    	
diff --git a/src/org/fox/ttrss/types/Article.java b/src/org/fox/ttrss/types/Article.java
index 8e619b4b..46da68ab 100644
--- a/src/org/fox/ttrss/types/Article.java
+++ b/src/org/fox/ttrss/types/Article.java
@@ -25,6 +25,7 @@ public class Article implements Parcelable {
 	public int comments_count;
 	public String comments_link;
 	public boolean always_display_attachments;
+	public String author;
 	
 	public Article(Parcel in) {
 		readFromParcel(in);
@@ -64,6 +65,7 @@ public class Article implements Parcelable {
 		out.writeInt(comments_count);
 		out.writeString(comments_link);
 		out.writeInt(always_display_attachments ? 1 : 0);
+		out.writeString(author);
 	}
 	
 	public void readFromParcel(Parcel in) {
@@ -90,6 +92,7 @@ public class Article implements Parcelable {
 		comments_count = in.readInt();
 		comments_link = in.readString();
 		always_display_attachments = in.readInt() == 1;
+		author = in.readString();
 	}
 	
 	@SuppressWarnings("rawtypes")
-- 
cgit v1.2.3-54-g00ecf