support displaying article notes (requires API 8)

4 files changed, 26 insertions, 2 deletions

diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 6f87d84d..fb0e2aa8 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -162,6 +162,17 @@ public class ArticleFragment extends Fragment  {
 				}
 			}
 			
+			TextView note = (TextView)view.findViewById(R.id.note);
+			
+			if (note != null) {
+				if (m_article.note != null && !"".equals(m_article.note)) {
+					note.setText(m_article.note);					
+				} else {
+					note.setVisibility(View.GONE);
+				}
+				
+			}
+			
 			final WebView web = (WebView)view.findViewById(R.id.content);
 			
 			if (web != null) {
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java
index 5704302d..afaa2535 100644
--- a/src/org/fox/ttrss/OnlineActivity.java
+++ b/src/org/fox/ttrss/OnlineActivity.java
@@ -1060,8 +1060,12 @@ public class OnlineActivity extends CommonActivity {
 		
 		builder.setPositiveButton(R.string.article_set_note, new Dialog.OnClickListener() {
 	        public void onClick(DialogInterface dialog, int which) {
-	        	saveArticleNote(article, topicEdit.getText().toString().trim());
-	        	article.published = true;	        	
+	        	String note = topicEdit.getText().toString().trim();
+	        	
+	        	saveArticleNote(article, note);
+	        	article.published = true;	
+	        	article.note = note;
+	        	
 	        	saveArticlePublished(article);
 	        	
 	        	HeadlinesFragment hf = (HeadlinesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
index ad148257..de50d42c 100644
--- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -175,6 +175,12 @@ public class OfflineArticleFragment extends Fragment {
 				comments.setVisibility(View.GONE);
 			}
 			
+			TextView note = (TextView)view.findViewById(R.id.note);
+			
+			if (note != null) {
+				note.setVisibility(View.GONE);
+			}
+			
 			final 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 f5053891..9beea81a 100644
--- a/src/org/fox/ttrss/types/Article.java
+++ b/src/org/fox/ttrss/types/Article.java
@@ -27,6 +27,7 @@ public class Article implements Parcelable {
 	public String comments_link;
 	public boolean always_display_attachments;
 	public String author;
+	public String note;
 	
 	public Article(Parcel in) {
 		readFromParcel(in);
@@ -68,6 +69,7 @@ public class Article implements Parcelable {
 		out.writeString(comments_link);
 		out.writeInt(always_display_attachments ? 1 : 0);
 		out.writeString(author);
+		out.writeString(note);
 	}
 	
 	public void readFromParcel(Parcel in) {
@@ -96,6 +98,7 @@ public class Article implements Parcelable {
 		comments_link = in.readString();
 		always_display_attachments = in.readInt() == 1;
 		author = in.readString();
+		note = in.readString();
 	}
 	
 	@SuppressWarnings("rawtypes")