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

More transitions

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-14 17:20:06 +01:00
commit 346961a636
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
View file

@ -257,7 +257,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements KabViewsDisab
case R.id.action_settings: case R.id.action_settings:
return true; return true;
case R.id.action_current_playing: case R.id.action_current_playing:
NavigationUtil.openCurrentPlayingIfPossible(this, null); NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null));
return true; return true;
case R.id.action_tag_editor: case R.id.action_tag_editor:
Intent intent = new Intent(this, AlbumTagEditorActivity.class); Intent intent = new Intent(this, AlbumTagEditorActivity.class);

2
app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
View file

@ -381,7 +381,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements KabViewsDisa
case R.id.action_settings: case R.id.action_settings:
return true; return true;
case R.id.action_current_playing: case R.id.action_current_playing:
NavigationUtil.openCurrentPlayingIfPossible(this, null); NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null));
return true; return true;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);

9
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
View file

@ -7,6 +7,7 @@ import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.support.v13.app.FragmentPagerAdapter; import android.support.v13.app.FragmentPagerAdapter;
import android.support.v4.util.Pair;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
@ -194,7 +195,11 @@ public class MainActivity extends AbsFabActivity
@Override @Override
public void onNavigationDrawerItemSelected(int position) { public void onNavigationDrawerItemSelected(int position) {
if (position == NavigationDrawerFragment.NAVIGATION_DRAWER_HEADER) { 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 { } else {
if (viewPager != null) { if (viewPager != null) {
viewPager.setCurrentItem(position, true); viewPager.setCurrentItem(position, true);
@ -232,7 +237,7 @@ public class MainActivity extends AbsFabActivity
AboutDeveloperDialogHelper.getDialog(this).show(); AboutDeveloperDialogHelper.getDialog(this).show();
return true; return true;
case R.id.action_current_playing: case R.id.action_current_playing:
NavigationUtil.openCurrentPlayingIfPossible(this, null); NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null));
return true; return true;
case R.id.action_playing_queue: case R.id.action_playing_queue:
final MaterialDialog materialDialog = PlayingQueueDialogHelper.getDialog(this); final MaterialDialog materialDialog = PlayingQueueDialogHelper.getDialog(this);

1
app/src/main/res/layout/fragment_navigation_drawer.xml
View file

@ -15,6 +15,7 @@
android:clickable="true"> android:clickable="true">
<ImageView <ImageView
android:transitionName="@string/transition_album_cover"
android:id="@+id/album_art" android:id="@+id/album_art"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/navigation_drawer_image_height" android:layout_height="@dimen/navigation_drawer_image_height"