refactor: migrate resource handling to new data.resources module

shared/build.gradle.kts

@@ -65,6 +65,7 @@ kotlin {
             implementation(projects.core.model)
 
             // Data modules
+            implementation(projects.data.resources)
             implementation(projects.data.subtitle)
 
             implementation(libs.compose.runtime)
@@ -72,7 +73,6 @@ kotlin {
             implementation(libs.compose.material3)
             implementation(libs.compose.material.icons.extended)
             implementation(libs.compose.ui)
-            implementation(libs.compose.components.resources)
             implementation(libs.compose.uiToolingPreview)
 
             // Lifecycle

shared/src/commonMain/composeResources/drawable/compose-multiplatform.xml

@@ -1,44 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="450dp"
-    android:height="450dp"
-    android:viewportWidth="64"
-    android:viewportHeight="64">
-  <path
-      android:pathData="M56.25,18V46L32,60 7.75,46V18L32,4Z"
-      android:fillColor="#6075f2"/>
-  <path
-      android:pathData="m41.5,26.5v11L32,43V60L56.25,46V18Z"
-      android:fillColor="#6b57ff"/>
-  <path
-      android:pathData="m32,43 l-9.5,-5.5v-11L7.75,18V46L32,60Z">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:centerX="23.131"
-          android:centerY="18.441"
-          android:gradientRadius="42.132"
-          android:type="radial">
-        <item android:offset="0" android:color="#FF5383EC"/>
-        <item android:offset="0.867" android:color="#FF7F52FF"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:pathData="M22.5,26.5 L32,21 41.5,26.5 56.25,18 32,4 7.75,18Z">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:startX="44.172"
-          android:startY="4.377"
-          android:endX="17.973"
-          android:endY="34.035"
-          android:type="linear">
-        <item android:offset="0" android:color="#FF33C3FF"/>
-        <item android:offset="0.878" android:color="#FF5383EC"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:pathData="m32,21 l9.526,5.5v11L32,43 22.474,37.5v-11z"
-      android:fillColor="#000000"/>
-</vector>

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

@@ -9,8 +9,7 @@ import fr.ajaury.gwenedeg.preferences.domain.PreferencesRepository
 import fr.ajaury.gwenedeg.records.data.InMemoryRecordRepository
 import fr.ajaury.gwenedeg.records.domain.RecordRepository
 import fr.ajaury.gwenedeg.records.ui.viewmodel.RecordsViewModel
-import fr.ajaury.gwenedeg.resourcereader.data.ComposeResourceReader
-import fr.ajaury.gwenedeg.resourcereader.data.domain.ResourceReader
+import fr.ajaury.gwenedeg.resources.di.resourcesModule
 import org.koin.core.module.dsl.bind
 import org.koin.core.module.dsl.factoryOf
 import org.koin.core.module.dsl.singleOf
@@ -19,10 +18,10 @@ import org.koin.dsl.module
 
 val sharedModule = module {
     includes(loggingModule)
+    includes(resourcesModule)
     factoryOf(::InMemoryRecordRepository) { bind<RecordRepository>() }
     singleOf(::PlaybackRepositoryImpl) { bind<PlaybackRepository>() }
     singleOf(::PreferencesRepositoryImpl) { bind<PreferencesRepository>() }
     viewModelOf(::RecordsViewModel)
     viewModelOf(::PlayerViewModel)
-    factoryOf(::ComposeResourceReader) { bind<ResourceReader>() }
 }

shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/data/PlaybackRepositoryImpl.kt

@@ -8,11 +8,10 @@ import fr.ajaury.gwenedeg.player.domain.PlaybackRepository
 import fr.ajaury.gwenedeg.player.model.PlaybackState
 import fr.ajaury.gwenedeg.player.model.PlaybackTiming
 import fr.ajaury.gwenedeg.player.model.PlayerState
-import fr.ajaury.gwenedeg.resourcereader.data.domain.ResourceReader
+import fr.ajaury.gwenedeg.resources.domain.ResourceReader
 import fr.ajaury.gwenedeg.subtitle.domain.GetCurrentSubtitleIndexUseCase
 import fr.ajaury.gwenedeg.subtitle.domain.SubtitleRepository
 import fr.ajaury.gwenedeg.subtitle.model.Subtitle
-import gwenedeg.shared.generated.resources.Res
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
@@ -96,7 +95,7 @@ internal class PlaybackRepositoryImpl(
 
     private fun playAudio(filePath: String) {
         try {
-            audioPlayer.load(uri = Res.getUri(filePath))
+            audioPlayer.load(uri = resourceReader.uri(filePath))
             audioPlayer.play()
         } catch (exception: Exception) {
             logger.error(message = "Failed to play audio: $filePath", throwable = exception)

shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/resourcereader/data/ComposeResourceReader.kt

@@ -1,15 +0,0 @@
-package fr.ajaury.gwenedeg.resourcereader.data
-
-import fr.ajaury.gwenedeg.core.coroutines.domain.DispatcherProvider
-import fr.ajaury.gwenedeg.resourcereader.data.domain.ResourceReader
-import gwenedeg.shared.generated.resources.Res
-import kotlinx.coroutines.withContext
-
-internal class ComposeResourceReader(
-    private val dispatcherProvider: DispatcherProvider,
-) : ResourceReader {
-    override suspend fun read(resourcePath: String): String =
-        withContext(dispatcherProvider.io) {
-            Res.readBytes(resourcePath).decodeToString()
-        }
-}

shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/resourcereader/domain/ResourceReader.kt

@@ -1,9 +0,0 @@
-package fr.ajaury.gwenedeg.resourcereader.data.domain
-
-/**
- * Reads the raw text of a subtitle file. Implemented by the host app, which owns the resource
- * bundle, so this module stays free of any platform/resource dependency.
- */
-interface ResourceReader {
-    suspend fun read(resourcePath: String): String
-}