Removed search button on main tab, it was redundant, added Exit button. Removed Help and Settings from remaining tabs. Start redesign of the Download tab

This commit is contained in:
Joshua Bahnsen 2012-05-29 18:11:58 -07:00
parent feca33c9ac
commit 97890e8929
9 changed files with 330 additions and 385 deletions

View File

@ -189,12 +189,13 @@
a:layout_alignParentLeft="true"
a:layout_toLeftOf="@+id/download_control_layout"
>
<FrameLayout
a:id="@+id/download_album_art_layout"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:background="@drawable/album_art_background">
a:id="@+id/download_album_art_layout"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:background="@drawable/pinstripe_tile" >
<ImageView
a:id="@+id/download_album_art_image"
a:layout_width="wrap_content"

View File

@ -9,14 +9,14 @@
a:layout_width="fill_parent"
a:layout_height="0dip"
a:layout_weight="1">
<RelativeLayout
a:id="@+id/download_album_art_layout"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:layout_weight="1"
a:background="@drawable/album_art_background">
a:id="@+id/download_album_art_layout"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:layout_weight="1"
a:background="@drawable/pinstripe_tile"
a:orientation="vertical" >
<ImageButton
a:id="@+id/download_repeat"

View File

@ -52,7 +52,7 @@
a:scaleType="center"
a:showAsAction="ifRoom|withText"
a:src="@drawable/ic_menu_help" />
<ImageButton
a:id="@+id/action_button_4"
a:layout_width="wrap_content"
@ -63,8 +63,8 @@
a:padding="5dp"
a:scaleType="center"
a:showAsAction="ifRoom|withText"
a:src="@drawable/ic_menu_settings" />
a:src="@drawable/ic_menu_exit" />
<ImageButton
a:id="@+id/action_button_1"
a:layout_width="wrap_content"
@ -75,8 +75,8 @@
a:padding="5dp"
a:scaleType="center"
a:showAsAction="ifRoom|withText"
a:src="@drawable/ic_menu_search" />
a:src="@drawable/ic_menu_shuffle" />
<ImageButton
a:id="@+id/action_button_2"
a:layout_width="wrap_content"
@ -87,6 +87,6 @@
a:padding="5dp"
a:scaleType="center"
a:showAsAction="ifRoom|withText"
a:src="@drawable/ic_menu_shuffle" />
a:src="@drawable/ic_menu_settings" />
</RelativeLayout>

View File

@ -118,20 +118,8 @@ public class MainActivity extends SubsonicTabActivity {
// Title: Subsonic
setTitle(R.string.common_appname);
// Button 1: search
ImageButton actionSearchButton = (ImageButton)findViewById(R.id.action_button_1);
actionSearchButton.setImageResource(R.drawable.ic_menu_search);
actionSearchButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(MainActivity.this, SearchActivity.class);
intent.putExtra(Constants.INTENT_EXTRA_REQUEST_SEARCH, true);
Util.startActivityWithoutTransition(MainActivity.this, intent);
}
});
// Button 2: shuffle
ImageButton actionShuffleButton = (ImageButton)findViewById(R.id.action_button_2);
// Button 1: shuffle
ImageButton actionShuffleButton = (ImageButton)findViewById(R.id.action_button_1);
actionShuffleButton.setImageResource(R.drawable.ic_menu_shuffle);
actionShuffleButton.setOnClickListener(new View.OnClickListener() {
@Override
@ -141,7 +129,17 @@ public class MainActivity extends SubsonicTabActivity {
Util.startActivityWithoutTransition(MainActivity.this, intent);
}
});
// Button 2: settings
ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_2);
actionSettingsButton.setImageResource(R.drawable.ic_menu_settings);
actionSettingsButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(MainActivity.this, SettingsActivity.class));
}
});
// Button 3: help
ImageButton actionHelpButton = (ImageButton)findViewById(R.id.action_button_3);
actionHelpButton.setImageResource(R.drawable.ic_menu_help);
@ -151,14 +149,14 @@ public class MainActivity extends SubsonicTabActivity {
startActivity(new Intent(MainActivity.this, HelpActivity.class));
}
});
// Button 4: settings
ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_4);
actionSettingsButton.setImageResource(R.drawable.ic_menu_settings);
actionSettingsButton.setOnClickListener(new View.OnClickListener() {
// Button 4: exit
ImageButton actionSearchButton = (ImageButton)findViewById(R.id.action_button_4);
actionSearchButton.setImageResource(R.drawable.ic_menu_exit);
actionSearchButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(MainActivity.this, SettingsActivity.class));
exit();
}
});

View File

@ -138,8 +138,14 @@ public class SearchActivity extends SubsonicTabActivity {
// Button 1: gone
findViewById(R.id.action_button_1).setVisibility(View.GONE);
// Button 2: search
final ImageButton actionSearchButton = (ImageButton)findViewById(R.id.action_button_2);
// Button 2: gone
findViewById(R.id.action_button_2).setVisibility(View.GONE);
// Button 3: gone
findViewById(R.id.action_button_3).setVisibility(View.GONE);
// Button 4: search
final ImageButton actionSearchButton = (ImageButton)findViewById(R.id.action_button_4);
actionSearchButton.setImageResource(R.drawable.ic_menu_search);
actionSearchButton.setOnClickListener(new View.OnClickListener() {
@Override
@ -147,26 +153,6 @@ public class SearchActivity extends SubsonicTabActivity {
onSearchRequested();
}
});
// Button 3: help
ImageButton actionHelpButton = (ImageButton)findViewById(R.id.action_button_3);
actionHelpButton.setImageResource(R.drawable.ic_menu_help);
actionHelpButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(SearchActivity.this, HelpActivity.class));
}
});
// Button 4: settings
ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_4);
actionSettingsButton.setImageResource(R.drawable.ic_menu_settings);
actionSettingsButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(SearchActivity.this, SettingsActivity.class));
}
});
onNewIntent(getIntent());
}

View File

@ -170,8 +170,14 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
getMusicDirectory(id, name);
}
// Button 1: play all
playAllButton = (ImageButton) findViewById(R.id.action_button_1);
// Button 1: gone
findViewById(R.id.action_button_1).setVisibility(View.GONE);
// Button 2: gone
findViewById(R.id.action_button_2).setVisibility(View.GONE);
// Button 3: play all
playAllButton = (ImageButton) findViewById(R.id.action_button_3);
playAllButton.setImageResource(R.drawable.ic_menu_play_all);
playAllButton.setVisibility(View.GONE);
playAllButton.setOnClickListener(new View.OnClickListener() {
@ -181,8 +187,8 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
}
});
// Button 2: refresh
ImageButton refreshButton = (ImageButton) findViewById(R.id.action_button_2);
// Button 4: refresh
ImageButton refreshButton = (ImageButton) findViewById(R.id.action_button_4);
refreshButton.setImageResource(R.drawable.ic_menu_refresh);
refreshButton.setOnClickListener(new View.OnClickListener() {
@Override
@ -190,26 +196,6 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
refresh();
}
});
// Button 3: help
ImageButton actionHelpButton = (ImageButton)findViewById(R.id.action_button_3);
actionHelpButton.setImageResource(R.drawable.ic_menu_help);
actionHelpButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(SelectAlbumActivity.this, HelpActivity.class));
}
});
// Button 4: settings
ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_4);
actionSettingsButton.setImageResource(R.drawable.ic_menu_settings);
actionSettingsButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(SelectAlbumActivity.this, SettingsActivity.class));
}
});
}
private void playAll() {

View File

@ -76,8 +76,14 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter
setTitle(Util.isOffline(this) ? R.string.music_library_label_offline : R.string.music_library_label);
// Button 1: shuffle
ImageButton shuffleButton = (ImageButton) findViewById(R.id.action_button_1);
// Button 1: gone
findViewById(R.id.action_button_1).setVisibility(View.GONE);
// Button 2: gone
findViewById(R.id.action_button_2).setVisibility(View.GONE);
// Button 3: shuffle
ImageButton shuffleButton = (ImageButton) findViewById(R.id.action_button_3);
shuffleButton.setImageResource(R.drawable.ic_menu_shuffle);
shuffleButton.setOnClickListener(new View.OnClickListener() {
@Override
@ -88,8 +94,8 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter
}
});
// Button 2: refresh
ImageButton refreshButton = (ImageButton) findViewById(R.id.action_button_2);
// Button 4: refresh
ImageButton refreshButton = (ImageButton) findViewById(R.id.action_button_4);
refreshButton.setImageResource(R.drawable.ic_menu_refresh);
refreshButton.setOnClickListener(new View.OnClickListener() {
@Override
@ -97,26 +103,8 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter
refresh();
}
});
// Button 3: help
ImageButton actionHelpButton = (ImageButton)findViewById(R.id.action_button_3);
actionHelpButton.setImageResource(R.drawable.ic_menu_help);
actionHelpButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(SelectArtistActivity.this, HelpActivity.class));
}
});
// Button 4: settings
ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_4);
actionSettingsButton.setImageResource(R.drawable.ic_menu_settings);
actionSettingsButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(SelectArtistActivity.this, SettingsActivity.class));
}
});
musicFolders = null;
load();

View File

@ -60,12 +60,17 @@ public class SelectPlaylistActivity extends SubsonicTabActivity implements Adapt
// Title: Playlists
setTitle(R.string.playlist_label);
// Button 1: gone
ImageButton searchButton = (ImageButton)findViewById(R.id.action_button_1);
searchButton.setVisibility(View.GONE);
// Button 1: gone
findViewById(R.id.action_button_1).setVisibility(View.GONE);
// Button 2: refresh
ImageButton refreshButton = (ImageButton) findViewById(R.id.action_button_2);
// Button 2: gone
findViewById(R.id.action_button_2).setVisibility(View.GONE);
// Button 3: gone
findViewById(R.id.action_button_3).setVisibility(View.GONE);
// Button 4: refresh
ImageButton refreshButton = (ImageButton) findViewById(R.id.action_button_4);
refreshButton.setImageResource(R.drawable.ic_menu_refresh);
refreshButton.setOnClickListener(new View.OnClickListener() {
@Override
@ -73,26 +78,6 @@ public class SelectPlaylistActivity extends SubsonicTabActivity implements Adapt
refresh();
}
});
// Button 3: help
ImageButton actionHelpButton = (ImageButton)findViewById(R.id.action_button_3);
actionHelpButton.setImageResource(R.drawable.ic_menu_help);
actionHelpButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(SelectPlaylistActivity.this, HelpActivity.class));
}
});
// Button 4: settings
ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_4);
actionSettingsButton.setImageResource(R.drawable.ic_menu_settings);
actionSettingsButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(SelectPlaylistActivity.this, SettingsActivity.class));
}
});
load();
}

View File

@ -1,252 +1,253 @@
/*
This file is part of Subsonic.
Subsonic is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Subsonic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
Copyright 2009 (C) Sindre Mehus
*/
package net.sourceforge.subsonic.androidapp.util;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.LinearGradient;
import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Shader;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.TransitionDrawable;
import android.os.Handler;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import net.sourceforge.subsonic.androidapp.R;
import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
import net.sourceforge.subsonic.androidapp.service.MusicService;
import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
/**
* Asynchronous loading of images, with caching.
* <p/>
* There should normally be only one instance of this class.
*
* @author Sindre Mehus
*/
public class ImageLoader implements Runnable {
private static final String TAG = ImageLoader.class.getSimpleName();
private static final int CONCURRENCY = 5;
private final LRUCache<String, Drawable> cache = new LRUCache<String, Drawable>(100);
private final BlockingQueue<Task> queue;
private final int imageSizeDefault;
private final int imageSizeLarge;
private Drawable largeUnknownImage;
public ImageLoader(Context context) {
queue = new LinkedBlockingQueue<Task>(500);
// Determine the density-dependent image sizes.
imageSizeDefault = context.getResources().getDrawable(R.drawable.unknown_album).getIntrinsicHeight();
DisplayMetrics metrics = context.getResources().getDisplayMetrics();
imageSizeLarge = (int) Math.round(Math.min(metrics.widthPixels, metrics.heightPixels) * 0.6);
for (int i = 0; i < CONCURRENCY; i++) {
new Thread(this, "ImageLoader").start();
}
createLargeUnknownImage(context);
}
private void createLargeUnknownImage(Context context) {
BitmapDrawable drawable = (BitmapDrawable) context.getResources().getDrawable(R.drawable.unknown_album_large);
Bitmap bitmap = Bitmap.createScaledBitmap(drawable.getBitmap(), imageSizeLarge, imageSizeLarge, true);
bitmap = createReflection(bitmap);
largeUnknownImage = Util.createDrawableFromBitmap(context, bitmap);
}
public void loadImage(View view, MusicDirectory.Entry entry, boolean large, boolean crossfade) {
if (entry == null || entry.getCoverArt() == null) {
setUnknownImage(view, large);
return;
}
int size = large ? imageSizeLarge : imageSizeDefault;
Drawable drawable = cache.get(getKey(entry.getCoverArt(), size));
if (drawable != null) {
setImage(view, drawable, large);
return;
}
if (!large) {
setUnknownImage(view, large);
}
queue.offer(new Task(view, entry, size, large, large, crossfade));
}
private String getKey(String coverArtId, int size) {
return coverArtId + size;
}
private void setImage(View view, Drawable drawable, boolean crossfade) {
if (view instanceof TextView) {
// Cross-fading is not implemented for TextView since it's not in use. It would be easy to add it, though.
TextView textView = (TextView) view;
textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
} else if (view instanceof ImageView) {
ImageView imageView = (ImageView) view;
if (crossfade) {
Drawable existingDrawable = imageView.getDrawable();
if (existingDrawable == null) {
Bitmap emptyImage = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
existingDrawable = new BitmapDrawable(emptyImage);
}
Drawable[] layers = new Drawable[]{existingDrawable, drawable};
TransitionDrawable transitionDrawable = new TransitionDrawable(layers);
imageView.setImageDrawable(transitionDrawable);
transitionDrawable.startTransition(250);
} else {
imageView.setImageDrawable(drawable);
}
}
}
private void setUnknownImage(View view, boolean large) {
if (large) {
setImage(view, largeUnknownImage, false);
} else {
if (view instanceof TextView) {
((TextView) view).setCompoundDrawablesWithIntrinsicBounds(R.drawable.unknown_album, 0, 0, 0);
} else if (view instanceof ImageView) {
((ImageView) view).setImageResource(R.drawable.unknown_album);
}
}
}
public void clear() {
queue.clear();
}
@Override
public void run() {
while (true) {
try {
Task task = queue.take();
task.execute();
} catch (Throwable x) {
Log.e(TAG, "Unexpected exception in ImageLoader.", x);
}
}
}
private Bitmap createReflection(Bitmap originalImage) {
int width = originalImage.getWidth();
int height = originalImage.getHeight();
// The gap we want between the reflection and the original image
final int reflectionGap = 4;
// This will not scale but will flip on the Y axis
Matrix matrix = new Matrix();
matrix.preScale(1, -1);
// Create a Bitmap with the flip matix applied to it.
// We only want the bottom half of the image
Bitmap reflectionImage = Bitmap.createBitmap(originalImage, 0, height / 2, width, height / 2, matrix, false);
// Create a new bitmap with same width but taller to fit reflection
Bitmap bitmapWithReflection = Bitmap.createBitmap(width, (height + height / 2), Bitmap.Config.ARGB_8888);
// Create a new Canvas with the bitmap that's big enough for
// the image plus gap plus reflection
Canvas canvas = new Canvas(bitmapWithReflection);
// Draw in the original image
canvas.drawBitmap(originalImage, 0, 0, null);
// Draw in the gap
Paint defaultPaint = new Paint();
canvas.drawRect(0, height, width, height + reflectionGap, defaultPaint);
// Draw in the reflection
canvas.drawBitmap(reflectionImage, 0, height + reflectionGap, null);
// Create a shader that is a linear gradient that covers the reflection
Paint paint = new Paint();
LinearGradient shader = new LinearGradient(0, originalImage.getHeight(), 0,
bitmapWithReflection.getHeight() + reflectionGap, 0x70000000, 0xff000000,
Shader.TileMode.CLAMP);
// Set the paint to use this shader (linear gradient)
paint.setShader(shader);
// Draw a rectangle using the paint with our linear gradient
canvas.drawRect(0, height, width, bitmapWithReflection.getHeight() + reflectionGap, paint);
return bitmapWithReflection;
}
private class Task {
private final View view;
private final MusicDirectory.Entry entry;
private final Handler handler;
private final int size;
private final boolean reflection;
private final boolean saveToFile;
private final boolean crossfade;
public Task(View view, MusicDirectory.Entry entry, int size, boolean reflection, boolean saveToFile, boolean crossfade) {
this.view = view;
this.entry = entry;
this.size = size;
this.reflection = reflection;
this.saveToFile = saveToFile;
this.crossfade = crossfade;
handler = new Handler();
}
public void execute() {
try {
MusicService musicService = MusicServiceFactory.getMusicService(view.getContext());
Bitmap bitmap = musicService.getCoverArt(view.getContext(), entry, size, saveToFile, null);
if (reflection) {
bitmap = createReflection(bitmap);
}
final Drawable drawable = Util.createDrawableFromBitmap(view.getContext(), bitmap);
cache.put(getKey(entry.getCoverArt(), size), drawable);
handler.post(new Runnable() {
@Override
public void run() {
setImage(view, drawable, crossfade);
}
});
} catch (Throwable x) {
Log.e(TAG, "Failed to download album art.", x);
}
}
}
}
/*
This file is part of Subsonic.
Subsonic is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Subsonic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
Copyright 2009 (C) Sindre Mehus
*/
package net.sourceforge.subsonic.androidapp.util;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.LinearGradient;
import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Shader;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.TransitionDrawable;
import android.os.Handler;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import net.sourceforge.subsonic.androidapp.R;
import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
import net.sourceforge.subsonic.androidapp.service.MusicService;
import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
/**
* Asynchronous loading of images, with caching.
* <p/>
* There should normally be only one instance of this class.
*
* @author Sindre Mehus
*/
public class ImageLoader implements Runnable {
private static final String TAG = ImageLoader.class.getSimpleName();
private static final int CONCURRENCY = 5;
private final LRUCache<String, Drawable> cache = new LRUCache<String, Drawable>(100);
private final BlockingQueue<Task> queue;
private final int imageSizeDefault;
private final int imageSizeLarge;
private Drawable largeUnknownImage;
public ImageLoader(Context context) {
queue = new LinkedBlockingQueue<Task>(500);
// Determine the density-dependent image sizes.
imageSizeDefault = context.getResources().getDrawable(R.drawable.unknown_album).getIntrinsicHeight();
DisplayMetrics metrics = context.getResources().getDisplayMetrics();
/*imageSizeLarge = (int) Math.round(Math.min(metrics.widthPixels, metrics.heightPixels) * 0.6);*/
imageSizeLarge = (int) Math.round(Math.min(metrics.widthPixels, metrics.heightPixels));
for (int i = 0; i < CONCURRENCY; i++) {
new Thread(this, "ImageLoader").start();
}
createLargeUnknownImage(context);
}
private void createLargeUnknownImage(Context context) {
BitmapDrawable drawable = (BitmapDrawable) context.getResources().getDrawable(R.drawable.unknown_album_large);
Bitmap bitmap = Bitmap.createScaledBitmap(drawable.getBitmap(), imageSizeLarge, imageSizeLarge, true);
bitmap = createReflection(bitmap);
largeUnknownImage = Util.createDrawableFromBitmap(context, bitmap);
}
public void loadImage(View view, MusicDirectory.Entry entry, boolean large, boolean crossfade) {
if (entry == null || entry.getCoverArt() == null) {
setUnknownImage(view, large);
return;
}
int size = large ? imageSizeLarge : imageSizeDefault;
Drawable drawable = cache.get(getKey(entry.getCoverArt(), size));
if (drawable != null) {
setImage(view, drawable, large);
return;
}
if (!large) {
setUnknownImage(view, large);
}
queue.offer(new Task(view, entry, size, false, large, crossfade));
}
private String getKey(String coverArtId, int size) {
return coverArtId + size;
}
private void setImage(View view, Drawable drawable, boolean crossfade) {
if (view instanceof TextView) {
// Cross-fading is not implemented for TextView since it's not in use. It would be easy to add it, though.
TextView textView = (TextView) view;
textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
} else if (view instanceof ImageView) {
ImageView imageView = (ImageView) view;
if (crossfade) {
Drawable existingDrawable = imageView.getDrawable();
if (existingDrawable == null) {
Bitmap emptyImage = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
existingDrawable = new BitmapDrawable(emptyImage);
}
Drawable[] layers = new Drawable[]{existingDrawable, drawable};
TransitionDrawable transitionDrawable = new TransitionDrawable(layers);
imageView.setImageDrawable(transitionDrawable);
transitionDrawable.startTransition(250);
} else {
imageView.setImageDrawable(drawable);
}
}
}
private void setUnknownImage(View view, boolean large) {
if (large) {
setImage(view, largeUnknownImage, false);
} else {
if (view instanceof TextView) {
((TextView) view).setCompoundDrawablesWithIntrinsicBounds(R.drawable.unknown_album, 0, 0, 0);
} else if (view instanceof ImageView) {
((ImageView) view).setImageResource(R.drawable.unknown_album);
}
}
}
public void clear() {
queue.clear();
}
@Override
public void run() {
while (true) {
try {
Task task = queue.take();
task.execute();
} catch (Throwable x) {
Log.e(TAG, "Unexpected exception in ImageLoader.", x);
}
}
}
private Bitmap createReflection(Bitmap originalImage) {
int width = originalImage.getWidth();
int height = originalImage.getHeight();
// The gap we want between the reflection and the original image
final int reflectionGap = 4;
// This will not scale but will flip on the Y axis
Matrix matrix = new Matrix();
matrix.preScale(1, -1);
// Create a Bitmap with the flip matix applied to it.
// We only want the bottom half of the image
Bitmap reflectionImage = Bitmap.createBitmap(originalImage, 0, height / 2, width, height / 2, matrix, false);
// Create a new bitmap with same width but taller to fit reflection
Bitmap bitmapWithReflection = Bitmap.createBitmap(width, (height + height / 2), Bitmap.Config.ARGB_8888);
// Create a new Canvas with the bitmap that's big enough for
// the image plus gap plus reflection
Canvas canvas = new Canvas(bitmapWithReflection);
// Draw in the original image
canvas.drawBitmap(originalImage, 0, 0, null);
// Draw in the gap
Paint defaultPaint = new Paint();
canvas.drawRect(0, height, width, height + reflectionGap, defaultPaint);
// Draw in the reflection
canvas.drawBitmap(reflectionImage, 0, height + reflectionGap, null);
// Create a shader that is a linear gradient that covers the reflection
Paint paint = new Paint();
LinearGradient shader = new LinearGradient(0, originalImage.getHeight(), 0,
bitmapWithReflection.getHeight() + reflectionGap, 0x70000000, 0xff000000,
Shader.TileMode.CLAMP);
// Set the paint to use this shader (linear gradient)
paint.setShader(shader);
// Draw a rectangle using the paint with our linear gradient
canvas.drawRect(0, height, width, bitmapWithReflection.getHeight() + reflectionGap, paint);
return bitmapWithReflection;
}
private class Task {
private final View view;
private final MusicDirectory.Entry entry;
private final Handler handler;
private final int size;
private final boolean reflection;
private final boolean saveToFile;
private final boolean crossfade;
public Task(View view, MusicDirectory.Entry entry, int size, boolean reflection, boolean saveToFile, boolean crossfade) {
this.view = view;
this.entry = entry;
this.size = size;
this.reflection = reflection;
this.saveToFile = saveToFile;
this.crossfade = crossfade;
handler = new Handler();
}
public void execute() {
try {
MusicService musicService = MusicServiceFactory.getMusicService(view.getContext());
Bitmap bitmap = musicService.getCoverArt(view.getContext(), entry, size, saveToFile, null);
if (reflection) {
bitmap = createReflection(bitmap);
}
final Drawable drawable = Util.createDrawableFromBitmap(view.getContext(), bitmap);
cache.put(getKey(entry.getCoverArt(), size), drawable);
handler.post(new Runnable() {
@Override
public void run() {
setImage(view, drawable, crossfade);
}
});
} catch (Throwable x) {
Log.e(TAG, "Failed to download album art.", x);
}
}
}
}