Reverted DownloadActivity and ImageLoader changes, updated icons, tweaked icon padding
@ -2,7 +2,7 @@
|
|||||||
<manifest xmlns:a="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:a="http://schemas.android.com/apk/res/android"
|
||||||
package="net.sourceforge.subsonic.androidapp"
|
package="net.sourceforge.subsonic.androidapp"
|
||||||
a:versionCode="47"
|
a:versionCode="47"
|
||||||
a:versionName="3.9.9" a:installLocation="auto">
|
a:versionName="3.9.9.1" a:installLocation="auto">
|
||||||
|
|
||||||
<uses-permission a:name="android.permission.INTERNET"/>
|
<uses-permission a:name="android.permission.INTERNET"/>
|
||||||
<uses-permission a:name="android.permission.READ_PHONE_STATE"/>
|
<uses-permission a:name="android.permission.READ_PHONE_STATE"/>
|
||||||
|
11
default.properties
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# This file is automatically generated by Android Tools.
|
||||||
|
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
||||||
|
#
|
||||||
|
# This file must be checked in Version Control Systems.
|
||||||
|
#
|
||||||
|
# To customize properties used by the Ant build system use,
|
||||||
|
# "ant.properties", and override values to adapt the script to your
|
||||||
|
# project structure.
|
||||||
|
|
||||||
|
# Project target.
|
||||||
|
target=android-15
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 923 B After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.8 KiB |
@ -194,8 +194,7 @@
|
|||||||
a:id="@+id/download_album_art_layout"
|
a:id="@+id/download_album_art_layout"
|
||||||
a:layout_width="fill_parent"
|
a:layout_width="fill_parent"
|
||||||
a:layout_height="fill_parent"
|
a:layout_height="fill_parent"
|
||||||
a:background="@drawable/pinstripe_tile" >
|
a:background="@drawable/album_art_background">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
a:id="@+id/download_album_art_image"
|
a:id="@+id/download_album_art_image"
|
||||||
a:layout_width="wrap_content"
|
a:layout_width="wrap_content"
|
||||||
|
@ -12,11 +12,11 @@
|
|||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
a:id="@+id/download_album_art_layout"
|
a:id="@+id/download_album_art_layout"
|
||||||
|
a:orientation="vertical"
|
||||||
a:layout_width="fill_parent"
|
a:layout_width="fill_parent"
|
||||||
a:layout_height="fill_parent"
|
a:layout_height="fill_parent"
|
||||||
a:layout_weight="1"
|
a:layout_weight="1"
|
||||||
a:background="@drawable/pinstripe_tile"
|
a:background="@drawable/album_art_background">
|
||||||
a:orientation="vertical" >
|
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
a:id="@+id/download_repeat"
|
a:id="@+id/download_repeat"
|
||||||
@ -40,7 +40,7 @@
|
|||||||
a:layout_gravity="top|right"
|
a:layout_gravity="top|right"
|
||||||
a:layout_below="@+id/download_repeat"
|
a:layout_below="@+id/download_repeat"
|
||||||
a:paddingTop="12dip"
|
a:paddingTop="12dip"
|
||||||
a:paddingLeft="14dip"
|
a:paddingLeft="0dip"
|
||||||
a:paddingBottom="15dip"/>
|
a:paddingBottom="15dip"/>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
@ -140,7 +140,7 @@
|
|||||||
a:background="@drawable/list_selector_holo_dark"
|
a:background="@drawable/list_selector_holo_dark"
|
||||||
a:paddingBottom="12dip"
|
a:paddingBottom="12dip"
|
||||||
a:paddingLeft="8dip"
|
a:paddingLeft="8dip"
|
||||||
a:paddingTop="24dip"
|
a:paddingTop="12dip"
|
||||||
a:src="@drawable/ic_menu_moreoverflow" />
|
a:src="@drawable/ic_menu_moreoverflow" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
|
@ -66,8 +66,7 @@ public class ImageLoader implements Runnable {
|
|||||||
// Determine the density-dependent image sizes.
|
// Determine the density-dependent image sizes.
|
||||||
imageSizeDefault = context.getResources().getDrawable(R.drawable.unknown_album).getIntrinsicHeight();
|
imageSizeDefault = context.getResources().getDrawable(R.drawable.unknown_album).getIntrinsicHeight();
|
||||||
DisplayMetrics metrics = context.getResources().getDisplayMetrics();
|
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) * 0.6);
|
||||||
imageSizeLarge = (int) Math.round(Math.min(metrics.widthPixels, metrics.heightPixels));
|
|
||||||
|
|
||||||
for (int i = 0; i < CONCURRENCY; i++) {
|
for (int i = 0; i < CONCURRENCY; i++) {
|
||||||
new Thread(this, "ImageLoader").start();
|
new Thread(this, "ImageLoader").start();
|
||||||
@ -99,7 +98,7 @@ public class ImageLoader implements Runnable {
|
|||||||
if (!large) {
|
if (!large) {
|
||||||
setUnknownImage(view, large);
|
setUnknownImage(view, large);
|
||||||
}
|
}
|
||||||
queue.offer(new Task(view, entry, size, false, large, crossfade));
|
queue.offer(new Task(view, entry, size, large, large, crossfade));
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getKey(String coverArtId, int size) {
|
private String getKey(String coverArtId, int size) {
|
||||||
|