diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1a97ecd5..8c700005 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="143" + android:versionName="1.20" > - + android:textStyle="normal" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout-sw600dp-port/headlines_row_selected.xml b/res/layout-sw600dp-port/headlines_row_selected.xml index 0805077d..cdcc20e7 100644 --- a/res/layout-sw600dp-port/headlines_row_selected.xml +++ b/res/layout-sw600dp-port/headlines_row_selected.xml @@ -29,7 +29,6 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" > - + android:textStyle="normal" > diff --git a/res/layout-sw600dp-port/headlines_row_selected_unread.xml b/res/layout-sw600dp-port/headlines_row_selected_unread.xml new file mode 100644 index 00000000..0805077d --- /dev/null +++ b/res/layout-sw600dp-port/headlines_row_selected_unread.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout-sw600dp/headlines_row_selected.xml b/res/layout-sw600dp/headlines_row_selected.xml index 0157fb65..ed84f9f6 100644 --- a/res/layout-sw600dp/headlines_row_selected.xml +++ b/res/layout-sw600dp/headlines_row_selected.xml @@ -39,7 +39,7 @@ android:text="{Title...}" android:textColor="?headlineSelectedTextColor" android:textSize="16sp" - android:textStyle="bold" > + android:textStyle="normal" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml index c4423d57..eefe8639 100644 --- a/res/layout/headlines_row_selected.xml +++ b/res/layout/headlines_row_selected.xml @@ -41,7 +41,7 @@ android:text="{Title...}" android:textColor="?headlineSelectedTextColor" android:textSize="16sp" - android:textStyle="bold" > + android:textStyle="normal" > diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml new file mode 100644 index 00000000..c4423d57 --- /dev/null +++ b/res/layout/headlines_row_selected_unread.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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;