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

Merge branch 'master' into multi-select

Browse source
This commit is contained in:
Karim Abou Zeid 2015-05-24 16:05:38 +02:00
commit 9835c595b2
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -24,8 +24,8 @@ android {
applicationId "com.kabouzeid.gramophone" applicationId "com.kabouzeid.gramophone"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 22 targetSdkVersion 22
versionCode 25 versionCode 26
versionName "0.9.10b" versionName "0.9.10.1b"
} }
compileOptions { compileOptions {

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

@ -67,11 +67,13 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
new SimpleImageLoadingListener() { new SimpleImageLoadingListener() {
@Override @Override
public void onLoadingFailed(String imageUri, View view, FailReason failReason) { public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
if (usePalette)
paletteBlackAndWhite(holder.title, holder.artist, holder.footer); paletteBlackAndWhite(holder.title, holder.artist, holder.footer);
} }
@Override @Override
public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) { public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
if (usePalette)
applyPalette(loadedImage, holder.title, holder.artist, holder.footer); applyPalette(loadedImage, holder.title, holder.artist, holder.footer);
} }
} }