iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb

Browse Source
This commit is contained in:
Andrew Dolgov 2012-10-10 13:28:27 +04:00
commit 171461be53
5 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout/article_fragment.xml
View File

@ -22,6 +22,15 @@
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:text="24 comments"
android:textSize="13sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

1
res/values/strings.xml
View File

@ -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>

29
src/org/fox/ttrss/ArticleFragment.java
View File

@ -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) {

6
src/org/fox/ttrss/offline/OfflineArticleFragment.java
View File

@ -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) {

4
src/org/fox/ttrss/types/Article.java
View File

@ -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);