From 346961a636314abc22fda2358b0002563e07fa1b Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sat, 14 Mar 2015 17:20:06 +0100 Subject: [PATCH] More transitions --- .../gramophone/ui/activities/AlbumDetailActivity.java | 2 +- .../gramophone/ui/activities/ArtistDetailActivity.java | 2 +- .../kabouzeid/gramophone/ui/activities/MainActivity.java | 9 +++++++-- app/src/main/res/layout/fragment_navigation_drawer.xml | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index afcc710e..3f6a53d0 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java @@ -257,7 +257,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements KabViewsDisab case R.id.action_settings: return true; case R.id.action_current_playing: - NavigationUtil.openCurrentPlayingIfPossible(this, null); + NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null)); return true; case R.id.action_tag_editor: Intent intent = new Intent(this, AlbumTagEditorActivity.class); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index bf8cd070..e4ed16db 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java @@ -381,7 +381,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements KabViewsDisa case R.id.action_settings: return true; case R.id.action_current_playing: - NavigationUtil.openCurrentPlayingIfPossible(this, null); + NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null)); return true; } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java index b9c7308a..0f542b50 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java @@ -7,6 +7,7 @@ import android.content.Intent; import android.content.res.Configuration; import android.os.Bundle; import android.support.v13.app.FragmentPagerAdapter; +import android.support.v4.util.Pair; import android.support.v4.view.ViewPager; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; @@ -194,7 +195,11 @@ public class MainActivity extends AbsFabActivity @Override public void onNavigationDrawerItemSelected(int position) { if (position == NavigationDrawerFragment.NAVIGATION_DRAWER_HEADER) { - NavigationUtil.openCurrentPlayingIfPossible(this, null); + NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(new Pair[]{ + Pair.create(navigationDrawerFragment.getAlbumArtImageView(), + getResources().getString(R.string.transition_album_cover) + ) + })); } else { if (viewPager != null) { viewPager.setCurrentItem(position, true); @@ -232,7 +237,7 @@ public class MainActivity extends AbsFabActivity AboutDeveloperDialogHelper.getDialog(this).show(); return true; case R.id.action_current_playing: - NavigationUtil.openCurrentPlayingIfPossible(this, null); + NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null)); return true; case R.id.action_playing_queue: final MaterialDialog materialDialog = PlayingQueueDialogHelper.getDialog(this); diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml index c4b5d9d1..95c7e14d 100644 --- a/app/src/main/res/layout/fragment_navigation_drawer.xml +++ b/app/src/main/res/layout/fragment_navigation_drawer.xml @@ -15,6 +15,7 @@ android:clickable="true">