From 1c2ae86a35e6157e539fbaf8ab3e8cde0a8f7af3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 1 Dec 2015 22:16:50 +0300 Subject: gallery stuff: use unique transition names --- .../src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java | 2 +- org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java index d3bc3c0a..d66319a4 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java @@ -131,7 +131,7 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur }); if (position == 0) { - ViewCompat.setTransitionName(imgView, "TRANSITION:ARTICLE_IMAGES_PAGER"); + ViewCompat.setTransitionName(imgView, "gallery:" + url); } registerForContextMenu(imgView); 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 31305a33..19f6bae2 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 @@ -1002,7 +1002,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, 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) { @@ -1368,9 +1368,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(m_activity, - transitionView != null ? transitionView : holder.flavorImageView, // The view which starts the transition - "TRANSITION:ARTICLE_IMAGES_PAGER" // The transitionName of the view we’re transitioning to - ); + transitionView != null ? transitionView : holder.flavorImageView, + "gallery:" + article.flavorImageUri); + ActivityCompat.startActivity(m_activity, intent, options.toBundle()); } -- cgit v1.2.3-54-g00ecf