react-native-media-notification 0.3.4 → 0.3.6

package/README.md

@@ -149,6 +149,8 @@ MediaControls.addEventListener('duck', () => {}); // reduce volume for interrupt
 MediaControls.addEventListener('unduck', () => {}); // restore volume after interruption
 ```
 
+**Note**: On iOS, seekForward and seekBackward are not fired, even when technically triggered. Instead, a seek event with the corresponding timestamp is fired.
+
 ### Stop Media Notification
 
 ```typescript

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

@@ -58,11 +58,11 @@ class MediaControlsModule(reactContext: ReactApplicationContext) :
       ensureServiceStarted()
 
       val trackMetadata = MediaTrackMetadata(
-        title = metadata.getString("title") ?: "",
-        artist = metadata.getString("artist") ?: "",
-        album = metadata.getString("album"),
+        title = if (metadata.hasKey("title")) metadata.getString("title") else null,
+        artist = if (metadata.hasKey("artist")) metadata.getString("artist") else null,
+        album = if (metadata.hasKey("album")) metadata.getString("album") else null,
         duration = if (metadata.hasKey("duration")) metadata.getDouble("duration") else null,
-        artwork = metadata.getString("artwork"),
+        artwork = if (metadata.hasKey("artwork")) metadata.getString("artwork") else null,
         position = if (metadata.hasKey("position")) metadata.getDouble("position") else null,
         isPlaying = if (metadata.hasKey("isPlaying")) metadata.getBoolean("isPlaying") else null,
         shuffleMode = if (metadata.hasKey("shuffle")) metadata.getBoolean("shuffle") else null,

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

@@ -1,25 +1,32 @@
 package com.mediacontrols
 
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
 import android.os.Handler
 import android.os.Looper
+import android.webkit.URLUtil
+import androidx.core.net.toUri
 import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import androidx.media3.common.Player
 import androidx.media3.common.SimpleBasePlayer
 import androidx.media3.common.util.UnstableApi
+import androidx.media3.session.CommandButton
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper
 import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
-import androidx.core.net.toUri
-import androidx.media3.session.CommandButton
+import java.io.ByteArrayOutputStream
+
 
 @UnstableApi
 class MediaControlsPlayer(
-    reactContext: ReactApplicationContext,
+    private val reactContext: ReactApplicationContext,
     private val module: MediaControlsModule,
 ) : SimpleBasePlayer(Looper.getMainLooper()) {
 
@@ -143,19 +150,19 @@ class MediaControlsPlayer(
             audioFocusListener.requestAudioFocus()
         }
 
-        this.currentMetadata = metadata
+        this.currentMetadata = this.currentMetadata?.merge(metadata) ?: metadata
 
         val mediaMetadata = MediaMetadata.Builder()
-            .setTitle(metadata.title)
-            .setArtist(metadata.artist)
-            .setAlbumTitle(metadata.album)
-            .setDurationMs(metadata.duration?.times(1000)?.toLong())
+            .setTitle(this.currentMetadata!!.title)
+            .setArtist(this.currentMetadata!!.artist)
+            .setAlbumTitle(this.currentMetadata!!.album)
+            .setDurationMs(this.currentMetadata!!.duration?.times(1000)?.toLong())
             .setIsPlayable(true)
             .setIsBrowsable(false)
             .setMediaType(MediaMetadata.MEDIA_TYPE_MUSIC)
-            .apply {
-                metadata.artwork?.let { artworkUrl ->
-                    setArtworkUri(artworkUrl.toUri())
+            .also {
+                this.currentMetadata!!.artwork?.let { artworkUrl ->
+                    it.setArtwork(artworkUrl)
                 }
             }
             .build()
@@ -171,23 +178,23 @@ class MediaControlsPlayer(
 
         val mediaItemData = MediaItemData.Builder(mediaId)
             .setMediaItem(mediaItem)
-            .setDefaultPositionUs(metadata.position?.times(1_000_000)?.toLong() ?: 0)
-            .setDurationUs(metadata.duration?.times(1_000_000)?.toLong() ?: androidx.media3.common.C.TIME_UNSET)
+            .setDefaultPositionUs(this.currentMetadata!!.position?.times(1_000_000)?.toLong() ?: 0)
+            .setDurationUs(this.currentMetadata!!.duration?.times(1_000_000)?.toLong() ?: androidx.media3.common.C.TIME_UNSET)
             .setIsSeekable(true)
             .build()
 
         updateState { builder ->
             builder.setPlaylist(listOf(mediaItemData))
                 .setCurrentMediaItemIndex(0)
-                .setContentPositionMs(metadata.position?.times(1000)?.toLong() ?: 0)
+                .setContentPositionMs(this.currentMetadata!!.position?.times(1000)?.toLong() ?: 0)
                 .setPlayWhenReady(
-                    metadata.isPlaying ?: false,
+                    this.currentMetadata!!.isPlaying ?: false,
                     Player.PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST
                 )
                 .setPlaybackState(Player.STATE_READY)
                 .setAvailableCommands(state.availableCommands)
-                .setRepeatMode(metadata.repeatMode)
-                .setShuffleModeEnabled(metadata.shuffleMode)
+                .setRepeatMode(this.currentMetadata!!.repeatMode)
+                .setShuffleModeEnabled(this.currentMetadata!!.shuffleMode)
         }
     }
 
@@ -211,6 +218,28 @@ class MediaControlsPlayer(
         return this.setShuffleModeEnabled(enabled)
     }
 
+    private fun MediaMetadata.Builder.setArtwork(artwork: String?): MediaMetadata.Builder {
+        if (artwork == null) {
+            return this
+        }
+        if (URLUtil.isValidUrl(artwork)) {
+            this.setArtworkUri(artwork.toUri())
+        } else {
+            val helper = ResourceDrawableIdHelper.getInstance()
+            val image = helper.getResourceDrawable(reactContext, artwork)
+
+            val bitmap = if (image is BitmapDrawable) {
+                image.bitmap
+            } else {
+                BitmapFactory.decodeFile(artwork)
+            }
+            val stream = ByteArrayOutputStream()
+            bitmap.compress(Bitmap.CompressFormat.PNG, 90, stream)
+            this.setArtworkData(stream.toByteArray(), MediaMetadata.PICTURE_TYPE_OTHER)
+        }
+        return this
+    }
+
     fun setControlEnabled(controlName: Controls, enabled: Boolean) {
         enabledControls[controlName] = enabled
 
@@ -313,8 +342,8 @@ class MediaControlsPlayer(
 
 // Data class for metadata
 data class MediaTrackMetadata(
-    val title: String,
-    val artist: String,
+    val title: String? = null,
+    val artist: String? = null,
     val album: String? = null,
     val duration: Double? = null,
     val artwork: String? = null,
@@ -322,4 +351,17 @@ data class MediaTrackMetadata(
     val isPlaying: Boolean? = null,
     val repeatMode: String? = null,
     val shuffleMode: Boolean? = null
-)
+) {
+
+    fun merge(other: MediaTrackMetadata): MediaTrackMetadata = MediaTrackMetadata(
+        title = other.title ?: this.title,
+        artist = other.artist ?: this.artist,
+        album = other.album ?: this.album,
+        duration = other.duration ?: this.duration,
+        artwork = other.artwork ?: this.artwork,
+        position = other.position ?: this.position,
+        isPlaying = other.isPlaying ?: this.isPlaying,
+        repeatMode = other.repeatMode ?: this.repeatMode,
+        shuffleMode = other.shuffleMode ?: this.shuffleMode
+    )
+}

package/ios/MediaControls.mm

@@ -87,17 +87,17 @@ RCT_EXPORT_METHOD(updateMetadata:(JS::NativeMediaControls::NativeMediaTrackMetad
     MPNowPlayingInfoCenter *_nowPlayingCenter = [MPNowPlayingInfoCenter defaultCenter];
 
     @try {
-        NSMutableDictionary *nowPlayingInfo = [NSMutableDictionary dictionary];
+        NSMutableDictionary *nowPlayingInfo = [[NSMutableDictionary alloc] initWithDictionary: _nowPlayingCenter.nowPlayingInfo];
 
-        if (metadata.title().length > 0) {
+        if (metadata.title() != nil && metadata.title().length > 0) {
             nowPlayingInfo[MPMediaItemPropertyTitle] = metadata.title();
         }
 
-        if (metadata.artist().length > 0) {
+        if (metadata.artist() != nil && metadata.artist().length > 0) {
             nowPlayingInfo[MPMediaItemPropertyArtist] = metadata.artist();
         }
 
-        if (metadata.album().length > 0) {
+        if (metadata.album() != nil && metadata.album().length > 0) {
             nowPlayingInfo[MPMediaItemPropertyAlbumTitle] = metadata.album();
         }
 
@@ -110,17 +110,20 @@ RCT_EXPORT_METHOD(updateMetadata:(JS::NativeMediaControls::NativeMediaTrackMetad
             double position = metadata.position().value();
             nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = [NSNumber numberWithDouble:position];
         }
-
-        nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = metadata.isPlaying() ? [NSNumber numberWithDouble:1] : [NSNumber numberWithDouble:0];
+      
+        if (metadata.isPlaying().has_value()) {
+            nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = metadata.isPlaying().value() ? [NSNumber numberWithDouble:1] : [NSNumber numberWithDouble:0];
+        }
+        
 
         _nowPlayingCenter.nowPlayingInfo = nowPlayingInfo;
 
-        if (@available(iOS 11.0, *)) {
+        if (@available(iOS 11.0, *) && metadata.isPlaying().has_value()) {
             if (!self.audioInterrupted) {
                 self.explictlyPaused = false;
             }
 
-            if (metadata.isPlaying()) {
+            if (metadata.isPlaying().value()) {
                 _nowPlayingCenter.playbackState = MPNowPlayingPlaybackStatePlaying;
             } else {
                 _nowPlayingCenter.playbackState = MPNowPlayingPlaybackStatePaused;
@@ -133,7 +136,7 @@ RCT_EXPORT_METHOD(updateMetadata:(JS::NativeMediaControls::NativeMediaTrackMetad
 
 
         // Load artwork if provided
-        if (metadata.artwork().length > 0) {
+        if (metadata.artwork() != nil && metadata.artwork().length > 0) {
             NSString *artworkURL = metadata.artwork();
             [self loadArtworkFromURL:artworkURL completion:^(UIImage *image) {
                 if (!image) {

package/lib/typescript/src/NativeMediaControls.d.ts

@@ -4,8 +4,8 @@ export declare const ALL_MEDIA_EVENTS: readonly ["play", "pause", "stop", "skipT
 export type MediaControl = (typeof ALL_MEDIA_EVENTS)[number];
 export type MediaControlEvent = MediaControl | 'duck' | 'unDuck';
 export interface NativeMediaTrackMetadata {
-    title: string;
-    artist: string;
+    title?: string;
+    artist?: string;
     album?: string;
     duration?: number;
     artwork?: string;

package/lib/typescript/src/NativeMediaControls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeMediaControls.d.ts","sourceRoot":"","sources":["../../../src/NativeMediaControls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAG9E,eAAO,MAAM,gBAAgB,oIAWnB,CAAC;AACX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D,MAAM,MAAM,iBAAiB,GAAG,YAAY,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEjE,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxD,cAAc,CAAC,QAAQ,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClE,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAGvC,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAGzD,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAE7C,QAAQ,IAAI,IAAI,CAAC;IAGjB,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;CAC7C;;AAED,wBAAuE"}
+{"version":3,"file":"NativeMediaControls.d.ts","sourceRoot":"","sources":["../../../src/NativeMediaControls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAG9E,eAAO,MAAM,gBAAgB,oIAWnB,CAAC;AACX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D,MAAM,MAAM,iBAAiB,GAAG,YAAY,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEjE,MAAM,WAAW,wBAAwB;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxD,cAAc,CAAC,QAAQ,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClE,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAGvC,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAGzD,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAE7C,QAAQ,IAAI,IAAI,CAAC;IAGjB,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;CAC7C;;AAED,wBAAuE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-media-notification",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "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",

package/src/NativeMediaControls.ts

@@ -1,56 +1,56 @@
-import type { TurboModule } from 'react-native';
-import { TurboModuleRegistry } from 'react-native';
-import type { EventEmitter } from 'react-native/Libraries/Types/CodegenTypes';
-
-// Event types
-export const ALL_MEDIA_EVENTS = [
-  'play',
-  'pause',
-  'stop',
-  'skipToNext',
-  'skipToPrevious',
-  'seekForward',
-  'seekBackward',
-  'seek',
-  'shuffle',
-  'repeatMode',
-] as const;
-export type MediaControl = (typeof ALL_MEDIA_EVENTS)[number];
-
-export type MediaControlEvent = MediaControl | 'duck' | 'unDuck';
-
-export interface NativeMediaTrackMetadata {
-  title: string;
-  artist: string;
-  album?: string;
-  duration?: number;
-  artwork?: string;
-  position?: number;
-  isPlaying?: boolean;
-  repeatMode?: 'off' | 'one' | 'all';
-  shuffle?: boolean;
-}
-
-export interface NativeEvent {
-  command: string;
-  seekPosition?: number; // Position in seconds for seek events
-}
-
-export interface Spec extends TurboModule {
-  setControlEnabled(name: string, enabled: boolean): void;
-  updateMetadata(metadata: NativeMediaTrackMetadata): Promise<void>;
-  stopMediaNotification(): Promise<void>;
-
-  // Audio interruption handling
-  enableAudioInterruption(enabled: boolean): Promise<void>;
-
-  // Audio session activation
-  enableBackgroundMode(enabled: boolean): void;
-
-  shutdown(): void;
-
-  // Event listeners (native events will be emitted)
-  readonly onEvent: EventEmitter<NativeEvent>;
-}
-
-export default TurboModuleRegistry.getEnforcing<Spec>('MediaControls');
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+import type { EventEmitter } from 'react-native/Libraries/Types/CodegenTypes';
+
+// Event types
+export const ALL_MEDIA_EVENTS = [
+  'play',
+  'pause',
+  'stop',
+  'skipToNext',
+  'skipToPrevious',
+  'seekForward',
+  'seekBackward',
+  'seek',
+  'shuffle',
+  'repeatMode',
+] as const;
+export type MediaControl = (typeof ALL_MEDIA_EVENTS)[number];
+
+export type MediaControlEvent = MediaControl | 'duck' | 'unDuck';
+
+export interface NativeMediaTrackMetadata {
+  title?: string;
+  artist?: string;
+  album?: string;
+  duration?: number;
+  artwork?: string;
+  position?: number;
+  isPlaying?: boolean;
+  repeatMode?: 'off' | 'one' | 'all';
+  shuffle?: boolean;
+}
+
+export interface NativeEvent {
+  command: string;
+  seekPosition?: number; // Position in seconds for seek events
+}
+
+export interface Spec extends TurboModule {
+  setControlEnabled(name: string, enabled: boolean): void;
+  updateMetadata(metadata: NativeMediaTrackMetadata): Promise<void>;
+  stopMediaNotification(): Promise<void>;
+
+  // Audio interruption handling
+  enableAudioInterruption(enabled: boolean): Promise<void>;
+
+  // Audio session activation
+  enableBackgroundMode(enabled: boolean): void;
+
+  shutdown(): void;
+
+  // Event listeners (native events will be emitted)
+  readonly onEvent: EventEmitter<NativeEvent>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('MediaControls');