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

Switched from Picasso to Ion

Browse source 
Much better performance.
Not well tested yet but it should work.
This commit is contained in:
Karim Abou Zeid 2015-04-17 00:56:55 +02:00
commit a11535c8a3
39 changed files with 733 additions and 419 deletions
Download patch file Download diff file Expand all files Collapse all files

71
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.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.util.Pair;
@ -16,7 +15,6 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import com.github.ksoichiro.android.observablescrollview.ObservableRecyclerView;
import com.kabouzeid.gramophone.App;
@ -30,7 +28,7 @@ import com.kabouzeid.gramophone.misc.AppKeys;
import com.kabouzeid.gramophone.misc.SmallObservableScrollViewCallbacks;
import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.model.UIPreferenceChangedEvent;
import com.kabouzeid.gramophone.model.UiPreferenceChangedEvent;
import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
import com.kabouzeid.gramophone.ui.activities.tageditor.AlbumTagEditorActivity;
import com.kabouzeid.gramophone.util.MusicUtil;
@ -38,10 +36,10 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.koushikdutta.async.future.FutureCallback;
import com.koushikdutta.ion.Ion;
import com.nineoldandroids.view.ViewHelper;
import com.squareup.otto.Subscribe;
import com.squareup.picasso.Callback;
import com.squareup.picasso.Picasso;
import java.util.List;
@ -112,7 +110,8 @@ public class AlbumDetailActivity extends AbsFabActivity {
App.bus.register(this);
if (Util.hasLollipopSDK()) postponeEnterTransition();
if (Util.hasLollipopSDK() && PreferenceUtils.getInstance(this).coloredNavigationBarAlbumEnabled()) getWindow().setNavigationBarColor(Util.resolveColor(this, R.attr.default_bar_color));
if (Util.hasLollipopSDK() && PreferenceUtils.getInstance(this).coloredNavigationBarAlbumEnabled())
getWindow().setNavigationBarColor(Util.resolveColor(this, R.attr.default_bar_color));
Bundle intentExtras = getIntent().getExtras();
int albumId = -1;
@ -128,8 +127,6 @@ public class AlbumDetailActivity extends AbsFabActivity {
setUpObservableListViewParams();
setUpToolBar();
setUpViews();
if (Util.hasLollipopSDK()) startPostponedEnterTransition();
}
@Override
@ -157,28 +154,37 @@ public class AlbumDetailActivity extends AbsFabActivity {
private void setUpViews() {
albumTitleView.setText(album.title);
ViewUtil.addOnGlobalLayoutListener(albumArtImageView, new Runnable() {
@Override
public void run() {
setUpAlbumArtAndApplyPalette();
}
});
setUpListView();
setUpSongsAdapter();
setUpAlbumArtAndApplyPalette();
}
private void setUpAlbumArtAndApplyPalette() {
Picasso.with(this).load(MusicUtil.getAlbumArtUri(album.id))
.placeholder(R.drawable.default_album_art)
.into(albumArtImageView, new Callback.EmptyCallback() {
@Override
public void onSuccess() {
super.onSuccess();
final Bitmap bitmap = ((BitmapDrawable) albumArtImageView.getDrawable()).getBitmap();
if (bitmap != null) applyPalette(bitmap);
}
});
albumArtImageView.post(new Runnable() {
@Override
public void run() {
Ion.with(AlbumDetailActivity.this)
.load(MusicUtil.getAlbumArtUri(album.id).toString())
.noCache()
.withBitmap()
.resize(albumArtImageView.getWidth(), albumArtImageView.getHeight())
.centerCrop()
.asBitmap()
.setCallback(new FutureCallback<Bitmap>() {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void onCompleted(Exception e, Bitmap result) {
if (result != null) {
albumArtImageView.setImageBitmap(result);
applyPalette(result);
} else {
albumArtImageView.setImageResource(R.drawable.default_album_art);
}
if (Util.hasLollipopSDK()) startPostponedEnterTransition();
}
});
}
});
}
private void applyPalette(Bitmap bitmap) {
@ -199,8 +205,8 @@ public class AlbumDetailActivity extends AbsFabActivity {
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
private void setNavigationBarColored(boolean colored){
if (colored){
private void setNavigationBarColored(boolean colored) {
if (colored) {
if (Util.hasLollipopSDK()) getWindow().setNavigationBarColor(toolbarColor);
} else {
if (Util.hasLollipopSDK()) getWindow().setNavigationBarColor(Color.BLACK);
@ -216,8 +222,8 @@ public class AlbumDetailActivity extends AbsFabActivity {
public void run() {
songsBackgroundView.getLayoutParams().height = contentView.getHeight();
observableScrollViewCallbacks.onScrollChanged(-(albumArtViewHeight + titleViewHeight), false, false);
recyclerView.scrollBy(0,1);
recyclerView.scrollBy(0,-1);
recyclerView.scrollBy(0, 1);
recyclerView.scrollBy(0, -1);
}
});
}
@ -291,9 +297,10 @@ public class AlbumDetailActivity extends AbsFabActivity {
return super.onOptionsItemSelected(item);
}
@Subscribe public void onUIPreferenceChanged(UIPreferenceChangedEvent event){
switch (event.getAction()){
case UIPreferenceChangedEvent.COLORED_NAVIGATION_BAR_ALBUM_CHANGED:
@Subscribe
public void onUIPreferenceChanged(UiPreferenceChangedEvent event) {
switch (event.getAction()) {
case UiPreferenceChangedEvent.COLORED_NAVIGATION_BAR_ALBUM_CHANGED:
setNavigationBarColored((boolean) event.getValue());
break;
}

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

@ -3,7 +3,6 @@ package com.kabouzeid.gramophone.ui.activities;
import android.annotation.TargetApi;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.graphics.Palette;
@ -39,16 +38,16 @@ import com.kabouzeid.gramophone.misc.SmallObservableScrollViewCallbacks;
import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.model.Artist;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.model.UIPreferenceChangedEvent;
import com.kabouzeid.gramophone.model.UiPreferenceChangedEvent;
import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.koushikdutta.async.future.FutureCallback;
import com.koushikdutta.ion.Ion;
import com.nineoldandroids.view.ViewHelper;
import com.squareup.otto.Subscribe;
import com.squareup.picasso.Callback;
import com.squareup.picasso.Picasso;
import java.util.List;
@ -70,7 +69,7 @@ public class ArtistDetailActivity extends AbsFabActivity {
private ObservableListView songListView;
private View statusBar;
private ImageView artistIv;
private ImageView artistImage;
private View songsBackgroundView;
private TextView artistNameTv;
private Toolbar toolbar;
@ -93,7 +92,7 @@ public class ArtistDetailActivity extends AbsFabActivity {
float flexibleRange = artistImageViewHeight - headerOffset;
// Translate album cover
ViewHelper.setTranslationY(artistIv, Math.max(-artistImageViewHeight, -scrollY / 2));
ViewHelper.setTranslationY(artistImage, Math.max(-artistImageViewHeight, -scrollY / 2));
// Translate list background
ViewHelper.setTranslationY(songsBackgroundView, Math.max(0, -scrollY + artistImageViewHeight));
@ -127,7 +126,8 @@ public class ArtistDetailActivity extends AbsFabActivity {
App.bus.register(this);
if (Util.hasLollipopSDK()) postponeEnterTransition();
if (Util.hasLollipopSDK() && PreferenceUtils.getInstance(this).coloredNavigationBarArtistEnabled()) getWindow().setNavigationBarColor(Util.resolveColor(this, R.attr.default_bar_color));
if (Util.hasLollipopSDK() && PreferenceUtils.getInstance(this).coloredNavigationBarArtistEnabled())
getWindow().setNavigationBarColor(Util.resolveColor(this, R.attr.default_bar_color));
getIntentExtras();
initViews();
@ -140,7 +140,7 @@ public class ArtistDetailActivity extends AbsFabActivity {
}
private void initViews() {
artistIv = (ImageView) findViewById(R.id.artist_image);
artistImage = (ImageView) findViewById(R.id.artist_image);
toolbar = (Toolbar) findViewById(R.id.toolbar);
songListView = (ObservableListView) findViewById(R.id.list);
artistNameTv = (TextView) findViewById(R.id.artist_name);
@ -168,7 +168,7 @@ public class ArtistDetailActivity extends AbsFabActivity {
private void setUpViews() {
artistNameTv.setText(artist.name);
ViewUtil.addOnGlobalLayoutListener(artistIv, new Runnable() {
ViewUtil.addOnGlobalLayoutListener(artistImage, new Runnable() {
@Override
public void run() {
setUpArtistImageAndApplyPalette(false);
@ -180,8 +180,8 @@ public class ArtistDetailActivity extends AbsFabActivity {
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
private void setNavigationBarColored(boolean colored){
if (colored){
private void setNavigationBarColored(boolean colored) {
if (colored) {
if (Util.hasLollipopSDK()) getWindow().setNavigationBarColor(toolbarColor);
} else {
if (Util.hasLollipopSDK()) getWindow().setNavigationBarColor(Color.BLACK);
@ -248,18 +248,30 @@ public class ArtistDetailActivity extends AbsFabActivity {
private void setUpArtistImageAndApplyPalette(final boolean forceDownload) {
LastFMArtistImageUrlLoader.loadArtistImageUrl(this, artist.name, forceDownload, new LastFMArtistImageUrlLoader.ArtistImageUrlLoaderCallback() {
@Override
public void onArtistImageUrlLoaded(String url) {
Picasso.with(ArtistDetailActivity.this)
.load(url)
.placeholder(R.drawable.default_artist_image)
.into(artistIv, new Callback.EmptyCallback() {
@Override
public void onSuccess() {
super.onSuccess();
final Bitmap bitmap = ((BitmapDrawable) artistIv.getDrawable()).getBitmap();
if (bitmap != null) applyPalette(bitmap);
}
});
public void onArtistImageUrlLoaded(final String url) {
artistImage.post(new Runnable() {
@Override
public void run() {
Ion.with(ArtistDetailActivity.this)
.load(url)
.withBitmap()
.resize(artistImage.getWidth(), artistImage.getHeight())
.centerCrop()
.asBitmap()
.setCallback(new FutureCallback<Bitmap>() {
@Override
public void onCompleted(Exception e, Bitmap result) {
if (result != null) {
artistImage.setImageBitmap(result);
applyPalette(result);
} else {
artistImage.setImageResource(R.drawable.default_artist_image);
resetColors();
}
}
});
}
});
}
});
}
@ -277,14 +289,14 @@ public class ArtistDetailActivity extends AbsFabActivity {
if (Util.hasLollipopSDK() && PreferenceUtils.getInstance(ArtistDetailActivity.this).coloredNavigationBarArtistEnabled())
getWindow().setNavigationBarColor(swatch.getRgb());
} else {
setStandardColors();
resetColors();
}
}
});
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
private void setStandardColors() {
private void resetColors() {
int titleTextColor = Util.resolveColor(this, R.attr.title_text_color);
int defaultBarColor = Util.resolveColor(this, R.attr.default_bar_color);
@ -292,7 +304,8 @@ public class ArtistDetailActivity extends AbsFabActivity {
artistNameTv.setBackgroundColor(defaultBarColor);
artistNameTv.setTextColor(titleTextColor);
if (Util.hasLollipopSDK() && PreferenceUtils.getInstance(this).coloredNavigationBarArtistEnabled()) getWindow().setNavigationBarColor(Util.resolveColor(this, R.attr.default_bar_color));
if (Util.hasLollipopSDK() && PreferenceUtils.getInstance(this).coloredNavigationBarArtistEnabled())
getWindow().setNavigationBarColor(Util.resolveColor(this, R.attr.default_bar_color));
}
private void setUpToolBar() {
@ -398,9 +411,9 @@ public class ArtistDetailActivity extends AbsFabActivity {
}
@Subscribe
public void onUIPreferenceChanged(UIPreferenceChangedEvent event){
switch (event.getAction()){
case UIPreferenceChangedEvent.COLORED_NAVIGATION_BAR_ARTIST_CHANGED:
public void onUIPreferenceChanged(UiPreferenceChangedEvent event) {
switch (event.getAction()) {
case UiPreferenceChangedEvent.COLORED_NAVIGATION_BAR_ARTIST_CHANGED:
setNavigationBarColored((boolean) event.getValue());
break;
}

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

@ -29,7 +29,7 @@ import com.kabouzeid.gramophone.loader.ArtistSongLoader;
import com.kabouzeid.gramophone.loader.PlaylistSongLoader;
import com.kabouzeid.gramophone.model.MusicRemoteEvent;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.model.UIPreferenceChangedEvent;
import com.kabouzeid.gramophone.model.UiPreferenceChangedEvent;
import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
import com.kabouzeid.gramophone.ui.fragments.NavigationDrawerFragment;
import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.AbsMainActivityFragment;
@ -42,7 +42,7 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.squareup.picasso.Picasso;
import com.koushikdutta.ion.Ion;
import java.util.List;
@ -174,11 +174,12 @@ public class MainActivity extends AbsFabActivity
if (navigationDrawerFragment != null) {
Song song = MusicPlayerRemote.getCurrentSong();
if (song.id != -1) {
Picasso.with(this)
.load(MusicUtil.getAlbumArtUri(song.albumId))
.error(R.drawable.default_album_art)
.placeholder(R.drawable.default_album_art)
.into(navigationDrawerFragment.getAlbumArtImageView());
Ion.with(this)
.load(MusicUtil.getAlbumArtUri(song.albumId).toString())
.withBitmap()
.resize(navigationDrawerFragment.getAlbumArtImageView().getWidth(), navigationDrawerFragment.getAlbumArtImageView().getHeight())
.centerCrop()
.intoImageView(navigationDrawerFragment.getAlbumArtImageView());
navigationDrawerFragment.getSongTitle().setText(song.title);
navigationDrawerFragment.getSongArtist().setText(song.artistName);
}
@ -295,10 +296,10 @@ public class MainActivity extends AbsFabActivity
}
@Override
public void onUIPreferenceChangedEvent(UIPreferenceChangedEvent event) {
public void onUIPreferenceChangedEvent(UiPreferenceChangedEvent event) {
super.onUIPreferenceChangedEvent(event);
switch (event.getAction()) {
case UIPreferenceChangedEvent.TOOLBAR_TRANSPARENT_CHANGED:
case UiPreferenceChangedEvent.TOOLBAR_TRANSPARENT_CHANGED:
setToolBarTransparent((boolean) event.getValue());
break;
}

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

@ -3,12 +3,11 @@ package com.kabouzeid.gramophone.ui.activities;
import android.annotation.TargetApi;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.graphics.Palette;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@ -30,7 +29,7 @@ import com.kabouzeid.gramophone.loader.SongFilePathLoader;
import com.kabouzeid.gramophone.misc.AppKeys;
import com.kabouzeid.gramophone.model.MusicRemoteEvent;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.model.UIPreferenceChangedEvent;
import com.kabouzeid.gramophone.model.UiPreferenceChangedEvent;
import com.kabouzeid.gramophone.service.MusicService;
import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
import com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity;
@ -39,10 +38,10 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.koushikdutta.async.future.FutureCallback;
import com.koushikdutta.ion.Ion;
import com.nineoldandroids.view.ViewPropertyAnimator;
import com.squareup.otto.Subscribe;
import com.squareup.picasso.Callback;
import com.squareup.picasso.Picasso;
import java.io.File;
@ -71,6 +70,7 @@ public class MusicControllerActivity extends AbsFabActivity {
private boolean killThreads = false;
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
protected void onCreate(Bundle savedInstanceState) {
setUpTranslucence(true, false);
@ -258,23 +258,30 @@ public class MusicControllerActivity extends AbsFabActivity {
}
private void setUpAlbumArtAndApplyPalette() {
Picasso.with(this)
.load(MusicUtil.getAlbumArtUri(song.albumId))
.placeholder(R.drawable.default_album_art)
.into(albumArt, new Callback.EmptyCallback() {
@Override
public void onSuccess() {
super.onSuccess();
final Bitmap bitmap = ((BitmapDrawable) albumArt.getDrawable()).getBitmap();
if (bitmap != null) applyPalette(bitmap);
}
@Override
public void onError() {
super.onError();
setStandardColors();
}
});
albumArt.post(new Runnable() {
@Override
public void run() {
Ion.with(MusicControllerActivity.this)
.load(MusicUtil.getAlbumArtUri(song.albumId).toString())
.withBitmap()
.resize(albumArt.getWidth(), albumArt.getHeight())
.centerCrop()
.asBitmap()
.setCallback(new FutureCallback<Bitmap>() {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void onCompleted(Exception e, Bitmap result) {
if (result != null) {
albumArt.setImageBitmap(result);
applyPalette(result);
} else {
albumArt.setImageResource(R.drawable.default_album_art);
resetColors();
}
}
});
}
});
}
private void applyPalette(Bitmap bitmap) {
@ -287,13 +294,13 @@ public class MusicControllerActivity extends AbsFabActivity {
songTitle.setTextColor(swatch.getTitleTextColor());
songArtist.setTextColor(swatch.getBodyTextColor());
} else {
setStandardColors();
resetColors();
}
}
});
}
private void setStandardColors() {
private void resetColors() {
int songTitleTextColor = Util.resolveColor(this, R.attr.title_text_color);
int artistNameTextColor = Util.resolveColor(this, R.attr.caption_text_color);
int defaultBarColor = Util.resolveColor(this, R.attr.default_bar_color);
@ -322,11 +329,9 @@ public class MusicControllerActivity extends AbsFabActivity {
LastFMArtistImageUrlLoader.loadArtistImageUrl(this, song.artistName, false, new LastFMArtistImageUrlLoader.ArtistImageUrlLoaderCallback() {
@Override
public void onArtistImageUrlLoaded(String url) {
Picasso.with(MusicControllerActivity.this)
.load(url)
.placeholder(R.drawable.default_artist_image)
Ion.with(artistArt)
.error(R.drawable.default_artist_image)
.into(artistArt);
.load(url);
}
});
}
@ -467,9 +472,9 @@ public class MusicControllerActivity extends AbsFabActivity {
}
@Subscribe
public void onUIPrefsChanged(UIPreferenceChangedEvent event) {
public void onUIPrefsChanged(UiPreferenceChangedEvent event) {
switch (event.getAction()) {
case UIPreferenceChangedEvent.PLAYBACK_CONTROLLER_CARD_CHANGED:
case UiPreferenceChangedEvent.PLAYBACK_CONTROLLER_CARD_CHANGED:
setUpBox((boolean) event.getValue());
break;
}

14
app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java
View file

@ -14,7 +14,7 @@ import android.view.MenuItem;
import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.model.UIPreferenceChangedEvent;
import com.kabouzeid.gramophone.model.UiPreferenceChangedEvent;
import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
import com.kabouzeid.gramophone.util.NavigationUtil;
@ -57,7 +57,7 @@ public class SettingsActivity extends AbsBaseActivity {
@Override
public boolean onPreferenceChange(Preference preference, Object o) {
setSummary(generalTheme, o);
App.bus.post(new UIPreferenceChangedEvent(UIPreferenceChangedEvent.THEME_CHANGED, o));
App.bus.post(new UiPreferenceChangedEvent(UiPreferenceChangedEvent.THEME_CHANGED, o));
return true;
}
});
@ -65,7 +65,7 @@ public class SettingsActivity extends AbsBaseActivity {
findPreference("transparent_toolbar").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object o) {
App.bus.post(new UIPreferenceChangedEvent(UIPreferenceChangedEvent.TOOLBAR_TRANSPARENT_CHANGED, o));
App.bus.post(new UiPreferenceChangedEvent(UiPreferenceChangedEvent.TOOLBAR_TRANSPARENT_CHANGED, o));
return true;
}
});
@ -73,7 +73,7 @@ public class SettingsActivity extends AbsBaseActivity {
findPreference("colored_album_footers").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object o) {
App.bus.post(new UIPreferenceChangedEvent(UIPreferenceChangedEvent.ALBUM_OVERVIEW_PALETTE_CHANGED, o));
App.bus.post(new UiPreferenceChangedEvent(UiPreferenceChangedEvent.ALBUM_OVERVIEW_PALETTE_CHANGED, o));
return true;
}
});
@ -81,7 +81,7 @@ public class SettingsActivity extends AbsBaseActivity {
findPreference("colored_navigation_bar_artist").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object o) {
App.bus.post(new UIPreferenceChangedEvent(UIPreferenceChangedEvent.COLORED_NAVIGATION_BAR_ARTIST_CHANGED, o));
App.bus.post(new UiPreferenceChangedEvent(UiPreferenceChangedEvent.COLORED_NAVIGATION_BAR_ARTIST_CHANGED, o));
return true;
}
});
@ -89,7 +89,7 @@ public class SettingsActivity extends AbsBaseActivity {
findPreference("colored_navigation_bar_album").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object o) {
App.bus.post(new UIPreferenceChangedEvent(UIPreferenceChangedEvent.COLORED_NAVIGATION_BAR_ALBUM_CHANGED, o));
App.bus.post(new UiPreferenceChangedEvent(UiPreferenceChangedEvent.COLORED_NAVIGATION_BAR_ALBUM_CHANGED, o));
return true;
}
});
@ -97,7 +97,7 @@ public class SettingsActivity extends AbsBaseActivity {
findPreference("playback_controller_card").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object o) {
App.bus.post(new UIPreferenceChangedEvent(UIPreferenceChangedEvent.PLAYBACK_CONTROLLER_CARD_CHANGED, o));
App.bus.post(new UiPreferenceChangedEvent(UiPreferenceChangedEvent.PLAYBACK_CONTROLLER_CARD_CHANGED, o));
return true;
}
});

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

@ -9,7 +9,7 @@ import com.crashlytics.android.Crashlytics;
import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble;
import com.kabouzeid.gramophone.misc.AppKeys;
import com.kabouzeid.gramophone.model.UIPreferenceChangedEvent;
import com.kabouzeid.gramophone.model.UiPreferenceChangedEvent;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.squareup.otto.Subscribe;
@ -22,7 +22,7 @@ public abstract class AbsBaseActivity extends ActionBarActivity implements KabVi
private boolean areViewsEnabled;
private Object uiPreferenceChangeListener = new Object() {
@Subscribe
public void onUIPreferenceChangedEvent(UIPreferenceChangedEvent event) {
public void onUIPreferenceChangedEvent(UiPreferenceChangedEvent event) {
AbsBaseActivity.this.onUIPreferenceChangedEvent(event);
}
};
@ -54,9 +54,9 @@ public abstract class AbsBaseActivity extends ActionBarActivity implements KabVi
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public void onUIPreferenceChangedEvent(UIPreferenceChangedEvent event) {
public void onUIPreferenceChangedEvent(UiPreferenceChangedEvent event) {
switch (event.getAction()) {
case UIPreferenceChangedEvent.THEME_CHANGED:
case UiPreferenceChangedEvent.THEME_CHANGED:
recreate();
break;
}

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

@ -27,6 +27,7 @@ import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.koushikdutta.ion.Ion;
import com.melnykov.fab.FloatingActionButton;
import com.nineoldandroids.view.ViewHelper;
import com.nineoldandroids.view.ViewPropertyAnimator;
@ -335,6 +336,11 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
}
if (deleteArtwork) {
MusicUtil.deleteAlbumArt(AbsTagEditorActivity.this, getId());
Ion.getDefault(AbsTagEditorActivity.this).getBitmapCache().clear();
Ion.getDefault(AbsTagEditorActivity.this).getCache().clear();
} else if (artwork != null){
Ion.getDefault(AbsTagEditorActivity.this).getBitmapCache().clear();
Ion.getDefault(AbsTagEditorActivity.this).getCache().clear();
}
progressDialog.dismiss();
rescanMedia();

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

@ -1,7 +1,6 @@
package com.kabouzeid.gramophone.ui.activities.tageditor;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.text.Editable;
@ -16,8 +15,8 @@ import com.kabouzeid.gramophone.loader.AlbumSongLoader;
import com.kabouzeid.gramophone.loader.SongFilePathLoader;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.squareup.picasso.Picasso;
import com.squareup.picasso.Target;
import com.koushikdutta.async.future.FutureCallback;
import com.koushikdutta.ion.Ion;
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.images.Artwork;
@ -96,36 +95,30 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
LastFMAlbumImageUrlLoader.loadAlbumImageUrl(this, albumTitleStr, albumArtistNameStr, new LastFMAlbumImageUrlLoader.AlbumImageUrlLoaderCallback() {
@Override
public void onAlbumImageUrlLoaded(String url) {
Picasso.with(AlbumTagEditorActivity.this)
Ion.with(AlbumTagEditorActivity.this)
.load(url)
.withBitmap()
.resize(500, 500)
.centerCrop()
.onlyScaleDown()
.into(new Target() {
.asBitmap()
.setCallback(new FutureCallback<Bitmap>() {
@Override
public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom from) {
albumArtBitmap = bitmap;
setImageBitmap(albumArtBitmap);
deleteAlbumArt = false;
dataChanged();
Toast.makeText(AlbumTagEditorActivity.this, "Success.", Toast.LENGTH_SHORT).show();
}
@Override
public void onBitmapFailed(Drawable errorDrawable) {
Toast.makeText(AlbumTagEditorActivity.this, "Failed.", Toast.LENGTH_SHORT).show();
}
@Override
public void onPrepareLoad(Drawable placeHolderDrawable) {
public void onCompleted(Exception e, Bitmap result) {
if(result != null) {
albumArtBitmap = result;
setImageBitmap(albumArtBitmap);
deleteAlbumArt = false;
dataChanged();
} else {
//TODO Toast failed message
}
}
});
}
@Override
public void onError() {
Toast.makeText(AlbumTagEditorActivity.this, "Failed.", Toast.LENGTH_SHORT).show();
//TODO Toast failed message
}
}
);
@ -192,28 +185,21 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
@Override
protected void loadImageFromFile(final Uri selectedFileUri) {
Picasso.with(this)
.load(selectedFileUri)
Ion.with(this)
.load(selectedFileUri.toString())
.withBitmap()
.resize(500, 500)
.centerCrop()
.onlyScaleDown()
.into(new Target() {
.asBitmap()
.setCallback(new FutureCallback<Bitmap>() {
@Override
public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom from) {
albumArtBitmap = bitmap;
setImageBitmap(albumArtBitmap);
deleteAlbumArt = false;
dataChanged();
}
@Override
public void onBitmapFailed(Drawable errorDrawable) {
//TODO Toast could not read file
}
@Override
public void onPrepareLoad(Drawable placeHolderDrawable) {
public void onCompleted(Exception e, Bitmap result) {
if (result != null) {
albumArtBitmap = result;
setImageBitmap(albumArtBitmap);
deleteAlbumArt = false;
dataChanged();
}
}
});
}