react-native-media-notification 0.3.0 → 0.3.1

package/android/src/main/java/com/mediacontrols/CustomCommandButton.kt

@@ -1,37 +1,59 @@
 package com.mediacontrols
 
 import android.os.Bundle
+import androidx.media3.common.util.UnstableApi
 import androidx.media3.session.CommandButton
-import androidx.media3.session.CommandButton.ICON_FAST_FORWARD
-import androidx.media3.session.CommandButton.ICON_REWIND
+import androidx.media3.session.CommandButton.ICON_NEXT
+import androidx.media3.session.CommandButton.ICON_PREVIOUS
 import androidx.media3.session.CommandButton.ICON_SHUFFLE_OFF
 import androidx.media3.session.CommandButton.ICON_SHUFFLE_ON
+import androidx.media3.session.CommandButton.ICON_SKIP_BACK_15
+import androidx.media3.session.CommandButton.ICON_SKIP_FORWARD_15
 import androidx.media3.session.SessionCommand
 
 private const val CUSTOM_COMMAND_REWIND_ACTION_ID = "REWIND_15"
 private const val CUSTOM_COMMAND_FORWARD_ACTION_ID = "FAST_FWD_15"
+private const val CUSTOM_COMMAND_NEXT_ACTION_ID = "SKIP_TO_NEXT"
+private const val CUSTOM_COMMAND_PREVIOUS_ACTION_ID = "SKIP_TO_PREVIOUS"
 private const val CUSTOM_COMMAND_SHUFFLE_ON_ACTION_ID = "SHUFFLE_ON"
 private const val CUSTOM_COMMAND_SHUFFLE_OFF_ACTION_ID = "SHUFFLE_OFF"
 private const val CUSTOM_COMMAND_REPEAT_ONE_ACTION_ID = "REPEAT_ONE"
 private const val CUSTOM_COMMAND_REPEAT_ALL_ACTION_ID = "REPEAT_ALL"
 private const val CUSTOM_COMMAND_REPEAT_OFF_ACTION_ID = "REPEAT_OFF"
 
+@UnstableApi
 enum class CustomCommandButton(
     val customAction: String,
     val commandButton: CommandButton,
 ) {
+    PREVIOUS(
+        customAction = CUSTOM_COMMAND_PREVIOUS_ACTION_ID,
+        commandButton = CommandButton.Builder(ICON_PREVIOUS)
+            .setDisplayName("Previous")
+            .setSessionCommand(SessionCommand(CUSTOM_COMMAND_PREVIOUS_ACTION_ID, Bundle()))
+            .build(),
+    ),
     REWIND(
         customAction = CUSTOM_COMMAND_REWIND_ACTION_ID,
-        commandButton = CommandButton.Builder(ICON_REWIND)
+        commandButton = CommandButton.Builder(ICON_SKIP_BACK_15)
             .setDisplayName("Rewind")
             .setSessionCommand(SessionCommand(CUSTOM_COMMAND_REWIND_ACTION_ID, Bundle()))
+            .setSlots(CommandButton.SLOT_BACK, CommandButton.SLOT_OVERFLOW)
             .build(),
     ),
     FORWARD(
         customAction = CUSTOM_COMMAND_FORWARD_ACTION_ID,
-        commandButton = CommandButton.Builder(ICON_FAST_FORWARD)
+        commandButton = CommandButton.Builder(ICON_SKIP_FORWARD_15)
             .setDisplayName("Forward")
             .setSessionCommand(SessionCommand(CUSTOM_COMMAND_FORWARD_ACTION_ID, Bundle()))
+            .setSlots(CommandButton.SLOT_FORWARD, CommandButton.SLOT_OVERFLOW)
+            .build(),
+    ),
+    NEXT(
+        customAction = CUSTOM_COMMAND_NEXT_ACTION_ID,
+        commandButton = CommandButton.Builder(ICON_NEXT)
+            .setDisplayName("Next")
+            .setSessionCommand(SessionCommand(CUSTOM_COMMAND_NEXT_ACTION_ID, Bundle()))
             .build(),
     ),
     SHUFFLE_ON(

package/android/src/main/java/com/mediacontrols/MediaControlsPlayer.kt

@@ -238,6 +238,12 @@ class MediaControlsPlayer(
 
     fun getAvailableCustomCommands(): Set<CommandButton> {
         return mutableSetOf<CommandButton>().apply {
+            if (isControlEnabled(Controls.PREVIOUS)) add(CustomCommandButton.PREVIOUS.commandButton)
+            if (isControlEnabled(Controls.NEXT)) add(CustomCommandButton.NEXT.commandButton)
+
+            if (isControlEnabled(Controls.SEEK_BACKWARD)) add(CustomCommandButton.REWIND.commandButton)
+            if (isControlEnabled(Controls.SEEK_FORWARD)) add(CustomCommandButton.FORWARD.commandButton)
+
             if(isControlEnabled(Controls.SHUFFLE)) {
                 if (state.shuffleModeEnabled) {
                     add(CustomCommandButton.SHUFFLE_ON.commandButton)
@@ -252,8 +258,6 @@ class MediaControlsPlayer(
                     REPEAT_MODE_ALL -> add(CustomCommandButton.REPEAT_ALL.commandButton)
                 }
             }
-            if (isControlEnabled(Controls.SEEK_BACKWARD)) add(CustomCommandButton.REWIND.commandButton)
-            if (isControlEnabled(Controls.SEEK_FORWARD)) add(CustomCommandButton.FORWARD.commandButton)
         }
     }
 

package/android/src/main/java/com/mediacontrols/MediaControlsService.kt

@@ -189,6 +189,10 @@ class MediaControlsService : MediaSessionService() {
                     }
                     Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
                 }
+                CustomCommandButton.PREVIOUS.customAction -> {
+                    player?.seekToPreviousMediaItem()
+                    Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
+                }
                 CustomCommandButton.FORWARD.customAction -> {
                     player?.seekForward()
                     Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
@@ -197,6 +201,10 @@ class MediaControlsService : MediaSessionService() {
                     player?.seekBack()
                     Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
                 }
+                CustomCommandButton.NEXT.customAction -> {
+                    player?.seekToNextMediaItem()
+                    Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
+                }
                 CustomCommandButton.SHUFFLE_ON.customAction, CustomCommandButton.SHUFFLE_OFF.customAction -> {
                     player?.emitShuffleClicked()
                     Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-media-notification",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Display and manage media style notifications based on react-native-music-control",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",