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

gallery stuff: use unique transition names

Browse Source
This commit is contained in:
Andrew Dolgov 2015-12-01 22:16:50 +03:00
parent 9855a70fb3
commit 1c2ae86a35
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
View File

@ -131,7 +131,7 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
}); });
if (position == 0) { if (position == 0) {
ViewCompat.setTransitionName(imgView, "TRANSITION:ARTICLE_IMAGES_PAGER"); ViewCompat.setTransitionName(imgView, "gallery:" + url);
} }
registerForContextMenu(imgView); registerForContextMenu(imgView);

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

@ -1002,7 +1002,7 @@ 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"); ViewCompat.setTransitionName(holder.textImage, "gallery:" + article.flavorImageUri);
if (article.flavorImage != null) { if (article.flavorImage != null) {
@ -1368,9 +1368,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
ActivityOptionsCompat options = ActivityOptionsCompat options =
ActivityOptionsCompat.makeSceneTransitionAnimation(m_activity, ActivityOptionsCompat.makeSceneTransitionAnimation(m_activity,
transitionView != null ? transitionView : holder.flavorImageView, // The view which starts the transition transitionView != null ? transitionView : holder.flavorImageView,
"TRANSITION:ARTICLE_IMAGES_PAGER" // The transitionName of the view we’re transitioning to "gallery:" + article.flavorImageUri);
);
ActivityCompat.startActivity(m_activity, intent, options.toBundle()); ActivityCompat.startActivity(m_activity, intent, options.toBundle());
} }