From 3bb2daaf0e368d2bf5e9e797c1c1d308c9f32ca2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 1 Jun 2015 20:10:12 +0400
Subject: use proper marked/published icons on dark theme headline views

---
 org.fox.ttrss/src/main/res/layout/headlines_row.xml                | 4 ++--
 org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml        | 2 +-
 .../src/main/res/layout/headlines_row_selected_compact.xml         | 2 +-
 .../src/main/res/layout/headlines_row_selected_unread_compact.xml  | 3 ++-
 org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml         | 4 ++--
 org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml | 2 +-
 org.fox.ttrss/src/main/res/values/attrs.xml                        | 3 +++
 org.fox.ttrss/src/main/res/values/style.xml                        | 7 +++++++
 8 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'org.fox.ttrss/src/main/res')

diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index d835d41e..9798a892 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -160,7 +160,7 @@
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_star_outline_dark" />
+                    android:src="?ic_star_outline" />
 
                 <ImageView
                     android:id="@+id/published"
@@ -170,7 +170,7 @@
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_rss_box_dark" />
+                    android:src="?ic_rss_box" />
 
                 <ImageView
                     android:id="@+id/article_menu_button"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
index 8e809ca9..fdd60d62 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
@@ -111,7 +111,7 @@
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="@drawable/ic_star_outline_dark" />
+            android:src="?ic_star_outline" />
 
 
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
index 175b0ca3..b4bfffcb 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
@@ -113,7 +113,7 @@
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="@drawable/ic_star_outline_dark" />
+            android:src="?ic_star_outline" />
 
 
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
index 0764b60b..669ae168 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
@@ -108,12 +108,13 @@
 
         <ImageView
             android:id="@+id/marked"
+            android:tint="?headlineFooterColor"
             android:layout_width="24dp"
             android:layout_gravity="bottom|right"
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="@drawable/ic_star_outline_dark" />
+            android:src="?ic_star_outline" />
 
 
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
index c12bc1f3..04bd55da 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -162,7 +162,7 @@
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_star_outline_dark" />
+                    android:src="?ic_star_outline" />
 
                 <ImageView
                     android:id="@+id/published"
@@ -172,7 +172,7 @@
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_checkbox_marked_dark" />
+                    android:src="?ic_checkbox_marked" />
 
                 <ImageView
                     android:id="@+id/article_menu_button"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
index 3d656b50..141aae0e 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
@@ -113,7 +113,7 @@
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="@drawable/ic_star_outline_dark" />
+            android:src="?ic_star_outline" />
 
 
 
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index 3b636cfa..723b0db4 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -31,4 +31,7 @@
     <attr name="articleHeaderSeparator" format="reference|color" />
     <attr name="ic_rss_box" format="reference"/>
     <attr name="ic_rss" format="reference"/>
+    <attr name="ic_checkbox_marked" format="reference" />
+    <attr name="ic_star" format="reference" />
+    <attr name="ic_star_outline" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 6579e9ee..71c96aec 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -39,6 +39,9 @@
 
         <item name="ic_rss_box">@drawable/ic_rss_box_dark</item>
         <item name="ic_rss">@drawable/ic_rss_dark</item>
+        <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked_dark</item>
+        <item name="ic_star">@drawable/ic_star_dark</item>
+        <item name="ic_star_outline">@drawable/ic_star_outline_dark</item>
     </style>
 
     <style name="SepiaTheme" parent="LightTheme">
@@ -124,6 +127,10 @@
 
         <item name="ic_rss_box">@drawable/ic_rss_box</item>
         <item name="ic_rss">@drawable/ic_rss</item>
+        <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked</item>
+        <item name="ic_star">@drawable/ic_star</item>
+        <item name="ic_star_outline">@drawable/ic_star_outline</item>
+
     </style>
 
     <style name="DarkDialogTheme" parent="android:Theme"></style>
-- 
cgit v1.2.3-54-g00ecf