diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png
new file mode 100644
index 00000000..eb1a7bd8
Binary files /dev/null and b/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png
new file mode 100644
index 00000000..2c395b80
Binary files /dev/null and b/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png differ
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 94d5f856..d339e281 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -120,6 +120,15 @@
android:clickable="true"
android:src="@drawable/ic_rss_bw" />
+
\ No newline at end of file
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index e1788ad5..be2239d9 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -120,6 +120,16 @@
android:layout_weight="0"
android:clickable="true"
android:src="@drawable/ic_rss_bw" />
+
+
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index a91d5407..0367199e 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -121,6 +121,15 @@
android:clickable="true"
android:src="@drawable/ic_rss_bw" />
+
\ No newline at end of file
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index df794891..a4cbae11 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -119,9 +119,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
- android:clickable="true"
+ android:clickable="true"
android:src="@drawable/ic_rss_bw" />
+
+
\ No newline at end of file
diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java
index e1cacb02..78d1937c 100644
--- a/src/org/fox/ttrss/CommonActivity.java
+++ b/src/org/fox/ttrss/CommonActivity.java
@@ -166,6 +166,13 @@ public class CommonActivity extends SherlockFragmentActivity {
toast.show();
}
+ public boolean isDarkTheme() {
+ String defaultTheme = "THEME_DARK";
+
+ return (m_prefs.getString("theme", defaultTheme).equals("THEME_DARK")) ||
+ m_prefs.getString("theme", defaultTheme).equals("THEME_DARK_GRAY");
+ }
+
protected void setAppTheme(SharedPreferences prefs) {
String defaultTheme = "THEME_DARK";
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index f9cc51d8..0c5b09ec 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -41,6 +41,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
+import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
@@ -721,17 +722,19 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
});
}
- /* ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
+ ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
if (ib != null) {
- ib.setVisibility(android.os.Build.VERSION.SDK_INT >= 10 ? View.VISIBLE : View.GONE);
+ if (m_activity.isDarkTheme())
+ ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
+
ib.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
getActivity().openContextMenu(v);
}
});
- } */
+ }
return v;
}
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index e7e848d2..85588195 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -38,6 +38,7 @@ import android.widget.AdapterView;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.CheckBox;
+import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
@@ -576,18 +577,20 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
});
}
- /* ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
+ ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
if (ib != null) {
- ib.setVisibility(android.os.Build.VERSION.SDK_INT >= 10 ? View.VISIBLE : View.GONE);
+ if (m_activity.isDarkTheme())
+ ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
+
ib.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
getActivity().openContextMenu(v);
}
});
- } */
-
+ }
+
return v;
}