From 00b80487b48e3a3812c98369a3d3c6c5fadea6fd Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 9 Oct 2012 19:36:23 +0400
Subject: [PATCH 1/2] support article comments for API 4 server (closes #490)

---
 res/layout/article_fragment.xml               | 10 +++++++
 res/values/strings.xml                        |  1 +
 src/org/fox/ttrss/ArticleFragment.java        | 29 +++++++++++++++++++
 .../ttrss/offline/OfflineArticleFragment.java |  6 ++++
 src/org/fox/ttrss/types/Article.java          |  4 ++-
 5 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index 0b847017..e228dbe1 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -22,6 +22,16 @@
                 android:text="There are many variations of passages of Lorem Ipsum available"
                 android:textSize="16sp" />
 
+            <TextView
+                android:id="@+id/comments"
+                android:textColor="?linkColor"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="24 comments"
+                android:textSize="13sp" />
+            
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cd2f7c4b..591b36b3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -145,4 +145,5 @@
     <string name="error_ssl_hostname_rejected">Error: SSL hostname not verified</string>
     <string name="offline_oldest_first">Show oldest articles first</string>
     <string name="prefs_dim_status_bar">Dim status bar when reading</string>
+    <string name="article_comments">%1$d comments</string>
 </resources>
\ No newline at end of file
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 5e84979d..9a7b0ed3 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -141,6 +141,35 @@ public class ArticleFragment extends Fragment {
 				registerForContextMenu(title); 
 			}
 			
+			TextView comments = (TextView)view.findViewById(R.id.comments);
+			
+			if (comments != null) {
+				if (m_activity.getApiLevel() >= 4 && m_article.comments_count > 0) {
+					String commentsTitle = getString(R.string.article_comments, m_article.comments_count);
+					comments.setText(commentsTitle);
+					comments.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+					comments.setOnClickListener(new OnClickListener() {					
+						@Override
+						public void onClick(View v) {
+							try {
+								String link = (m_article.comments_link != null && m_article.comments_link.length() > 0) ?
+									m_article.comments_link : m_article.link; 
+								
+								Intent intent = new Intent(Intent.ACTION_VIEW, 
+										Uri.parse(link.trim()));
+									startActivity(intent);
+							} catch (Exception e) {
+								e.printStackTrace();
+								m_activity.toast(R.string.error_other_error);
+							}
+						}
+					});
+					
+				} else {
+					comments.setVisibility(View.GONE);					
+				}
+			}
+			
 			WebView web = (WebView)view.findViewById(R.id.content);
 			
 			if (web != null) {
diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
index 98ce59f4..65933b61 100644
--- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -143,6 +143,12 @@ public class OfflineArticleFragment extends Fragment {
 				registerForContextMenu(title);
 			}
 			
+			TextView comments = (TextView)view.findViewById(R.id.comments);
+			
+			if (comments != null) {
+				comments.setVisibility(View.GONE);
+			}
+			
 			WebView web = (WebView)view.findViewById(R.id.content);
 			
 			if (web != null) {
diff --git a/src/org/fox/ttrss/types/Article.java b/src/org/fox/ttrss/types/Article.java
index bf9614e8..6db4b938 100644
--- a/src/org/fox/ttrss/types/Article.java
+++ b/src/org/fox/ttrss/types/Article.java
@@ -21,7 +21,9 @@ public class Article implements Parcelable {
 	public List<Attachment> attachments;
 	public String content;
 	public List<List<String>> labels;
-	public String feed_title;
+	public String feed_title;	
+	public int comments_count;
+	public String comments_link;
 	
 	public Article(Parcel in) {
 		readFromParcel(in);

From e80c14c8f598b5ad83ec22d8848f342f196439ce Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 9 Oct 2012 19:39:16 +0400
Subject: [PATCH 2/2] remove gravity: right on comments link

---
 res/layout/article_fragment.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index e228dbe1..2320625b 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -28,7 +28,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="right"
                 android:text="24 comments"
                 android:textSize="13sp" />