diff options
author | Andrew Dolgov <[email protected]> | 2015-07-11 03:04:04 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-07-11 03:04:04 +0300 |
commit | b26d659004d46ab8e90da1b01cd8bc448f35fc6e (patch) | |
tree | 8bbda283dc49377fece8bdd14a4c3126749a9ab7 /org.fox.ttrss/src/main | |
parent | ee63b0d88fbe110a877f94a4112dc16f96d4c983 (diff) |
only set header tinting if necessary (2)
Diffstat (limited to 'org.fox.ttrss/src/main')
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 32 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java | 1 |
2 files changed, 29 insertions, 4 deletions
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 8e940904..cc09c9f9 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 @@ -670,6 +670,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public ImageView textImage; public ImageView textChecked; public View headlineHeader; + public boolean flavorImageEmbedded; } private class ArticleListAdapter extends ArrayAdapter<Article> { @@ -1141,6 +1142,14 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } else { holder.flavorImageView.setVisibility(View.VISIBLE); holder.flavorVideoKindView.setVisibility(View.VISIBLE); + + if (holder.flavorImageEmbedded) { + TypedValue tv = new TypedValue(); + if (m_activity.getTheme().resolveAttribute(R.attr.headlineHeaderBackground, tv, true)) { + holder.headlineHeader.setBackgroundColor(tv.data); + } + } + } videoFound = true; @@ -1234,6 +1243,14 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } else { holder.flavorImageView.setVisibility(View.VISIBLE); holder.flavorVideoKindView.setVisibility(View.VISIBLE); + + if (holder.flavorImageEmbedded) { + TypedValue tv = new TypedValue(); + if (m_activity.getTheme().resolveAttribute(R.attr.headlineHeaderBackground, tv, true)) { + holder.headlineHeader.setBackgroundColor(tv.data); + } + } + } @@ -1285,7 +1302,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } }); - if (holder.flavorImageView.getTag() == null || !holder.flavorImageView.getTag().equals(imgSrc)) { + if (!imgSrc.equals(holder.flavorImageView.getTag())) { ImageAware imageAware = new ImageViewAware(holder.flavorImageView, false); @@ -1304,11 +1321,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, View view, Bitmap bitmap) { if (!isAdded() || bitmap == null) return; - holder.flavorImageView.setTag(finalImgSrc); holder.flavorImageLoadingBar.setVisibility(View.GONE); if (bitmap.getWidth() > FLAVOR_IMG_MIN_SIZE && bitmap.getHeight() > FLAVOR_IMG_MIN_SIZE) { holder.flavorImageView.setVisibility(View.VISIBLE); + holder.flavorImageView.setTag(finalImgSrc); if (article.flavorImageCount > 1) { holder.flavorVideoKindView.setVisibility(View.VISIBLE); @@ -1343,6 +1360,13 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, holder.flavorVideoKindView.setImageResource(R.drawable.ic_image_album); } + if (holder.flavorImageEmbedded) { + TypedValue tv = new TypedValue(); + if (m_activity.getTheme().resolveAttribute(R.attr.headlineHeaderBackground, tv, true)) { + holder.headlineHeader.setBackgroundColor(tv.data); + } + } + } } } @@ -1442,15 +1466,17 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, lp.addRule(RelativeLayout.BELOW, R.id.headline_header); holder.headlineHeader.setBackgroundDrawable(null); + holder.flavorImageEmbedded = false; } 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); } + + holder.flavorImageEmbedded = true; } view.setLayoutParams(lp); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java index 7990c55c..33cd56fa 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java @@ -38,7 +38,6 @@ public class Article implements Parcelable { public Document articleDoc; public Element flavorImage; public int flavorImageCount; - public boolean noValidFlavorImage; public Article(Parcel in) { readFromParcel(in); |