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

Replaced Glide with UIL. Should finally fix all image loading problems.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-05-19 18:45:57 +02:00
commit c7125b1386
18 changed files with 276 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -67,7 +67,7 @@ dependencies {
compile 'com.mcxiaoke.volley:library:1.0.15' compile 'com.mcxiaoke.volley:library:1.0.15'
compile 'com.squareup:otto:1.3.6' compile 'com.squareup:otto:1.3.6'
compile 'de.hdodenhof:circleimageview:1.2.2' compile 'de.hdodenhof:circleimageview:1.2.2'
compile 'com.github.bumptech.glide:glide:3.6.0' compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
compile 'com.afollestad:material-dialogs:0.7.4.1' compile 'com.afollestad:material-dialogs:0.7.4.1'
compile 'com.jpardogo.materialtabstrip:library:1.0.9' compile 'com.jpardogo.materialtabstrip:library:1.0.9'

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

@ -7,6 +7,8 @@ import com.android.volley.RequestQueue;
import com.android.volley.toolbox.Volley; import com.android.volley.toolbox.Volley;
import com.crashlytics.android.Crashlytics; import com.crashlytics.android.Crashlytics;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import com.squareup.otto.Bus; import com.squareup.otto.Bus;
import com.squareup.otto.ThreadEnforcer; import com.squareup.otto.ThreadEnforcer;
@ -26,7 +28,8 @@ public class App extends Application {
super.onCreate(); super.onCreate();
Fabric.with(this, new Crashlytics()); Fabric.with(this, new Crashlytics());
MusicPlayerRemote.init(this); MusicPlayerRemote.init(this);
//Picasso.with(this).setIndicatorsEnabled(true);// debug only ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build();
ImageLoader.getInstance().init(config);
} }
public void addToVolleyRequestQueue(Request request) { public void addToVolleyRequestQueue(Request request) {

45
app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumAdapter.java
View file

@ -2,7 +2,6 @@ package com.kabouzeid.gramophone.adapter;
import android.app.Activity; import android.app.Activity;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri;
import android.support.v4.util.Pair; import android.support.v4.util.Pair;
import android.support.v7.graphics.Palette; import android.support.v7.graphics.Palette;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@ -13,13 +12,6 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.afollestad.materialdialogs.util.DialogUtils; import com.afollestad.materialdialogs.util.DialogUtils;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.GlideBitmapDrawable;
import com.bumptech.glide.load.resource.drawable.GlideDrawable;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.signature.StringSignature;
import com.kabouzeid.gramophone.App; import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.loader.AlbumLoader; import com.kabouzeid.gramophone.loader.AlbumLoader;
@ -31,6 +23,10 @@ import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.NavigationUtil; import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils; import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.ViewUtil; import com.kabouzeid.gramophone.util.ViewUtil;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
import com.squareup.otto.Subscribe; import com.squareup.otto.Subscribe;
import java.util.List; import java.util.List;
@ -59,28 +55,27 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
holder.title.setText(album.title); holder.title.setText(album.title);
holder.artist.setText(album.artistName); holder.artist.setText(album.artistName);
Glide.with(activity)
.loadFromMediaStore(MusicUtil.getAlbumArtUri(album.id)) ImageLoader.getInstance().displayImage(
.diskCacheStrategy(DiskCacheStrategy.NONE) MusicUtil.getAlbumArtUri(album.id).toString(),
.signature(new StringSignature(album.albumArtPath)) holder.albumArt,
.error(R.drawable.default_album_art) new DisplayImageOptions.Builder()
.placeholder(R.drawable.default_album_art) .cacheInMemory(true)
.listener(new RequestListener<Uri, GlideDrawable>() { .showImageOnFail(R.drawable.default_album_art)
.resetViewBeforeLoading(true)
.build(),
new SimpleImageLoadingListener() {
@Override @Override
public boolean onException(Exception e, Uri model, Target<GlideDrawable> target, boolean isFirstResource) { public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
if (usePalette) paletteBlackAndWhite(holder.title, holder.artist, holder.footer);
applyPalette(null, holder.title, holder.artist, holder.footer);
return false;
} }
@Override @Override
public boolean onResourceReady(GlideDrawable resource, Uri model, Target<GlideDrawable> target, boolean isFromMemoryCache, boolean isFirstResource) { public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
if (usePalette) applyPalette(loadedImage, holder.title, holder.artist, holder.footer);
applyPalette(((GlideBitmapDrawable) resource).getBitmap(), holder.title, holder.artist, holder.footer);
return false;
} }
}) }
.into(holder.albumArt); );
} }
@Override @Override

19
app/src/main/java/com/kabouzeid/gramophone/adapter/ArtistAdapter.java
View file

@ -9,7 +9,6 @@ import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.kabouzeid.gramophone.App; import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.lastfm.artist.LastFMArtistThumbnailUrlLoader; import com.kabouzeid.gramophone.lastfm.artist.LastFMArtistThumbnailUrlLoader;
@ -19,6 +18,8 @@ import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity; import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.NavigationUtil; import com.kabouzeid.gramophone.util.NavigationUtil;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.squareup.otto.Subscribe; import com.squareup.otto.Subscribe;
import java.util.List; import java.util.List;
@ -51,16 +52,20 @@ public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder
holder.artistName.setText(artist.name); holder.artistName.setText(artist.name);
holder.artistInfo.setText(MusicUtil.getArtistInfoString(activity, artist)); holder.artistInfo.setText(MusicUtil.getArtistInfoString(activity, artist));
holder.artistImage.setImageResource(R.drawable.default_artist_image); holder.artistImage.setImageDrawable(null);
LastFMArtistThumbnailUrlLoader.loadArtistThumbnailUrl(activity, artist.name, false, new LastFMArtistThumbnailUrlLoader.ArtistThumbnailUrlLoaderCallback() { LastFMArtistThumbnailUrlLoader.loadArtistThumbnailUrl(activity, artist.name, false, new LastFMArtistThumbnailUrlLoader.ArtistThumbnailUrlLoaderCallback() {
@Override @Override
public void onArtistThumbnailUrlLoaded(final String url) { public void onArtistThumbnailUrlLoaded(final String url) {
Glide.with(activity) ImageLoader.getInstance().displayImage(url,
.load(url) holder.artistImage,
.error(R.drawable.default_artist_image) new DisplayImageOptions.Builder()
.placeholder(R.drawable.default_artist_image) .cacheInMemory(true)
.into(holder.artistImage); .cacheOnDisk(true)
.showImageOnFail(R.drawable.default_artist_image)
.resetViewBeforeLoading(true)
.build()
);
} }
}); });
} }

22
app/src/main/java/com/kabouzeid/gramophone/adapter/ArtistAlbumAdapter.java
View file

@ -9,14 +9,13 @@ import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.signature.StringSignature;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.model.Album; import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity; import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.NavigationUtil; import com.kabouzeid.gramophone.util.NavigationUtil;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import java.util.List; import java.util.List;
@ -49,13 +48,16 @@ public class ArtistAlbumAdapter extends RecyclerView.Adapter<ArtistAlbumAdapter.
@Override @Override
public void onBindViewHolder(final ViewHolder holder, int position) { public void onBindViewHolder(final ViewHolder holder, int position) {
final Album album = dataSet.get(position); final Album album = dataSet.get(position);
Glide.with(activity)
.loadFromMediaStore(MusicUtil.getAlbumArtUri(album.id)) ImageLoader.getInstance().displayImage(
.diskCacheStrategy(DiskCacheStrategy.NONE) MusicUtil.getAlbumArtUri(album.id).toString(),
.signature(new StringSignature(album.albumArtPath)) holder.albumArt,
.error(R.drawable.default_album_art) new DisplayImageOptions.Builder()
.placeholder(R.drawable.default_album_art) .cacheInMemory(true)
.into(holder.albumArt); .showImageOnFail(R.drawable.default_album_art)
.resetViewBeforeLoading(true)
.build()
);
holder.title.setText(album.title); holder.title.setText(album.title);
holder.year.setText(String.valueOf(album.year)); holder.year.setText(String.valueOf(album.year));

35
app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
View file

@ -11,9 +11,6 @@ import android.widget.ImageView;
import android.widget.PopupMenu; import android.widget.PopupMenu;
import android.widget.TextView; import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.signature.StringSignature;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.MenuItemClickHelper; import com.kabouzeid.gramophone.helper.MenuItemClickHelper;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
@ -26,6 +23,8 @@ import com.kabouzeid.gramophone.model.Artist;
import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.NavigationUtil; import com.kabouzeid.gramophone.util.NavigationUtil;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -100,13 +99,15 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
final Album album = (Album) results.get(position); final Album album = (Album) results.get(position);
holder.title.setText(album.title); holder.title.setText(album.title);
holder.subTitle.setText(album.artistName); holder.subTitle.setText(album.artistName);
Glide.with(activity) ImageLoader.getInstance().displayImage(
.loadFromMediaStore(MusicUtil.getAlbumArtUri(album.id)) MusicUtil.getAlbumArtUri(album.id).toString(),
.error(R.drawable.default_album_art) holder.image,
.placeholder(R.drawable.default_album_art) new DisplayImageOptions.Builder()
.diskCacheStrategy(DiskCacheStrategy.NONE) .cacheInMemory(true)
.signature(new StringSignature(album.albumArtPath)) .showImageOnFail(R.drawable.default_album_art)
.into(holder.image); .resetViewBeforeLoading(true)
.build()
);
break; break;
case ARTIST: case ARTIST:
final Artist artist = (Artist) results.get(position); final Artist artist = (Artist) results.get(position);
@ -116,11 +117,15 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
LastFMArtistThumbnailUrlLoader.loadArtistThumbnailUrl(activity, artist.name, false, new LastFMArtistThumbnailUrlLoader.ArtistThumbnailUrlLoaderCallback() { LastFMArtistThumbnailUrlLoader.loadArtistThumbnailUrl(activity, artist.name, false, new LastFMArtistThumbnailUrlLoader.ArtistThumbnailUrlLoaderCallback() {
@Override @Override
public void onArtistThumbnailUrlLoaded(final String url) { public void onArtistThumbnailUrlLoaded(final String url) {
Glide.with(activity) ImageLoader.getInstance().displayImage(url,
.load(url) holder.image,
.error(R.drawable.default_artist_image) new DisplayImageOptions.Builder()
.placeholder(R.drawable.default_artist_image) .cacheInMemory(true)
.into(holder.image); .cacheOnDisk(true)
.showImageOnFail(R.drawable.default_artist_image)
.resetViewBeforeLoading(true)
.build()
);
} }
}); });
break; break;

21
app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/ArtistSongAdapter.java
View file

@ -11,15 +11,14 @@ import android.widget.ImageView;
import android.widget.PopupMenu; import android.widget.PopupMenu;
import android.widget.TextView; import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.signature.StringSignature;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.MenuItemClickHelper; import com.kabouzeid.gramophone.helper.MenuItemClickHelper;
import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity; import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.NavigationUtil; import com.kabouzeid.gramophone.util.NavigationUtil;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import java.util.List; import java.util.List;
@ -49,13 +48,15 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> {
songTitle.setText(song.title); songTitle.setText(song.title);
songInfo.setText(song.albumName); songInfo.setText(song.albumName);
Glide.with(activity) ImageLoader.getInstance().displayImage(
.loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId)) MusicUtil.getAlbumArtUri(song.albumId).toString(),
.diskCacheStrategy(DiskCacheStrategy.NONE) albumArt,
.signature(new StringSignature(String.valueOf(song.dateModified))) new DisplayImageOptions.Builder()
.error(R.drawable.default_album_art) .cacheInMemory(true)
.placeholder(R.drawable.default_album_art) .showImageOnFail(R.drawable.default_album_art)
.into(albumArt); .resetViewBeforeLoading(true)
.build()
);
final ImageView overflowButton = (ImageView) convertView.findViewById(R.id.menu); final ImageView overflowButton = (ImageView) convertView.findViewById(R.id.menu);
overflowButton.setOnClickListener(new View.OnClickListener() { overflowButton.setOnClickListener(new View.OnClickListener() {

21
app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/PlaylistSongAdapter.java
View file

@ -11,9 +11,6 @@ import android.widget.ImageView;
import android.widget.PopupMenu; import android.widget.PopupMenu;
import android.widget.TextView; import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.signature.StringSignature;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.MenuItemClickHelper; import com.kabouzeid.gramophone.helper.MenuItemClickHelper;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
@ -23,6 +20,8 @@ import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.NavigationUtil; import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PlaylistsUtil; import com.kabouzeid.gramophone.util.PlaylistsUtil;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -53,13 +52,15 @@ public class PlaylistSongAdapter extends RecyclerView.Adapter<PlaylistSongAdapte
holder.songTitle.setText(song.title); holder.songTitle.setText(song.title);
holder.songInfo.setText(song.artistName); holder.songInfo.setText(song.artistName);
Glide.with(activity) ImageLoader.getInstance().displayImage(
.loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId)) MusicUtil.getAlbumArtUri(song.albumId).toString(),
.diskCacheStrategy(DiskCacheStrategy.NONE) holder.albumArt,
.signature(new StringSignature(String.valueOf(song.dateModified))) new DisplayImageOptions.Builder()
.error(R.drawable.default_album_art) .cacheInMemory(true)
.placeholder(R.drawable.default_album_art) .showImageOnFail(R.drawable.default_album_art)
.into(holder.albumArt); .resetViewBeforeLoading(true)
.build()
);
} }
@Override @Override

21
app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java
View file

@ -13,9 +13,6 @@ import android.widget.PopupMenu;
import android.widget.TextView; import android.widget.TextView;
import com.afollestad.materialdialogs.ThemeSingleton; import com.afollestad.materialdialogs.ThemeSingleton;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.signature.StringSignature;
import com.kabouzeid.gramophone.App; import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.MenuItemClickHelper; import com.kabouzeid.gramophone.helper.MenuItemClickHelper;
@ -26,6 +23,8 @@ import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity; import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.NavigationUtil; import com.kabouzeid.gramophone.util.NavigationUtil;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.squareup.otto.Subscribe; import com.squareup.otto.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
@ -69,13 +68,15 @@ public class SongAdapter extends RecyclerView.Adapter<SongAdapter.ViewHolder> {
holder.songTitle.setText(song.title); holder.songTitle.setText(song.title);
holder.songInfo.setText(song.artistName); holder.songInfo.setText(song.artistName);
Glide.with(activity) ImageLoader.getInstance().displayImage(
.loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId)) MusicUtil.getAlbumArtUri(song.albumId).toString(),
.diskCacheStrategy(DiskCacheStrategy.NONE) holder.albumArt,
.signature(new StringSignature(String.valueOf(song.dateModified))) new DisplayImageOptions.Builder()
.error(R.drawable.default_album_art) .cacheInMemory(true)
.placeholder(R.drawable.default_album_art) .showImageOnFail(R.drawable.default_album_art)
.into(holder.albumArt); .resetViewBeforeLoading(true)
.build()
);
} else { } else {
holder.songTitle.setText(activity.getResources().getString(R.string.shuffle_all).toUpperCase()); holder.songTitle.setText(activity.getResources().getString(R.string.shuffle_all).toUpperCase());
holder.songTitle.setTextColor(ThemeSingleton.get().positiveColor); holder.songTitle.setTextColor(ThemeSingleton.get().positiveColor);

51
app/src/main/java/com/kabouzeid/gramophone/appwidget/MusicPlayerWidget.java
View file

@ -7,24 +7,25 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri; import android.view.View;
import android.widget.RemoteViews; import android.widget.RemoteViews;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.Request;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.service.MusicService; import com.kabouzeid.gramophone.service.MusicService;
import com.kabouzeid.gramophone.ui.activities.MusicControllerActivity; import com.kabouzeid.gramophone.ui.activities.MusicControllerActivity;
import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.MusicUtil;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.assist.ImageSize;
import com.nostra13.universalimageloader.core.assist.ViewScaleType;
import com.nostra13.universalimageloader.core.imageaware.NonViewAware;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
public class MusicPlayerWidget extends AppWidgetProvider { public class MusicPlayerWidget extends AppWidgetProvider {
private static RemoteViews widgetLayout; private static RemoteViews widgetLayout;
private static Request albumArtRequest; private static String currentAlbumArtUri;
@Override @Override
public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
@ -62,28 +63,22 @@ public class MusicPlayerWidget extends AppWidgetProvider {
} }
private static void loadAlbumArt(final Context context, final Song song) { private static void loadAlbumArt(final Context context, final Song song) {
if (albumArtRequest != null) albumArtRequest.clear(); if (song != null) {
final int notificationAlbumArtSize = context.getResources().getDimensionPixelSize(R.dimen.app_widget_small_artwork_height); currentAlbumArtUri = MusicUtil.getAlbumArtUri(song.albumId).toString();
albumArtRequest = Glide.with(context) ImageLoader.getInstance().displayImage(currentAlbumArtUri, new NonViewAware(new ImageSize(-1, -1), ViewScaleType.CROP), new SimpleImageLoadingListener() {
.loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId)) @Override
.asBitmap() public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
.diskCacheStrategy(DiskCacheStrategy.NONE) if (currentAlbumArtUri.equals(imageUri))
.skipMemoryCache(true) setAlbumArt(context, loadedImage);
.listener(new RequestListener<Uri, Bitmap>() { }
@Override
public boolean onException(Exception e, Uri model, Target<Bitmap> target, boolean isFirstResource) {
setAlbumArt(context, null);
return false;
}
@Override @Override
public boolean onResourceReady(Bitmap resource, Uri model, Target<Bitmap> target, boolean isFromMemoryCache, boolean isFirstResource) { public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
setAlbumArt(context, resource); if (currentAlbumArtUri.equals(imageUri))
return false; setAlbumArt(context, null);
} }
}) });
.into(notificationAlbumArtSize, notificationAlbumArtSize) }
.getRequest();
} }
private static void setAlbumArt(final Context context, final Bitmap albumArt) { private static void setAlbumArt(final Context context, final Bitmap albumArt) {

51
app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
View file

@ -12,20 +12,21 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.view.View;
import android.widget.RemoteViews; import android.widget.RemoteViews;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.Request;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.service.MusicService; import com.kabouzeid.gramophone.service.MusicService;
import com.kabouzeid.gramophone.ui.activities.MusicControllerActivity; import com.kabouzeid.gramophone.ui.activities.MusicControllerActivity;
import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.MusicUtil;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.assist.ImageSize;
import com.nostra13.universalimageloader.core.assist.ViewScaleType;
import com.nostra13.universalimageloader.core.imageaware.NonViewAware;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
public class PlayingNotificationHelper { public class PlayingNotificationHelper {
@ -40,8 +41,8 @@ public class PlayingNotificationHelper {
private RemoteViews notificationLayout; private RemoteViews notificationLayout;
private RemoteViews notificationLayoutExpanded; private RemoteViews notificationLayoutExpanded;
private Request albumArtRequest;
private Song currentSong; private Song currentSong;
private String currentAlbumArtUri;
public PlayingNotificationHelper(final MusicService service) { public PlayingNotificationHelper(final MusicService service) {
this.service = service; this.service = service;
@ -161,30 +162,20 @@ public class PlayingNotificationHelper {
} }
private void loadAlbumArt() { private void loadAlbumArt() {
if (currentSong != null) { currentAlbumArtUri = MusicUtil.getAlbumArtUri(currentSong.albumId).toString();
if (albumArtRequest != null) albumArtRequest.clear(); ImageLoader.getInstance().displayImage(currentAlbumArtUri, new NonViewAware(new ImageSize(-1, -1), ViewScaleType.CROP), new SimpleImageLoadingListener() {
final int notificationAlbumArtSize = service.getResources().getDimensionPixelSize(R.dimen.notification_albumart_size); @Override
albumArtRequest = Glide.with(service) public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
.loadFromMediaStore(MusicUtil.getAlbumArtUri(currentSong.albumId)) if (currentAlbumArtUri.equals(imageUri))
.asBitmap() setAlbumArt(loadedImage);
.diskCacheStrategy(DiskCacheStrategy.NONE) }
.skipMemoryCache(true)
.listener(new RequestListener<Uri, Bitmap>() {
@Override
public boolean onException(Exception e, Uri model, Target<Bitmap> target, boolean isFirstResource) {
setAlbumArt(null);
return false;
}
@Override @Override
public boolean onResourceReady(Bitmap resource, Uri model, Target<Bitmap> target, boolean isFromMemoryCache, boolean isFirstResource) { public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
setAlbumArt(resource); if (currentAlbumArtUri.equals(imageUri))
return false; setAlbumArt(null);
} }
}) });
.into(notificationAlbumArtSize, notificationAlbumArtSize)
.getRequest();
}
} }
private void setAlbumArt(Bitmap albumArt) { private void setAlbumArt(Bitmap albumArt) {

48
app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
View file

@ -20,13 +20,9 @@ import android.os.IBinder;
import android.os.PowerManager; import android.os.PowerManager;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
import android.view.View;
import android.widget.Toast; import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.Request;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.kabouzeid.gramophone.App; import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appwidget.MusicPlayerWidget; import com.kabouzeid.gramophone.appwidget.MusicPlayerWidget;
@ -37,6 +33,12 @@ import com.kabouzeid.gramophone.model.MusicRemoteEvent;
import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.InternalStorageUtil; import com.kabouzeid.gramophone.util.InternalStorageUtil;
import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.MusicUtil;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.assist.ImageSize;
import com.nostra13.universalimageloader.core.assist.ViewScaleType;
import com.nostra13.universalimageloader.core.imageaware.NonViewAware;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -81,8 +83,8 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
private PlayingNotificationHelper playingNotificationHelper; private PlayingNotificationHelper playingNotificationHelper;
private AudioManager audioManager; private AudioManager audioManager;
private RemoteControlClient remoteControlClient; private RemoteControlClient remoteControlClient;
private Request remoteControlClientAlbumArtRequest;
private PowerManager.WakeLock wakeLock; private PowerManager.WakeLock wakeLock;
private String currentAlbumArtUri;
public MusicService() { public MusicService() {
} }
@ -358,28 +360,20 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, song.title) .putString(MediaMetadataRetriever.METADATA_KEY_TITLE, song.title)
.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, song.duration) .putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, song.duration)
.apply(); .apply();
currentAlbumArtUri = MusicUtil.getAlbumArtUri(song.albumId).toString();
ImageLoader.getInstance().displayImage(currentAlbumArtUri, new NonViewAware(new ImageSize(-1, -1), ViewScaleType.CROP), new SimpleImageLoadingListener() {
@Override
public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
if (currentAlbumArtUri.equals(imageUri))
updateRemoteControlClientBitmap(loadedImage);
}
if (remoteControlClientAlbumArtRequest != null) remoteControlClientAlbumArtRequest.clear(); @Override
remoteControlClientAlbumArtRequest = Glide.with(this) public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
.loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId)) if (currentAlbumArtUri.equals(imageUri))
.asBitmap() updateRemoteControlClientBitmap(null);
.diskCacheStrategy(DiskCacheStrategy.NONE) }
.skipMemoryCache(true) });
.listener(new RequestListener<Uri, Bitmap>() {
@Override
public boolean onException(Exception e, Uri model, Target<Bitmap> target, boolean isFirstResource) {
updateRemoteControlClientBitmap(null);
return false;
}
@Override
public boolean onResourceReady(Bitmap resource, Uri model, Target<Bitmap> target, boolean isFromMemoryCache, boolean isFirstResource) {
updateRemoteControlClientBitmap(resource);
return false;
}
})
.into(-1, -1)
.getRequest();
} }
private void updateRemoteControlClientBitmap(final Bitmap albumArt) { private void updateRemoteControlClientBitmap(final Bitmap albumArt) {

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

@ -4,7 +4,6 @@ import android.annotation.TargetApi;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Color; import android.graphics.Color;
import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.util.Pair; import android.support.v4.util.Pair;
@ -18,13 +17,6 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.afollestad.materialdialogs.util.DialogUtils; import com.afollestad.materialdialogs.util.DialogUtils;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.GlideBitmapDrawable;
import com.bumptech.glide.load.resource.drawable.GlideDrawable;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.signature.StringSignature;
import com.github.ksoichiro.android.observablescrollview.ObservableRecyclerView; import com.github.ksoichiro.android.observablescrollview.ObservableRecyclerView;
import com.kabouzeid.gramophone.App; import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
@ -46,6 +38,10 @@ import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util; import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil; import com.kabouzeid.gramophone.util.ViewUtil;
import com.nineoldandroids.view.ViewHelper; import com.nineoldandroids.view.ViewHelper;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
import com.squareup.otto.Subscribe; import com.squareup.otto.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
@ -176,31 +172,30 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
} }
private void setUpAlbumArtAndApplyPalette() { private void setUpAlbumArtAndApplyPalette() {
Glide.with(AlbumDetailActivity.this) ImageLoader.getInstance().displayImage(
.loadFromMediaStore(MusicUtil.getAlbumArtUri(album.id)) MusicUtil.getAlbumArtUri(album.id).toString(),
.diskCacheStrategy(DiskCacheStrategy.NONE) albumArtImageView,
.signature(new StringSignature(album.albumArtPath)) new DisplayImageOptions.Builder()
.error(R.drawable.default_album_art) .cacheInMemory(true)
.listener(new RequestListener<Uri, GlideDrawable>() { .showImageOnFail(R.drawable.default_album_art)
.resetViewBeforeLoading(true)
.build(),
new SimpleImageLoadingListener() {
@TargetApi(Build.VERSION_CODES.LOLLIPOP) @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override @Override
public boolean onException(Exception e, Uri model, Target<GlideDrawable> target, boolean isFirstResource) { public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
applyPalette(null); applyPalette(null);
if (Util.isAtLeastLollipop()) startPostponedEnterTransition(); if (Util.isAtLeastLollipop()) startPostponedEnterTransition();
return false;
} }
@TargetApi(Build.VERSION_CODES.LOLLIPOP) @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override @Override
public boolean onResourceReady(GlideDrawable resource, Uri model, Target<GlideDrawable> target, boolean isFromMemoryCache, boolean isFirstResource) { public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
applyPalette(((GlideBitmapDrawable) resource).getBitmap()); applyPalette(loadedImage);
if (Util.isAtLeastLollipop()) startPostponedEnterTransition(); if (Util.isAtLeastLollipop()) startPostponedEnterTransition();
// workaround for glide not working well with shared element, dont remove this redundant looking call!
albumArtImageView.setImageDrawable(resource);
return false;
} }
}) }
.into(albumArtImageView); );
} }
private void applyPalette(Bitmap bitmap) { private void applyPalette(Bitmap bitmap) {

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

@ -24,11 +24,6 @@ import android.widget.Toast;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.util.DialogUtils; import com.afollestad.materialdialogs.util.DialogUtils;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.GlideBitmapDrawable;
import com.bumptech.glide.load.resource.drawable.GlideDrawable;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.github.ksoichiro.android.observablescrollview.ObservableListView; import com.github.ksoichiro.android.observablescrollview.ObservableListView;
import com.kabouzeid.gramophone.App; import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
@ -53,6 +48,10 @@ import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util; import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil; import com.kabouzeid.gramophone.util.ViewUtil;
import com.nineoldandroids.view.ViewHelper; import com.nineoldandroids.view.ViewHelper;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
import com.squareup.otto.Subscribe; import com.squareup.otto.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
@ -268,23 +267,26 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
LastFMArtistImageUrlLoader.loadArtistImageUrl(this, artist.name, forceDownload, new LastFMArtistImageUrlLoader.ArtistImageUrlLoaderCallback() { LastFMArtistImageUrlLoader.loadArtistImageUrl(this, artist.name, forceDownload, new LastFMArtistImageUrlLoader.ArtistImageUrlLoaderCallback() {
@Override @Override
public void onArtistImageUrlLoaded(final String url) { public void onArtistImageUrlLoaded(final String url) {
Glide.with(ArtistDetailActivity.this) ImageLoader.getInstance().displayImage(url,
.load(url) artistImage,
.error(R.drawable.default_artist_image) new DisplayImageOptions.Builder()
.listener(new RequestListener<String, GlideDrawable>() { .cacheInMemory(true)
.cacheOnDisk(true)
.showImageOnFail(R.drawable.default_artist_image)
.resetViewBeforeLoading(true)
.build(),
new SimpleImageLoadingListener() {
@Override @Override
public boolean onException(Exception e, String model, Target<GlideDrawable> target, boolean isFirstResource) { public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
applyPalette(null); applyPalette(null);
return false;
} }
@Override @Override
public boolean onResourceReady(GlideDrawable resource, String model, Target<GlideDrawable> target, boolean isFromMemoryCache, boolean isFirstResource) { public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
applyPalette(((GlideBitmapDrawable) resource).getBitmap()); applyPalette(loadedImage);
return false;
} }
}) }
.into(artistImage); );
} }
}); });
} }

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

@ -27,12 +27,6 @@ import android.widget.FrameLayout;
import com.afollestad.materialdialogs.ThemeSingleton; import com.afollestad.materialdialogs.ThemeSingleton;
import com.astuetz.PagerSlidingTabStrip; import com.astuetz.PagerSlidingTabStrip;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.drawable.GlideDrawable;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.signature.StringSignature;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.PagerAdapter; import com.kabouzeid.gramophone.adapter.PagerAdapter;
import com.kabouzeid.gramophone.dialogs.AboutDialog; import com.kabouzeid.gramophone.dialogs.AboutDialog;
@ -54,6 +48,8 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils; import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util; import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil; import com.kabouzeid.gramophone.util.ViewUtil;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
@ -73,8 +69,6 @@ public class MainActivity extends AbsFabActivity
private ViewPager viewPager; private ViewPager viewPager;
private PagerSlidingTabStrip slidingTabLayout; private PagerSlidingTabStrip slidingTabLayout;
private int currentPage = -1; private int currentPage = -1;
private int navigationDrawerImageWidth = -1;
private int navigationDrawerImageHeight = -1;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -194,9 +188,6 @@ public class MainActivity extends AbsFabActivity
} }
navDrawerFrame.setLayoutParams(new DrawerLayout.LayoutParams(navDrawerWidth, navDrawerFrame.setLayoutParams(new DrawerLayout.LayoutParams(navDrawerWidth,
DrawerLayout.LayoutParams.MATCH_PARENT, Gravity.START)); DrawerLayout.LayoutParams.MATCH_PARENT, Gravity.START));
navigationDrawerImageWidth = navDrawerWidth;
navigationDrawerImageHeight = getResources().getDimensionPixelSize(R.dimen.navigation_drawer_image_height);
} }
@Override @Override
@ -216,25 +207,15 @@ public class MainActivity extends AbsFabActivity
if (song.id != -1) { if (song.id != -1) {
navigationDrawerFragment.getSongTitle().setText(song.title); navigationDrawerFragment.getSongTitle().setText(song.title);
navigationDrawerFragment.getSongArtist().setText(song.artistName); navigationDrawerFragment.getSongArtist().setText(song.artistName);
Glide.with(this) ImageLoader.getInstance().displayImage(
.loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId)) MusicUtil.getAlbumArtUri(song.albumId).toString(),
.centerCrop() navigationDrawerFragment.getAlbumArtImageView(),
.diskCacheStrategy(DiskCacheStrategy.NONE) new DisplayImageOptions.Builder()
.signature(new StringSignature(String.valueOf(song.dateModified))) .cacheInMemory(true)
.listener(new RequestListener<Uri, GlideDrawable>() { .showImageOnFail(R.drawable.default_album_art)
@Override .resetViewBeforeLoading(true)
public boolean onException(Exception e, Uri model, Target<GlideDrawable> target, boolean isFirstResource) { .build()
navigationDrawerFragment.getAlbumArtImageView().setImageResource(R.drawable.default_album_art); );
return false;
}
@Override
public boolean onResourceReady(GlideDrawable resource, Uri model, Target<GlideDrawable> target, boolean isFromMemoryCache, boolean isFirstResource) {
navigationDrawerFragment.getAlbumArtImageView().setImageDrawable(resource);
return false;
}
})
.into(navigationDrawerImageWidth, navigationDrawerImageHeight);
} }
} }
} }

53
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
View file

@ -5,7 +5,6 @@ import android.content.Intent;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.graphics.Palette; import android.support.v7.graphics.Palette;
@ -22,13 +21,6 @@ import android.widget.TextView;
import com.afollestad.materialdialogs.ThemeSingleton; import com.afollestad.materialdialogs.ThemeSingleton;
import com.afollestad.materialdialogs.util.DialogUtils; import com.afollestad.materialdialogs.util.DialogUtils;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.GlideBitmapDrawable;
import com.bumptech.glide.load.resource.drawable.GlideDrawable;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.signature.StringSignature;
import com.kabouzeid.gramophone.App; import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.dialogs.AddToPlaylistDialog; import com.kabouzeid.gramophone.dialogs.AddToPlaylistDialog;
@ -49,6 +41,10 @@ import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util; import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil; import com.kabouzeid.gramophone.util.ViewUtil;
import com.nineoldandroids.view.ViewPropertyAnimator; import com.nineoldandroids.view.ViewPropertyAnimator;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
import com.squareup.otto.Subscribe; import com.squareup.otto.Subscribe;
import java.io.File; import java.io.File;
@ -305,26 +301,26 @@ public class MusicControllerActivity extends AbsFabActivity {
} }
private void setUpAlbumArtAndApplyPalette() { private void setUpAlbumArtAndApplyPalette() {
Glide.with(this) ImageLoader.getInstance().displayImage(
.loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId)) MusicUtil.getAlbumArtUri(song.albumId).toString(),
.diskCacheStrategy(DiskCacheStrategy.NONE) albumArt,
.signature(new StringSignature(String.valueOf(song.dateModified))) new DisplayImageOptions.Builder()
.error(R.drawable.default_album_art) .cacheInMemory(true)
.placeholder(R.drawable.default_album_art) .showImageOnFail(R.drawable.default_album_art)
.listener(new RequestListener<Uri, GlideDrawable>() { .resetViewBeforeLoading(true)
.build(),
new SimpleImageLoadingListener() {
@Override @Override
public boolean onException(Exception e, Uri model, Target<GlideDrawable> target, boolean isFirstResource) { public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
applyPalette(null); applyPalette(null);
return false;
} }
@Override @Override
public boolean onResourceReady(GlideDrawable resource, Uri model, Target<GlideDrawable> target, boolean isFromMemoryCache, boolean isFirstResource) { public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
applyPalette(((GlideBitmapDrawable) resource).getBitmap()); applyPalette(loadedImage);
return false;
} }
}) }
.into(albumArt); );
} }
private void applyPalette(Bitmap bitmap) { private void applyPalette(Bitmap bitmap) {
@ -381,10 +377,15 @@ public class MusicControllerActivity extends AbsFabActivity {
LastFMArtistImageUrlLoader.loadArtistImageUrl(this, song.artistName, false, new LastFMArtistImageUrlLoader.ArtistImageUrlLoaderCallback() { LastFMArtistImageUrlLoader.loadArtistImageUrl(this, song.artistName, false, new LastFMArtistImageUrlLoader.ArtistImageUrlLoaderCallback() {
@Override @Override
public void onArtistImageUrlLoaded(String url) { public void onArtistImageUrlLoaded(String url) {
Glide.with(MusicControllerActivity.this) ImageLoader.getInstance().displayImage(url,
.load(url) artistImage,
.error(R.drawable.default_artist_image) new DisplayImageOptions.Builder()
.into(artistImage); .cacheInMemory(true)
.cacheOnDisk(true)
.showImageOnFail(R.drawable.default_artist_image)
.resetViewBeforeLoading(true)
.build()
);
} }
}); });
} }

10
app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
View file

@ -20,7 +20,6 @@ import android.widget.ImageView;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.util.DialogUtils; import com.afollestad.materialdialogs.util.DialogUtils;
import com.bumptech.glide.Glide;
import com.github.ksoichiro.android.observablescrollview.ObservableScrollView; import com.github.ksoichiro.android.observablescrollview.ObservableScrollView;
import com.kabouzeid.gramophone.App; import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
@ -36,6 +35,7 @@ import com.kabouzeid.gramophone.util.ViewUtil;
import com.melnykov.fab.FloatingActionButton; import com.melnykov.fab.FloatingActionButton;
import com.nineoldandroids.view.ViewHelper; import com.nineoldandroids.view.ViewHelper;
import com.nineoldandroids.view.ViewPropertyAnimator; import com.nineoldandroids.view.ViewPropertyAnimator;
import com.nostra13.universalimageloader.core.ImageLoader;
import org.jaudiotagger.audio.AudioFile; import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO; import org.jaudiotagger.audio.AudioFileIO;
@ -382,11 +382,11 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
progressDialog.setContent(getString(R.string.rescanning_media)); progressDialog.setContent(getString(R.string.rescanning_media));
if (deleteArtwork) { if (deleteArtwork) {
MusicUtil.deleteAlbumArt(AbsTagEditorActivity.this, getId()); MusicUtil.deleteAlbumArt(AbsTagEditorActivity.this, getId());
Glide.get(AbsTagEditorActivity.this).clearMemory(); //ImageLoader.getInstance().getMemoryCache().remove(MusicUtil.getAlbumArtUri(getId()).toString());
Glide.get(AbsTagEditorActivity.this).getBitmapPool().clearMemory(); ImageLoader.getInstance().clearMemoryCache();
} else if (artwork != null) { } else if (artwork != null) {
Glide.get(AbsTagEditorActivity.this).clearMemory(); //ImageLoader.getInstance().getMemoryCache().remove(MusicUtil.getAlbumArtUri(getId()).toString());
Glide.get(AbsTagEditorActivity.this).getBitmapPool().clearMemory(); ImageLoader.getInstance().clearMemoryCache();
} }
} }
}); });

71
app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
View file

@ -6,18 +6,20 @@ import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.Log; import android.util.Log;
import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Toast; import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.lastfm.album.LastFMAlbumImageUrlLoader; import com.kabouzeid.gramophone.lastfm.album.LastFMAlbumImageUrlLoader;
import com.kabouzeid.gramophone.loader.AlbumSongLoader; import com.kabouzeid.gramophone.loader.AlbumSongLoader;
import com.kabouzeid.gramophone.loader.SongFilePathLoader; import com.kabouzeid.gramophone.loader.SongFilePathLoader;
import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.MusicUtil;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.assist.ImageSize;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
import org.jaudiotagger.tag.FieldKey; import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.images.Artwork; import org.jaudiotagger.tag.images.Artwork;
@ -95,34 +97,24 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
LastFMAlbumImageUrlLoader.loadAlbumImageUrl(this, albumTitleStr, albumArtistNameStr, new LastFMAlbumImageUrlLoader.AlbumImageUrlLoaderCallback() { LastFMAlbumImageUrlLoader.loadAlbumImageUrl(this, albumTitleStr, albumArtistNameStr, new LastFMAlbumImageUrlLoader.AlbumImageUrlLoaderCallback() {
@Override @Override
public void onAlbumImageUrlLoaded(String url) { public void onAlbumImageUrlLoaded(String url) {
Glide.with(AlbumTagEditorActivity.this) ImageLoader.getInstance().loadImage(url,
.load(url) new ImageSize(500, 500),
.asBitmap() new SimpleImageLoadingListener() {
.centerCrop()
.listener(new RequestListener<String, Bitmap>() {
@Override @Override
public boolean onException(Exception e, String model, Target<Bitmap> target, boolean isFirstResource) { public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
Toast.makeText(AlbumTagEditorActivity.this, Toast.makeText(AlbumTagEditorActivity.this,
R.string.failed_download_albumart, Toast.LENGTH_SHORT).show(); R.string.failed_download_albumart, Toast.LENGTH_SHORT).show();
return false;
} }
@Override @Override
public boolean onResourceReady(Bitmap resource, String model, Target<Bitmap> target, boolean isFromMemoryCache, boolean isFirstResource) { public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
if (resource != null) { albumArtBitmap = loadedImage;
albumArtBitmap = resource; setImageBitmap(albumArtBitmap);
setImageBitmap(albumArtBitmap); deleteAlbumArt = false;
deleteAlbumArt = false; dataChanged();
dataChanged(); setResult(RESULT_OK);
setResult(RESULT_OK);
} else {
Toast.makeText(AlbumTagEditorActivity.this,
R.string.failed_download_albumart, Toast.LENGTH_SHORT).show();
}
return false;
} }
}) });
.into(500, 500);
} }
@Override @Override
@ -191,29 +183,24 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
@Override @Override
protected void loadImageFromFile(final Uri selectedFileUri) { protected void loadImageFromFile(final Uri selectedFileUri) {
Glide.with(this) ImageLoader.getInstance().loadImage(selectedFileUri.toString(),
.load(selectedFileUri) new ImageSize(500, 500),
.asBitmap() new SimpleImageLoadingListener() {
.centerCrop()
.listener(new RequestListener<Uri, Bitmap>() {
@Override @Override
public boolean onException(Exception e, Uri model, Target<Bitmap> target, boolean isFirstResource) { public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
return false; Toast.makeText(AlbumTagEditorActivity.this,
R.string.failed_download_albumart, Toast.LENGTH_SHORT).show();
} }
@Override @Override
public boolean onResourceReady(Bitmap resource, Uri model, Target<Bitmap> target, boolean isFromMemoryCache, boolean isFirstResource) { public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
if (resource != null) { albumArtBitmap = loadedImage;
albumArtBitmap = resource; setImageBitmap(albumArtBitmap);
setImageBitmap(albumArtBitmap); deleteAlbumArt = false;
deleteAlbumArt = false; dataChanged();
dataChanged(); setResult(RESULT_OK);
setResult(RESULT_OK);
}
return false;
} }
}) });
.into(500, 500);
} }
@Override @Override