Finish convert drawables to vectors. Closes #308

Signed-off-by: Óscar García Amor <ogarcia@connectical.com>

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

@@ -378,6 +378,7 @@ public class SongView extends UpdateView implements Checkable
 				{
 					AnimationDrawable frameAnimation = (AnimationDrawable) rightImage;
 					frameAnimation.setVisible(true, true);
+					frameAnimation.start();
 				}
 			}
 		}

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

ultrasonic/src/main/res/drawable/ic_menu_arrow.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12 L24,0v24z"
+      android:strokeWidth="0.396875"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>

ultrasonic/src/main/res/drawable/ic_menu_download_dark.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M19,12v7L5,19v-7L3,12v7c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2zM13,12.67l2.59,-2.58L17,11.5l-5,5 -5,-5 1.41,-1.41L11,12.67L11,3h2z"/>
+</vector>

ultrasonic/src/main/res/drawable/ic_menu_download_light.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000"
+      android:pathData="M19,12v7L5,19v-7L3,12v7c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2zM13,12.67l2.59,-2.58L17,11.5l-5,5 -5,-5 1.41,-1.41L11,12.67L11,3h2z"/>
+</vector>

ultrasonic/src/main/res/drawable/ic_menu_server_dark.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M12,7L12,3L2,3v18h20L22,7L12,7zM6,19L4,19v-2h2v2zM6,15L4,15v-2h2v2zM6,11L4,11L4,9h2v2zM6,7L4,7L4,5h2v2zM10,19L8,19v-2h2v2zM10,15L8,15v-2h2v2zM10,11L8,11L8,9h2v2zM10,7L8,7L8,5h2v2zM20,19h-8v-2h2v-2h-2v-2h2v-2h-2L12,9h8v10zM18,11h-2v2h2v-2zM18,15h-2v2h2v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/ic_menu_server_light.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000"
+      android:pathData="M12,7L12,3L2,3v18h20L22,7L12,7zM6,19L4,19v-2h2v2zM6,15L4,15v-2h2v2zM6,11L4,11L4,9h2v2zM6,7L4,7L4,5h2v2zM10,19L8,19v-2h2v2zM10,15L8,15v-2h2v2zM10,11L8,11L8,9h2v2zM10,7L8,7L8,5h2v2zM20,19h-8v-2h2v-2h-2v-2h2v-2h-2L12,9h8v10zM18,11h-2v2h2v-2zM18,15h-2v2h2v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/menu_arrow.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M8,12 L20,4v16z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_dark.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_light.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000"
+      android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_dark.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M15,5V3H9v2"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="M9,5V9H5l7,7 7,-7H15V5M5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_light.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000"
+      android:pathData="M15,5V3H9v2"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="M9,5V9H5l7,7 7,-7H15V5M5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_dark.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M15,7V3H9v4"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="M9,7V9H5l7,7 7,-7H15V7M5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_light.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000"
+      android:pathData="M15,7V3H9v4"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="M9,7V9H5l7,7 7,-7H15V7M5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_dark.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M15,9V3H9v6"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="M9,9H5l7,7 7,-7H15M5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_light.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000"
+      android:pathData="M15,9V3H9v6"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="M9,9H5l7,7 7,-7H15M5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_dark.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M17,11 L19,9H15V3H9V9H5l2,2"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="m7,11 l5,5 5,-5M5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_light.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000"
+      android:pathData="M17,11 L19,9H15V3H9V9H5l2,2"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="m7,11 l5,5 5,-5M5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_dark.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M15,13 L19,9H15V3H9V9H5l4,4"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="m9,13 l3,3 3,-3M5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_light.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000"
+      android:pathData="M15,13 L19,9H15V3H9V9H5l4,4"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="m9,13 l3,3 3,-3M5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_dark.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M13,15 L19,9H15V3H9V9H5l6,6"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="m11,15 l1,1 1,-1m-8,3v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_light.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000"
+      android:pathData="M13,15 L19,9H15V3H9V9H5l6,6"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="m11,15 l1,1 1,-1m-8,3v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_dark.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M19,9H15V3H9V9H5l7,7z"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="m5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_light.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000"
+      android:pathData="M19,9H15V3H9V9H5l7,7z"/>
+  <path
+      android:fillColor="#888"
+      android:pathData="m5,18v2h14v-2z"/>
+</vector>

ultrasonic/src/main/res/drawable/stat_sys_download_dark.xml

@@ -20,11 +20,13 @@
 <animation-list
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:oneshot="false">
-    <item android:drawable="@drawable/stat_sys_download_anim0_dark" android:duration="200" />
-    <item android:drawable="@drawable/stat_sys_download_anim1_dark" android:duration="200" />
-    <item android:drawable="@drawable/stat_sys_download_anim2_dark" android:duration="200" />
-    <item android:drawable="@drawable/stat_sys_download_anim3_dark" android:duration="200" />
-    <item android:drawable="@drawable/stat_sys_download_anim4_dark" android:duration="200" />
-    <item android:drawable="@drawable/stat_sys_download_anim5_dark" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_0_dark" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_1_dark" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_2_dark" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_3_dark" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_4_dark" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_5_dark" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_6_dark" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_7_dark" android:duration="200" />
 </animation-list>
 

ultrasonic/src/main/res/drawable/stat_sys_download_light.xml

@@ -20,11 +20,13 @@
 <animation-list
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:oneshot="false">
-    <item android:drawable="@drawable/stat_sys_download_anim0_light" android:duration="200" />
-    <item android:drawable="@drawable/stat_sys_download_anim1_light" android:duration="200" />
-    <item android:drawable="@drawable/stat_sys_download_anim2_light" android:duration="200" />
-    <item android:drawable="@drawable/stat_sys_download_anim3_light" android:duration="200" />
-    <item android:drawable="@drawable/stat_sys_download_anim4_light" android:duration="200" />
-    <item android:drawable="@drawable/stat_sys_download_anim5_light" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_0_light" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_1_light" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_2_light" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_3_light" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_4_light" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_5_light" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_6_light" android:duration="200" />
+    <item android:drawable="@drawable/stat_sys_download_anim_7_light" android:duration="200" />
 </animation-list>
 

ultrasonic/src/main/res/drawable/unknown_album.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M0 0 L24 0 L24 24 L0 24 Z"/>
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
+</vector>

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" />    
 
     <ImageView