From f9e97e878eecd5f974264182fc5b08129390d138 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 12 Feb 2020 14:18:02 +0100
Subject: Replaced images with vector version

---
 .../antennapod/core/service/PlayerWidgetJobService.java  |  7 +++----
 .../core/util/playback/PlaybackController.java           | 16 ++++++----------
 2 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'core/src/main/java/de/danoeh')

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
index e6f2176f7..4562f1393 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
@@ -8,7 +8,6 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import androidx.annotation.NonNull;
@@ -158,10 +157,10 @@ public class PlayerWidgetJobService extends SafeJobIntentService {
             }
 
             if (status == PlayerStatus.PLAYING) {
-                views.setImageViewResource(R.id.butPlay, R.drawable.ic_pause_white_24dp);
+                views.setImageViewResource(R.id.butPlay, R.drawable.ic_av_pause_white_48dp);
                 views.setContentDescription(R.id.butPlay, getString(R.string.pause_label));
             } else {
-                views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
+                views.setImageViewResource(R.id.butPlay, R.drawable.ic_av_play_white_48dp);
                 views.setContentDescription(R.id.butPlay, getString(R.string.play_label));
             }
             views.setOnClickPendingIntent(R.id.butPlay, createMediaButtonIntent());
@@ -177,7 +176,7 @@ public class PlayerWidgetJobService extends SafeJobIntentService {
             views.setViewVisibility(R.id.txtvTitle, View.GONE);
             views.setViewVisibility(R.id.txtNoPlaying, View.VISIBLE);
             views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_foreground);
-            views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
+            views.setImageViewResource(R.id.butPlay, R.drawable.ic_av_play_white_48dp);
         }
 
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index cb22fbcc9..d9567e1e1 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -21,6 +21,7 @@ import android.widget.ImageButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import de.danoeh.antennapod.core.util.ThemeUtils;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
 import de.danoeh.antennapod.core.R;
@@ -397,12 +398,10 @@ public class PlaybackController {
         final CharSequence playText = activity.getString(R.string.play_label);
         final CharSequence pauseText = activity.getString(R.string.pause_label);
 
-        if (PlaybackService.getCurrentMediaType() == MediaType.AUDIO ||
-                PlaybackService.isCasting()) {
-            TypedArray res = activity.obtainStyledAttributes(new int[]{
-                    R.attr.av_play_big, R.attr.av_pause_big});
-            playResource = res.getResourceId(0, R.drawable.ic_play_arrow_grey600_36dp);
-            pauseResource = res.getResourceId(1, R.drawable.ic_pause_grey600_36dp);
+        if (PlaybackService.getCurrentMediaType() == MediaType.AUDIO  ||  PlaybackService.isCasting()) {
+            TypedArray res = activity.obtainStyledAttributes(new int[]{ R.attr.av_play, R.attr.av_pause});
+            playResource = res.getResourceId(0, R.drawable.ic_av_play_dark_48dp);
+            pauseResource = res.getResourceId(1, R.drawable.ic_av_pause_dark_48dp);
             res.recycle();
         } else {
             playResource = R.drawable.ic_av_play_white_80dp;
@@ -779,11 +778,8 @@ public class PlaybackController {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(media -> {
                 if (media.getMediaType() == MediaType.AUDIO) {
-                    TypedArray res = activity.obtainStyledAttributes(new int[]{
-                            de.danoeh.antennapod.core.R.attr.av_play_big});
                     getPlayButton().setImageResource(
-                            res.getResourceId(0, de.danoeh.antennapod.core.R.drawable.ic_play_arrow_grey600_36dp));
-                    res.recycle();
+                            ThemeUtils.getDrawableFromAttr(activity, de.danoeh.antennapod.core.R.attr.av_play));
                 } else {
                     getPlayButton().setImageResource(R.drawable.ic_av_play_white_80dp);
                 }
-- 
cgit v1.2.3