From b4e073cde7d737ea6c6230ecb17f47acac1da0b8 Mon Sep 17 00:00:00 2001 From: Stypox Date: Tue, 22 Sep 2020 18:12:51 +0200 Subject: [PATCH] Show replay icon in notification when player state is completed --- .../newpipe/player/NotificationUtil.java | 23 ++++++++---------- .../ic_replay_white_24dp_png.png | Bin 0 -> 621 bytes .../ic_replay_white_24dp_png.png | Bin 0 -> 411 bytes .../ic_replay_white_24dp_png.png | Bin 0 -> 837 bytes .../ic_replay_white_24dp_png.png | Bin 0 -> 1420 bytes .../ic_replay_white_24dp_png.png | Bin 0 -> 2098 bytes 6 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_replay_white_24dp_png.png create mode 100644 app/src/main/res/drawable-mdpi/ic_replay_white_24dp_png.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_replay_white_24dp_png.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp_png.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp_png.png diff --git a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java index 1656d60b1..370631116 100644 --- a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java +++ b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java @@ -257,18 +257,6 @@ public final class NotificationUtil { R.string.exo_controls_fastforward_description, ACTION_FAST_FORWARD); } - case NotificationConstants.PLAY_PAUSE: - if (player.isPlaying() - || player.getCurrentState() == BasePlayer.STATE_PREFLIGHT - || player.getCurrentState() == BasePlayer.STATE_BLOCKED - || player.getCurrentState() == BasePlayer.STATE_BUFFERING) { - return getAction(player, R.drawable.exo_notification_pause, - R.string.exo_controls_pause_description, ACTION_PLAY_PAUSE); - } else { - return getAction(player, R.drawable.exo_notification_play, - R.string.exo_controls_play_description, ACTION_PLAY_PAUSE); - } - case NotificationConstants.PLAY_PAUSE_BUFFERING: if (player.getCurrentState() == BasePlayer.STATE_PREFLIGHT || player.getCurrentState() == BasePlayer.STATE_BLOCKED @@ -277,7 +265,16 @@ public final class NotificationUtil { return new NotificationCompat.Action(R.drawable.ic_hourglass_top_white_24dp_png, player.context.getString(R.string.notification_action_buffering), null); - } else if (player.isPlaying()) { + } + + case NotificationConstants.PLAY_PAUSE: + if (player.getCurrentState() == BasePlayer.STATE_COMPLETED) { + return getAction(player, R.drawable.ic_replay_white_24dp_png, + R.string.exo_controls_pause_description, ACTION_PLAY_PAUSE); + } else if (player.isPlaying() + || player.getCurrentState() == BasePlayer.STATE_PREFLIGHT + || player.getCurrentState() == BasePlayer.STATE_BLOCKED + || player.getCurrentState() == BasePlayer.STATE_BUFFERING) { return getAction(player, R.drawable.exo_notification_pause, R.string.exo_controls_pause_description, ACTION_PLAY_PAUSE); } else { diff --git a/app/src/main/res/drawable-hdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-hdpi/ic_replay_white_24dp_png.png new file mode 100644 index 0000000000000000000000000000000000000000..8c5afb38015ca1370dc2a166c21a5bb27e198402 GIT binary patch literal 621 zcmV-z0+RiSP)%N_m)1RvbM11YEqd0VQ&)pg@PH6kvTtPz=bRTp9uA z%J+w$T!*N1u_O#iDcvN_95QEEm><@gs)y`NGID$OO&$ zf}lnwXv2tO2_w=(K^7+H%!uP9bF4H`P%Yc{*ofmUb8IkCP$%2hYQ%AdIgXk!LeK~^ z!S?;>?k_n2(IyCrqjAJ|ju}6-vDF*yA!IH8^zbEG&p&XsGBbif_r2el|Qv$tW z|5HZUaS-ZhGA4p)J9F|r7y~V!8q|PR@SSo_wMh_bRzr&dLk`}_9N9JaDrX`cmtzGr zO`8isr1&ZDN%xH%0*b*GO7eYrxQxUem;*ha2z>bO{{VXiYf$hjFY7I100000NkvXX Hu0mjfQxF~R literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-mdpi/ic_replay_white_24dp_png.png new file mode 100644 index 0000000000000000000000000000000000000000..038804d113396e8fd7adb1d3e8b4de356df7b8fb GIT binary patch literal 411 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 literal 0 HcmV?d00001