From f458d146af3ea4d8f20c15ec6232683974c44c46 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Fri, 28 Aug 2015 18:12:39 +0200 Subject: [PATCH] Clean ups --- .../gramophone/adapter/PlaylistAdapter.java | 2 +- .../gramophone/adapter/SearchAdapter.java | 16 ++-- .../helper/menu/SongMenuHelper.java | 4 +- .../base/AbsSlidingMusicPanelActivity.java | 12 +-- .../gramophone/util/NavigationUtil.java | 83 ++++++++----------- 5 files changed, 48 insertions(+), 69 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java index 377b1a16..b470c14a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java @@ -216,7 +216,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter playList = new ArrayList<>(); diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongMenuHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongMenuHelper.java index fcab321f..0c7bef3b 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongMenuHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongMenuHelper.java @@ -60,13 +60,13 @@ public class SongMenuHelper { case R.id.action_go_to_album: Pair[] albumPairs = null; if (activity instanceof AbsSlidingMusicPanelActivity) - albumPairs = ((AbsSlidingMusicPanelActivity) activity).addPlayPauseFabToSharedViews(null); + albumPairs = ((AbsSlidingMusicPanelActivity) activity).addPlayPauseFabToSharedViews(); NavigationUtil.goToAlbum(activity, song.albumId, albumPairs); return true; case R.id.action_go_to_artist: Pair[] artistPairs = null; if (activity instanceof AbsSlidingMusicPanelActivity) - artistPairs = ((AbsSlidingMusicPanelActivity) activity).addPlayPauseFabToSharedViews(null); + artistPairs = ((AbsSlidingMusicPanelActivity) activity).addPlayPauseFabToSharedViews(); NavigationUtil.goToArtist(activity, song.artistId, artistPairs); return true; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java index a1c05725..6b88efea 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java @@ -561,11 +561,11 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi } } - public Pair[] addPlayPauseFabToSharedViews(@Nullable Pair[] sharedViews) { + public final Pair[] addPlayPauseFabToSharedViews(@Nullable final Pair... sharedElements) { Pair[] sharedViewsWithFab; - if (sharedViews != null) { - sharedViewsWithFab = new Pair[sharedViews.length + 1]; - System.arraycopy(sharedViews, 0, sharedViewsWithFab, 0, sharedViews.length); + if (sharedElements != null) { + sharedViewsWithFab = new Pair[sharedElements.length + 1]; + System.arraycopy(sharedElements, 0, sharedViewsWithFab, 0, sharedElements.length); } else { sharedViewsWithFab = new Pair[1]; } @@ -1098,10 +1098,10 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi SongDetailDialog.create(song).show(getSupportFragmentManager(), "SONG_DETAIL"); return true; case R.id.action_go_to_album: - NavigationUtil.goToAlbum(this, song.albumId, addPlayPauseFabToSharedViews(null)); + NavigationUtil.goToAlbum(this, song.albumId, addPlayPauseFabToSharedViews()); return true; case R.id.action_go_to_artist: - NavigationUtil.goToArtist(this, song.artistId, addPlayPauseFabToSharedViews(null)); + NavigationUtil.goToArtist(this, song.artistId, addPlayPauseFabToSharedViews()); return true; } return false; diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java index fa4078b0..9e8c55b9 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.media.audiofx.AudioEffect; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityOptionsCompat; import android.support.v4.util.Pair; import android.support.v7.app.AppCompatActivity; @@ -26,62 +25,46 @@ import com.kabouzeid.gramophone.ui.activities.PlaylistDetailActivity; */ public class NavigationUtil { - public static void goToArtist(final Activity activity, final int artistId, @Nullable final Pair[] sharedViews) { - if (activity instanceof ArtistDetailActivity) - return; - if ((activity instanceof KabViewsDisableAble && ((KabViewsDisableAble) activity).areViewsEnabled()) || !(activity instanceof KabViewsDisableAble)) { - if (activity instanceof KabViewsDisableAble) - ((KabViewsDisableAble) activity).disableViews(); - final Intent intent = new Intent(activity, ArtistDetailActivity.class); - intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, artistId); - if (sharedViews != null) { - @SuppressWarnings("unchecked") ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(activity, - sharedViews - ); - ActivityCompat.startActivity(activity, intent, optionsCompat.toBundle()); - } else { - activity.startActivity(intent); - } - } + public static void goToArtist(@NonNull final Activity activity, final int artistId, @Nullable final Pair... sharedElements) { + if (activity instanceof ArtistDetailActivity) return; + if (!disableViewsAndCheckIsReadyForTransition(activity)) return; + + final Intent intent = new Intent(activity, ArtistDetailActivity.class); + intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, artistId); + + //noinspection unchecked + activity.startActivity(intent, ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); } - public static void goToAlbum(final Activity activity, final int albumId, @Nullable final Pair[] sharedViews) { - if (activity instanceof AlbumDetailActivity) - return; - if ((activity instanceof KabViewsDisableAble && ((KabViewsDisableAble) activity).areViewsEnabled()) || !(activity instanceof KabViewsDisableAble)) { - if (activity instanceof KabViewsDisableAble) - ((KabViewsDisableAble) activity).disableViews(); - final Intent intent = new Intent(activity, AlbumDetailActivity.class); - intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM_ID, albumId); - if (sharedViews != null) { - @SuppressWarnings("unchecked") ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(activity, - sharedViews - ); - ActivityCompat.startActivityForResult(activity, intent, 1001, optionsCompat.toBundle()); - } else { - activity.startActivity(intent); - } - } + public static void goToAlbum(@NonNull final Activity activity, final int albumId, @Nullable final Pair... sharedElements) { + if (activity instanceof AlbumDetailActivity) return; + if (!disableViewsAndCheckIsReadyForTransition(activity)) return; + + final Intent intent = new Intent(activity, AlbumDetailActivity.class); + intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM_ID, albumId); + + //noinspection unchecked + activity.startActivity(intent, ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); } - public static void goToPlaylist(final Activity activity, final Playlist playlist, @Nullable final Pair[] sharedViews) { - if ((activity instanceof KabViewsDisableAble && ((KabViewsDisableAble) activity).areViewsEnabled()) || !(activity instanceof KabViewsDisableAble)) { - if (activity instanceof KabViewsDisableAble) + public static void goToPlaylist(@NonNull final Activity activity, final Playlist playlist, @Nullable final Pair... sharedElements) { + if (!disableViewsAndCheckIsReadyForTransition(activity)) return; + + final Intent intent = new Intent(activity, PlaylistDetailActivity.class); + intent.putExtra(PlaylistDetailActivity.EXTRA_PLAYLIST, playlist); + + //noinspection unchecked + activity.startActivity(intent, ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); + } + + private static boolean disableViewsAndCheckIsReadyForTransition(@NonNull final Activity activity) { + if (activity instanceof KabViewsDisableAble) { + if (((KabViewsDisableAble) activity).areViewsEnabled()) { ((KabViewsDisableAble) activity).disableViews(); - - final Intent intent; - intent = new Intent(activity, PlaylistDetailActivity.class); - intent.putExtra(PlaylistDetailActivity.EXTRA_PLAYLIST, playlist); - - if (sharedViews != null) { - @SuppressWarnings("unchecked") ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(activity, - sharedViews - ); - ActivityCompat.startActivity(activity, intent, optionsCompat.toBundle()); - } else { - activity.startActivity(intent); + return true; } } + return false; } public static void openPlayingQueueDialog(@NonNull final AppCompatActivity activity) {