diff options
| author | Andrew Dolgov <[email protected]> | 2012-10-09 19:36:23 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-10-09 19:36:23 +0400 |
| commit | 00b80487b48e3a3812c98369a3d3c6c5fadea6fd (patch) | |
| tree | 1cdf87a959f1b83e231aa036796dea2340ca63b7 /src/org | |
| parent | 2424b72246a7e5da1558b7da4633fdd1a515f3a6 (diff) | |
support article comments for API 4 server (closes #490)
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 29 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineArticleFragment.java | 6 | ||||
| -rw-r--r-- | src/org/fox/ttrss/types/Article.java | 4 |
3 files changed, 38 insertions, 1 deletions
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);
|