Show replay icon in notification when player state is completed

TeamNewPipe · Sep 22, 2020 · b4e073c · b4e073c
1 parent 814efbf
commit b4e073c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git 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 @@ private NotificationCompat.Action getAction(
                             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 @@ private NotificationCompat.Action getAction(
                     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
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
diff --git a/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp_png.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp_png.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp_png.png