diff --git a/res/drawable-hdpi/ic_action_overflow.png b/res/drawable-hdpi/ic_action_overflow.png
index 0612f431..5845b648 100644
Binary files a/res/drawable-hdpi/ic_action_overflow.png and b/res/drawable-hdpi/ic_action_overflow.png differ
diff --git a/res/drawable-hdpi/ic_published.png b/res/drawable-hdpi/ic_published.png
new file mode 100644
index 00000000..6f790827
Binary files /dev/null and b/res/drawable-hdpi/ic_published.png differ
diff --git a/res/drawable-hdpi/ic_rss.png b/res/drawable-hdpi/ic_rss.png
deleted file mode 100644
index bd03379a..00000000
Binary files a/res/drawable-hdpi/ic_rss.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_rss_bw.png b/res/drawable-hdpi/ic_rss_bw.png
deleted file mode 100644
index 56d79bc7..00000000
Binary files a/res/drawable-hdpi/ic_rss_bw.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_star_empty.png b/res/drawable-hdpi/ic_star_empty.png
new file mode 100644
index 00000000..057c6c66
Binary files /dev/null and b/res/drawable-hdpi/ic_star_empty.png differ
diff --git a/res/drawable-hdpi/ic_star_full.png b/res/drawable-hdpi/ic_star_full.png
new file mode 100644
index 00000000..2ad21203
Binary files /dev/null and b/res/drawable-hdpi/ic_star_full.png differ
diff --git a/res/drawable-hdpi/ic_unpublished.png b/res/drawable-hdpi/ic_unpublished.png
new file mode 100644
index 00000000..5d84ec52
Binary files /dev/null and b/res/drawable-hdpi/ic_unpublished.png differ
diff --git a/res/drawable/s_headline_published.svg b/res/drawable/s_headline_published.svg
new file mode 100644
index 00000000..b07448a0
--- /dev/null
+++ b/res/drawable/s_headline_published.svg
@@ -0,0 +1,905 @@
+
+
diff --git a/res/drawable/s_headline_unpublished.svg b/res/drawable/s_headline_unpublished.svg
new file mode 100644
index 00000000..3bcbf2a6
--- /dev/null
+++ b/res/drawable/s_headline_unpublished.svg
@@ -0,0 +1,193 @@
+
+
diff --git a/res/drawable/s_marked_bw.svg b/res/drawable/s_marked_bw.svg
new file mode 100644
index 00000000..df88f4a5
--- /dev/null
+++ b/res/drawable/s_marked_bw.svg
@@ -0,0 +1,93 @@
+
+
+
+
diff --git a/res/drawable/s_marked_bw_full.svg b/res/drawable/s_marked_bw_full.svg
new file mode 100644
index 00000000..3ccf34c1
--- /dev/null
+++ b/res/drawable/s_marked_bw_full.svg
@@ -0,0 +1,93 @@
+
+
+
+
diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml
index 35cef732..38b854ab 100644
--- a/res/layout/feeds_row.xml
+++ b/res/layout/feeds_row.xml
@@ -18,7 +18,7 @@
android:layout_height="20dp"
android:layout_weight="0"
android:scaleType="fitXY"
- android:src="@drawable/ic_rss_bw" />
+ android:src="@drawable/ic_unpublished" />
diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml
index 0d145b23..568f9adb 100644
--- a/res/layout/feeds_row_selected.xml
+++ b/res/layout/feeds_row_selected.xml
@@ -18,7 +18,7 @@
android:layout_height="20dp"
android:layout_weight="0"
android:scaleType="fitXY"
- android:src="@drawable/ic_rss_bw" />
+ android:src="@drawable/ic_unpublished" />
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 92b0d3cc..92fba271 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -113,8 +113,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:clickable="true"
- android:paddingRight="6dp"
- android:src="@android:drawable/star_off" />
+ android:paddingRight="8dp"
+ android:src="@drawable/ic_star_empty" />
+ android:paddingRight="8dp"
+ android:src="@drawable/ic_published" />
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index c88c0a83..4ac82d02 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -108,8 +108,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:clickable="true"
- android:paddingRight="6dp"
- android:src="@android:drawable/star_off" />
+ android:paddingRight="8dp"
+ android:src="@drawable/ic_star_empty" />
+ android:paddingRight="8dp"
+ android:src="@drawable/ic_published" />
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index 764571d4..25574784 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -109,8 +109,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:clickable="true"
- android:paddingRight="6dp"
- android:src="@android:drawable/star_off" />
+ android:paddingRight="8dp"
+ android:src="@drawable/ic_star_empty" />
+ android:paddingRight="8dp"
+ android:src="@drawable/ic_published" />
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 141b1736..2ae08a91 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -109,8 +109,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:clickable="true"
- android:paddingRight="6dp"
- android:src="@android:drawable/star_off" />
+ android:paddingRight="8dp"
+ android:src="@drawable/ic_star_empty" />
+ android:paddingRight="8dp"
+ android:src="@drawable/ic_unpublished" />
diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java
index f2c6d522..addfc8e2 100644
--- a/src/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/FeedCategoriesFragment.java
@@ -439,7 +439,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
ImageView icon = (ImageView)v.findViewById(R.id.icon);
if (icon != null) {
- icon.setImageResource(cat.unread > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw);
+ icon.setImageResource(cat.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
}
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index cc851cd4..19aac645 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -556,14 +556,14 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
icon.setImageBitmap(bmpOrig);
}
} else {
- icon.setImageResource(feed.unread > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw);
+ icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
}
} catch (NullPointerException e) {
- icon.setImageResource(feed.unread > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw);
+ icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
}
} else {
- icon.setImageResource(feed.unread > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw);
+ icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
}
}
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 0b5bc1ca..f5e62e5b 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -685,7 +685,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
ImageView marked = (ImageView)v.findViewById(R.id.marked);
if (marked != null) {
- marked.setImageResource(article.marked ? android.R.drawable.star_on : android.R.drawable.star_off);
+ marked.setImageResource(article.marked ? R.drawable.ic_star_full : R.drawable.ic_star_empty);
marked.setOnClickListener(new OnClickListener() {
@@ -702,7 +702,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
ImageView published = (ImageView)v.findViewById(R.id.published);
if (published != null) {
- published.setImageResource(article.published ? R.drawable.ic_rss : R.drawable.ic_rss_bw);
+ published.setImageResource(article.published ? R.drawable.ic_published : R.drawable.ic_unpublished);
published.setOnClickListener(new OnClickListener() {
diff --git a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
index 682cf3e6..8fde8176 100644
--- a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
@@ -282,7 +282,7 @@ public class OfflineFeedCategoriesFragment extends Fragment implements OnItemCli
ImageView icon = (ImageView)v.findViewById(R.id.icon);
if (icon != null) {
- icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw);
+ icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
}
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
diff --git a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
index 69a07595..8c04d0cd 100644
--- a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
@@ -307,14 +307,14 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene
icon.setImageBitmap(bmpOrig);
}
} else {
- icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw);
+ icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
}
} catch (NullPointerException e) {
- icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw);
+ icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
}
} else {
- icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw);
+ icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
}
}
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index afa08b40..eae05b8b 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -525,7 +525,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
ImageView marked = (ImageView)v.findViewById(R.id.marked);
if (marked != null) {
- marked.setImageResource(article.getInt(article.getColumnIndex("marked")) == 1 ? android.R.drawable.star_on : android.R.drawable.star_off);
+ marked.setImageResource(article.getInt(article.getColumnIndex("marked")) == 1 ? R.drawable.ic_star_full : R.drawable.ic_star_empty);
marked.setOnClickListener(new OnClickListener() {
@@ -546,7 +546,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
ImageView published = (ImageView)v.findViewById(R.id.published);
if (published != null) {
- published.setImageResource(article.getInt(article.getColumnIndex("published")) == 1 ? R.drawable.ic_rss : R.drawable.ic_rss_bw);
+ published.setImageResource(article.getInt(article.getColumnIndex("published")) == 1 ? R.drawable.ic_published : R.drawable.ic_unpublished);
published.setOnClickListener(new OnClickListener() {