From 655b3e873e78db8e07792c9847f4298cbe7ec9ab Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 1 Dec 2015 14:56:49 +0300
Subject: [PATCH] add (un)read to headline context menu

---
 .../java/org/fox/ttrss/HeadlinesFragment.java | 15 +++---
 .../offline/OfflineHeadlinesFragment.java     |  3 +-
 .../src/main/res/menu/context_headlines.xml   | 50 ++++++++++---------
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index e51318ea..31305a33 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -81,7 +81,7 @@ import java.util.List;
 import java.util.TimeZone;
 
 public class HeadlinesFragment extends Fragment implements OnItemClickListener, OnScrollListener {
-	public static enum ArticlesSelection { ALL, NONE, UNREAD }
+	public enum ArticlesSelection { ALL, NONE, UNREAD }
 
     public static final int FLAVOR_IMG_MIN_SIZE = 128;
 	public static final int THUMB_IMG_MIN_SIZE = 32;
@@ -155,6 +155,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			case R.id.article_set_note:
 				m_activity.editArticleNote(article);
 				return true;
+			case R.id.headlines_article_unread:
+				article.unread = !article.unread;
+				m_activity.saveArticleUnread(article);
+				m_adapter.notifyDataSetChanged();
+				return true;
 			case R.id.headlines_article_link_copy:
 				m_activity.copyToClipboard(article.link);
 				return true;
@@ -456,7 +461,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
                     m_activity.getResources().getDimensionPixelSize(R.dimen.abc_action_bar_default_padding_end_material));
         }
 
-		m_adapter = new ArticleListAdapter(getActivity(), R.layout.headlines_row, (ArrayList<Article>)m_articles);
+		m_adapter = new ArticleListAdapter(getActivity(), R.layout.headlines_row, m_articles);
 		m_animationAdapter = new SwingBottomInAnimationAdapter(m_adapter);
 
 		m_animationAdapter.setAbsListView(m_list);
@@ -1289,11 +1294,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 					public void onClick(View view) {
 						CheckBox cb = (CheckBox)view;
 
-						if (cb.isChecked()) {
-							article.selected = true;
-						} else {
-							article.selected = false;
-						}
+						article.selected = cb.isChecked();
 
 						m_listener.onArticleListSelectionChange(getSelectedArticles());
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 95ab8985..453ed82c 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -56,7 +56,7 @@ import java.util.Date;
 import java.util.TimeZone;
 
 public class OfflineHeadlinesFragment extends Fragment implements OnItemClickListener, AbsListView.OnScrollListener {
-	public static enum ArticlesSelection { ALL, NONE, UNREAD }
+	public enum ArticlesSelection { ALL, NONE, UNREAD }
 
     private final String TAG = this.getClass().getSimpleName();
 	
@@ -712,6 +712,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 
 						popup.getMenu().findItem(R.id.set_labels).setVisible(false);
 						popup.getMenu().findItem(R.id.article_set_note).setVisible(false);
+						popup.getMenu().findItem(R.id.headlines_article_unread).setVisible(false); // TODO: implement
 
 						popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
 							@Override
diff --git a/org.fox.ttrss/src/main/res/menu/context_headlines.xml b/org.fox.ttrss/src/main/res/menu/context_headlines.xml
index f0767736..dffc9e47 100644
--- a/org.fox.ttrss/src/main/res/menu/context_headlines.xml
+++ b/org.fox.ttrss/src/main/res/menu/context_headlines.xml
@@ -1,28 +1,32 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
 
-        <item
-            android:id="@+id/headlines_article_link_open"
-            app:showAsAction=""
-            android:title="@string/open_with"/>
-        <item
-            android:id="@+id/headlines_share_article"
-            app:showAsAction=""
-            android:title="@string/share_article"/>
+    <item
+        android:id="@+id/headlines_article_link_open"
+        app:showAsAction=""
+        android:title="@string/open_with"/>
+    <item
+        android:id="@+id/headlines_share_article"
+        app:showAsAction=""
+        android:title="@string/share_article"/>
 
-        <item
-            android:id="@+id/headlines_article_link_copy"
-            app:showAsAction=""
-            android:title="@string/article_link_copy"/>
-        <item
-            android:id="@+id/catchup_above"
-            app:showAsAction=""
-            android:title="@string/article_mark_read_above"/>
-        <item
-            android:id="@+id/set_labels"
-            android:title="@string/article_set_labels"/>
-        <item
-            android:id="@+id/article_set_note"
-            app:showAsAction=""
-            android:title="@string/article_set_note"/>
+    <item
+        android:id="@+id/headlines_article_link_copy"
+        app:showAsAction=""
+        android:title="@string/article_link_copy"/>
+    <item
+        android:id="@+id/catchup_above"
+        app:showAsAction=""
+        android:title="@string/article_mark_read_above"/>
+    <item
+        android:id="@+id/set_labels"
+        android:title="@string/article_set_labels"/>
+    <item
+        android:id="@+id/article_set_note"
+        app:showAsAction=""
+        android:title="@string/article_set_note"/>
+    <item
+        android:id="@+id/headlines_article_unread"
+        app:showAsAction=""
+        android:title="@string/context_selection_toggle_unread"/>
 
 </menu>
\ No newline at end of file