diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-18 16:37:38 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-18 16:40:57 +0400 |
| commit | aadfbbc18b7126011d879754b1b3d11056519b01 (patch) | |
| tree | ef531963c7881aacf6403aa5cab2bdeb14eb3ee3 /src | |
| parent | 490f53e6d088cc8c09a1a9ea933d24db4afae5d1 (diff) | |
| parent | f012d88a7e2a4a30b91f6617480dbb5d658454ee (diff) | |
Merge branch 'master' of git://github.com/dalingrin/Tiny-Tiny-RSS-for-Honeycomb
Conflicts:
res/values/strings.xml
res/xml/preferences.xml
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index d61a2244..bc31f0d8 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -62,6 +62,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, private ArticleListAdapter m_adapter;
private ArticleList m_articles = GlobalState.getInstance().m_loadedArticles;
private ArticleList m_selectedArticles = new ArticleList();
+ private ArticleList m_readArticles = new ArticleList();
private HeadlinesEventListener m_listener;
private OnlineActivity m_activity;
@@ -797,11 +798,27 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (!m_refreshInProgress && m_articles.findById(-1) != null && firstVisibleItem + visibleItemCount == m_articles.size()) {
refresh(true);
}
+
+ if (m_prefs.getBoolean("headlines_mark_read_scroll", false) && firstVisibleItem > 0) {
+ Article a = m_articles.get(firstVisibleItem - 1);
+
+ if (a != null && a.unread) {
+ a.unread = false;
+ m_readArticles.add(a);
+ m_feed.unread--;
+ }
+ }
}
@Override
public void onScrollStateChanged(AbsListView view, int scrollState) {
- // no-op
+ if (scrollState == SCROLL_STATE_IDLE && m_prefs.getBoolean("headlines_mark_read_scroll", false)) {
+ if (!m_readArticles.isEmpty()) {
+ m_activity.toggleArticlesUnread(m_readArticles);
+ m_activity.refresh(false);
+ m_readArticles.clear();
+ }
+ }
}
public Article getActiveArticle() {
|