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

Improve image loading in the notification, the widget and the lockscreen album art by moving stuff to worker thread and adjusting the bitmap size which should also prevent the to large bitmap exception currently occurring in the widget for some devices.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-07-11 00:34:25 +02:00
commit 9d4ea9911f
7 changed files with 98 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

55
app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
View file

@ -18,12 +18,14 @@ import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.service.MusicService;
import com.kabouzeid.gramophone.ui.activities.MainActivity;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
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 com.nostra13.universalimageloader.core.process.BitmapProcessor;
public class WidgetMedium extends AppWidgetProvider {
private static RemoteViews widgetLayout;
@ -66,33 +68,40 @@ public class WidgetMedium extends AppWidgetProvider {
private static void loadAlbumArt(@NonNull final Context context, @Nullable final Song song) {
if (song != null) {
int widgetImageSize = context.getResources().getDimensionPixelSize(R.dimen.widget_medium_image_size);
currentAlbumArtUri = MusicUtil.getSongImageLoaderString(song);
ImageLoader.getInstance().displayImage(currentAlbumArtUri, new NonViewAware(new ImageSize(-1, -1), ViewScaleType.CROP), new SimpleImageLoadingListener() {
@Override
public void onLoadingComplete(String imageUri, View view, @Nullable Bitmap loadedImage) {
if (currentAlbumArtUri.equals(imageUri)) {
if (loadedImage != null) {
// The RemoteViews might wants to recycle the bitmaps thrown at it, so we need
// to make sure not to hand out our cache copy
Bitmap.Config config = loadedImage.getConfig();
if (config == null) {
config = Bitmap.Config.ARGB_8888;
ImageLoader.getInstance().displayImage(
currentAlbumArtUri,
new NonViewAware(new ImageSize(widgetImageSize, widgetImageSize), ViewScaleType.CROP),
new DisplayImageOptions.Builder()
.postProcessor(new BitmapProcessor() {
@Override
public Bitmap process(Bitmap bitmap) {
// The RemoteViews might wants to recycle the bitmaps thrown at it, so we need
// to make sure not to hand out our cache copy
Bitmap.Config config = bitmap.getConfig();
if (config == null) {
config = Bitmap.Config.ARGB_8888;
}
bitmap = bitmap.copy(config, false);
return bitmap.copy(bitmap.getConfig(), true);
}
}).build(),
new SimpleImageLoadingListener() {
@Override
public void onLoadingComplete(String imageUri, View view, @Nullable Bitmap loadedImage) {
if (currentAlbumArtUri.equals(imageUri)) {
setAlbumArt(context, loadedImage);
}
loadedImage = loadedImage.copy(config, false);
setAlbumArt(context, loadedImage.copy(loadedImage.getConfig(), true));
} else {
setAlbumArt(context, null);
}
}
}
@Override
public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
if (currentAlbumArtUri.equals(imageUri)) {
setAlbumArt(context, null);
}
}
});
@Override
public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
if (currentAlbumArtUri.equals(imageUri)) {
setAlbumArt(context, null);
}
}
});
}
}

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

@ -46,7 +46,7 @@ public class PlayingNotificationHelper {
@NonNull
private final NotificationManager notificationManager;
@Nullable
private Notification notification = null;
private Notification notification;
private RemoteViews notificationLayout;
private RemoteViews notificationLayoutExpanded;
@ -59,6 +59,8 @@ public class PlayingNotificationHelper {
private boolean isReceiverRegistered;
private boolean isNotificationShown;
private int bigNotificationImageSize;
@NonNull
final IntentFilter intentFilter;
@ -69,6 +71,8 @@ public class PlayingNotificationHelper {
intentFilter = new IntentFilter();
intentFilter.addAction(ACTION_NOTIFICATION_COLOR_PREFERENCE_CHANGED);
bigNotificationImageSize = service.getResources().getDimensionPixelSize(R.dimen.notification_big_image_size);
}
@NonNull
@ -211,19 +215,22 @@ public class PlayingNotificationHelper {
private void loadAlbumArt() {
currentAlbumArtUri = MusicUtil.getSongImageLoaderString(currentSong);
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))
setAlbumArt(loadedImage);
}
ImageLoader.getInstance().displayImage(
currentAlbumArtUri,
new NonViewAware(new ImageSize(bigNotificationImageSize, bigNotificationImageSize), ViewScaleType.CROP),
new SimpleImageLoadingListener() {
@Override
public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
if (currentAlbumArtUri.equals(imageUri))
setAlbumArt(loadedImage);
}
@Override
public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
if (currentAlbumArtUri.equals(imageUri))
setAlbumArt(null);
}
});
@Override
public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
if (currentAlbumArtUri.equals(imageUri))
setAlbumArt(null);
}
});
}
private void setAlbumArt(@Nullable Bitmap albumArt) {
@ -244,7 +251,9 @@ public class PlayingNotificationHelper {
}
}
notificationManager.notify(NOTIFICATION_ID, notification);
if (notification != null) {
notificationManager.notify(NOTIFICATION_ID, notification);
}
}
private void setBackgroundColor(int color) {

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

@ -38,12 +38,14 @@ import com.kabouzeid.gramophone.provider.RecentlyPlayedStore;
import com.kabouzeid.gramophone.provider.SongPlayCountStore;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
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 com.nostra13.universalimageloader.core.process.BitmapProcessor;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@ -438,33 +440,38 @@ public class MusicService extends Service {
.apply();
if (showAlbumArt) {
final String currentAlbumArtUri = MusicUtil.getSongImageLoaderString(song);
ImageLoader.getInstance().displayImage(currentAlbumArtUri, new NonViewAware(new ImageSize(-1, -1), ViewScaleType.CROP), new SimpleImageLoadingListener() {
@Override
public void onLoadingComplete(String imageUri, View view, @Nullable Bitmap loadedImage) {
if (!currentAlbumArtUri.equals(imageUri)) {
return;
}
if (loadedImage == null) {
onLoadingFailed(imageUri, view, null);
return;
}
// RemoteControlClient wants to recycle the bitmaps thrown at it, so we need
// to make sure not to hand out our cache copy
Bitmap.Config config = loadedImage.getConfig();
if (config == null) {
config = Bitmap.Config.ARGB_8888;
}
loadedImage = loadedImage.copy(config, false);
updateRemoteControlClientBitmap(loadedImage.copy(loadedImage.getConfig(), true));
}
ImageLoader.getInstance().displayImage(
currentAlbumArtUri,
new NonViewAware(new ImageSize(-1, -1), ViewScaleType.CROP),
new DisplayImageOptions.Builder()
.postProcessor(new BitmapProcessor() {
@Override
public Bitmap process(Bitmap bitmap) {
// RemoteControlClient wants to recycle the bitmaps thrown at it, so we need
// to make sure not to hand out our cache copy
Bitmap.Config config = bitmap.getConfig();
if (config == null) {
config = Bitmap.Config.ARGB_8888;
}
bitmap = bitmap.copy(config, false);
return bitmap.copy(bitmap.getConfig(), true);
}
}).build(),
new SimpleImageLoadingListener() {
@Override
public void onLoadingComplete(String imageUri, View view, @Nullable Bitmap loadedImage) {
if (currentAlbumArtUri.equals(imageUri)) {
updateRemoteControlClientBitmap(loadedImage);
}
}
@Override
public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
if (currentAlbumArtUri.equals(imageUri)) {
updateRemoteControlClientBitmap(null);
}
}
});
@Override
public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
if (currentAlbumArtUri.equals(imageUri)) {
updateRemoteControlClientBitmap(null);
}
}
});
} else {
updateRemoteControlClientBitmap(null);
}

4
app/src/main/res/layout/notification_controller_big.xml
View file

@ -23,8 +23,8 @@
<ImageView
android:id="@+id/icon"
android:layout_width="128dp"
android:layout_height="128dp"
android:layout_width="@dimen/notification_big_image_size"
android:layout_height="@dimen/notification_big_image_size"
android:scaleType="centerCrop"
tools:ignore="ContentDescription" />

4
app/src/main/res/layout/notification_controller_big_colored.xml
View file

@ -24,8 +24,8 @@
<ImageView
android:id="@+id/icon"
android:layout_width="128dp"
android:layout_height="128dp"
android:layout_width="@dimen/notification_big_image_size"
android:layout_height="@dimen/notification_big_image_size"
android:scaleType="centerCrop"
tools:ignore="ContentDescription" />

4
app/src/main/res/layout/widget_medium.xml
View file

@ -7,8 +7,8 @@
<ImageView
android:id="@+id/album_art"
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_width="@dimen/widget_medium_image_size"
android:layout_height="@dimen/widget_medium_image_size"
android:scaleType="centerCrop"
android:src="@drawable/default_album_art" />

12
app/src/main/res/values/dimens.xml
View file

@ -17,12 +17,6 @@
<dimen name="status_bar_padding">0dp</dimen>
<!-- Notification template -->
<dimen name="notification_big_icon_height">64.0dip</dimen>
<dimen name="notification_big_icon_width">64.0dip</dimen>
<dimen name="notification_info_container_padding_left">8.0dip</dimen>
<dimen name="notification_info_container_padding_bottom">4.0dip</dimen>
<dimen name="tab_height">48dp</dimen>
<dimen name="tagEditorHeaderVariableSpace">100dp</dimen>
@ -31,8 +25,6 @@
Refer to App Widget Documentation for margin information
http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
-->
<dimen name="app_widget_small_artwork_height">64dp</dimen>
<dimen name="pause_bar_width">5dp</dimen>
<dimen name="pause_bar_distance">4dp</dimen>
<dimen name="pause_bar_height">14dp</dimen>
@ -48,7 +40,9 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
<dimen name="seek_bar_margin_left_right">-17dp</dimen>
<dimen name="list_padding_vertical">2dp</dimen>
<dimen name="notification_albumart_size">128dp</dimen>
<dimen name="widget_medium_image_size">96dp</dimen>
<dimen name="notification_big_image_size">128dp</dimen>
<dimen name="bottom_offset_fab_activity">86dp</dimen>
<dimen name="scrollbar_width">8dp</dimen>