diff --git a/res/drawable-hdpi/ic_action_overflow.png b/res/drawable-hdpi/ic_action_overflow.png
new file mode 100644
index 00000000..0612f431
Binary files /dev/null and b/res/drawable-hdpi/ic_action_overflow.png differ
diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png
deleted file mode 100644
index eb1a7bd8..00000000
Binary files a/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png
deleted file mode 100644
index 2c395b80..00000000
Binary files a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png and /dev/null differ
diff --git a/res/drawable/headline_row.xml b/res/drawable/headline_row.xml
new file mode 100644
index 00000000..45235231
--- /dev/null
+++ b/res/drawable/headline_row.xml
@@ -0,0 +1,19 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/headline_row_selected.xml b/res/drawable/headline_row_selected.xml
new file mode 100644
index 00000000..1f30f42f
--- /dev/null
+++ b/res/drawable/headline_row_selected.xml
@@ -0,0 +1,19 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/headline_row_selected_sepia.xml b/res/drawable/headline_row_selected_sepia.xml
new file mode 100644
index 00000000..0ed5da7a
--- /dev/null
+++ b/res/drawable/headline_row_selected_sepia.xml
@@ -0,0 +1,19 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/headline_row_sepia.xml b/res/drawable/headline_row_sepia.xml
new file mode 100644
index 00000000..5e2aad22
--- /dev/null
+++ b/res/drawable/headline_row_sepia.xml
@@ -0,0 +1,19 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/headline_row_unread.xml b/res/drawable/headline_row_unread.xml
new file mode 100644
index 00000000..14840998
--- /dev/null
+++ b/res/drawable/headline_row_unread.xml
@@ -0,0 +1,19 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/headline_row_unread_sepia.xml b/res/drawable/headline_row_unread_sepia.xml
new file mode 100644
index 00000000..f062fb7e
--- /dev/null
+++ b/res/drawable/headline_row_unread_sepia.xml
@@ -0,0 +1,19 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml
index e52de2c2..35cef732 100644
--- a/res/layout/feeds_row.xml
+++ b/res/layout/feeds_row.xml
@@ -58,9 +58,6 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:background="@null"
- android:paddingLeft="6dp"
- android:paddingTop="6dp"
- android:visibility="gone"
- android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+ android:src="@drawable/ic_action_overflow" />
\ No newline at end of file
diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml
index 7876d150..0d145b23 100644
--- a/res/layout/feeds_row_selected.xml
+++ b/res/layout/feeds_row_selected.xml
@@ -58,9 +58,6 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:background="@null"
- android:paddingLeft="6dp"
- android:paddingTop="6dp"
- android:visibility="gone"
- android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+ android:src="@drawable/ic_action_overflow" />
\ No newline at end of file
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index ac371724..92b0d3cc 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -1,12 +1,14 @@
+ android:paddingTop="3dp"
+ tools:ignore="HardcodedText" >
+ android:paddingBottom="2dp"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:paddingTop="6dp" >
-
+ android:src="@drawable/ic_action_overflow" />
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index e370d32f..c88c0a83 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -14,7 +14,7 @@
android:layout_height="match_parent"
android:background="?headlineSelectedBackground"
android:orientation="vertical"
- android:padding="6dp" >
+ android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" >
-
+ android:src="@drawable/ic_action_overflow" />
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index 2305a4f3..764571d4 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -14,7 +14,7 @@
android:layout_height="match_parent"
android:background="?headlineSelectedBackground"
android:orientation="vertical"
- android:padding="6dp" >
+ android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" >
-
+ android:src="@drawable/ic_action_overflow" />
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 22f9c452..141b1736 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -14,7 +14,7 @@
android:layout_height="match_parent"
android:background="?headlineUnreadBackground"
android:orientation="vertical"
- android:padding="6dp" >
+ android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" > >
-
+ android:src="@drawable/ic_action_overflow" />
diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml
index 5e1c4cfb..d2adf334 100644
--- a/res/values-v11/style.xml
+++ b/res/values-v11/style.xml
@@ -7,9 +7,9 @@
- @drawable/shadow_headlines
- #f0f0f0
- @android:color/transparent
- - #88b0f0
- - #ffffff
- - #f0f0f0
+ - @drawable/headline_row_selected
+ - @drawable/headline_row_unread
+ - @drawable/headline_row
- #88b0f0
- @android:color/primary_text_light
- #ffffff
@@ -32,8 +32,9 @@
- @drawable/shadow_feeds_sepia
- @drawable/shadow_headlines_sepia
- @drawable/paper_sepia
- - #f2eae8
- - #E5B0A0
+ - @drawable/headline_row_unread_sepia
+ - @drawable/headline_row_sepia
+ - @drawable/headline_row_selected_sepia
- #E5B0A0
- @drawable/paper_sepia
- @drawable/counter_background_sepia
diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java
index 34b21922..559a72d4 100644
--- a/src/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/FeedCategoriesFragment.java
@@ -415,9 +415,6 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) {
- if (m_activity.isDarkTheme())
- ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
-
ib.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index 9eae321b..fc5996f0 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -542,9 +542,6 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) {
- if (m_activity.isDarkTheme())
- ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
-
ib.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 16a0f64d..53bedc59 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -795,13 +795,13 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
});
}
- ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
+ ImageView iv = (ImageView) v.findViewById(R.id.article_menu_button);
- if (ib != null) {
- if (m_activity.isDarkTheme())
- ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
+ if (iv != null) {
+ //if (m_activity.isDarkTheme())
+ // ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
- ib.setOnClickListener(new OnClickListener() {
+ iv.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
getActivity().openContextMenu(v);
diff --git a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
index ad229919..682cf3e6 100644
--- a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
@@ -288,9 +288,6 @@ public class OfflineFeedCategoriesFragment extends Fragment implements OnItemCli
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) {
- if (m_activity.isDarkTheme())
- ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
-
ib.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
index 98996858..69a07595 100644
--- a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
@@ -322,9 +322,6 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) {
- if (m_activity.isDarkTheme())
- ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
-
ib.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index da929569..afa08b40 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -645,11 +645,11 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
});
}
- ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
+ ImageView ib = (ImageView) v.findViewById(R.id.article_menu_button);
if (ib != null) {
- if (m_activity.isDarkTheme())
- ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
+ //if (m_activity.isDarkTheme())
+ // ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() {
@Override