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

Removed Some animations and palette

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-12 18:14:08 +01:00
commit af21f191dd
20 changed files with 343 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,13 +7,11 @@ import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.support.v7.graphics.Palette;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.animation.DecelerateInterpolator;
import android.widget.AbsListView;
import android.widget.AdapterView;
import android.widget.ImageView;
@ -37,10 +35,7 @@ import com.kabouzeid.gramophone.ui.activities.tageditor.AlbumTagEditorActivity;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.nhaarman.listviewanimations.appearance.AnimationAdapter;
import com.nhaarman.listviewanimations.appearance.simple.ScaleInAnimationAdapter;
import com.nineoldandroids.view.ViewHelper;
import com.nineoldandroids.view.ViewPropertyAnimator;
import com.squareup.picasso.Callback;
import com.squareup.picasso.Picasso;
@ -58,15 +53,11 @@ public class AlbumDetailActivity extends AbsFabActivity implements KabViewsDisab
public static final String TAG = AlbumDetailActivity.class.getSimpleName();
private static final boolean TOOLBAR_IS_STICKY = true;
private static final int DEFAULT_DELAY_NO_TRANSITION = 200;
private static final int DEFAULT_DELAY = 450;
private static final int DEFAULT_ANIMATION_TIME = 1000;
private App app;
private Album album;
private AnimationAdapter animatedSongsAdapter;
private ObservableListView absSongListView;
private View statusBar;
private ImageView albumArtImageView;
@ -138,6 +129,8 @@ public class AlbumDetailActivity extends AbsFabActivity implements KabViewsDisab
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_album_detail);
if (Util.hasLollipopSDK()) postponeEnterTransition();
Bundle intentExtras = getIntent().getExtras();
int albumId = -1;
if (intentExtras != null) {
@ -152,7 +145,8 @@ public class AlbumDetailActivity extends AbsFabActivity implements KabViewsDisab
setUpObservableListViewParams();
setUpToolBar();
setUpViews();
animateEnterActivity();
if (Util.hasLollipopSDK()) startPostponedEnterTransition();
}
@Override
@ -190,17 +184,11 @@ public class AlbumDetailActivity extends AbsFabActivity implements KabViewsDisab
albumTitleView.setText(album.title);
ViewHelper.setAlpha(albumArtOverlayView, 0);
prepareViewsForOpenAnimation();
setUpAlbumArtAndApplyPalette();
setUpListView();
setUpSongsAdapter();
}
private void prepareViewsForOpenAnimation() {
albumTitleView.setPivotY(0);
albumTitleView.setScaleY(0);
}
@SuppressLint("NewApi")
private void setUpAlbumArtAndApplyPalette() {
Picasso.with(this).load(MusicUtil.getAlbumArtUri(album.id))
.placeholder(R.drawable.default_album_art)
@ -285,39 +273,11 @@ public class AlbumDetailActivity extends AbsFabActivity implements KabViewsDisab
}
}
private void animateEnterActivity() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
animateHeader(0);
setUpSongsAdapter();
}
}, DEFAULT_DELAY);
} else {
setUpSongsAdapter();
getFab().setScaleX(0);
getFab().setScaleY(0);
animateHeader(DEFAULT_DELAY_NO_TRANSITION);
animateFab(DEFAULT_DELAY_NO_TRANSITION);
}
}
private void setUpSongsAdapter() {
final List<Song> songs = AlbumSongLoader.getAlbumSongList(this, album.id, new SongTrackNumberComparator());
final SongAdapter songAdapter = new SongAdapter(this, this, songs);
// SwingBottomInAnimationAdapter songsAdapter = new SwingBottomInAnimationAdapter(songAdapter);
// SwingRightInAnimationAdapter songsAdapter = new SwingRightInAnimationAdapter(songAdapter);
// SwingLeftInAnimationAdapter songsAdapter = new SwingLeftInAnimationAdapter(songAdapter);
ScaleInAnimationAdapter songsAdapter = new ScaleInAnimationAdapter(songAdapter);
// AlphaInAnimationAdapter songsAdapter = new AlphaInAnimationAdapter(songAdapter);
animatedSongsAdapter = songsAdapter;
animatedSongsAdapter.setAbsListView(absSongListView);
absSongListView.setAdapter(animatedSongsAdapter);
absSongListView.setAdapter(songAdapter);
absSongListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@ -328,26 +288,6 @@ public class AlbumDetailActivity extends AbsFabActivity implements KabViewsDisab
});
}
private void animateHeader(int startDelay) {
ViewPropertyAnimator.animate(albumTitleView)
.scaleX(1)
.scaleY(1)
.setInterpolator(new DecelerateInterpolator(4))
.setDuration(DEFAULT_ANIMATION_TIME)
.setStartDelay(startDelay)
.start();
}
private void animateFab(int startDelay) {
ViewPropertyAnimator.animate(getFab())
.scaleX(1)
.scaleY(1)
.setInterpolator(new DecelerateInterpolator(4))
.setDuration(DEFAULT_ANIMATION_TIME)
.setStartDelay(startDelay)
.start();
}
@Override
public void enableViews() {
super.enableViews();

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

@ -12,7 +12,6 @@ import android.support.v13.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.graphics.Palette;
import android.support.v7.widget.Toolbar;
import android.transition.Transition;
import android.util.SparseArray;
import android.view.Menu;
import android.view.MenuItem;
@ -91,40 +90,15 @@ public class ArtistDetailActivity extends AbsFabActivity implements KabViewsDisa
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_artist_detail);
if (Util.hasLollipopSDK()) postponeEnterTransition();
getIntentExtras();
initViews();
setUpObservableListViewParams();
setUpToolBar();
setUpViews();
if (Util.hasLollipopSDK()) {
getWindow().getSharedElementEnterTransition().addListener(new Transition.TransitionListener() {
@Override
public void onTransitionStart(Transition transition) {
}
@Override
public void onTransitionEnd(Transition transition) {
setUpArtistImageAndApplyPalette(false);
}
@Override
public void onTransitionCancel(Transition transition) {
}
@Override
public void onTransitionPause(Transition transition) {
}
@Override
public void onTransitionResume(Transition transition) {
}
});
}
if (Util.hasLollipopSDK()) startPostponedEnterTransition();
}
@Override
@ -442,7 +416,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements KabViewsDisa
private String[] titles;
private SparseArray<Fragment> pages; //TODO check if this must be static
private SparseArray<Fragment> pages;
private Artist artist;
private Context context;

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

@ -39,6 +39,7 @@ import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.ArtistViewFra
import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.MainActivityFragment;
import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.SongViewFragment;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.squareup.picasso.Picasso;
@ -75,7 +76,7 @@ public class MainActivity extends AbsFabActivity
private void setUpViewPager() {
viewPagerAdapter = new MainActivityViewPagerAdapter(this);
viewPager.setAdapter(viewPagerAdapter);
int startPosition = PreferenceManager.getDefaultSharedPreferences(this).getInt(AppKeys.SP_VIEWPAGER_ITEM_POSITION, 1);
int startPosition = PreferenceUtils.getInstace(this).getStartPage();
viewPager.setCurrentItem(startPosition);
navigationDrawerFragment.setItemChecked(startPosition);
@ -89,7 +90,7 @@ public class MainActivity extends AbsFabActivity
@Override
public void onPageSelected(final int position) {
PreferenceManager.getDefaultSharedPreferences(MainActivity.this).edit().putInt(AppKeys.SP_VIEWPAGER_ITEM_POSITION, position).apply();
PreferenceUtils.getInstace(MainActivity.this).setStartPage(position);
navigationDrawerFragment.setItemChecked(position);
}

6
app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsFabActivity.java
View file

@ -33,6 +33,7 @@ public abstract class AbsFabActivity extends AbsBaseActivity {
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
setUpFab();
App.bus.register(busEventListener);
}
private void setUpFab() {
@ -100,7 +101,6 @@ public abstract class AbsFabActivity extends AbsBaseActivity {
protected void onResume() {
super.onResume();
updateControllerState();
App.bus.register(busEventListener);
}
@Override
@ -149,9 +149,9 @@ public abstract class AbsFabActivity extends AbsBaseActivity {
}
@Override
protected void onStop() {
super.onStop();
protected void onDestroy() {
App.bus.unregister(busEventListener);
super.onDestroy();
}
public void onMusicRemoteEvent(MusicRemoteEvent event) {

2
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AlbumViewFragment.java
View file

@ -75,7 +75,7 @@ public class AlbumViewFragment extends MainActivityFragment {
}
private void fillAbsListView(List<Album> albums) {
Collections.sort(albums, new AlbumAlphabeticComparator());
//Collections.sort(albums, new AlbumAlphabeticComparator());
AlbumViewGridAdapter albumViewGridAdapter = new AlbumViewGridAdapter(getActivity(), albums);
absListView.setAdapter(albumViewGridAdapter);
absListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {

2
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/ArtistViewFragment.java
View file

@ -82,7 +82,7 @@ public class ArtistViewFragment extends MainActivityFragment {
}
private void fillAbsListView(List<Artist> artists) {
Collections.sort(artists, new ArtistAlphabeticComparator());
//Collections.sort(artists, new ArtistAlphabeticComparator());
ArtistViewListAdapter artistAdapter = new ArtistViewListAdapter(getActivity(), artists);
absListView.setAdapter(artistAdapter);
absListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {

2
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongViewFragment.java
View file

@ -64,7 +64,7 @@ public class SongViewFragment extends MainActivityFragment {
}
private void fillAbsListView(final List<Song> songs) {
Collections.sort(songs, new SongAlphabeticComparator());
//Collections.sort(songs, new SongAlphabeticComparator());
AbsBaseActivity absBaseActivity = null;
if (getActivity() instanceof AbsBaseActivity) {
absBaseActivity = (AbsBaseActivity) getActivity();