iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor thumbnail fixes (2)

Browse Source
This commit is contained in:
Andrew Dolgov 2015-07-08 17:03:17 +03:00
parent 3599b91766
commit 49a4128833
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
View File

@ -860,7 +860,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (showFlavorImage && article.flavorImage == null) { if (showFlavorImage && article.flavorImage == null) {
Elements imgs = article.articleDoc.select("img"); Elements imgs = article.articleDoc.select("img");
Element firstImg = null;
for (Element tmp : imgs) { for (Element tmp : imgs) {
try { try {
@ -868,8 +867,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
continue; continue;
} }
if (firstImg != null) firstImg = tmp;
if (Integer.valueOf(tmp.attr("width")) > FLAVOR_IMG_MIN_WIDTH && Integer.valueOf(tmp.attr("width")) > FLAVOR_IMG_MIN_HEIGHT) { if (Integer.valueOf(tmp.attr("width")) > FLAVOR_IMG_MIN_WIDTH && Integer.valueOf(tmp.attr("width")) > FLAVOR_IMG_MIN_HEIGHT) {
article.flavorImage = tmp; article.flavorImage = tmp;
break; break;
@ -880,10 +877,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
} }
} }
Log.d(TAG, "" + firstImg);
if (article.flavorImage == null) if (article.flavorImage == null)
article.flavorImage = firstImg; article.flavorImage = imgs.first();
} }
if (holder.textImage != null) { if (holder.textImage != null) {
@ -903,6 +898,32 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
Log.d(TAG, "num selected: " + getSelectedArticles().size()); Log.d(TAG, "num selected: " + getSelectedArticles().size());
} }
}); });
ViewCompat.setTransitionName(holder.textImage, "TRANSITION:ARTICLE_IMAGES_PAGER");
if (article.flavorImage != null) {
final String imgSrcFirst = article.flavorImage.attr("src");
holder.textImage.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
Intent intent = new Intent(m_activity, ArticleImagesPagerActivity.class);
intent.putExtra("firstSrc", imgSrcFirst);
intent.putExtra("title", article.title);
intent.putExtra("content", article.content);
ActivityOptionsCompat options =
ActivityOptionsCompat.makeSceneTransitionAnimation(m_activity,
holder.textImage, // The view which starts the transition
"TRANSITION:ARTICLE_IMAGES_PAGER" // The transitionName of the view we’re transitioning to
);
ActivityCompat.startActivity(m_activity, intent, options.toBundle());
return true;
}
});
}
} }