refactor: extract audio player logic into a dedicated multiplatform module

shared/build.gradle.kts

@@ -56,12 +56,11 @@ kotlin {
     sourceSets {
         androidMain.dependencies {
             implementation(libs.compose.uiToolingPreview)
-
-            // Player audio
-            implementation(libs.media3.exoplayer)
-            implementation(libs.media3.common)
         }
         commonMain.dependencies {
+            // Audio player module
+            implementation(projects.core.audioplayer)
+
             implementation(libs.compose.runtime)
             implementation(libs.compose.foundation)
             implementation(libs.compose.material3)

shared/src/androidMain/kotlin/fr/ajaury/gwenedeg/di/Modules.android.kt

@@ -1,13 +0,0 @@
-package fr.ajaury.gwenedeg.di
-
-import fr.ajaury.gwenedeg.player.AndroidAudioPlayer
-import fr.ajaury.gwenedeg.player.AndroidAudioSessionManager
-import fr.ajaury.gwenedeg.player.AudioPlayer
-import fr.ajaury.gwenedeg.player.AudioSessionManager
-import org.koin.core.module.Module
-import org.koin.dsl.module
-
-actual val platformModule: Module = module {
-    single<AudioPlayer> { AndroidAudioPlayer(context = get()) }
-    single<AudioSessionManager> { AndroidAudioSessionManager() }
-}

shared/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/AndroidAudioPlayer.kt

@@ -1,34 +0,0 @@
-package fr.ajaury.gwenedeg.player
-
-import android.content.Context
-import androidx.media3.common.MediaItem
-import androidx.media3.exoplayer.ExoPlayer
-import gwenedeg.shared.generated.resources.Res
-
-class AndroidAudioPlayer(
-    context: Context,
-) : AudioPlayer {
-    private val player = ExoPlayer.Builder(context).build()
-
-    override fun load(filePath: String) {
-        val mediaItem = MediaItem.fromUri(Res.getUri(filePath))
-        player.setMediaItem(mediaItem)
-        player.prepare()
-    }
-
-    override fun play() {
-        player.play()
-    }
-
-    override fun pause() {
-        player.pause()
-    }
-
-    override fun stop() {
-        player.stop()
-    }
-
-    override fun release() {
-        player.release()
-    }
-}

shared/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/AndroidAudioSessionManager.kt

@@ -1,9 +0,0 @@
-package fr.ajaury.gwenedeg.player
-
-class AndroidAudioSessionManager : AudioSessionManager {
-    override fun activate() {
-    }
-
-    override fun deactivate() {
-    }
-}

shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt

@@ -7,9 +7,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.ui.NavDisplay
 import androidx.savedstate.compose.serialization.serializers.SnapshotStateListSerializer
-import fr.ajaury.gwenedeg.di.platformModule
 import fr.ajaury.gwenedeg.di.sharedModule
 import fr.ajaury.gwenedeg.navigation.Route
+import fr.ajaury.gwenedeg.player.di.audioPlayerModule
 import fr.ajaury.gwenedeg.player.ui.PlayerScreen
 import fr.ajaury.gwenedeg.records.ui.RecordsScreen
 import fr.ajaury.gwenedeg.theme.GwenedegTheme
@@ -23,7 +23,7 @@ fun App() {
         configuration = koinConfiguration {
             modules(
                 sharedModule,
-                platformModule,
+                audioPlayerModule,
             )
         },
     ) {

shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt

@@ -4,7 +4,6 @@ import fr.ajaury.gwenedeg.player.ui.viewmodel.PlayerViewModel
 import fr.ajaury.gwenedeg.records.data.InMemoryRecordRepository
 import fr.ajaury.gwenedeg.records.domain.RecordRepository
 import fr.ajaury.gwenedeg.records.ui.viewmodel.RecordsViewModel
-import org.koin.core.module.Module
 import org.koin.core.module.dsl.bind
 import org.koin.core.module.dsl.factoryOf
 import org.koin.core.module.dsl.viewModelOf
@@ -15,5 +14,3 @@ val sharedModule = module {
     viewModelOf(::RecordsViewModel)
     viewModelOf(::PlayerViewModel)
 }
-
-expect val platformModule: Module

shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/AudioPlayer.kt

@@ -1,13 +0,0 @@
-package fr.ajaury.gwenedeg.player
-
-interface AudioPlayer {
-    fun play()
-
-    fun pause()
-
-    fun stop()
-
-    fun release()
-
-    fun load(filePath: String)
-}

shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/AudioSessionManager.kt

@@ -1,10 +0,0 @@
-package fr.ajaury.gwenedeg.player
-
-/**
- * An Audio Session will allow to request Audio focus and declare our audio source to the system
- */
-interface AudioSessionManager {
-    fun activate()
-
-    fun deactivate()
-}

shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/viewmodel/PlayerViewModel.kt

@@ -3,6 +3,7 @@ package fr.ajaury.gwenedeg.player.ui.viewmodel
 import androidx.lifecycle.ViewModel
 import fr.ajaury.gwenedeg.player.AudioPlayer
 import fr.ajaury.gwenedeg.player.AudioSessionManager
+import gwenedeg.shared.generated.resources.Res
 
 class PlayerViewModel(
     private val audioPlayer: AudioPlayer,
@@ -13,7 +14,7 @@ class PlayerViewModel(
     }
 
     fun play(filePath: String) {
-        audioPlayer.load(filePath = filePath)
+        audioPlayer.load(uri = Res.getUri(filePath))
         audioPlayer.play()
     }
 

shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/di/Modules.ios.kt

@@ -1,13 +0,0 @@
-package fr.ajaury.gwenedeg.di
-
-import fr.ajaury.gwenedeg.player.AudioPlayer
-import fr.ajaury.gwenedeg.player.AudioSessionManager
-import fr.ajaury.gwenedeg.player.IosAudioPlayer
-import fr.ajaury.gwenedeg.player.IosAudioSessionManager
-import org.koin.core.module.Module
-import org.koin.dsl.module
-
-actual val platformModule: Module = module {
-    single<AudioPlayer> { IosAudioPlayer() }
-    single<AudioSessionManager> { IosAudioSessionManager() }
-}

shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/IosAudioPlayer.kt

@@ -1,39 +0,0 @@
-package fr.ajaury.gwenedeg.player
-
-import gwenedeg.shared.generated.resources.Res
-import kotlinx.cinterop.ExperimentalForeignApi
-import platform.AVFoundation.AVPlayer
-import platform.AVFoundation.pause
-import platform.AVFoundation.play
-import platform.AVFoundation.replaceCurrentItemWithPlayerItem
-import platform.Foundation.NSURL
-
-class IosAudioPlayer : AudioPlayer {
-    private var player: AVPlayer? = null
-
-    @OptIn(ExperimentalForeignApi::class)
-    override fun load(filePath: String) {
-        val uri = Res.getUri(filePath)
-        val nsUrl = NSURL.URLWithString(uri) ?: error("Invalid audio URI: $uri")
-
-        player = AVPlayer(nsUrl)
-    }
-
-    override fun play() {
-        player?.play()
-    }
-
-    override fun pause() {
-        player?.pause()
-    }
-
-    override fun stop() {
-        player?.pause()
-        player?.replaceCurrentItemWithPlayerItem(null)
-    }
-
-    override fun release() {
-        player?.pause()
-        player = null
-    }
-}

shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/IosAudioSessionManager.kt

@@ -1,35 +0,0 @@
-package fr.ajaury.gwenedeg.player
-
-import kotlinx.cinterop.ExperimentalForeignApi
-import platform.AVFAudio.AVAudioSession
-import platform.AVFAudio.AVAudioSessionCategoryOptionDuckOthers
-import platform.AVFAudio.AVAudioSessionCategoryPlayback
-import platform.AVFAudio.AVAudioSessionModeSpokenAudio
-import platform.AVFAudio.setActive
-
-class IosAudioSessionManager : AudioSessionManager {
-    private val session = AVAudioSession.sharedInstance()
-
-    @OptIn(ExperimentalForeignApi::class)
-    override fun activate() {
-        session.setCategory(
-            category = AVAudioSessionCategoryPlayback,
-            mode = AVAudioSessionModeSpokenAudio,
-            options = AVAudioSessionCategoryOptionDuckOthers,
-            error = null,
-        )
-
-        session.setActive(
-            active = true,
-            error = null,
-        )
-    }
-
-    @OptIn(ExperimentalForeignApi::class)
-    override fun deactivate() {
-        session.setActive(
-            false,
-            error = null,
-        )
-    }
-}

shared/src/jsMain/kotlin/fr/ajaury/gwenedeg/player/JsAudioPlayer.kt

@@ -1,23 +0,0 @@
-package fr.ajaury.gwenedeg.player
-
-class JsAudioPlayer : AudioPlayer {
-    override fun play(file: String) {
-        TODO("Not yet implemented")
-    }
-
-    override fun pause() {
-        TODO("Not yet implemented")
-    }
-
-    override fun stop() {
-        TODO("Not yet implemented")
-    }
-
-    override fun release() {
-        TODO("Not yet implemented")
-    }
-
-    override fun load(filePath: String) {
-        TODO("Not yet implemented")
-    }
-}

shared/src/jvmMain/kotlin/fr/ajaury/gwenedeg/di/Modules.jvm.kt

@@ -1,6 +0,0 @@
-package fr.ajaury.gwenedeg.di
-
-import org.koin.core.module.Module
-
-actual val platformModule: Module
-    get() = TODO("Not yet implemented")

shared/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/JvmAudioPlayer.kt

@@ -1,23 +0,0 @@
-package fr.ajaury.gwenedeg.player
-
-class JvmAudioPlayer : AudioPlayer {
-    override fun play(file: String) {
-        TODO("Not yet implemented")
-    }
-
-    override fun pause() {
-        TODO("Not yet implemented")
-    }
-
-    override fun stop() {
-        TODO("Not yet implemented")
-    }
-
-    override fun release() {
-        TODO("Not yet implemented")
-    }
-
-    override fun load(filePath: String) {
-        TODO("Not yet implemented")
-    }
-}

shared/src/wasmJsMain/kotlin/fr/ajaury/gwenedeg/player/WasmAudioPlayer.kt

@@ -1,23 +0,0 @@
-package fr.ajaury.gwenedeg.player
-
-class WasmAudioPlayer : AudioPlayer {
-    override fun play(file: String) {
-        TODO("Not yet implemented")
-    }
-
-    override fun pause() {
-        TODO("Not yet implemented")
-    }
-
-    override fun stop() {
-        TODO("Not yet implemented")
-    }
-
-    override fun release() {
-        TODO("Not yet implemented")
-    }
-
-    override fun load(filePath: String) {
-        TODO("Not yet implemented")
-    }
-}

shared/src/webMain/kotlin/fr/ajaury/gwenedeg/di/Modules.web.kt

@@ -1,4 +0,0 @@
-package fr.ajaury.gwenedeg.di
-
-actual val platformModule: org.koin.core.module.Module
-    get() = TODO("Not yet implemented")