Progress with #13

This commit is contained in:
Aidan Follestad 2015-04-19 00:03:38 -05:00
commit 58b277354b
3 changed files with 82 additions and 23 deletions

View file

@ -17,6 +17,7 @@ import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble;
import com.kabouzeid.gramophone.misc.AppKeys;
import com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity;
import com.kabouzeid.gramophone.ui.activities.ArtistDetailActivity;
import com.kabouzeid.gramophone.ui.activities.MainActivity;
import com.kabouzeid.gramophone.ui.activities.MusicControllerActivity;
import com.kabouzeid.gramophone.ui.activities.PlaylistDetailActivity;
@ -24,10 +25,12 @@ import com.kabouzeid.gramophone.ui.activities.PlaylistDetailActivity;
* @author Karim Abou Zeid (kabouzeid)
*/
public class NavigationUtil {
public static void goToArtist(final Activity activity, final int artistId, final Pair[] sharedViews) {
if (activity instanceof ArtistDetailActivity) {
if (activity instanceof ArtistDetailActivity)
return;
}
else if (activity instanceof MainActivity)
((MainActivity) activity).setReentering(false);
if ((activity instanceof KabViewsDisableAble && ((KabViewsDisableAble) activity).areViewsEnabled()) || !(activity instanceof KabViewsDisableAble)) {
if (activity instanceof KabViewsDisableAble)
((KabViewsDisableAble) activity).disableViews();
@ -45,9 +48,10 @@ public class NavigationUtil {
}
public static void goToAlbum(final Activity activity, final int albumId, final Pair[] sharedViews) {
if (activity instanceof AlbumDetailActivity) {
if (activity instanceof AlbumDetailActivity)
return;
}
else if (activity instanceof MainActivity)
((MainActivity) activity).setReentering(false);
if ((activity instanceof KabViewsDisableAble && ((KabViewsDisableAble) activity).areViewsEnabled()) || !(activity instanceof KabViewsDisableAble)) {
if (activity instanceof KabViewsDisableAble)
((KabViewsDisableAble) activity).disableViews();