diff options
Diffstat (limited to 'core/src/main')
91 files changed, 111 insertions, 39 deletions
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); } diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_24dp.png Binary files differdeleted file mode 100644 index df9e662c1..000000000 --- a/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_36dp.png Binary files differdeleted file mode 100644 index 59ae40266..000000000 --- a/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_white_24dp.png Binary files differdeleted file mode 100644 index 2d61b31f1..000000000 --- a/core/src/main/res/drawable-hdpi/ic_fast_forward_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_white_36dp.png Binary files differdeleted file mode 100644 index e5ae251d3..000000000 --- a/core/src/main/res/drawable-hdpi/ic_fast_forward_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_24dp.png Binary files differdeleted file mode 100644 index f661ca723..000000000 --- a/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_36dp.png Binary files differdeleted file mode 100644 index d36891a8d..000000000 --- a/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_24dp.png Binary files differdeleted file mode 100644 index ab8b48ec3..000000000 --- a/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_36dp.png Binary files differdeleted file mode 100644 index 75796d7a9..000000000 --- a/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_pause_grey600_24dp.png Binary files differdeleted file mode 100644 index 7281f37e1..000000000 --- a/core/src/main/res/drawable-hdpi/ic_pause_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_pause_grey600_36dp.png Binary files differdeleted file mode 100644 index dde9bb25c..000000000 --- a/core/src/main/res/drawable-hdpi/ic_pause_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_pause_white_24dp.png Binary files differdeleted file mode 100644 index 1701f34b0..000000000 --- a/core/src/main/res/drawable-hdpi/ic_pause_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_pause_white_36dp.png Binary files differdeleted file mode 100644 index 1d024393a..000000000 --- a/core/src/main/res/drawable-hdpi/ic_pause_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_24dp.png Binary files differdeleted file mode 100644 index b540e4a63..000000000 --- a/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_36dp.png Binary files differdeleted file mode 100644 index a12b921e4..000000000 --- a/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png Binary files differdeleted file mode 100644 index f77ad6b57..000000000 --- a/core/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png Binary files differdeleted file mode 100644 index 2b8e3513f..000000000 --- a/core/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_skip_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_skip_grey600_36dp.png Binary files differdeleted file mode 100644 index 6e1dffc93..000000000 --- a/core/src/main/res/drawable-hdpi/ic_skip_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_skip_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_skip_white_36dp.png Binary files differdeleted file mode 100644 index 760ec9987..000000000 --- a/core/src/main/res/drawable-hdpi/ic_skip_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_24dp.png Binary files differdeleted file mode 100644 index c67fc25f1..000000000 --- a/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_36dp.png Binary files differdeleted file mode 100644 index df9e662c1..000000000 --- a/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_white_24dp.png Binary files differdeleted file mode 100644 index fceffcb7b..000000000 --- a/core/src/main/res/drawable-mdpi/ic_fast_forward_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_white_36dp.png Binary files differdeleted file mode 100644 index 2d61b31f1..000000000 --- a/core/src/main/res/drawable-mdpi/ic_fast_forward_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_24dp.png Binary files differdeleted file mode 100644 index de04575da..000000000 --- a/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_36dp.png Binary files differdeleted file mode 100644 index f661ca723..000000000 --- a/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_24dp.png Binary files differdeleted file mode 100644 index bfb476b4a..000000000 --- a/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_36dp.png Binary files differdeleted file mode 100644 index ab8b48ec3..000000000 --- a/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_pause_grey600_24dp.png Binary files differdeleted file mode 100644 index 126ee03ef..000000000 --- a/core/src/main/res/drawable-mdpi/ic_pause_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_pause_grey600_36dp.png Binary files differdeleted file mode 100644 index 7281f37e1..000000000 --- a/core/src/main/res/drawable-mdpi/ic_pause_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_pause_white_24dp.png Binary files differdeleted file mode 100644 index 2272d478c..000000000 --- a/core/src/main/res/drawable-mdpi/ic_pause_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_pause_white_36dp.png Binary files differdeleted file mode 100644 index 1701f34b0..000000000 --- a/core/src/main/res/drawable-mdpi/ic_pause_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_24dp.png Binary files differdeleted file mode 100644 index 9c8f2c555..000000000 --- a/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_36dp.png Binary files differdeleted file mode 100644 index b540e4a63..000000000 --- a/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png Binary files differdeleted file mode 100644 index 172c211ab..000000000 --- a/core/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png Binary files differdeleted file mode 100644 index f77ad6b57..000000000 --- a/core/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_skip_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_skip_grey600_36dp.png Binary files differdeleted file mode 100644 index 229eeca47..000000000 --- a/core/src/main/res/drawable-mdpi/ic_skip_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_skip_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_skip_white_36dp.png Binary files differdeleted file mode 100644 index 9032328d4..000000000 --- a/core/src/main/res/drawable-mdpi/ic_skip_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_24dp.png Binary files differdeleted file mode 100644 index 6f8b42221..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_36dp.png Binary files differdeleted file mode 100644 index 521f7490b..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_24dp.png Binary files differdeleted file mode 100644 index 2b34fb82d..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_36dp.png Binary files differdeleted file mode 100644 index 2d9a7e3c9..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_24dp.png Binary files differdeleted file mode 100644 index 9468020b7..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_36dp.png Binary files differdeleted file mode 100644 index ea5493251..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_24dp.png Binary files differdeleted file mode 100644 index f4182f174..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_36dp.png Binary files differdeleted file mode 100644 index de9ec1d90..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_grey600_24dp.png Binary files differdeleted file mode 100644 index 6708b4161..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_pause_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_grey600_36dp.png Binary files differdeleted file mode 100644 index aeb13ebc4..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_pause_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png Binary files differdeleted file mode 100644 index f49aed757..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png Binary files differdeleted file mode 100644 index 7192ad487..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_24dp.png Binary files differdeleted file mode 100644 index 6874b8236..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_36dp.png Binary files differdeleted file mode 100644 index dabd252ee..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png Binary files differdeleted file mode 100644 index 5b0110454..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png Binary files differdeleted file mode 100644 index fff3e1f56..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_skip_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_skip_grey600_36dp.png Binary files differdeleted file mode 100644 index 31aa09ca2..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_skip_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_skip_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_skip_white_36dp.png Binary files differdeleted file mode 100644 index e664f607c..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_skip_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_24dp.png Binary files differdeleted file mode 100644 index 521f7490b..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_36dp.png Binary files differdeleted file mode 100644 index 644645c8b..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_24dp.png Binary files differdeleted file mode 100644 index 2d9a7e3c9..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_36dp.png Binary files differdeleted file mode 100644 index 76c94c3ba..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_24dp.png Binary files differdeleted file mode 100644 index ea5493251..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_36dp.png Binary files differdeleted file mode 100644 index 831fda2ab..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_24dp.png Binary files differdeleted file mode 100644 index de9ec1d90..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_36dp.png Binary files differdeleted file mode 100644 index 8e11ac89e..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_24dp.png Binary files differdeleted file mode 100644 index aeb13ebc4..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_36dp.png Binary files differdeleted file mode 100644 index 8753d9c50..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png Binary files differdeleted file mode 100644 index 7192ad487..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png Binary files differdeleted file mode 100644 index fb63ddc5a..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_24dp.png Binary files differdeleted file mode 100644 index dabd252ee..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_36dp.png Binary files differdeleted file mode 100644 index 9fcf99558..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png Binary files differdeleted file mode 100644 index fff3e1f56..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png Binary files differdeleted file mode 100644 index 9b31e2d19..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_skip_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_skip_grey600_36dp.png Binary files differdeleted file mode 100644 index 75a4a9545..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_skip_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_skip_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_skip_white_36dp.png Binary files differdeleted file mode 100644 index a31299c81..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_skip_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxxhdpi/ic_skip_grey600_36dp.png b/core/src/main/res/drawable-xxxhdpi/ic_skip_grey600_36dp.png Binary files differdeleted file mode 100644 index b599c2207..000000000 --- a/core/src/main/res/drawable-xxxhdpi/ic_skip_grey600_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxxhdpi/ic_skip_white_36dp.png b/core/src/main/res/drawable-xxxhdpi/ic_skip_white_36dp.png Binary files differdeleted file mode 100644 index a0dd670c3..000000000 --- a/core/src/main/res/drawable-xxxhdpi/ic_skip_white_36dp.png +++ /dev/null diff --git a/core/src/main/res/drawable/ic_av_fast_forward_dark_48dp.xml b/core/src/main/res/drawable/ic_av_fast_forward_dark_48dp.xml new file mode 100644 index 000000000..cf0faa33e --- /dev/null +++ b/core/src/main/res/drawable/ic_av_fast_forward_dark_48dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FF757575" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_av_fast_forward_white_48dp.xml b/core/src/main/res/drawable/ic_av_fast_forward_white_48dp.xml new file mode 100644 index 000000000..aca5bcf29 --- /dev/null +++ b/core/src/main/res/drawable/ic_av_fast_forward_white_48dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FFFFFFFF" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_av_fast_rewind_dark_48dp.xml b/core/src/main/res/drawable/ic_av_fast_rewind_dark_48dp.xml new file mode 100644 index 000000000..47d1189cb --- /dev/null +++ b/core/src/main/res/drawable/ic_av_fast_rewind_dark_48dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FF757575" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_av_fast_rewind_white_48dp.xml b/core/src/main/res/drawable/ic_av_fast_rewind_white_48dp.xml new file mode 100644 index 000000000..ba2b8ae4f --- /dev/null +++ b/core/src/main/res/drawable/ic_av_fast_rewind_white_48dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FFFFFFFF" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_av_pause_dark_48dp.xml b/core/src/main/res/drawable/ic_av_pause_dark_48dp.xml new file mode 100644 index 000000000..61fdd4b5b --- /dev/null +++ b/core/src/main/res/drawable/ic_av_pause_dark_48dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FF757575" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_av_pause_white_48dp.xml b/core/src/main/res/drawable/ic_av_pause_white_48dp.xml new file mode 100644 index 000000000..3512563ec --- /dev/null +++ b/core/src/main/res/drawable/ic_av_pause_white_48dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FFFFFFFF" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_av_play_dark_24dp.xml b/core/src/main/res/drawable/ic_av_play_dark_24dp.xml new file mode 100644 index 000000000..5bc12c0e1 --- /dev/null +++ b/core/src/main/res/drawable/ic_av_play_dark_24dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FF757575" android:pathData="M8,5v14l11,-7z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_av_play_dark_48dp.xml b/core/src/main/res/drawable/ic_av_play_dark_48dp.xml new file mode 100644 index 000000000..dbe5e7104 --- /dev/null +++ b/core/src/main/res/drawable/ic_av_play_dark_48dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FF757575" android:pathData="M8,5v14l11,-7z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_av_play_white_24dp.xml b/core/src/main/res/drawable/ic_av_play_white_24dp.xml new file mode 100644 index 000000000..0e896a8d4 --- /dev/null +++ b/core/src/main/res/drawable/ic_av_play_white_24dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FFFFFFFF" android:pathData="M8,5v14l11,-7z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_av_play_white_48dp.xml b/core/src/main/res/drawable/ic_av_play_white_48dp.xml new file mode 100644 index 000000000..bf94a000b --- /dev/null +++ b/core/src/main/res/drawable/ic_av_play_white_48dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FFFFFFFF" android:pathData="M8,5v14l11,-7z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_av_skip_dark_48dp.xml b/core/src/main/res/drawable/ic_av_skip_dark_48dp.xml new file mode 100644 index 000000000..2552f8d73 --- /dev/null +++ b/core/src/main/res/drawable/ic_av_skip_dark_48dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FF757575" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_av_skip_white_48dp.xml b/core/src/main/res/drawable/ic_av_skip_white_48dp.xml new file mode 100644 index 000000000..7e0073e88 --- /dev/null +++ b/core/src/main/res/drawable/ic_av_skip_white_48dp.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FFFFFFFF" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/> +</vector> diff --git a/core/src/main/res/layout/player_widget.xml b/core/src/main/res/layout/player_widget.xml index 5f49fb7ef..b0e5e0fd8 100644 --- a/core/src/main/res/layout/player_widget.xml +++ b/core/src/main/res/layout/player_widget.xml @@ -19,8 +19,10 @@ android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_margin="12dp" - android:background="@android:color/transparent" - android:src="@drawable/ic_play_arrow_white_24dp" /> + android:background="?android:attr/selectableItemBackground" + android:scaleType="fitCenter" + android:padding="8dp" + android:src="@drawable/ic_av_play_white_24dp" /> <LinearLayout android:id="@+id/layout_left" diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index 066594f3d..1147f015d 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -9,6 +9,7 @@ <attr name="av_fast_forward" format="reference"/> <attr name="av_pause" format="reference"/> <attr name="av_play" format="reference"/> + <attr name="av_skip" format="reference"/> <attr name="av_speed" format="reference"/> <attr name="av_rewind" format="reference"/> <attr name="content_discard" format="reference"/> @@ -32,11 +33,7 @@ <attr name="dragview_float_background" format="reference"/> <attr name="ic_new" format="reference"/> <attr name="ic_history" format="reference"/> - <attr name="av_play_big" format="reference"/> - <attr name="av_pause_big" format="reference"/> - <attr name="av_ff_big" format="reference"/> - <attr name="av_rew_big" format="reference"/> - <attr name="av_skip_big" format="reference"/> + <attr name="ic_settings_playback" format="reference"/> <attr name="ic_settings" format="reference"/> <attr name="ic_lock_open" format="reference"/> <attr name="ic_lock_closed" format="reference"/> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index 33b736089..f6c31f652 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -20,12 +20,13 @@ <item name="action_search">@drawable/ic_search_grey600_24dp</item> <item name="action_stream">@drawable/ic_stream_grey600</item> <item name="av_download">@drawable/ic_file_download_grey600_24dp</item> - <item name="av_fast_forward">@drawable/ic_fast_forward_grey600_24dp</item> - <item name="av_pause">@drawable/ic_pause_grey600_24dp</item> - <item name="av_play">@drawable/ic_play_arrow_grey600_24dp</item> + <item name="av_pause">@drawable/ic_av_pause_dark_48dp</item> + <item name="av_play">@drawable/ic_av_play_dark_48dp</item> + <item name="av_rewind">@drawable/ic_av_fast_rewind_dark_48dp</item> + <item name="av_fast_forward">@drawable/ic_av_fast_forward_dark_48dp</item> + <item name="av_skip">@drawable/ic_av_skip_dark_48dp</item> <item name="av_speed">@drawable/ic_playback_speed_dark_48dp</item> <item name="ic_settings_speed">@drawable/ic_playback_speed_dark_24dp</item> - <item name="av_rewind">@drawable/ic_fast_rewind_grey600_24dp</item> <item name="content_discard">@drawable/ic_delete_grey600_24dp</item> <item name="content_new">@drawable/ic_add_grey600_24dp</item> <item name="content_remove_from_queue">@drawable/ic_remove_grey600</item> @@ -49,11 +50,7 @@ <item name="ic_new">@drawable/ic_new_releases_grey600_24dp</item> <item name="ic_history">@drawable/ic_history_grey600_24dp</item> <item name="ic_folder">@drawable/ic_folder_grey600_24dp</item> - <item name="av_play_big">@drawable/ic_play_arrow_grey600_36dp</item> - <item name="av_pause_big">@drawable/ic_pause_grey600_36dp</item> - <item name="av_ff_big">@drawable/ic_fast_forward_grey600_36dp</item> - <item name="av_rew_big">@drawable/ic_fast_rewind_grey600_36dp</item> - <item name="av_skip_big">@drawable/ic_skip_grey600_36dp</item> + <item name="ic_settings_playback">@drawable/ic_av_play_dark_24dp</item> <item name="ic_fav">@drawable/ic_star_border_grey600_24dp</item> <item name="ic_unfav">@drawable/ic_star_grey600_24dp</item> <item name="ic_settings">@drawable/ic_settings_grey600_24dp</item> @@ -108,12 +105,13 @@ <item name="action_search">@drawable/ic_search_white_24dp</item> <item name="action_stream">@drawable/ic_stream_white</item> <item name="av_download">@drawable/ic_file_download_white_24dp</item> - <item name="av_fast_forward">@drawable/ic_fast_forward_white_24dp</item> - <item name="av_pause">@drawable/ic_pause_white_24dp</item> - <item name="av_play">@drawable/ic_play_arrow_white_24dp</item> + <item name="av_rewind">@drawable/ic_av_fast_rewind_white_48dp</item> + <item name="av_fast_forward">@drawable/ic_av_fast_forward_white_48dp</item> + <item name="av_pause">@drawable/ic_av_pause_white_48dp</item> + <item name="av_play">@drawable/ic_av_play_white_48dp</item> + <item name="av_skip">@drawable/ic_av_skip_white_48dp</item> <item name="av_speed">@drawable/ic_playback_speed_white_48dp</item> <item name="ic_settings_speed">@drawable/ic_playback_speed_white_24dp</item> - <item name="av_rewind">@drawable/ic_fast_rewind_white_24dp</item> <item name="content_discard">@drawable/ic_delete_white_24dp</item> <item name="content_new">@drawable/ic_add_white_24dp</item> <item name="content_remove_from_queue">@drawable/ic_remove_white</item> @@ -137,11 +135,7 @@ <item name="ic_new">@drawable/ic_new_releases_white_24dp</item> <item name="ic_history">@drawable/ic_history_white_24dp</item> <item name="ic_folder">@drawable/ic_folder_white_24dp</item> - <item name="av_play_big">@drawable/ic_play_arrow_white_36dp</item> - <item name="av_pause_big">@drawable/ic_pause_white_36dp</item> - <item name="av_ff_big">@drawable/ic_fast_forward_white_36dp</item> - <item name="av_rew_big">@drawable/ic_fast_rewind_white_36dp</item> - <item name="av_skip_big">@drawable/ic_skip_white_36dp</item> + <item name="ic_settings_playback">@drawable/ic_av_play_white_24dp</item> <item name="ic_fav">@drawable/ic_star_border_white_24dp</item> <item name="ic_unfav">@drawable/ic_star_white_24dp</item> <item name="ic_settings">@drawable/ic_settings_white_24dp</item> |
