Merge pull request #312 from ultrasonic/vector

Vector

core/menudrawer/build.gradle

@@ -6,3 +6,7 @@ android {
         abortOnError true
     }
 }
+
+dependencies {
+    implementation "androidx.appcompat:appcompat-resources:1.2.0"
+}

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);

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

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) {

ultrasonic/src/main/java/org/moire/ultrasonic/view/SongView.java

@@ -61,7 +61,7 @@ public class SongView extends UpdateView implements Checkable
 	private static final String TAG = SongView.class.getSimpleName();
 	private static Drawable starHollowDrawable;
 	private static Drawable starDrawable;
-	private static Drawable unpinImage;
+	private static Drawable pinImage;
 	private static Drawable downloadedImage;
 	private static Drawable downloadingImage;
 	private static Drawable playingImage;
@@ -108,9 +108,9 @@ public class SongView extends UpdateView implements Checkable
 			starDrawable = Util.getDrawableFromAttribute(context, R.attr.star_full);
 		}
 
-		if (unpinImage == null || !themesMatch)
+		if (pinImage == null || !themesMatch)
 		{
-			unpinImage = Util.getDrawableFromAttribute(context, R.attr.unpin);
+			pinImage = Util.getDrawableFromAttribute(context, R.attr.pin);
 		}
 
 		if (downloadedImage == null || !themesMatch)
@@ -323,11 +323,11 @@ public class SongView extends UpdateView implements Checkable
 
 		if (downloadFile.isWorkDone())
 		{
-			ImageType newLeftImageType = downloadFile.isSaved() ? ImageType.unpin : ImageType.downloaded;
+			ImageType newLeftImageType = downloadFile.isSaved() ? ImageType.pin : ImageType.downloaded;
 
 			if (this.leftImageType != newLeftImageType)
 			{
-				this.leftImage = downloadFile.isSaved() ? unpinImage : downloadedImage;
+				this.leftImage = downloadFile.isSaved() ? pinImage : downloadedImage;
 				this.leftImageType = newLeftImageType;
 			}
 		}
@@ -378,6 +378,7 @@ public class SongView extends UpdateView implements Checkable
 				{
 					AnimationDrawable frameAnimation = (AnimationDrawable) rightImage;
 					frameAnimation.setVisible(true, true);
+					frameAnimation.start();
 				}
 			}
 		}
@@ -469,7 +470,7 @@ public class SongView extends UpdateView implements Checkable
 	public enum ImageType
 	{
 		none,
-		unpin,
+		pin,
 		downloaded,
 		downloading
 	}

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