summaryrefslogtreecommitdiff
path: root/org.fox.ttrss
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-12-02 14:30:26 +0300
committerAndrew Dolgov <[email protected]>2015-12-02 14:30:26 +0300
commit2c370a4d0badf84e782f1192c27d6029939205fb (patch)
tree76fb248fb09e129a38ca4306c313bff1e0934134 /org.fox.ttrss
parentbc380ba3d1f183c11648e88915dbbdc7bfded952 (diff)
limit maximum height of flavor images within headlines list
Diffstat (limited to 'org.fox.ttrss')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java8
1 files changed, 8 insertions, 0 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 979364e6..dffdb800 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
@@ -69,6 +69,7 @@ import com.shamanland.fab.ShowHideOnScroll;
import org.fox.ttrss.types.Article;
import org.fox.ttrss.types.ArticleList;
import org.fox.ttrss.types.Feed;
+import org.fox.ttrss.util.EnlargingImageView;
import org.fox.ttrss.util.HeadlinesRequest;
import org.jsoup.Jsoup;
@@ -773,6 +774,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
boolean showFlavorImage;
private int m_minimumHeightToEmbed;
boolean m_youtubeInstalled;
+ private int m_maxFlavorImageHeight;
public ArticleListAdapter(Context context, int textViewResourceId, ArrayList<Article> items) {
super(context, textViewResourceId, items);
@@ -783,6 +785,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
display.getSize(size);
m_minimumHeightToEmbed = size.y/3;
+ m_maxFlavorImageHeight = (int)(size.y * 0.8f);
+
String headlineMode = m_prefs.getString("headline_mode", "HL_DEFAULT");
showFlavorImage = "HL_DEFAULT".equals(headlineMode) || "HL_COMPACT".equals(headlineMode);
@@ -957,6 +961,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
holder.topChangedMessage = v.findViewById(R.id.headlines_row_top_changed);
holder.flavorImageOverflow = v.findViewById(R.id.flavor_image_overflow);
+ if (holder.flavorImageView != null) {
+ holder.flavorImageView.setMaxHeight(m_maxFlavorImageHeight);
+ }
+
v.setTag(holder);
// http://code.google.com/p/android/issues/detail?id=3414