fix not matching colors in dark theme

disable showasaction for attachment actionbar item

2 files changed, 14 insertions, 15 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
index 1e916e10..d92203f4 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
@@ -1,9 +1,5 @@
 package org.fox.ttrss;
 
-import org.fox.ttrss.types.Article;
-import org.fox.ttrss.types.ArticleList;
-import org.fox.ttrss.types.Feed;
-
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -11,11 +7,14 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 
+import org.fox.ttrss.types.Article;
+import org.fox.ttrss.types.ArticleList;
+import org.fox.ttrss.types.Feed;
+
 public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventListener {
 	private final String TAG = this.getClass().getSimpleName();
 	
@@ -171,14 +170,14 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
 			
 			if (af != null) {
 				if (af.getSelectedArticle() != null && af.getSelectedArticle().attachments != null && af.getSelectedArticle().attachments.size() > 0) {
-					if (!isCompatMode() && (isSmallScreen() || !isPortrait())) {
+					/* if (!isCompatMode() && (isSmallScreen() || !isPortrait())) {
 						m_menu.findItem(R.id.toggle_attachments).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-					}
+					} */
 					m_menu.findItem(R.id.toggle_attachments).setVisible(true);
 				} else {
-					if (!isCompatMode()) {
+					/* if (!isCompatMode()) {
 						m_menu.findItem(R.id.toggle_attachments).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-					}
+					} */
 					m_menu.findItem(R.id.toggle_attachments).setVisible(false);
 				}
 			}
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index e02b6c13..6e58a8b2 100644
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -95,25 +95,25 @@
 	</style>
 		
 	<style name="DarkThemeBase" parent="HoloTheme">
-        <item name="statusBarHintColor">#22667f</item>
+        <item name="statusBarHintColor">#51698E</item>
 	    <item name="smallScreenBackground">@color/feeds_dark_gray</item>
 		<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
 		<item name="feedlistBackground">@drawable/shadow_feeds_gray</item>		
 		<item name="headlinesBackground">@drawable/shadow_headlines_gray</item>
 		<item name="headlinesBackgroundSolid">@color/feeds_dark_gray</item>
 		<item name="articleBackground">@color/feeds_dark_gray</item>
-		<item name="headlineSelectedBackground">#22667f</item>
+		<item name="headlineSelectedBackground">#51698E</item>
 		<item name="headlineUnreadBackground">#383c42</item>
-		<item name="feedsSelectedBackground">#22667f</item>
+		<item name="feedsSelectedBackground">#51698E</item>
         <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item>
         <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item>
         <item name="headlineTextColor">@android:color/secondary_text_dark</item>
         <!--  <item name="actionBarStyle">@style/ActionBarDarkGray</item> -->
         <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>
 
-        <item name="colorPrimary">#22667f</item>
-        <item name="colorPrimaryDark">#394a63</item>
-        <item name="colorAccent">#22667f</item>
+        <item name="colorPrimary">#51698E</item>
+        <item name="colorPrimaryDark">#445877</item>
+        <item name="colorAccent">#88b0f0</item>
 	</style>
 
 	<style name="DarkTheme" parent="DarkThemeBase">