Migrate to vector drawables

Author: vrih

app/build.gradle

@@ -9,6 +9,7 @@ android {
 		targetSdkVersion 26
 		versionCode 202
 		versionName '5.4.4'
+		vectorDrawables.useSupportLibrary = true
 		setProperty("archivesBaseName", "DSub $versionName")
 		resConfigs "de", "es", "fr", "hu", "nl", "pt-rPT", "ru", "sv"
 	}
@@ -65,10 +66,11 @@ dependencies {
 	googleImplementation 'com.google.android.gms:play-services-cast:8.1.0'
 	implementation 'com.sothree.slidinguppanel:library:3.0.0'
 	implementation 'de.hdodenhof:circleimageview:1.2.1'
-    implementation 'com.shehabic.droppy:Droppy:0.5.1@aar'
-	implementation group: 'org.fourthline.cling', name: 'cling-core', version:'2.1.1'
-	implementation group: 'org.fourthline.cling', name: 'cling-support', version:'2.1.1'
-	implementation group: 'org.eclipse.jetty', name: 'jetty-server', version:'8.1.16.v20140903'
-	implementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version:'8.1.16.v20140903'
-	implementation group: 'org.eclipse.jetty', name: 'jetty-client', version:'8.1.16.v20140903'
+	implementation 'com.shehabic.droppy:Droppy:0.5.1@aar'
+	implementation 'org.fourthline.cling:cling-core:2.1.1'
+	implementation 'org.fourthline.cling:cling-support:2.1.1'
+	implementation 'org.eclipse.jetty:jetty-server:8.1.16.v20140903'
+	implementation 'org.eclipse.jetty:jetty-servlet:8.1.16.v20140903'
+	implementation 'org.eclipse.jetty:jetty-client:8.1.16.v20140903'
+	implementation 'com.android.support:support-vector-drawable:27.1.1'
 }

app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java

@@ -651,7 +651,7 @@ private void populateTabs() {
 				item.setChecked(true);
 			}
 		}
-		drawerHeaderToggle.setImageResource(R.drawable.main_select_server_dark);
+		drawerHeaderToggle.setImageResource(R.drawable.main_select_server);
 
 		showingTabs = true;
 	}
@@ -667,7 +667,7 @@ private void populateServers() {
 			}
 		}
 		drawerList.getMenu().setGroupCheckable(MENU_GROUP_SERVER, true, true);
-		drawerHeaderToggle.setImageResource(R.drawable.main_select_tabs_dark);
+		drawerHeaderToggle.setImageResource(R.drawable.main_select_tabs);
 
 		showingTabs = false;
 	}

app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java

@@ -1111,7 +1111,7 @@ protected void error(Throwable error) {
 				if(oldBookmark == null) {
 					int bookmark;
 					if(context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-						bookmark = R.drawable.ic_menu_bookmark_dark;
+						bookmark = R.drawable.ic_menu_bookmark;
 					} else {
 						bookmark = DrawableTint.getDrawableRes(context, R.attr.bookmark);
 					}
@@ -1430,7 +1430,7 @@ public void onMetadataUpdate(Entry song, int fieldChange) {
 			rateBadButton.setImageDrawable(DrawableTint.getTintedDrawable(context, R.drawable.ic_action_rating_bad_selected));
 		} else {
 			if(context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-				badRating = R.drawable.ic_action_rating_bad_dark;
+				badRating = R.drawable.ic_action_rating_bad;
 			} else {
 				badRating = DrawableTint.getDrawableRes(context, R.attr.rating_bad);
 			}
@@ -1441,7 +1441,7 @@ public void onMetadataUpdate(Entry song, int fieldChange) {
 			rateGoodButton.setImageDrawable(DrawableTint.getTintedDrawable(context, R.drawable.ic_action_rating_good_selected));
 		} else {
 			if(context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-				goodRating = R.drawable.ic_action_rating_good_dark;
+				goodRating = R.drawable.ic_action_rating_good;
 			} else {
 				goodRating = DrawableTint.getDrawableRes(context, R.attr.rating_good);
 			}
@@ -1452,7 +1452,7 @@ public void onMetadataUpdate(Entry song, int fieldChange) {
 			bookmarkButton.setImageDrawable(DrawableTint.getTintedDrawable(context, R.drawable.ic_menu_bookmark_selected));
 		} else {
 			if(context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-				bookmark = R.drawable.ic_menu_bookmark_dark;
+				bookmark = R.drawable.ic_menu_bookmark;
 			} else {
 				bookmark = DrawableTint.getDrawableRes(context, R.attr.bookmark);
 			}

app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java

@@ -212,9 +212,9 @@ private void performUpdate(Context context, DownloadService service, int[] appWi
 
         // Set correct drawable for pause state
         if (playing) {
-            views.setImageViewResource(R.id.control_play, R.drawable.media_pause_dark);
+            views.setImageViewResource(R.id.control_play, R.drawable.widget_media_pause);
         } else {
-            views.setImageViewResource(R.id.control_play, R.drawable.media_start_dark);
+            views.setImageViewResource(R.id.control_play, R.drawable.widget_media_start);
         }
 
         // Set the cover art

app/src/main/java/github/daneren2005/dsub/util/Notifications.java

@@ -187,31 +187,31 @@ private static void setupViews(RemoteViews rv, Context context, MusicDirectory.E
 		boolean persistent = Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_PERSISTENT_NOTIFICATION, false);
 		if(persistent) {
 			if(expanded) {
-				rv.setImageViewResource(R.id.control_pause, playing ? R.drawable.notification_pause : R.drawable.notification_start);
+				rv.setImageViewResource(R.id.control_pause, playing ? R.drawable.notification_media_pause : R.drawable.notification_media_start);
 
 				if(shouldFastForward) {
-					rv.setImageViewResource(R.id.control_previous, R.drawable.notification_rewind);
-					rv.setImageViewResource(R.id.control_next, R.drawable.notification_fastforward);
+					rv.setImageViewResource(R.id.control_previous, R.drawable.notification_media_rewind);
+					rv.setImageViewResource(R.id.control_next, R.drawable.notification_media_fastforward);
 				} else {
-					rv.setImageViewResource(R.id.control_previous, R.drawable.notification_backward);
-					rv.setImageViewResource(R.id.control_next, R.drawable.notification_forward);
+					rv.setImageViewResource(R.id.control_previous, R.drawable.notification_media_backward);
+					rv.setImageViewResource(R.id.control_next, R.drawable.notification_media_forward);
 				}
 			} else {
-				rv.setImageViewResource(R.id.control_previous, playing ? R.drawable.notification_pause : R.drawable.notification_start);
+				rv.setImageViewResource(R.id.control_previous, playing ? R.drawable.notification_media_pause : R.drawable.notification_media_start);
 				if(shouldFastForward) {
-					rv.setImageViewResource(R.id.control_pause, R.drawable.notification_fastforward);
+					rv.setImageViewResource(R.id.control_pause, R.drawable.notification_media_fastforward);
 				} else {
-					rv.setImageViewResource(R.id.control_pause, R.drawable.notification_forward);
+					rv.setImageViewResource(R.id.control_pause, R.drawable.notification_media_forward);
 				}
 				rv.setImageViewResource(R.id.control_next, R.drawable.notification_close);
 			}
 		} else if(shouldFastForward) {
-			rv.setImageViewResource(R.id.control_previous, R.drawable.notification_rewind);
-			rv.setImageViewResource(R.id.control_next, R.drawable.notification_fastforward);
+			rv.setImageViewResource(R.id.control_previous, R.drawable.notification_media_rewind);
+			rv.setImageViewResource(R.id.control_next, R.drawable.notification_media_fastforward);
 		} else {
 			// Necessary for switching back since it appears to re-use the same layout
-			rv.setImageViewResource(R.id.control_previous, R.drawable.notification_backward);
-			rv.setImageViewResource(R.id.control_next, R.drawable.notification_forward);
+			rv.setImageViewResource(R.id.control_previous, R.drawable.notification_media_backward);
+			rv.setImageViewResource(R.id.control_next, R.drawable.notification_media_forward);
 		}
 
 		// Create actions for media buttons

app/src/main/java/github/daneren2005/dsub/view/SongView.java

@@ -258,9 +258,9 @@ protected void update() {
 				moreButton.setImageResource(moreImage);
 				this.moreImage = moreImage;
 			}
-		} else if(this.moreImage != R.drawable.download_none_light) {
+		} else if(this.moreImage != R.drawable.download_none) {
 			moreButton.setImageResource(DrawableTint.getDrawableRes(context, R.attr.download_none));
-			this.moreImage = R.drawable.download_none_light;
+			this.moreImage = R.drawable.download_none;
 		}
 
 		if (downloadFile.isDownloading() && !downloadFile.isDownloadCancelled() && partialFileExists) {

app/src/main/res/drawable-hdpi/action_toggle_list_dark.png

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:src="@drawable/notification_close_light"/>
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/lightElement" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

app/src/main/res/drawable-hdpi/action_toggle_list_light.png

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<size android:width="1dip" />
+	<solid android:color="@android:color/darker_gray" />
+</shape>

app/src/main/res/drawable-hdpi/download_cached.png

@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/lightElement" android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+</vector>

app/src/main/res/drawable-hdpi/download_none_dark.png

@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/lightElement" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
+</vector>

app/src/main/res/drawable-hdpi/download_none_light.png

@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/lightElement" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>

app/src/main/res/drawable-hdpi/download_pinned.png

@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/lightElement" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>

app/src/main/res/drawable-hdpi/downloading_dark.png

@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/lightElement" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
+</vector>

app/src/main/res/drawable-hdpi/downloading_light.png

@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/lightElement" android:pathData="M8,5v14l11,-7z"/>
+</vector>