diff options
| author | Andrew Dolgov <fox@madoka.volgo-balt.ru> | 2012-06-20 14:16:24 +0400 |
|---|---|---|
| committer | Andrew Dolgov <fox@madoka.volgo-balt.ru> | 2012-06-20 14:16:24 +0400 |
| commit | b7c9792ada57c2fcc398c95320bfbb57ae59fb35 (patch) | |
| tree | 866027a4bbb5e3552014eeb94d42eec5c3188560 /src | |
| parent | 1ffdbfe1873f0b5b41ff05553cdc8b0fe5e99510 (diff) | |
various layout and code updates to support feed_title in virtual feeds
(requires API 3)
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 4 | ||||
| -rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 11 | ||||
| -rw-r--r-- | src/org/fox/ttrss/types/Article.java | 4 |
3 files changed, 18 insertions, 1 deletions
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")
|