Update a ton of drawables to modern material versions

4 files changed, 13 insertions, 14 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
index 92ecf930..bb20843d 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -247,7 +247,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
 		drawerList.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() {
 			@Override
 			public boolean onNavigationItemSelected(final MenuItem menuItem) {
-				if(showingTabs) {
+				if (showingTabs) {
 					// Settings are on a different selectable track
 					if (menuItem.getItemId() != R.id.drawer_settings && menuItem.getItemId() != R.id.drawer_admin) {
 						menuItem.setChecked(true);
@@ -310,7 +310,6 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
 				return false;
 			}
 		});
-		populateTabs();
 
 		drawerHeader = drawerList.inflateHeaderView(R.layout.drawer_header);
 		drawerHeader.setOnClickListener(new View.OnClickListener() {
@@ -329,6 +328,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
 		drawerUserName = (TextView) drawerHeader.findViewById(R.id.header_user_name);
 
 		drawerUserAvatar = (ImageView) drawerHeader.findViewById(R.id.header_user_avatar);
+		populateTabs();
 		updateDrawerHeader();
 
 		if(!isTv()) {
@@ -577,6 +577,8 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
 				item.setChecked(true);
 			}
 		}
+		drawerHeaderToggle.setImageResource(R.drawable.main_select_server_dark);
+
 		showingTabs = true;
 	}
 	private void populateServers() {
@@ -591,6 +593,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
 			}
 		}
 		drawerList.getMenu().setGroupCheckable(MENU_GROUP_SERVER, true, true);
+		drawerHeaderToggle.setImageResource(R.drawable.main_select_tabs_dark);
 
 		showingTabs = false;
 	}
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index 00b780a5..cc4fd9f0 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -1333,17 +1333,13 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
 
 		switch (downloadService.getRepeatMode()) {
 			case OFF:
-				if("light".equals(SubsonicActivity.getThemeName()) | "light_fullscreen".equals(SubsonicActivity.getThemeName())) {
-					repeatButton.setImageResource(R.drawable.media_repeat_off_light);
-				} else {
-					repeatButton.setImageResource(R.drawable.media_repeat_off);
-				}
+				repeatButton.setImageResource(DrawableTint.getDrawableRes(context, R.attr.media_button_repeat_off));
 				break;
 			case ALL:
-				repeatButton.setImageResource(R.drawable.media_repeat_all);
+				repeatButton.setImageResource(DrawableTint.getDrawableRes(context, R.attr.media_button_repeat_all));
 				break;
 			case SINGLE:
-				repeatButton.setImageResource(R.drawable.media_repeat_single);
+				repeatButton.setImageResource(DrawableTint.getDrawableRes(context, R.attr.media_button_repeat_single));
 				break;
 			default:
 				break;
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java b/app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java
index 7cb3ce8b..83733618 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java
+++ b/app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java
@@ -208,9 +208,9 @@ public class DSubWidgetProvider extends AppWidgetProvider {
 
         // Set correct drawable for pause state
         if (playing) {
-            views.setImageViewResource(R.id.control_play, R.drawable.ic_appwidget_music_pause);
+            views.setImageViewResource(R.id.control_play, R.drawable.media_pause_dark);
         } else {
-            views.setImageViewResource(R.id.control_play, R.drawable.ic_appwidget_music_play);
+            views.setImageViewResource(R.id.control_play, R.drawable.media_start_dark);
         }
 
         // Set the cover art
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java b/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
index c7b6986e..bc87624f 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
@@ -148,10 +148,10 @@ public final class Notifications {
 		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_play);
+				rv.setImageViewResource(R.id.control_pause, playing ? R.drawable.media_pause_dark : R.drawable.media_start_dark);
 			} else {
-				rv.setImageViewResource(R.id.control_previous, playing ? R.drawable.notification_pause : R.drawable.notification_play);
-				rv.setImageViewResource(R.id.control_pause, R.drawable.notification_next);
+				rv.setImageViewResource(R.id.control_previous, playing ? R.drawable.media_pause_dark : R.drawable.media_start_dark);
+				rv.setImageViewResource(R.id.control_pause, R.drawable.media_forward_dark);
 				rv.setImageViewResource(R.id.control_next, R.drawable.notification_close);
 			}
 		}