From 5ca6bd5617ee26bbfa0ddcea1ab7d39efd40f84b Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Fri, 17 Apr 2015 12:13:15 +0200 Subject: [PATCH] Fixed issue navigation drawer hero don't show default album art and made the transition between navigation drawer and MusicControllerActivity fluid by using basically the same bitmap and let android do the center crop stuff --- .../gramophone/ui/activities/MainActivity.java | 16 +++++++++++++--- .../ui/activities/MusicControllerActivity.java | 3 +-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java index 574a88bd..36b38105 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java @@ -2,6 +2,7 @@ package com.kabouzeid.gramophone.ui.activities; import android.content.Intent; import android.content.res.Configuration; +import android.graphics.Bitmap; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -44,6 +45,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.koushikdutta.async.future.FutureCallback; import com.koushikdutta.ion.Ion; import java.util.ArrayList; @@ -189,9 +191,17 @@ public class MainActivity extends AbsFabActivity Ion.with(this) .load(MusicUtil.getAlbumArtUri(song.albumId).toString()) .withBitmap() - .resize(navigationDrawerFragment.getAlbumArtImageView().getWidth(), navigationDrawerFragment.getAlbumArtImageView().getHeight()) - .centerCrop() - .intoImageView(navigationDrawerFragment.getAlbumArtImageView()); + .smartSize(false) + .asBitmap() + .setCallback(new FutureCallback() { + @Override + public void onCompleted(Exception e, Bitmap result) { + if (result != null) + navigationDrawerFragment.getAlbumArtImageView().setImageBitmap(result); + else + navigationDrawerFragment.getAlbumArtImageView().setImageResource(R.drawable.default_album_art); + } + }); navigationDrawerFragment.getSongTitle().setText(song.title); navigationDrawerFragment.getSongArtist().setText(song.artistName); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java index 547db9c5..186d9988 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java @@ -280,8 +280,7 @@ public class MusicControllerActivity extends AbsFabActivity { Ion.with(MusicControllerActivity.this) .load(MusicUtil.getAlbumArtUri(song.albumId).toString()) .withBitmap() - .resize(albumArt.getWidth(), albumArt.getHeight()) - .centerCrop() + .smartSize(false) .asBitmap() .setCallback(new FutureCallback() { @TargetApi(Build.VERSION_CODES.LOLLIPOP)