tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Normal transition when there are no shared elements.

Browse source
This commit is contained in:
Karim Abou Zeid 2018-04-28 14:02:26 +02:00
commit 76869888bb
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
View file

@ -29,7 +29,11 @@ public class NavigationUtil {
intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, artistId); intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, artistId);
//noinspection unchecked //noinspection unchecked
activity.startActivity(intent, ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); if (sharedElements != null && sharedElements.length > 0) {
activity.startActivity(intent, ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle());
} else {
activity.startActivity(intent);
}
} }
public static void goToAlbum(@NonNull final Activity activity, final int albumId, @Nullable Pair... sharedElements) { public static void goToAlbum(@NonNull final Activity activity, final int albumId, @Nullable Pair... sharedElements) {
@ -37,7 +41,11 @@ public class NavigationUtil {
intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM_ID, albumId); intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM_ID, albumId);
//noinspection unchecked //noinspection unchecked
activity.startActivity(intent, ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); if (sharedElements != null && sharedElements.length > 0) {
activity.startActivity(intent, ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle());
} else {
activity.startActivity(intent);
}
} }
public static void goToGenre(@NonNull final Activity activity, final Genre genre, @Nullable Pair... sharedElements) { public static void goToGenre(@NonNull final Activity activity, final Genre genre, @Nullable Pair... sharedElements) {