From ee63b0d88fbe110a877f94a4112dc16f96d4c983 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 11 Jul 2015 02:40:37 +0300
Subject: only set header tinting if necessary

---
 org.fox.ttrss/src/main/AndroidManifest.xml               |  4 ++--
 .../src/main/java/org/fox/ttrss/HeadlinesFragment.java   | 16 ++++++++++++----
 .../org/fox/ttrss/offline/OfflineHeadlinesFragment.java  |  4 ++++
 3 files changed, 18 insertions(+), 6 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 3e1f6cee..3afc5eb2 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="358"
-    android:versionName="1.131" >
+    android:versionCode="359"
+    android:versionName="1.132" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 5d714b5a..8e940904 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -1077,6 +1077,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 				holder.flavorImageLoadingBar.setVisibility(View.GONE);
 				holder.flavorImageView.setVisibility(View.GONE);
 				holder.flavorVideoKindView.setVisibility(View.GONE);
+				holder.headlineHeader.setBackgroundDrawable(null);
 
 				boolean videoFound = false;
 
@@ -1115,7 +1116,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 												holder.flavorImageView.setVisibility(View.VISIBLE);
 												holder.flavorVideoKindView.setVisibility(View.VISIBLE);
 
-												maybeRepositionFlavorImage(view, bitmap);
+												maybeRepositionFlavorImage(view, bitmap, holder);
 											}
 
 											@Override
@@ -1209,7 +1210,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 											holder.flavorImageView.setVisibility(View.VISIBLE);
 											holder.flavorVideoKindView.setVisibility(View.VISIBLE);
 
-											maybeRepositionFlavorImage(view, bitmap);
+											maybeRepositionFlavorImage(view, bitmap, holder);
 										}
 
 										@Override
@@ -1314,7 +1315,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 												holder.flavorVideoKindView.setImageResource(R.drawable.ic_image_album);
 											}
 
-											maybeRepositionFlavorImage(view, bitmap);
+											maybeRepositionFlavorImage(view, bitmap, holder);
 										}
 									}
 
@@ -1427,7 +1428,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			return px;
 		}
 
-		private void maybeRepositionFlavorImage(View view, Bitmap bitmap) {
+		private void maybeRepositionFlavorImage(View view, Bitmap bitmap, HeadlineViewHolder holder) {
 			RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) view.getLayoutParams();
 
 			int w = bitmap.getWidth();
@@ -1440,9 +1441,16 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 
 				lp.addRule(RelativeLayout.BELOW, R.id.headline_header);
 
+				holder.headlineHeader.setBackgroundDrawable(null);
 
 			} else {
 				lp.addRule(RelativeLayout.BELOW, 0);
+
+				TypedValue tv = new TypedValue();
+
+				if (m_activity.getTheme().resolveAttribute(R.attr.headlineHeaderBackground, tv, true)) {
+					holder.headlineHeader.setBackgroundColor(tv.data);
+				}
 			}
 
 			view.setLayoutParams(lp);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 41386942..46539997 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -462,6 +462,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
         public ImageView textImage;
         public ImageView textChecked;
 		public ImageView flavorVideoKindView;
+		public View headlineHeader;
 	}
 
     private class ArticleListAdapter extends SimpleCursorAdapter {
@@ -581,6 +582,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
                 holder.textImage = (ImageView) v.findViewById(R.id.text_image);
                 holder.textChecked = (ImageView) v.findViewById(R.id.text_checked);
 				holder.flavorVideoKindView = (ImageView) v.findViewById(R.id.flavor_video_kind);
+				holder.headlineHeader = v.findViewById(R.id.headline_header);
 
                 v.setTag(holder);
 
@@ -768,6 +770,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 				holder.flavorImageLoadingBar.setVisibility(View.GONE);
 				holder.flavorImageView.setVisibility(View.GONE);
 				holder.flavorVideoKindView.setVisibility(View.GONE);
+
+				holder.headlineHeader.setBackgroundDrawable(null);
             }
 			
 			if (holder.menuButtonView != null) {
-- 
cgit v1.2.3