some dark theme layout tweaks

8 files changed, 19 insertions, 13 deletions

diff --git a/res/drawable-hdpi/ics_divider_vertical_bitmap.png b/res/drawable-hdpi/ics_divider_vertical_bitmap.png
new file mode 100644
index 00000000..3391f40c
--- /dev/null
+++ b/res/drawable-hdpi/ics_divider_vertical_bitmap.png
diff --git a/res/drawable/ics_divider_vertical.xml b/res/drawable/ics_divider_vertical.xml
new file mode 100644
index 00000000..9967aa1f
--- /dev/null
+++ b/res/drawable/ics_divider_vertical.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>

+<bitmap

+    xmlns:android="http://schemas.android.com/apk/res/android"

+    android:src="@drawable/ics_divider_vertical_bitmap"

+    android:gravity="fill_vertical|right" />    

diff --git a/res/layout-xlarge-port/main.xml b/res/layout-xlarge-port/main.xml
index 78ccdd3d..3ee728a6 100644
--- a/res/layout-xlarge-port/main.xml
+++ b/res/layout-xlarge-port/main.xml
@@ -35,7 +35,7 @@
                 android:id="@+id/article_fragment"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:background="?articleHeader" 
+                android:background="?articleBackground" 
                 android:layout_weight="0.5" >
             </FrameLayout>
         </LinearLayout>
diff --git a/res/layout-xlarge/main.xml b/res/layout-xlarge/main.xml
index 3278ff22..615232a4 100644
--- a/res/layout-xlarge/main.xml
+++ b/res/layout-xlarge/main.xml
@@ -31,7 +31,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.6"
-            android:background="?articleHeader" >
+            android:background="?articleBackground" >
         </FrameLayout>
     </LinearLayout>
 
diff --git a/res/values-v14/style.xml b/res/values-v14/style.xml
index 696fea9b..dc254c41 100644
--- a/res/values-v14/style.xml
+++ b/res/values-v14/style.xml
@@ -5,7 +5,7 @@
 		<item name="unreadCounterColor">#0000ff</item>

 		<item name="headlinesBackground"><!--  #f0f0f0 -->@drawable/shadow_headlines</item>

 		<item name="headlinesBackgroundSolid">#f0f0f0</item>

-		<item name="articleHeader">#ffffff</item>

+		<item name="articleBackground">#ffffff</item>

 		<item name="headlineSelectedBackground">#ffffff</item>

 		<item name="headlineUnreadBackground">@android:color/transparent</item>

 		<item name="headlineNormalBackground">@android:color/transparent</item>

@@ -22,15 +22,15 @@
 

 	<style name="DarkTheme" parent="android:Theme.Holo">

 		<item name="horizontalDivider">@android:drawable/divider_horizontal_dark</item>

-		<item name="feedlistBackground">@android:color/transparent</item>

+		<item name="feedlistBackground">@drawable/ics_divider_vertical</item>

 		<item name="unreadCounterColor">#303030</item>

-		<item name="headlinesBackground">#101010</item>

-		<item name="headlinesBackgroundSolid">#101010</item>

-		<item name="articleHeader">@android:color/transparent</item>

-		<item name="headlineSelectedBackground">#33b5e5</item>

+		<item name="headlinesBackground">@drawable/ics_divider_vertical</item>

+		<item name="headlinesBackgroundSolid">@android:color/transparent</item>

+		<item name="articleBackground">@android:color/transparent</item>

+		<item name="headlineSelectedBackground">@color/ics_cyan</item>

 		<item name="headlineUnreadBackground">@android:color/transparent</item>

 		<item name="headlineNormalBackground">@android:color/transparent</item>

-		<item name="feedsSelectedBackground">#33b5e5</item>

+		<item name="feedsSelectedBackground">@color/ics_cyan</item>

         <item name="feedlistTextColor">@android:color/primary_text_dark</item>

         <item name="feedlistSelectedTextColor">@android:color/black</item>

         <item name="headlineTextColor">@android:color/secondary_text_dark</item>

@@ -38,7 +38,7 @@
         <item name="headlineSelectedTextColor">@android:color/black</item>

         <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>

         <item name="headlineSelectedExcerptTextColor">@android:color/black</item>

-        <item name="linkColor">#33b5e5</item>

+        <item name="linkColor">@color/ics_cyan</item>

 	</style>

 

 </resources>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 61b0a706..706ea035 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -5,7 +5,7 @@
     <attr name="unreadCounterColor" format="reference|color" />

     <attr name="headlinesBackground" format="reference|color" />

     <attr name="headlinesBackgroundSolid" format="reference|color" />

-    <attr name="articleHeader" format="reference|color" />

+    <attr name="articleBackground" format="reference|color" />

     <attr name="headlineSelectedBackground" format="reference|color" />

     <attr name="headlineUnreadBackground" format="reference|color" />

     <attr name="headlineNormalBackground" format="reference|color" />

diff --git a/res/values/resources.xml b/res/values/resources.xml
index 41158d27..dbf96dc6 100644
--- a/res/values/resources.xml
+++ b/res/values/resources.xml
@@ -3,5 +3,6 @@
 

     <color name="feeds_light">#e0e0e0</color>

     <color name="headlines_light">#f0f0f0</color>

+    <color name="ics_cyan">#33b5e5</color>

 

 </resources>
\ No newline at end of file
diff --git a/res/values/style.xml b/res/values/style.xml
index 61940c8c..9bf539eb 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -6,7 +6,7 @@
         <item name="unreadCounterColor">#0000ff</item>

         <item name="headlinesBackground">#ffffff</item>

         <item name="headlinesBackgroundSolid">#ffffff</item>

-        <item name="articleHeader">@android:color/transparent</item>

+        <item name="articleBackground">@android:color/transparent</item>

         <item name="headlineSelectedBackground">#fff7d5</item>

         <item name="headlineUnreadBackground">#ffffff</item>

         <item name="headlineNormalBackground">#f0f0f0</item>

@@ -27,7 +27,7 @@
         <item name="unreadCounterColor">#303030</item>

         <item name="headlinesBackground">#000000</item>

         <item name="headlinesBackgroundSolid">#000000</item>

-        <item name="articleHeader">@android:color/transparent</item>

+        <item name="articleBackground">@android:color/transparent</item>

         <item name="headlineSelectedBackground">#F5B800</item>

         <item name="headlineUnreadBackground">#303030</item>

         <item name="headlineNormalBackground">@android:color/transparent</item>