-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Android 13+ custom notification actions #10580
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
app/src/main/java/org/schabi/newpipe/player/mediasession/SessionConnectorActionProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
package org.schabi.newpipe.player.mediasession; | ||
|
||
import android.content.Context; | ||
import android.content.Intent; | ||
import android.os.Bundle; | ||
import android.support.v4.media.session.PlaybackStateCompat; | ||
|
||
import androidx.annotation.NonNull; | ||
import androidx.annotation.Nullable; | ||
|
||
import com.google.android.exoplayer2.Player; | ||
import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector; | ||
|
||
import org.schabi.newpipe.player.notification.NotificationActionData; | ||
|
||
import java.lang.ref.WeakReference; | ||
|
||
public class SessionConnectorActionProvider implements MediaSessionConnector.CustomActionProvider { | ||
|
||
private final NotificationActionData data; | ||
@NonNull | ||
private final WeakReference<Context> context; | ||
|
||
public SessionConnectorActionProvider(final NotificationActionData notificationActionData, | ||
@NonNull final Context context) { | ||
this.data = notificationActionData; | ||
this.context = new WeakReference<>(context); | ||
} | ||
|
||
@Override | ||
public void onCustomAction(@NonNull final Player player, | ||
@NonNull final String action, | ||
@Nullable final Bundle extras) { | ||
final Context actualContext = context.get(); | ||
if (actualContext != null) { | ||
actualContext.sendBroadcast(new Intent(action)); | ||
} | ||
} | ||
|
||
@Nullable | ||
@Override | ||
public PlaybackStateCompat.CustomAction getCustomAction(@NonNull final Player player) { | ||
if (data.action() == null) { | ||
return null; | ||
} else { | ||
return new PlaybackStateCompat.CustomAction.Builder( | ||
data.action(), data.name(), data.icon() | ||
).build(); | ||
} | ||
} | ||
} |
168 changes: 168 additions & 0 deletions
168
app/src/main/java/org/schabi/newpipe/player/notification/NotificationActionData.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,168 @@ | ||
package org.schabi.newpipe.player.notification; | ||
|
||
import static com.google.android.exoplayer2.Player.REPEAT_MODE_ALL; | ||
import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE; | ||
import static org.schabi.newpipe.player.notification.NotificationConstants.ACTION_CLOSE; | ||
import static org.schabi.newpipe.player.notification.NotificationConstants.ACTION_FAST_FORWARD; | ||
import static org.schabi.newpipe.player.notification.NotificationConstants.ACTION_FAST_REWIND; | ||
import static org.schabi.newpipe.player.notification.NotificationConstants.ACTION_PLAY_NEXT; | ||
import static org.schabi.newpipe.player.notification.NotificationConstants.ACTION_PLAY_PAUSE; | ||
import static org.schabi.newpipe.player.notification.NotificationConstants.ACTION_PLAY_PREVIOUS; | ||
import static org.schabi.newpipe.player.notification.NotificationConstants.ACTION_REPEAT; | ||
import static org.schabi.newpipe.player.notification.NotificationConstants.ACTION_SHUFFLE; | ||
|
||
import android.content.Context; | ||
|
||
import androidx.annotation.DrawableRes; | ||
import androidx.annotation.NonNull; | ||
import androidx.annotation.Nullable; | ||
|
||
import org.schabi.newpipe.R; | ||
import org.schabi.newpipe.player.Player; | ||
|
||
public final class NotificationActionData { | ||
@Nullable | ||
private final String action; | ||
@NonNull | ||
private final String name; | ||
@DrawableRes | ||
private final int icon; | ||
|
||
public NotificationActionData(@Nullable final String action, @NonNull final String name, | ||
@DrawableRes final int icon) { | ||
this.action = action; | ||
this.name = name; | ||
this.icon = icon; | ||
} | ||
|
||
@Nullable | ||
public String action() { | ||
return action; | ||
} | ||
|
||
@NonNull | ||
public String name() { | ||
return name; | ||
} | ||
|
||
@DrawableRes | ||
public int icon() { | ||
return icon; | ||
} | ||
|
||
|
||
@Nullable | ||
public static NotificationActionData fromNotificationActionEnum( | ||
@NonNull final Player player, | ||
@NotificationConstants.Action final int selectedAction | ||
) { | ||
|
||
final int baseActionIcon = NotificationConstants.ACTION_ICONS[selectedAction]; | ||
final Context ctx = player.getContext(); | ||
|
||
switch (selectedAction) { | ||
case NotificationConstants.PREVIOUS: | ||
return new NotificationActionData(ACTION_PLAY_PREVIOUS, | ||
ctx.getString(R.string.exo_controls_previous_description), baseActionIcon); | ||
|
||
case NotificationConstants.NEXT: | ||
return new NotificationActionData(ACTION_PLAY_NEXT, | ||
ctx.getString(R.string.exo_controls_next_description), baseActionIcon); | ||
|
||
case NotificationConstants.REWIND: | ||
return new NotificationActionData(ACTION_FAST_REWIND, | ||
ctx.getString(R.string.exo_controls_rewind_description), baseActionIcon); | ||
|
||
case NotificationConstants.FORWARD: | ||
return new NotificationActionData(ACTION_FAST_FORWARD, | ||
ctx.getString(R.string.exo_controls_fastforward_description), | ||
baseActionIcon); | ||
|
||
case NotificationConstants.SMART_REWIND_PREVIOUS: | ||
if (player.getPlayQueue() != null && player.getPlayQueue().size() > 1) { | ||
return new NotificationActionData(ACTION_PLAY_PREVIOUS, | ||
ctx.getString(R.string.exo_controls_previous_description), | ||
R.drawable.exo_notification_previous); | ||
} else { | ||
return new NotificationActionData(ACTION_FAST_REWIND, | ||
ctx.getString(R.string.exo_controls_rewind_description), | ||
R.drawable.exo_controls_rewind); | ||
} | ||
|
||
case NotificationConstants.SMART_FORWARD_NEXT: | ||
if (player.getPlayQueue() != null && player.getPlayQueue().size() > 1) { | ||
return new NotificationActionData(ACTION_PLAY_NEXT, | ||
ctx.getString(R.string.exo_controls_next_description), | ||
R.drawable.exo_notification_next); | ||
} else { | ||
return new NotificationActionData(ACTION_FAST_FORWARD, | ||
ctx.getString(R.string.exo_controls_fastforward_description), | ||
R.drawable.exo_controls_fastforward); | ||
} | ||
|
||
case NotificationConstants.PLAY_PAUSE_BUFFERING: | ||
if (player.getCurrentState() == Player.STATE_PREFLIGHT | ||
|| player.getCurrentState() == Player.STATE_BLOCKED | ||
|| player.getCurrentState() == Player.STATE_BUFFERING) { | ||
// null intent action -> show hourglass icon that does nothing when clicked | ||
return new NotificationActionData(null, | ||
ctx.getString(R.string.notification_action_buffering), | ||
R.drawable.ic_hourglass_top); | ||
} | ||
|
||
// fallthrough | ||
case NotificationConstants.PLAY_PAUSE: | ||
if (player.getCurrentState() == Player.STATE_COMPLETED) { | ||
return new NotificationActionData(ACTION_PLAY_PAUSE, | ||
ctx.getString(R.string.exo_controls_pause_description), | ||
R.drawable.ic_replay); | ||
} else if (player.isPlaying() | ||
|| player.getCurrentState() == Player.STATE_PREFLIGHT | ||
|| player.getCurrentState() == Player.STATE_BLOCKED | ||
|| player.getCurrentState() == Player.STATE_BUFFERING) { | ||
return new NotificationActionData(ACTION_PLAY_PAUSE, | ||
ctx.getString(R.string.exo_controls_pause_description), | ||
R.drawable.exo_notification_pause); | ||
} else { | ||
return new NotificationActionData(ACTION_PLAY_PAUSE, | ||
ctx.getString(R.string.exo_controls_play_description), | ||
R.drawable.exo_notification_play); | ||
} | ||
|
||
case NotificationConstants.REPEAT: | ||
if (player.getRepeatMode() == REPEAT_MODE_ALL) { | ||
return new NotificationActionData(ACTION_REPEAT, | ||
ctx.getString(R.string.exo_controls_repeat_all_description), | ||
R.drawable.exo_media_action_repeat_all); | ||
} else if (player.getRepeatMode() == REPEAT_MODE_ONE) { | ||
return new NotificationActionData(ACTION_REPEAT, | ||
ctx.getString(R.string.exo_controls_repeat_one_description), | ||
R.drawable.exo_media_action_repeat_one); | ||
} else /* player.getRepeatMode() == REPEAT_MODE_OFF */ { | ||
return new NotificationActionData(ACTION_REPEAT, | ||
ctx.getString(R.string.exo_controls_repeat_off_description), | ||
R.drawable.exo_media_action_repeat_off); | ||
} | ||
|
||
case NotificationConstants.SHUFFLE: | ||
if (player.getPlayQueue() != null && player.getPlayQueue().isShuffled()) { | ||
return new NotificationActionData(ACTION_SHUFFLE, | ||
ctx.getString(R.string.exo_controls_shuffle_on_description), | ||
R.drawable.exo_controls_shuffle_on); | ||
} else { | ||
return new NotificationActionData(ACTION_SHUFFLE, | ||
ctx.getString(R.string.exo_controls_shuffle_off_description), | ||
R.drawable.exo_controls_shuffle_off); | ||
} | ||
|
||
case NotificationConstants.CLOSE: | ||
return new NotificationActionData(ACTION_CLOSE, ctx.getString(R.string.close), | ||
R.drawable.ic_close); | ||
|
||
case NotificationConstants.NOTHING: | ||
default: | ||
// do nothing | ||
return null; | ||
} | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this going to hurt Bluetooth media controls like double pressing the pause button on a headset to skip to the next item?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this change prevents to do the action you described, I just tested the artifact built by the CI with a Bluetooth speaker.