diff --git a/core/menudrawer/build.gradle b/core/menudrawer/build.gradle
index 102c5711..edb61955 100644
--- a/core/menudrawer/build.gradle
+++ b/core/menudrawer/build.gradle
@@ -6,3 +6,7 @@ android {
abortOnError true
}
}
+
+dependencies {
+ implementation "androidx.appcompat:appcompat-resources:1.2.0"
+}
\ No newline at end of file
diff --git a/core/menudrawer/src/main/java/net/simonvt/menudrawer/MenuDrawer.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/MenuDrawer.java
index 655fcc6e..dfe48876 100644
--- a/core/menudrawer/src/main/java/net/simonvt/menudrawer/MenuDrawer.java
+++ b/core/menudrawer/src/main/java/net/simonvt/menudrawer/MenuDrawer.java
@@ -25,6 +25,9 @@ import android.view.ViewTreeObserver;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.Interpolator;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.graphics.drawable.DrawableCompat;
+
public abstract class MenuDrawer extends ViewGroup {
/**
@@ -547,6 +550,21 @@ public abstract class MenuDrawer extends ViewGroup {
initDrawer(context, attrs, defStyle);
}
+ public static Bitmap getBitmapFromVectorDrawable(Context context, int drawableId) {
+ Drawable drawable = AppCompatResources.getDrawable(context, drawableId);
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+ drawable = (DrawableCompat.wrap(drawable)).mutate();
+ }
+
+ Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
+ drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+ Canvas canvas = new Canvas(bitmap);
+ drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+ drawable.draw(canvas);
+
+ return bitmap;
+ }
+
protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
setWillNotDraw(false);
setFocusable(false);
@@ -561,7 +579,8 @@ public abstract class MenuDrawer extends ViewGroup {
final int indicatorResId = a.getResourceId(R.styleable.MenuDrawer_mdActiveIndicator, 0);
if (indicatorResId != 0) {
- mActiveIndicator = BitmapFactory.decodeResource(getResources(), indicatorResId);
+ //mActiveIndicator = BitmapFactory.decodeResource(getResources(), indicatorResId);
+ mActiveIndicator = getBitmapFromVectorDrawable(context, indicatorResId);
}
mDropShadowEnabled = a.getBoolean(R.styleable.MenuDrawer_mdDropShadowEnabled, true);
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.java
index a97294b0..fde86b7d 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.java
@@ -131,7 +131,7 @@ public class UltrasonicAppWidgetProvider extends AppWidgetProvider
{
views.setTextViewText(R.id.album, null);
}
- views.setImageViewResource(R.id.appwidget_coverart, R.drawable.unknown_album_large);
+ views.setImageViewResource(R.id.appwidget_coverart, R.drawable.unknown_album);
}
else
{
@@ -162,7 +162,7 @@ public class UltrasonicAppWidgetProvider extends AppWidgetProvider
if (bitmap == null)
{
// Set default cover art
- views.setImageViewResource(R.id.appwidget_coverart, R.drawable.unknown_album_large);
+ views.setImageViewResource(R.id.appwidget_coverart, R.drawable.unknown_album);
}
else
{
@@ -172,7 +172,7 @@ public class UltrasonicAppWidgetProvider extends AppWidgetProvider
catch (Exception x)
{
Log.e(TAG, "Failed to load cover art", x);
- views.setImageViewResource(R.id.appwidget_coverart, R.drawable.unknown_album_large);
+ views.setImageViewResource(R.id.appwidget_coverart, R.drawable.unknown_album);
}
// Link actions buttons to intents
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/LegacyImageLoader.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LegacyImageLoader.java
index ebc3867d..ac6bd80d 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/LegacyImageLoader.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LegacyImageLoader.java
@@ -120,7 +120,7 @@ public class LegacyImageLoader implements Runnable, ImageLoader {
}
private void createLargeUnknownImage(Context context) {
- BitmapDrawable drawable = (BitmapDrawable) context.getResources().getDrawable(R.drawable.unknown_album_large);
+ BitmapDrawable drawable = (BitmapDrawable) context.getResources().getDrawable(R.drawable.unknown_album);
Log.i(TAG, "createLargeUnknownImage");
if (drawable != null) {
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongView.java
index 7885f36a..1c64b263 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongView.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongView.java
@@ -378,6 +378,7 @@ public class SongView extends UpdateView implements Checkable
{
AnimationDrawable frameAnimation = (AnimationDrawable) rightImage;
frameAnimation.setVisible(true, true);
+ frameAnimation.start();
}
}
}
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerRowAdapter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerRowAdapter.kt
index fcddc267..bd78295f 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerRowAdapter.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerRowAdapter.kt
@@ -96,7 +96,7 @@ internal class ServerRowAdapter(
serverMenu?.visibility = View.INVISIBLE
image?.setImageDrawable(Util.getDrawableFromAttribute(context, R.attr.screen_on_off))
} else {
- image?.setImageDrawable(Util.getDrawableFromAttribute(context, R.attr.podcasts))
+ image?.setImageDrawable(Util.getDrawableFromAttribute(context, R.attr.server))
}
// Highlight the Active Server's row by changing its background
diff --git a/ultrasonic/src/main/res/drawable-hdpi-v14/menu_arrow.png b/ultrasonic/src/main/res/drawable-hdpi-v14/menu_arrow.png
deleted file mode 100644
index 0c765739..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi-v14/menu_arrow.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/menu_arrow.png b/ultrasonic/src/main/res/drawable-hdpi/menu_arrow.png
deleted file mode 100644
index 8333fc2b..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/menu_arrow.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim0_dark.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim0_dark.png
deleted file mode 100644
index 3a79bb54..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim0_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim0_light.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim0_light.png
deleted file mode 100644
index 3ace905e..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim0_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim1_dark.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim1_dark.png
deleted file mode 100644
index 1ae4b0e1..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim1_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim1_light.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim1_light.png
deleted file mode 100644
index 2f25c63e..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim1_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim2_dark.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim2_dark.png
deleted file mode 100644
index 48d52875..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim2_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim2_light.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim2_light.png
deleted file mode 100644
index ffb5864e..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim2_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim3_dark.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim3_dark.png
deleted file mode 100644
index 862d5f1c..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim3_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim3_light.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim3_light.png
deleted file mode 100644
index def3fe67..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim3_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim4_dark.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim4_dark.png
deleted file mode 100644
index 2bcffa39..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim4_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim4_light.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim4_light.png
deleted file mode 100644
index 4d4b4399..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim4_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim5_dark.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim5_dark.png
deleted file mode 100644
index 71107c15..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim5_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim5_light.png b/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim5_light.png
deleted file mode 100644
index 651ec104..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/stat_sys_download_anim5_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/unknown_album.png b/ultrasonic/src/main/res/drawable-hdpi/unknown_album.png
index f9df287c..e59b7868 100644
Binary files a/ultrasonic/src/main/res/drawable-hdpi/unknown_album.png and b/ultrasonic/src/main/res/drawable-hdpi/unknown_album.png differ
diff --git a/ultrasonic/src/main/res/drawable-hdpi/unknown_album_large.png b/ultrasonic/src/main/res/drawable-hdpi/unknown_album_large.png
deleted file mode 100644
index e59b7868..00000000
Binary files a/ultrasonic/src/main/res/drawable-hdpi/unknown_album_large.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim0_dark.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim0_dark.png
deleted file mode 100644
index c98d9769..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim0_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim0_light.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim0_light.png
deleted file mode 100644
index ba43c5aa..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim0_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim1_dark.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim1_dark.png
deleted file mode 100644
index fb869a6e..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim1_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim1_light.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim1_light.png
deleted file mode 100644
index b2b2cf86..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim1_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim2_dark.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim2_dark.png
deleted file mode 100644
index bbbfa5f0..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim2_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim2_light.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim2_light.png
deleted file mode 100644
index 1c7a2318..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim2_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim3_dark.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim3_dark.png
deleted file mode 100644
index d4678282..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim3_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim3_light.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim3_light.png
deleted file mode 100644
index 2eb67a5b..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim3_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim4_dark.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim4_dark.png
deleted file mode 100644
index 6bdadea2..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim4_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim4_light.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim4_light.png
deleted file mode 100644
index c1f373df..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim4_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim5_dark.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim5_dark.png
deleted file mode 100644
index 3468f676..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim5_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim5_light.png b/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim5_light.png
deleted file mode 100644
index 99cf5d1c..00000000
Binary files a/ultrasonic/src/main/res/drawable-ldpi/stat_sys_download_anim5_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi-v14/menu_arrow.png b/ultrasonic/src/main/res/drawable-mdpi-v14/menu_arrow.png
deleted file mode 100644
index 5e37831f..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi-v14/menu_arrow.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/menu_arrow.png b/ultrasonic/src/main/res/drawable-mdpi/menu_arrow.png
deleted file mode 100644
index a3a5b859..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/menu_arrow.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim0_dark.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim0_dark.png
deleted file mode 100644
index d6950426..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim0_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim0_light.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim0_light.png
deleted file mode 100644
index eca7e673..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim0_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim1_dark.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim1_dark.png
deleted file mode 100644
index ff0e9293..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim1_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim1_light.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim1_light.png
deleted file mode 100644
index ce0cb81f..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim1_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim2_dark.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim2_dark.png
deleted file mode 100644
index 3cfa42c3..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim2_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim2_light.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim2_light.png
deleted file mode 100644
index a599a46d..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim2_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim3_dark.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim3_dark.png
deleted file mode 100644
index 2cae5e6b..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim3_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim3_light.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim3_light.png
deleted file mode 100644
index 0c3c4381..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim3_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim4_dark.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim4_dark.png
deleted file mode 100644
index 0c1d6305..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim4_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim4_light.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim4_light.png
deleted file mode 100644
index 39df5adf..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim4_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim5_dark.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim5_dark.png
deleted file mode 100644
index f3e80433..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim5_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim5_light.png b/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim5_light.png
deleted file mode 100644
index 34372394..00000000
Binary files a/ultrasonic/src/main/res/drawable-mdpi/stat_sys_download_anim5_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi-v14/menu_arrow.png b/ultrasonic/src/main/res/drawable-xhdpi-v14/menu_arrow.png
deleted file mode 100644
index 8ebf4af2..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi-v14/menu_arrow.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/menu_arrow.png b/ultrasonic/src/main/res/drawable-xhdpi/menu_arrow.png
deleted file mode 100644
index 8d1ba7ff..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/menu_arrow.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim0_dark.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim0_dark.png
deleted file mode 100644
index 0bb5855c..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim0_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim0_light.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim0_light.png
deleted file mode 100644
index 4c55dfac..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim0_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim1_dark.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim1_dark.png
deleted file mode 100644
index 91af06f9..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim1_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim1_light.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim1_light.png
deleted file mode 100644
index b6ae63fb..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim1_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim2_dark.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim2_dark.png
deleted file mode 100644
index 86f32c7a..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim2_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim2_light.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim2_light.png
deleted file mode 100644
index 6527a627..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim2_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim3_dark.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim3_dark.png
deleted file mode 100644
index 51677fa1..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim3_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim3_light.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim3_light.png
deleted file mode 100644
index 63b22c34..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim3_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim4_dark.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim4_dark.png
deleted file mode 100644
index 7743a011..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim4_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim4_light.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim4_light.png
deleted file mode 100644
index 8d28fe56..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim4_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim5_dark.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim5_dark.png
deleted file mode 100644
index b422bdd1..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim5_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim5_light.png b/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim5_light.png
deleted file mode 100644
index 3ab32725..00000000
Binary files a/ultrasonic/src/main/res/drawable-xhdpi/stat_sys_download_anim5_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim0_dark.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim0_dark.png
deleted file mode 100644
index 63bb4c80..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim0_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim0_light.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim0_light.png
deleted file mode 100644
index 88583fae..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim0_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim1_dark.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim1_dark.png
deleted file mode 100644
index b980a727..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim1_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim1_light.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim1_light.png
deleted file mode 100644
index cd444db3..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim1_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim2_dark.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim2_dark.png
deleted file mode 100644
index a738764f..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim2_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim2_light.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim2_light.png
deleted file mode 100644
index a30bcefb..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim2_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim3_dark.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim3_dark.png
deleted file mode 100644
index 702ac98d..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim3_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim3_light.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim3_light.png
deleted file mode 100644
index bebc07f5..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim3_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim4_dark.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim4_dark.png
deleted file mode 100644
index 12da6056..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim4_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim4_light.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim4_light.png
deleted file mode 100644
index 2e3cc82e..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim4_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim5_dark.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim5_dark.png
deleted file mode 100644
index 9b4c4381..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim5_dark.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim5_light.png b/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim5_light.png
deleted file mode 100644
index a77736cb..00000000
Binary files a/ultrasonic/src/main/res/drawable-xxhdpi/stat_sys_download_anim5_light.png and /dev/null differ
diff --git a/ultrasonic/src/main/res/drawable/ic_menu_arrow.xml b/ultrasonic/src/main/res/drawable/ic_menu_arrow.xml
new file mode 100644
index 00000000..64ff6cff
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/ic_menu_arrow.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/ic_menu_download_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_download_dark.xml
new file mode 100644
index 00000000..1ba9033f
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/ic_menu_download_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/ic_menu_download_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_download_light.xml
new file mode 100644
index 00000000..c34ad570
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/ic_menu_download_light.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/ic_menu_server_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_server_dark.xml
new file mode 100644
index 00000000..7d2c5684
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/ic_menu_server_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/ic_menu_server_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_server_light.xml
new file mode 100644
index 00000000..f0f97357
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/ic_menu_server_light.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/menu_arrow.xml b/ultrasonic/src/main/res/drawable/menu_arrow.xml
new file mode 100644
index 00000000..f6db0abe
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/menu_arrow.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_dark.xml
new file mode 100644
index 00000000..6c598235
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_light.xml
new file mode 100644
index 00000000..b9d158fe
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_light.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_dark.xml
new file mode 100644
index 00000000..803d2b73
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_dark.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_light.xml
new file mode 100644
index 00000000..3020a3ba
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_light.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_dark.xml
new file mode 100644
index 00000000..cdba81f2
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_dark.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_light.xml
new file mode 100644
index 00000000..171d7381
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_light.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_dark.xml
new file mode 100644
index 00000000..57a409aa
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_dark.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_light.xml
new file mode 100644
index 00000000..780b394e
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_light.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_dark.xml
new file mode 100644
index 00000000..bdbb8691
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_dark.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_light.xml
new file mode 100644
index 00000000..4a443e3c
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_light.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_dark.xml
new file mode 100644
index 00000000..544b9002
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_dark.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_light.xml
new file mode 100644
index 00000000..eec7de09
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_light.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_dark.xml
new file mode 100644
index 00000000..bf00227f
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_dark.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_light.xml
new file mode 100644
index 00000000..c8c43d00
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_light.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_dark.xml
new file mode 100644
index 00000000..1bd9bb35
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_dark.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_light.xml
new file mode 100644
index 00000000..53f7e5bc
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_light.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_dark.xml
index 64fba75d..8c747871 100644
--- a/ultrasonic/src/main/res/drawable/stat_sys_download_dark.xml
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_dark.xml
@@ -20,11 +20,13 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_light.xml
index 4a938c37..894be778 100644
--- a/ultrasonic/src/main/res/drawable/stat_sys_download_light.xml
+++ b/ultrasonic/src/main/res/drawable/stat_sys_download_light.xml
@@ -20,11 +20,13 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/ultrasonic/src/main/res/drawable/unknown_album.xml b/ultrasonic/src/main/res/drawable/unknown_album.xml
new file mode 100644
index 00000000..eae63c63
--- /dev/null
+++ b/ultrasonic/src/main/res/drawable/unknown_album.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/ultrasonic/src/main/res/layout/album_buttons.xml b/ultrasonic/src/main/res/layout/album_buttons.xml
index 278bb505..651afe5a 100644
--- a/ultrasonic/src/main/res/layout/album_buttons.xml
+++ b/ultrasonic/src/main/res/layout/album_buttons.xml
@@ -59,7 +59,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:src="?attr/downloaded"
+ android:src="?attr/download"
android:visibility="gone" />
+ a:src="@drawable/unknown_album" />
+ a:src="@drawable/unknown_album" />
+ a:src="@drawable/unknown_album" />
+ a:src="@drawable/unknown_album" />
+ a:src="@drawable/unknown_album"/>
diff --git a/ultrasonic/src/main/res/values/styles.xml b/ultrasonic/src/main/res/values/styles.xml
index b96797f0..9334649d 100644
--- a/ultrasonic/src/main/res/values/styles.xml
+++ b/ultrasonic/src/main/res/values/styles.xml
@@ -54,10 +54,12 @@
+
+
diff --git a/ultrasonic/src/main/res/values/themes.xml b/ultrasonic/src/main/res/values/themes.xml
index 48a04ed8..3e006f46 100644
--- a/ultrasonic/src/main/res/values/themes.xml
+++ b/ultrasonic/src/main/res/values/themes.xml
@@ -22,11 +22,13 @@
- @drawable/ic_menu_save_dark
- @drawable/ic_menu_screen_on_off_dark
- @drawable/ic_menu_search_holo_dark
+ - @drawable/ic_menu_server_dark
- @drawable/ic_menu_select_server_dark
- @drawable/ic_menu_select_folder_dark
- @drawable/ic_menu_settings_dark
- @drawable/ic_menu_share_dark
- - @drawable/stat_sys_download_anim0_dark
+ - @drawable/ic_menu_download_dark
+ - @drawable/stat_sys_download_anim_0_dark
- @drawable/stat_sys_download_dark
- @drawable/media_backward_normal_dark
- @drawable/media_forward_normal_dark
@@ -78,11 +80,13 @@
- @drawable/ic_menu_save_light
- @drawable/ic_menu_screen_on_off_light
- @drawable/ic_menu_search_holo_light
+ - @drawable/ic_menu_server_light
- @drawable/ic_menu_select_server_light
- @drawable/ic_menu_select_folder_light
- @drawable/ic_menu_settings_light
- @drawable/ic_menu_share_light
- - @drawable/stat_sys_download_anim0_light
+ - @drawable/ic_menu_download_light
+ - @drawable/stat_sys_download_anim_0_light
- @drawable/stat_sys_download_light
- @drawable/media_backward_normal_light
- @drawable/media_forward_normal_light