diff options
| author | Andrew Dolgov <[email protected]> | 2013-03-19 14:44:11 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-03-19 14:44:11 +0400 |
| commit | ef8fb0f7e8ea243484a5ce6d0bd63b075d78499e (patch) | |
| tree | a580a80d1d832beedc194f5123efc536b3fb91d7 /src | |
| parent | 0be7d5eac54391bf6fe7878e194f4474a07d57ed (diff) | |
implement different resources for selected and selected+unread headlines
(refs #595)
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 8 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 10 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 339da6cd..e8de1dbd 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -525,7 +525,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public static final int VIEW_NORMAL = 0;
public static final int VIEW_UNREAD = 1;
public static final int VIEW_SELECTED = 2;
- public static final int VIEW_LOADMORE = 3;
+ public static final int VIEW_SELECTED_UNREAD = 3;
+ public static final int VIEW_LOADMORE = 4;
public static final int VIEW_COUNT = VIEW_LOADMORE+1;
@@ -544,6 +545,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (a.id == -1) {
return VIEW_LOADMORE;
+ } else if (m_activeArticle != null && a.id == m_activeArticle.id && a.unread) {
+ return VIEW_SELECTED_UNREAD;
} else if (m_activeArticle != null && a.id == m_activeArticle.id) {
return VIEW_SELECTED;
} else if (a.unread) {
@@ -573,6 +576,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, case VIEW_SELECTED:
layoutId = R.layout.headlines_row_selected;
break;
+ case VIEW_SELECTED_UNREAD:
+ layoutId = R.layout.headlines_row_selected_unread;
+ break;
}
LayoutInflater vi = (LayoutInflater)getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 60858473..bfc6d64f 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -378,7 +378,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis public static final int VIEW_NORMAL = 0;
public static final int VIEW_UNREAD = 1;
public static final int VIEW_SELECTED = 2;
- public static final int VIEW_LOADMORE = 3;
+ public static final int VIEW_SELECTED_UNREAD = 3;
+ public static final int VIEW_LOADMORE = 4;
public static final int VIEW_COUNT = VIEW_LOADMORE+1;
@@ -393,7 +394,9 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis //Log.d(TAG, "@gIVT " + position + " " + c.getInt(0) + " vs " + m_activeArticleId);
- if (c.getInt(0) == m_activeArticleId) {
+ if (c.getInt(0) == m_activeArticleId && c.getInt(c.getColumnIndex("unread")) == 1) {
+ return VIEW_SELECTED_UNREAD;
+ } else if (c.getInt(0) == m_activeArticleId) {
return VIEW_SELECTED;
} else if (c.getInt(c.getColumnIndex("unread")) == 1) {
return VIEW_UNREAD;
@@ -420,6 +423,9 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis case VIEW_UNREAD:
layoutId = R.layout.headlines_row_unread;
break;
+ case VIEW_SELECTED_UNREAD:
+ layoutId = R.layout.headlines_row_selected_unread;
+ break;
case VIEW_SELECTED:
layoutId = R.layout.headlines_row_selected;
break;
|