summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/java
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-12-01 22:16:50 +0300
committerAndrew Dolgov <[email protected]>2015-12-01 22:16:50 +0300
commit1c2ae86a35e6157e539fbaf8ab3e8cde0a8f7af3 (patch)
tree6bacd8d23f4db9766bc59724fd3a319e95948f73 /org.fox.ttrss/src/main/java
parent9855a70fb31accec9ff0f02788ed60b4beeabf21 (diff)
gallery stuff: use unique transition names
Diffstat (limited to 'org.fox.ttrss/src/main/java')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java2
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java8
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());
}