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

Fixed scrolling lags when loading album covers directly from their song files.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-08-23 17:03:39 +02:00
commit e1f0b32e9f
4 changed files with 46 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

37
app/src/main/java/com/kabouzeid/gramophone/imageloader/PhonographImageDownloader.java
View file

@ -15,6 +15,7 @@ import com.nostra13.universalimageloader.core.download.BaseImageDownloader;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.images.Artwork;
import java.io.ByteArrayInputStream;
import java.io.File;
@ -73,14 +74,9 @@ public class PhonographImageDownloader extends BaseImageDownloader {
if (PreferenceUtil.getInstance(context).ignoreMediaStoreArtwork()) {
ArrayList<Song> songs = AlbumSongLoader.getAlbumSongList(context, albumId);
for (Song song : songs) {
try {
AudioFile audioFile = AudioFileIO.read(new File(song.data));
byte[] albumCover = audioFile.getTagOrCreateAndSetDefault().getFirstArtwork().getBinaryData();
if (albumCover != null) {
return new ByteArrayInputStream(albumCover);
}
} catch (@NonNull Exception e) {
e.printStackTrace();
byte[] albumCover = getAlbumCoverBinaryData(new File(song.data));
if (albumCover != null) {
return new ByteArrayInputStream(albumCover);
}
}
}
@ -92,14 +88,9 @@ public class PhonographImageDownloader extends BaseImageDownloader {
String[] data = imageUri.substring(SCHEME_SONG.length()).split("#", 2);
if (PreferenceUtil.getInstance(context).ignoreMediaStoreArtwork()) {
try {
AudioFile audioFile = AudioFileIO.read(new File(data[1]));
byte[] albumCover = audioFile.getTagOrCreateAndSetDefault().getFirstArtwork().getBinaryData();
if (albumCover != null) {
return new ByteArrayInputStream(albumCover);
}
} catch (@NonNull Exception e) {
e.printStackTrace();
byte[] albumCover = getAlbumCoverBinaryData(new File(data[1]));
if (albumCover != null) {
return new ByteArrayInputStream(albumCover);
}
}
@ -107,6 +98,20 @@ public class PhonographImageDownloader extends BaseImageDownloader {
return getMediaProviderAlbumArtInputStream(id);
}
@Nullable
private static byte[] getAlbumCoverBinaryData(File song) {
try {
AudioFile audioFile = AudioFileIO.read(song);
Artwork artwork = audioFile.getTagOrCreateAndSetDefault().getFirstArtwork();
if (artwork != null) {
return artwork.getBinaryData();
}
} catch (@NonNull Exception e) {
e.printStackTrace();
}
return null;
}
@Nullable
private InputStream getMediaProviderAlbumArtInputStream(int albumId) throws
FileNotFoundException {

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

@ -92,8 +92,8 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
@Override
protected void onCreate(Bundle savedInstanceState) {
setStatusBarTransparent();
super.onCreate(savedInstanceState);
setStatusBarTransparent();
ButterKnife.bind(this);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@ -107,7 +107,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
setUpObservableListViewParams();
setUpToolBar();
setUpViews();
animateFabCircularRevealOnEnterTransitionEnd();
animateAlbumArtBackgroundOnEnterTransitionEnd();
}
@Override
@ -115,7 +115,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
return wrapSlidingMusicPanelAndFab(R.layout.activity_album_detail);
}
private void animateFabCircularRevealOnEnterTransitionEnd() {
private void animateAlbumArtBackgroundOnEnterTransitionEnd() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
getWindow().getEnterTransition().addListener(new SimpleTransitionListener() {
@Override
@ -372,6 +372,8 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == TAG_EDITOR_REQUEST) {
getAlbumFromIntentExtras();
albumTitleView.setText(album.title);
setUpAlbumArtAndApplyPalette();
setResult(RESULT_OK);
}

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

@ -109,8 +109,8 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
@Override
protected void onCreate(Bundle savedInstanceState) {
setStatusBarTransparent();
super.onCreate(savedInstanceState);
setStatusBarTransparent();
ButterKnife.bind(this);
if (shouldColorNavigationBar())
@ -122,12 +122,16 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
initViews();
setUpObservableListViewParams();
setUpViews();
setUpToolbar();
animateAlbumArtBackgroundOnEnterTransitionEnd();
}
setSupportActionBar(toolbar);
//noinspection ConstantConditions
getSupportActionBar().setTitle(null);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@Override
protected View createContentView() {
return wrapSlidingMusicPanelAndFab(R.layout.activity_artist_detail);
}
private void animateAlbumArtBackgroundOnEnterTransitionEnd() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
getWindow().getEnterTransition().addListener(new SimpleTransitionListener() {
@Override
@ -153,11 +157,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
}
}
@Override
protected View createContentView() {
return wrapSlidingMusicPanelAndFab(R.layout.activity_artist_detail);
}
private final SimpleObservableScrollViewCallbacks observableScrollViewCallbacks = new SimpleObservableScrollViewCallbacks() {
@Override
public void onScrollChanged(int scrollY, boolean b, boolean b2) {
@ -203,7 +202,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
private void setUpViews() {
artistName.setText(artist.name);
setUpArtistImageAndApplyPalette(false);
setUpSongListView();
setUpAlbumRecyclerView();
@ -347,8 +345,9 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK)
albumAdapter.notifyDataSetChanged();
if (resultCode == RESULT_OK) {
reloadDataSets();
}
}
@Override
@ -384,6 +383,13 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
}
}
private void setUpToolbar() {
setSupportActionBar(toolbar);
//noinspection ConstantConditions
getSupportActionBar().setTitle(null);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_artist_detail, menu);

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

@ -55,8 +55,8 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ButterKnife.bind(this);
setStatusBarTransparent();
ButterKnife.bind(this);
getIntentExtras();