@javascriptcommon/react-native-track-player 1.2.23 → 4.1.4

package/android/src/main/java/com/doublesymmetry/trackplayer/TrackPlayer.kt

@@ -0,0 +1,33 @@
+package com.doublesymmetry.trackplayer
+
+import com.doublesymmetry.trackplayer.module.MusicModule
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class TrackPlayer : BaseReactPackage() {
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? =
+        if (name == MusicModule.NAME) {
+            MusicModule(reactContext)
+        } else {
+            null
+        }
+
+    override fun getReactModuleInfoProvider() = ReactModuleInfoProvider {
+          mapOf(
+              MusicModule.NAME to ReactModuleInfo(
+                  MusicModule.NAME,
+                  MusicModule.NAME,
+                  canOverrideExistingModule = false, // canOverrideExistingModule
+                  needsEagerInit = false, // needsEagerInit
+                      isCxxModule = false, // isCxxModule
+                  isTurboModule = true // isTurboModule
+              )
+          )
+    }
+
+    override fun createViewManagers(reactContext: ReactApplicationContext) =
+        listOf<com.facebook.react.uimanager.ViewManager<*, *>>(com.doublesymmetry.trackplayer.video.TrackPlayerVideoViewManager())
+}

package/android/src/main/java/com/{guichaguri → doublesymmetry}/trackplayer/extensions/AudioPlayerStateExt.kt

@@ -1,7 +1,7 @@
-package com.guichaguri.trackplayer.extensions
+package com.doublesymmetry.trackplayer.extensions
 
-import com.guichaguri.trackplayer.kotlinaudio.models.AudioPlayerState
-import com.guichaguri.trackplayer.model.State
+import com.lovegaoshi.kotlinaudio.models.AudioPlayerState
+import com.doublesymmetry.trackplayer.model.State
 
 val AudioPlayerState.asLibState: State
     get() {

package/android/src/main/java/com/doublesymmetry/trackplayer/extensions/EnumExtensions.kt

@@ -0,0 +1,5 @@
+package com.doublesymmetry.trackplayer.extensions
+
+inline fun <reified T : Enum<T>, V> ((T) -> V).find(value: V): T? {
+    return enumValues<T>().firstOrNull { this(it) == value }
+}

package/android/src/main/java/com/doublesymmetry/trackplayer/extensions/NumberExt.kt

@@ -0,0 +1,13 @@
+package com.doublesymmetry.trackplayer.extensions
+
+class NumberExt {
+    companion object {
+        fun Number.toSeconds(): Double {
+            return this.toDouble() / 1000
+        }
+
+        fun Number.toMilliseconds(): Long {
+            return (this.toDouble() * 1000).toLong()
+        }
+    }
+}

package/android/src/main/java/com/{guichaguri → doublesymmetry}/trackplayer/model/MetadataAdapter.kt

@@ -1,19 +1,22 @@
-package com.guichaguri.trackplayer.model
+package com.doublesymmetry.trackplayer.model
 
 import android.os.Bundle
-import com.google.android.exoplayer2.MediaMetadata
-import com.google.android.exoplayer2.metadata.Metadata
-import com.google.android.exoplayer2.metadata.flac.VorbisComment
-import com.google.android.exoplayer2.metadata.icy.IcyHeaders
-import com.google.android.exoplayer2.metadata.icy.IcyInfo
-import com.google.android.exoplayer2.metadata.id3.ChapterFrame
-import com.google.android.exoplayer2.metadata.id3.TextInformationFrame
-import com.google.android.exoplayer2.metadata.id3.UrlLinkFrame
-import com.google.android.exoplayer2.metadata.mp4.MdtaMetadataEntry
+import androidx.annotation.OptIn
+import androidx.media3.common.Metadata
+import androidx.media3.common.MediaMetadata
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.extractor.metadata.vorbis.VorbisComment
+import androidx.media3.extractor.metadata.icy.IcyHeaders
+import androidx.media3.extractor.metadata.icy.IcyInfo
+import androidx.media3.extractor.metadata.id3.ChapterFrame
+import androidx.media3.extractor.metadata.id3.TextInformationFrame
+import androidx.media3.extractor.metadata.id3.UrlLinkFrame
+import androidx.media3.container.MdtaMetadataEntry
 import timber.log.Timber
 
 sealed class MetadataAdapter {
     companion object {
+        @OptIn(UnstableApi::class)
         fun fromMetadata(metadata: Metadata): List<Bundle> {
             val group = mutableListOf<Bundle>()
 
@@ -30,30 +33,30 @@ sealed class MetadataAdapter {
 
                             when (entry.id.uppercase()) {
                                 "TIT2", "TT2" -> {
-                                    putString("title", entry.value)
+                                    putString("title", entry.values[0])
                                     rawEntry.putString("commonKey", "title")
                                 }
                                 "TALB", "TOAL", "TAL" -> {
-                                    putString("albumName", entry.value)
+                                    putString("albumName", entry.values[0])
                                     rawEntry.putString("commonKey", "albumName")
                                 }
                                 "TOPE", "TPE1", "TP1" -> {
-                                    putString("artist", entry.value)
+                                    putString("artist", entry.values[0])
                                     rawEntry.putString("commonKey", "artist")
                                 }
                                 "TDRC", "TOR" -> {
-                                    putString("creationDate", entry.value)
+                                    putString("creationDate", entry.values[0])
                                     rawEntry.putString("commonKey", "creationDate")
                                 }
                                 "TCON", "TCO" -> {
-                                    putString("genre", entry.value)
+                                    putString("genre", entry.values[0])
                                     rawEntry.putString("commonKey", "genre")
                                 }
                             }
 
                             rawEntry.putString("key", entry.id.uppercase())
                             rawEntry.putString("keySpace", "org.id3")
-                            rawEntry.putString("value", entry.value)
+                            rawEntry.putString("value", entry.values[0])
                             rawEntry.putString("time", "-1")
                             rawEntries.add(rawEntry)
                         }
@@ -204,7 +207,7 @@ sealed class MetadataAdapter {
                 metadata.genre?.let { putString("genre", it.toString()) }
                 metadata.compilation?.let { putString("compilation", it.toString()) }
                 metadata.station?.let { putString("station", it.toString()) }
-                // metadata.mediaType?.let { putInt("mediaType", it) }
+                metadata.mediaType?.let { putInt("mediaType", it) }
 
                 // This is how SwiftAudioEx outputs it in the metadata dictionary
                 (metadata.recordingDay to metadata.recordingMonth).let { (day, month) ->

package/android/src/main/java/com/doublesymmetry/trackplayer/model/NowPlayingMetadata.kt

@@ -0,0 +1,16 @@
+package com.doublesymmetry.trackplayer.model
+
+import android.content.Context
+import android.os.Bundle
+
+class NowPlayingMetadata(context: Context, bundle: Bundle?, ratingType: Int) : TrackMetadata() {
+    var elapsedTime = 0.0
+    override fun setMetadata(context: Context, bundle: Bundle?, ratingType: Int) {
+        super.setMetadata(context, bundle, ratingType)
+        elapsedTime = bundle!!.getDouble("elapsedTime", 0.0)
+    }
+
+    init {
+        setMetadata(context, bundle, ratingType)
+    }
+}

package/android/src/main/java/com/{guichaguri/trackplayer/kotlinaudio/models → doublesymmetry/trackplayer/model}/PlaybackMetadata.kt

@@ -1,13 +1,16 @@
-package com.guichaguri.trackplayer.kotlinaudio.models
-
-import com.google.android.exoplayer2.metadata.flac.VorbisComment
-import com.google.android.exoplayer2.metadata.icy.IcyHeaders
-import com.google.android.exoplayer2.metadata.icy.IcyInfo
-import com.google.android.exoplayer2.metadata.id3.TextInformationFrame
-import com.google.android.exoplayer2.metadata.id3.UrlLinkFrame
-import com.google.android.exoplayer2.metadata.mp4.MdtaMetadataEntry
-import com.google.android.exoplayer2.metadata.Metadata
-
+package com.doublesymmetry.trackplayer.model
+
+import androidx.annotation.OptIn
+import androidx.media3.common.Metadata
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.extractor.metadata.vorbis.VorbisComment
+import androidx.media3.extractor.metadata.icy.IcyHeaders
+import androidx.media3.extractor.metadata.icy.IcyInfo
+import androidx.media3.extractor.metadata.id3.TextInformationFrame
+import androidx.media3.extractor.metadata.id3.UrlLinkFrame
+import androidx.media3.container.MdtaMetadataEntry
+
+@OptIn(UnstableApi::class)
 data class PlaybackMetadata(
     val source: String,
     var title: String? = null,
@@ -38,23 +41,23 @@ data class PlaybackMetadata(
                         when (entry.id.uppercase()) {
                             "TIT2", "TT2" -> {
                                 handled = true
-                                title = entry.value
+                                title = entry.values[0]
                             }
                             "TALB", "TOAL", "TAL" -> {
                                 handled = true
-                                album = entry.value
+                                album = entry.values[0]
                             }
                             "TOPE", "TPE1", "TP1" -> {
                                 handled = true
-                                artist = entry.value
+                                artist = entry.values[0]
                             }
                             "TDRC", "TOR" -> {
                                 handled = true
-                                date = entry.value
+                                date = entry.values[0]
                             }
                             "TCON", "TCO" -> {
                                 handled = true
-                                genre = entry.value
+                                genre = entry.values[0]
                             }
 
                         }
@@ -62,8 +65,8 @@ data class PlaybackMetadata(
                     is UrlLinkFrame -> {
                         when (entry.id.uppercase()) {
                             "WOAS", "WOAF", "WOAR", "WAR" -> {
-                                handled = true;
-                                url = entry.url;
+                                handled = true
+                                url = entry.url
                             }
                         }
                     }
@@ -110,7 +113,7 @@ data class PlaybackMetadata(
          * https://xiph.org/vorbis/doc/v-comment.html
          */
         fun fromVorbisComment(metadata: Metadata): PlaybackMetadata? {
-            var handled = false;
+            var handled = false
 
             var title: String? = null
             var url: String? = null
@@ -125,15 +128,15 @@ data class PlaybackMetadata(
                     when (entry.key) {
                         "TITLE" -> {
                             handled = true
-                            title = entry.value;
+                            title = entry.value
                         }
                         "ARTIST" -> {
                             handled = true
-                            artist = entry.value;
+                            artist = entry.value
                         }
                         "ALBUM" -> {
                             handled = true
-                            album = entry.value;
+                            album = entry.value
                         }
                         "DATE" -> {
                             handled = true
@@ -158,7 +161,7 @@ data class PlaybackMetadata(
          * https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/Metadata/Metadata.html
          */
         fun fromQuickTime(metadata: Metadata): PlaybackMetadata? {
-            var handled = false;
+            var handled = false
 
             var title: String? = null
             var artist: String? = null
@@ -167,28 +170,28 @@ data class PlaybackMetadata(
             var genre: String? = null
 
             for (i in 0 until metadata.length()) {
-                val entry = metadata[i];
+                val entry = metadata[i]
                 if (entry is MdtaMetadataEntry) {
                     when (entry.key) {
                         "com.apple.quicktime.title" -> {
                             handled = true
-                            title = entry.value.toString();
+                            title = entry.value.toString()
                         }
                         "com.apple.quicktime.artist" -> {
                             handled = true
-                            artist = entry.value.toString();
+                            artist = entry.value.toString()
                         }
                         "com.apple.quicktime.album" -> {
                             handled = true
-                            album = entry.value.toString();
+                            album = entry.value.toString()
                         }
                         "com.apple.quicktime.creationdate" -> {
                             handled = true
-                            date = entry.value.toString();
+                            date = entry.value.toString()
                         }
                         "com.apple.quicktime.genre" -> {
                             handled = true
-                            genre = entry.value.toString();
+                            genre = entry.value.toString()
                         }
                     }
                 }

package/android/src/main/java/com/{guichaguri → doublesymmetry}/trackplayer/model/State.kt

@@ -1,4 +1,4 @@
-package com.guichaguri.trackplayer.model
+package com.doublesymmetry.trackplayer.model
 
 enum class State(val state: String) {
     Buffering("buffering"),

package/android/src/main/java/com/doublesymmetry/trackplayer/model/Track.kt

@@ -0,0 +1,67 @@
+package com.doublesymmetry.trackplayer.model
+
+import android.content.ContentResolver
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import androidx.annotation.OptIn
+import androidx.media3.common.util.UnstableApi
+import com.lovegaoshi.kotlinaudio.models.AudioItemOptions
+import com.lovegaoshi.kotlinaudio.models.MediaType
+import com.doublesymmetry.trackplayer.utils.BundleUtils
+
+/**
+ * @author Milen Pivchev @mpivchev
+ */
+@OptIn(UnstableApi::class)
+class Track
+    (context: Context, bundle: Bundle, ratingType: Int) : TrackMetadata() {
+    var uri: Uri? = null
+    var resourceId: Int?
+    var type = MediaType.DEFAULT
+    var contentType: String?
+    var userAgent: String?
+    var originalItem: Bundle?
+    var headers: HashMap<String, String>? = null
+    val queueId: Long
+
+    override fun setMetadata(context: Context, bundle: Bundle?, ratingType: Int) {
+        super.setMetadata(context, bundle, ratingType)
+        if (originalItem != null && originalItem != bundle) originalItem!!.putAll(bundle)
+    }
+
+    fun toAudioItem(): TrackAudioItem {
+        return TrackAudioItem(this, type, uri.toString(), artist, title, album, artwork.toString(), duration,
+                AudioItemOptions(headers, userAgent, resourceId), mediaId)
+    }
+
+    init {
+        resourceId = BundleUtils.getRawResourceId(context, bundle, "url")
+        uri = if (resourceId == 0) {
+            resourceId = null
+            BundleUtils.getUri(context, bundle, "url")
+        } else {
+            // RawResourceDataSource.buildRawResourceUri(resourceId!!)
+            Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE).path(resourceId!!.toString()).build()
+        }
+        val trackType = bundle.getString("type", "default")
+        for (t in MediaType.entries) {
+            if (t.name.equals(trackType, ignoreCase = true)) {
+                type = t
+                break
+            }
+        }
+        contentType = bundle.getString("contentType")
+        userAgent = bundle.getString("userAgent")
+        val httpHeaders = bundle.getBundle("headers")
+        if (httpHeaders != null) {
+            headers = HashMap()
+            for (header in httpHeaders.keySet()) {
+                headers!![header] = httpHeaders.getString(header)!!
+            }
+        }
+        setMetadata(context, bundle, ratingType)
+        queueId = System.currentTimeMillis()
+        originalItem = bundle
+    }
+}

package/android/src/main/java/com/doublesymmetry/trackplayer/model/TrackAudioItem.kt

@@ -0,0 +1,18 @@
+package com.doublesymmetry.trackplayer.model
+
+import com.lovegaoshi.kotlinaudio.models.AudioItem
+import com.lovegaoshi.kotlinaudio.models.AudioItemOptions
+import com.lovegaoshi.kotlinaudio.models.MediaType
+
+data class TrackAudioItem(
+    val track: Track,
+    override val type: MediaType,
+    override var audioUrl: String,
+    override var artist: String? = null,
+    override var title: String? = null,
+    override var albumTitle: String? = null,
+    override val artwork: String? = null,
+    override val duration: Long? = null,
+    override val options: AudioItemOptions? = null,
+    override val mediaId: String? = null
+): AudioItem

package/android/src/main/java/com/doublesymmetry/trackplayer/model/TrackMetadata.kt

@@ -0,0 +1,38 @@
+package com.doublesymmetry.trackplayer.model
+
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import androidx.media3.common.Rating
+import com.doublesymmetry.trackplayer.extensions.NumberExt.Companion.toMilliseconds
+import com.doublesymmetry.trackplayer.utils.BundleUtils
+
+abstract class TrackMetadata {
+    var artwork: Uri? = null
+    var title: String? = null
+    var artist: String? = null
+    var album: String? = null
+    var date: String? = null
+    var genre: String? = null
+    var duration: Long? = null
+    var rating: Rating? = null
+    var mediaId: String? = null
+
+    open fun setMetadata(context: Context, bundle: Bundle?, ratingType: Int) {
+        artwork = BundleUtils.getUri(context, bundle, "artwork")
+        title = bundle!!.getString("title")
+        artist = bundle.getString("artist")
+        album = bundle.getString("album")
+        date = bundle.getString("date")
+        genre = bundle.getString("genre")
+        mediaId = bundle.getString("mediaId")
+
+        duration = if (bundle.containsKey("duration")) {
+            bundle.getDouble("duration").toMilliseconds()
+        } else {
+            null
+        }
+
+        rating = BundleUtils.getRating(bundle, "rating", ratingType)
+    }
+}

package/android/src/main/java/com/{guichaguri → doublesymmetry}/trackplayer/module/MusicEvents.kt

@@ -1,4 +1,4 @@
-package com.guichaguri.trackplayer.module
+package com.doublesymmetry.trackplayer.module
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -15,18 +15,16 @@ class MusicEvents(private val reactContext: ReactContext) : BroadcastReceiver()
         val event = intent.getStringExtra("event")
         val data = intent.getBundleExtra("data")
         val map = if (data != null) Arguments.fromBundle(data) else null
-        reactContext.getJSModule(RCTDeviceEventEmitter::class.java).emit(
-            event!!, map
-        )
+        reactContext.emitDeviceEvent(event!!, map)
     }
 
     companion object {
         // Media Control Events
         const val BUTTON_PLAY = "remote-play"
+        const val BUTTON_PLAY_PAUSE = "remote-play-pause"
         const val BUTTON_PLAY_FROM_ID = "remote-play-id"
-        const val SEARCH = "remote-search"
         const val BUTTON_PLAY_FROM_SEARCH = "remote-play-search"
-        const val BUTTON_PLAY_FROM_QUEUE = "remote-play-queue"
+        const val BUTTON_SEARCH = "remote-search"
         const val BUTTON_PAUSE = "remote-pause"
         const val BUTTON_STOP = "remote-stop"
         const val BUTTON_SKIP = "remote-skip"
@@ -38,9 +36,7 @@ class MusicEvents(private val reactContext: ReactContext) : BroadcastReceiver()
         const val BUTTON_JUMP_BACKWARD = "remote-jump-backward"
         const val BUTTON_DUCK = "remote-duck"
         const val BUTTON_BROWSE = "remote-browse"
-        const val BUTTON_SHUFFLE = "remote-shuffle"
-        const val BUTTON_REPEAT = "remote-repeat"
-        const val BUTTON_TRACK_STATUS = "remote-track-status"
+        const val BUTTON_CUSTOM_ACTION = "remote-custom-action"
 
         // Playback Events
         const val PLAYBACK_PLAY_WHEN_READY_CHANGED = "playback-play-when-ready-changed"
@@ -51,6 +47,9 @@ class MusicEvents(private val reactContext: ReactContext) : BroadcastReceiver()
         const val PLAYBACK_METADATA = "playback-metadata-received"
         const val PLAYBACK_PROGRESS_UPDATED = "playback-progress-updated"
         const val PLAYBACK_ERROR = "playback-error"
+        const val PLAYBACK_ANIMATED_VOLUME_CHANGED = "playback-animated-volume-changed"
+        const val PLAYBACK_RESUME = "playback-resume-android"
+        const val FFT_UPDATED = "fft-updated"
 
         // Metadata Events
         const val METADATA_CHAPTER_RECEIVED = "metadata-chapter-received"
@@ -60,6 +59,8 @@ class MusicEvents(private val reactContext: ReactContext) : BroadcastReceiver()
 
         // Other
         const val PLAYER_ERROR = "player-error"
+        const val CONNECTOR_CONNECTED = "android-controller-connected"
+        const val CONNECTOR_DISCONNECTED = "android-controller-disconnected"
 
         const val EVENT_INTENT = "com.doublesymmetry.trackplayer.event"
     }