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

Removed toolbar transition & co (58b2773) from master branch and moved those changes to the new shared-element-item-glitch branch to keep everything clean

Browse source
This commit is contained in:
Karim Abou Zeid 2015-04-19 22:35:15 +02:00
commit 6a6da75fd6
4 changed files with 17 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,6 @@ 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;
@ -29,8 +28,6 @@ public class NavigationUtil {
public static void goToArtist(final Activity activity, final int artistId, final Pair[] sharedViews) {
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();
@ -50,8 +47,6 @@ public class NavigationUtil {
public static void goToAlbum(final Activity activity, final int albumId, final Pair[] sharedViews) {
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();