From b58fcdb8aa320d1c59e41b53b12c4d7fa5e393eb Mon Sep 17 00:00:00 2001
From: Piripe <pierre.piripe@proton.me>
Date: Sun, 21 Jun 2026 11:21:39 +0200
Subject: [PATCH] Init refactor

---
 .../java/com/craftworks/music/MainActivity.kt |   3 +-
 .../music/data/MediaNavidromeProvider.kt      |   2 +
 .../data/datasource/local/LocalDataSource.kt  |  14 +-
 .../navidrome/NavidromeDataSource.kt          |  52 +-
 .../com/craftworks/music/data/model/Album.kt  |  59 --
 .../com/craftworks/music/data/model/Artist.kt |  16 -
 .../com/craftworks/music/data/model/Lyric.kt  |   4 +-
 .../craftworks/music/data/model/MediaData.kt  | 210 ++------
 .../craftworks/music/data/model/MediaItem.kt  | 270 ++++++++++
 .../craftworks/music/data/model/MediaQuery.kt | 133 +++++
 .../craftworks/music/data/model/Playlist.kt   |  40 --
 .../music/data/model/ProviderFeatures.kt      |  18 +
 .../music/data/model/ProviderResponses.kt     |  65 +++
 .../music/data/model/ProviderType.kt          |   6 +
 .../com/craftworks/music/data/model/Radio.kt  |  35 --
 .../com/craftworks/music/data/model/Song.kt   |  93 ----
 .../craftworks/music/data/model/SortOrder.kt  |  91 +++-
 .../music/data/repository/AlbumRepository.kt  |   2 +
 .../music/data/repository/ArtistRepository.kt |  14 +-
 .../data/repository/PlaylistRepository.kt     |   2 +
 .../music/data/repository/RadioRepository.kt  |  10 +-
 .../music/data/repository/SongRepository.kt   |   2 +
 .../data/repository/StarredRepository.kt      |   2 +
 .../music/managers/LocalProviderManager.kt    |   2 +
 .../music/managers/MediaProviderManager.kt    |  15 +
 .../music/managers/NavidromeManager.kt        |   2 +
 .../settings/LocalDataSettingsManager.kt      |  16 +-
 .../com/craftworks/music/player/SongHelper.kt |   6 +-
 .../music/providers/MediaProvider.kt          |  83 +++
 .../providers/local/LocalPlaylistImage.kt     |   2 +
 .../music/providers/local/LocalProvider.kt    |  10 +-
 .../navidrome/DownloadNavidromeAlbums.kt      |   2 +
 .../navidrome/DownloadNavidromeSongs.kt       |   2 +
 .../providers/navidrome/GetNavidromeAlbums.kt |   6 +-
 .../navidrome/GetNavidromeArtists.kt          |  14 +-
 .../navidrome/GetNavidromeFavourites.kt       |  10 +-
 .../navidrome/GetNavidromeLibraries.kt        |   2 +
 .../providers/navidrome/GetNavidromeLyrics.kt |  10 +-
 .../navidrome/GetNavidromePlaylists.kt        |   6 +-
 .../providers/navidrome/GetNavidromeRadios.kt |   8 +-
 .../navidrome/GetNavidromeSimilarTracks.kt    |   5 +-
 .../providers/navidrome/GetNavidromeSongs.kt  |  13 +-
 .../providers/navidrome/GetNavidromeStatus.kt |   2 +
 .../navidrome/NavidromeConnection.kt          |  18 +-
 .../subsonic/SubsonicMediaProvider.kt         | 510 ++++++++++++++++++
 .../music/providers/subsonic/SubsonicTypes.kt |  16 +
 .../music/ui/elements/ArtistCard.kt           |   4 +-
 .../craftworks/music/ui/elements/SongCard.kt  |   8 +-
 .../music/ui/elements/SongLazyLists.kt        |  12 +-
 .../music/ui/elements/tv/TvArtistCard.kt      |   4 +-
 .../music/ui/playing/NowPlayingElements.kt    |   6 +-
 .../music/ui/playing/tv/NowPlayingElements.kt |   6 +-
 .../music/ui/screens/AlbumDetailsScreen.kt    |  75 +--
 .../music/ui/screens/PlaylistDetailsScreen.kt |   4 +-
 .../ui/screens/tv/TvAlbumDetailsScreen.kt     |   5 +-
 .../music/ui/screens/tv/TvHomeScreen.kt       |   4 +-
 .../ui/screens/tv/TvPlaylistDetailsScreen.kt  |   4 +-
 .../ui/viewmodels/AlbumDetailsViewModel.kt    |  22 +-
 .../ui/viewmodels/ArtistsScreenViewModel.kt   |  14 +-
 .../ui/viewmodels/RadioScreenViewModel.kt     |   4 +-
 60 files changed, 1494 insertions(+), 581 deletions(-)
 delete mode 100755 app/src/main/java/com/craftworks/music/data/model/Album.kt
 delete mode 100755 app/src/main/java/com/craftworks/music/data/model/Artist.kt
 create mode 100644 app/src/main/java/com/craftworks/music/data/model/MediaItem.kt
 create mode 100644 app/src/main/java/com/craftworks/music/data/model/MediaQuery.kt
 delete mode 100755 app/src/main/java/com/craftworks/music/data/model/Playlist.kt
 create mode 100644 app/src/main/java/com/craftworks/music/data/model/ProviderFeatures.kt
 create mode 100644 app/src/main/java/com/craftworks/music/data/model/ProviderResponses.kt
 create mode 100644 app/src/main/java/com/craftworks/music/data/model/ProviderType.kt
 delete mode 100755 app/src/main/java/com/craftworks/music/data/model/Radio.kt
 delete mode 100755 app/src/main/java/com/craftworks/music/data/model/Song.kt
 create mode 100644 app/src/main/java/com/craftworks/music/managers/MediaProviderManager.kt
 create mode 100644 app/src/main/java/com/craftworks/music/providers/MediaProvider.kt
 create mode 100644 app/src/main/java/com/craftworks/music/providers/subsonic/SubsonicMediaProvider.kt
 create mode 100644 app/src/main/java/com/craftworks/music/providers/subsonic/SubsonicTypes.kt

diff --git a/app/src/main/java/com/craftworks/music/MainActivity.kt b/app/src/main/java/com/craftworks/music/MainActivity.kt
index 9618c757..148f02f0 100755
--- a/app/src/main/java/com/craftworks/music/MainActivity.kt
+++ b/app/src/main/java/com/craftworks/music/MainActivity.kt
@@ -769,7 +769,8 @@ fun AnimatedBottomNavBar(
     }
 }
 
-fun formatMilliseconds(seconds: Int): String {
+// TODO("Move these utils funtions to a separated utils package")
+fun formatSeconds(seconds: Int): String {
     return String.format(Locale.getDefault(), "%02d:%02d", seconds / 60, seconds % 60)
 }
 
diff --git a/app/src/main/java/com/craftworks/music/data/MediaNavidromeProvider.kt b/app/src/main/java/com/craftworks/music/data/MediaNavidromeProvider.kt
index 70271173..458e23f1 100755
--- a/app/src/main/java/com/craftworks/music/data/MediaNavidromeProvider.kt
+++ b/app/src/main/java/com/craftworks/music/data/MediaNavidromeProvider.kt
@@ -2,6 +2,8 @@ package com.craftworks.music.data
 
 import kotlinx.serialization.Serializable
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Serializable
 data class NavidromeProvider (
     val id: String = "0",
diff --git a/app/src/main/java/com/craftworks/music/data/datasource/local/LocalDataSource.kt b/app/src/main/java/com/craftworks/music/data/datasource/local/LocalDataSource.kt
index 0223cda3..175fa05b 100644
--- a/app/src/main/java/com/craftworks/music/data/datasource/local/LocalDataSource.kt
+++ b/app/src/main/java/com/craftworks/music/data/datasource/local/LocalDataSource.kt
@@ -1,7 +1,7 @@
 package com.craftworks.music.data.datasource.local
 
 import androidx.media3.common.MediaItem
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.model.toMediaItem
 import com.craftworks.music.data.model.toSong
 import com.craftworks.music.managers.settings.AppearanceSettingsManager
@@ -53,7 +53,7 @@ class LocalDataSource @Inject constructor(
         return localProvider.getLocalSongs().find { it.mediaMetadata.extras?.getString("navidromeID") == songId }
     }
 
-    fun getLocalArtists(): List<MediaData.Artist> {
+    fun getLocalArtists(): List<com.craftworks.music.data.model.MediaItem.Artist> {
         return localProvider.getLocalArtists()
     }
 
@@ -61,7 +61,7 @@ class LocalDataSource @Inject constructor(
         return localProvider.getAlbumsByArtistId(artist)
     }
 
-    fun searchLocalArtists(query: String): List<MediaData.Artist> {
+    fun searchLocalArtists(query: String): List<com.craftworks.music.data.model.MediaItem.Artist> {
         if (query.isBlank()) return getLocalArtists()
         return localProvider.getLocalArtists().filter {
             it.name.contains(query, ignoreCase = true)
@@ -85,7 +85,7 @@ class LocalDataSource @Inject constructor(
     ): Boolean {
         val initialSong = getLocalSong(initialSongId ?: "")?.toSong()
 
-        val newPlaylist = MediaData.Playlist(
+        val newPlaylist = MediaItem.Playlist(
             navidromeID = "Local_${UUID.randomUUID()}",
             name = playlistName,
             comment = "",
@@ -163,7 +163,7 @@ class LocalDataSource @Inject constructor(
     }
 
     // Radios
-    suspend fun getLocalRadios(): List<MediaData.Radio> {
+    suspend fun getLocalRadios(): List<com.craftworks.music.data.model.MediaItem.Radio> {
         return localDataSettingsManager.localRadios.first()
     }
 
@@ -172,7 +172,7 @@ class LocalDataSource @Inject constructor(
         url: String,
         homePageUrl: String?
     ): Boolean {
-        val newRadio = MediaData.Radio(
+        val newRadio = MediaItem.Radio(
             name = name,
             media = url,
             homePageUrl = homePageUrl ?: "",
@@ -185,7 +185,7 @@ class LocalDataSource @Inject constructor(
         return true
     }
 
-    suspend fun updateLocalRadio(radio: MediaData.Radio): Boolean {
+    suspend fun updateLocalRadio(radio: com.craftworks.music.data.model.MediaItem.Radio): Boolean {
         val currentRadiosFromStore = localDataSettingsManager.localRadios.first().toMutableList()
         val index = currentRadiosFromStore.indexOfFirst { it.navidromeID == radio.navidromeID }
         if (index != -1) {
diff --git a/app/src/main/java/com/craftworks/music/data/datasource/navidrome/NavidromeDataSource.kt b/app/src/main/java/com/craftworks/music/data/datasource/navidrome/NavidromeDataSource.kt
index 027403f5..2e99fa85 100644
--- a/app/src/main/java/com/craftworks/music/data/datasource/navidrome/NavidromeDataSource.kt
+++ b/app/src/main/java/com/craftworks/music/data/datasource/navidrome/NavidromeDataSource.kt
@@ -6,7 +6,7 @@ import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import com.craftworks.music.data.NavidromeLibrary
 import com.craftworks.music.data.model.Lyric
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.model.toLyric
 import com.craftworks.music.data.model.toLyrics
 import com.craftworks.music.managers.NavidromeManager
@@ -54,6 +54,8 @@ import javax.inject.Singleton
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Singleton
 class NavidromeDataSource @Inject constructor() {
     private val json = Json { ignoreUnknownKeys = true }
@@ -72,20 +74,6 @@ class NavidromeDataSource @Inject constructor() {
     }
 
     private val insecureClient: HttpClient by lazy { buildInsecureClient() }
-
-    companion object {
-        fun md5Hash(input: String): String {
-            val md = MessageDigest.getInstance("MD5")
-            val hashBytes = md.digest(input.toByteArray())
-            return hashBytes.joinToString("") { "%02x".format(it) }
-        }
-
-        fun generateSalt(length: Int): String {
-            val allowedChars = ('a'..'z') + ('A'..'Z') + ('0'..'9')
-            return (1..length).map { allowedChars.random() }.joinToString("")
-        }
-    }
-
     private fun buildInsecureClient(): HttpClient {
         val trustAllCerts = arrayOf<TrustManager>(
             @SuppressLint("CustomX509TrustManager")
@@ -117,6 +105,20 @@ class NavidromeDataSource @Inject constructor() {
         }
     }
 
+    companion object {
+        fun md5Hash(input: String): String {
+            val md = MessageDigest.getInstance("MD5")
+            val hashBytes = md.digest(input.toByteArray())
+            return hashBytes.joinToString("") { "%02x".format(it) }
+        }
+
+        fun generateSalt(length: Int): String {
+            val allowedChars = ('a'..'z') + ('A'..'Z') + ('0'..'9')
+            return (1..length).map { allowedChars.random() }.joinToString("")
+        }
+    }
+
+
     private suspend fun getRequest(
         endpoint: String,
         musicFolderIds: List<Int>? = null,
@@ -284,12 +286,12 @@ class NavidromeDataSource @Inject constructor() {
     suspend fun getNavidromeArtists(
         ignoreCachedResponse: Boolean = false,
         musicFolderIds: List<Int>? = NavidromeManager.getEnabledLibraryIdsForCurrentServer(),
-    ): List<MediaData.Artist> = withContext(Dispatchers.IO) {
+    ): List<com.craftworks.music.data.model.MediaItem.Artist> = withContext(Dispatchers.IO) {
         getRequest(
             "getArtists.view?f=json",
             musicFolderIds,
             ignoreCachedResponse
-        ).filterIsInstance<MediaData.Artist>()
+        ).filterIsInstance<com.craftworks.music.data.model.MediaItem.Artist>()
     }
 
     suspend fun getNavidromeArtistAlbums(
@@ -304,25 +306,25 @@ class NavidromeDataSource @Inject constructor() {
 
     suspend fun getNavidromeArtistInfo(
         artistId: String, ignoreCachedResponse: Boolean = false
-    ): MediaData.ArtistInfo? = withContext(Dispatchers.IO) {
+    ): com.craftworks.music.data.model.MediaItem.ArtistInfo? = withContext(Dispatchers.IO) {
         getRequest(
             "getArtistInfo.view?id=$artistId",
             null,
             ignoreCachedResponse
-        ).filterIsInstance<MediaData.ArtistInfo>().firstOrNull()
+        ).filterIsInstance<com.craftworks.music.data.model.MediaItem.ArtistInfo>().firstOrNull()
     }
 
     suspend fun searchNavidromeArtists(
         query: String? = "",
         ignoreCachedResponse: Boolean = false,
         musicFolderIds: List<Int>? = NavidromeManager.getEnabledLibraryIdsForCurrentServer(),
-    ): List<MediaData.Artist> = withContext(Dispatchers.IO) {
+    ): List<com.craftworks.music.data.model.MediaItem.Artist> = withContext(Dispatchers.IO) {
         if (query.isNullOrBlank()) getNavidromeArtists(musicFolderIds = musicFolderIds, ignoreCachedResponse = ignoreCachedResponse)
         else getRequest(
             "search3.view?query=$query&artistCount=100&albumCount=0&songCount=0",
             musicFolderIds,
             ignoreCachedResponse
-        ).filterIsInstance<MediaData.Artist>()
+        ).filterIsInstance<com.craftworks.music.data.model.MediaItem.Artist>()
     }
 
     // Playlists
@@ -392,12 +394,12 @@ class NavidromeDataSource @Inject constructor() {
     // Radios
     suspend fun getNavidromeRadios(
         ignoreCachedResponse: Boolean = false
-    ): List<MediaData.Radio> = withContext(Dispatchers.IO) {
+    ): List<com.craftworks.music.data.model.MediaItem.Radio> = withContext(Dispatchers.IO) {
         getRequest(
             "getInternetRadioStations.view?f=json",
             null,
             ignoreCachedResponse
-        ).filterIsInstance<MediaData.Radio>()
+        ).filterIsInstance<com.craftworks.music.data.model.MediaItem.Radio>()
     }
 
     suspend fun createNavidromeRadio(
@@ -434,14 +436,14 @@ class NavidromeDataSource @Inject constructor() {
     suspend fun getNavidromePlainLyrics(
         metadata: MediaMetadata?, ignoreCachedResponse: Boolean = false
     ): List<Lyric> = withContext(Dispatchers.IO) {
-        getRequest("getLyrics.view?artist=${metadata?.artist}&title=${metadata?.title}", null).filterIsInstance<MediaData.PlainLyrics>().getOrNull(0)?.toLyric()?.takeIf { it.text.isNotEmpty() }?.let { listOf(it) } ?: emptyList()
+        getRequest("getLyrics.view?artist=${metadata?.artist}&title=${metadata?.title}", null).filterIsInstance<com.craftworks.music.data.model.MediaItem.PlainLyrics>().getOrNull(0)?.toLyric()?.takeIf { it.text.isNotEmpty() }?.let { listOf(it) } ?: emptyList()
     }
 
     suspend fun getNavidromeSyncedLyrics(
         songId: String, ignoreCachedResponse: Boolean = false
     ): List<Lyric> = withContext(Dispatchers.IO) {
         getRequest("getLyricsBySongId.view?id=${songId}", null, ignoreCachedResponse)
-            .filterIsInstance<MediaData.StructuredLyrics>().flatMap { it.toLyrics() }
+            .filterIsInstance<com.craftworks.music.data.model.MediaItem.StructuredLyrics>().flatMap { it.toLyrics() }
     }
 
     // Starred Items
diff --git a/app/src/main/java/com/craftworks/music/data/model/Album.kt b/app/src/main/java/com/craftworks/music/data/model/Album.kt
deleted file mode 100755
index 82570446..00000000
--- a/app/src/main/java/com/craftworks/music/data/model/Album.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.craftworks.music.data.model
-
-import android.os.Bundle
-import androidx.compose.runtime.mutableStateListOf
-import androidx.core.net.toUri
-import androidx.media3.common.MediaItem
-import androidx.media3.common.MediaMetadata
-
-var albumList:MutableList<MediaData.Album> = mutableStateListOf()
-
-fun MediaData.Album.toMediaItem(): MediaItem {
-    val mediaMetadata = MediaMetadata.Builder()
-        .setTitle(this@toMediaItem.name)
-        .setArtist(this@toMediaItem.artist)
-        .setAlbumTitle(this@toMediaItem.name)
-        .setDisplayTitle(this@toMediaItem.name)
-        .setAlbumArtist(this@toMediaItem.artist)
-        .setArtworkUri(this@toMediaItem.coverArt?.toUri())
-        .setRecordingYear(this@toMediaItem.year)
-        .setDurationMs(this@toMediaItem.duration?.times(1000)?.toLong())
-        .setIsBrowsable(true)
-        .setIsPlayable(false)
-        .setGenre(this@toMediaItem.genres?.joinToString() { it.name ?: "" })
-        .setMediaType(MediaMetadata.MEDIA_TYPE_ALBUM)
-        .setExtras(
-            Bundle().apply {
-                putString("navidromeID", this@toMediaItem.navidromeID)
-                putString("starred", this@toMediaItem.starred)
-            }
-        )
-        .build()
-
-    return MediaItem.Builder()
-        .setMediaId(
-            if (this@toMediaItem.navidromeID.startsWith("Local_"))
-                "folder_album_" + this@toMediaItem.navidromeID
-            else
-                this@toMediaItem.navidromeID
-        )
-        .setMediaMetadata(mediaMetadata)
-        .build()
-}
-
-fun MediaItem.toAlbum(): MediaData.Album {
-    val mediaMetadata = this.mediaMetadata
-    val extras = mediaMetadata.extras
-
-    return MediaData.Album(
-        navidromeID = extras?.getString("navidromeID") ?: "",
-        name = mediaMetadata.albumTitle.toString(),
-        artist = mediaMetadata.artist.toString(),
-        year = mediaMetadata.releaseYear ?: 0,
-        coverArt = mediaMetadata.artworkUri.toString(),
-        duration = extras?.getInt("Duration") ?: 0,
-        songs = mutableListOf(),
-        songCount = 0,
-        artistId = ""
-    )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/data/model/Artist.kt b/app/src/main/java/com/craftworks/music/data/model/Artist.kt
deleted file mode 100755
index 4f5bcf52..00000000
--- a/app/src/main/java/com/craftworks/music/data/model/Artist.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.craftworks.music.data.model
-
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-
-var artistList: MutableList<MediaData.Artist> = mutableStateListOf()
-
-var selectedArtist by mutableStateOf(
-    MediaData.Artist(
-        name = "My Favourite Artist",
-        artistImageUrl = "",
-        navidromeID = "Local"
-    )
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/data/model/Lyric.kt b/app/src/main/java/com/craftworks/music/data/model/Lyric.kt
index 6fc55130..fa6df626 100755
--- a/app/src/main/java/com/craftworks/music/data/model/Lyric.kt
+++ b/app/src/main/java/com/craftworks/music/data/model/Lyric.kt
@@ -43,14 +43,14 @@ data class NeteaseLrc(
 )
 
 //region Convert lyric format to app format.
-fun MediaData.PlainLyrics.toLyric(): Lyric {
+fun MediaItem.PlainLyrics.toLyric(): Lyric {
     return Lyric(
         startMs = -1,
         text = if (value.isBlank()) emptyList() else listOf(value)
     )
 }
 
-fun MediaData.StructuredLyrics.toLyrics(): List<Lyric> {
+fun MediaItem.StructuredLyrics.toLyrics(): List<Lyric> {
     return line
         .groupBy { if (synced) it.start!! + (offset ?: 0) else -1 }
         .map { (timestamp, lines) ->
diff --git a/app/src/main/java/com/craftworks/music/data/model/MediaData.kt b/app/src/main/java/com/craftworks/music/data/model/MediaData.kt
index 2cd656f4..9e42b2cb 100644
--- a/app/src/main/java/com/craftworks/music/data/model/MediaData.kt
+++ b/app/src/main/java/com/craftworks/music/data/model/MediaData.kt
@@ -1,156 +1,62 @@
 package com.craftworks.music.data.model
 
-import com.craftworks.music.providers.navidrome.SyncedLyrics
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-sealed class MediaData {
-    @Serializable
-    data class Song(
-        @SerialName("id")
-        val navidromeID: String,
-        val parent: String,
-        val isDir: Boolean? = false,
-        val title: String,
-        val album: String,
-        val artist: String,
-        val artists: List<Artists> = listOf(),
-        val track: Int? = 0,
-        val year: Int? = 0,
-        val genre: String? = "",
-        @SerialName("coverArt")
-        var imageUrl: String,
-        val size: Int? = 0,
-        val contentType: String? = "audio/flac",
-        @SerialName("suffix")
-        val format: String,
-        val duration: Int = 0,
-        @SerialName("bitRate")
-        val bitrate: Int? = 0,
-        val path: String,
-        @SerialName("playCount")
-        var timesPlayed: Int? = 0,
-        val discNumber: Int? = 0,
-        @SerialName("created")
-        val dateAdded: String,
-        val albumId: String,
-        val artistId: String? = "",
-        val type: String? = "music",
-        val isVideo: Boolean? = false,
-        @SerialName("played")
-        val lastPlayed: String? = "",
-        val bpm: Int,
-        val comment: String? = "",
-        val sortName: String? = "",
-        val mediaType: String? = "song",
-        val musicBrainzId: String? = "",
-        val genres: List<Genre>? = listOf(),
-        val replayGain: ReplayGain? = null,
-        val channelCount: Int? = 2,
-        val samplingRate: Int? = 0,
-
-        val isRadio: Boolean? = false,
-        var media: String? = null,
-        val trackIndex: Int? = 0,
-        var starred: String? = null,
-    ) : MediaData()
-
-    @Serializable
-    data class Album(
-        @SerialName("id")
-        val navidromeID : String,
-        val parent : String? = "",
-
-        val album : String? = "",
-        val title : String? = "",
-        val name : String? = "",
-
-        val isDir : Boolean? = false,
-        var coverArt : String?,
-        val songCount : Int,
-
-        val played : String? = "",
-        val created : String? = "",
-        val duration : Int? = 0,
-        val playCount : Int? = 0,
-
-        val artistId : String?,
-        val artist : String,
-        val year : Int? = 0,
-        val genre : String? = "",
-        val genres : List<Genre>? = listOf(),
-
-        val starred: String? = null,
-
-        @SerialName("song")
-        var songs: List<Song>? = listOf()
-    ) : MediaData()
-
-    @Serializable
-    data class Artist(
-        @SerialName("id")
-        var navidromeID : String = "",
-        val name : String = "",
-        //val coverArt : String? = "",
-        val artistImageUrl : String? = null,
-        val albumCount : Int? = 0,
-        var description : String = "",
-        var starred : String? = "",
-        var musicBrainzId : String? = "",
-//        val sortName: String? = "",
-        var similarArtist : List<Artist>? = null,
-        var album : List<Album>? = null
-    ) : MediaData()
-
-    @Serializable
-    data class ArtistInfo(
-        val biography : String? = "",
-        val musicBrainzId : String? = "",
-        val lastFmUrl : String? = "",
-        val similarArtist : List<Artist>? = null
+data class RelatedArtist(
+    val id: String,
+    val imageId: String?,
+    val imageUrl: String?,
+    val name: String,
+    val userFavorite: Boolean,
+    val userRating: Number?
+)
+
+data class GainInfo(
+    val album: Double? = null,
+    val track: Double? = null
+)
+
+enum class ExplicitStatus {
+    CLEAN,
+    EXPLICIT,
+}
+
+data class PlaylistRules(
+    val limit: Int? = null,
+    val limitPercent: Int? = null,
+    val sort: String? = null
+)
+
+enum class LibraryType {
+    ALBUM,
+    ALBUM_ARTIST,
+    ARTIST,
+    FOLDER,
+    GENRE,
+    PLAYLIST,
+    PLAYLIST_SONG,
+    QUEUE_SONG,
+    RADIO_STATION,
+    SONG,
+}
+data class AlbumInfo(
+    val imageUrl: String?,
+    val notes: String?
+)
+data class InternetRadioStation(
+    val homepageUrl: String?,
+    val id: String,
+    val imageId: String? = null,
+    val imageUrl: String? = null,
+    val name: String,
+    val streamUrl: String,
+    val uploadedImage: String? = null
+)
+
+data class Tag(
+    val name: String,
+    val options: List<Option>
+) {
+    data class Option(
+        val id: String,
+        val name: String
     )
-
-    @Serializable
-    data class Radio(
-        @SerialName("id")
-        val navidromeID: String,
-        val name: String,
-        @SerialName("streamUrl")
-        val media: String,
-        val homePageUrl: String? = "",
-    ) : MediaData()
-
-    @Serializable
-    data class Playlist(
-        @SerialName("id")
-        val navidromeID: String,
-        val name: String,
-        val comment: String? = "",
-        val owner: String? = "",
-        val public: Boolean? = true,
-        val created: String,
-        val changed: String,
-        val songCount: Int,
-        val duration: Int,
-        var coverArt: String? = "",
-        @SerialName("entry")
-        var songs: MutableList<Song>? = mutableListOf()
-    ) : MediaData()
-
-    @Serializable
-    data class PlainLyrics(
-        val value: String,
-        val artist: String? = "",
-        val title: String? = ""
-    ) : MediaData()
-
-    @Serializable
-    data class StructuredLyrics(
-        val displayArtist: String? = "",
-        val displayTitle: String? = "",
-        val lang: String,
-        val offset: Int? = 0,
-        val synced: Boolean,
-        val line: List<SyncedLyrics>
-    ) : MediaData()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/data/model/MediaItem.kt b/app/src/main/java/com/craftworks/music/data/model/MediaItem.kt
new file mode 100644
index 00000000..e9097a9c
--- /dev/null
+++ b/app/src/main/java/com/craftworks/music/data/model/MediaItem.kt
@@ -0,0 +1,270 @@
+package com.craftworks.music.data.model
+
+import androidx.core.net.toUri
+import androidx.media3.common.MediaMetadata
+
+abstract class MediaItem (
+    val providerId: String,
+    val providerType: ProviderType,
+    val id: String,
+) {
+
+    class Album(
+        providerId: String,
+        providerType: ProviderType,
+        id: String,
+
+        val albumArtistName: String,
+        val albumArtists: List<RelatedArtist>,
+        val artists: List<RelatedArtist>,
+        val comment: String?,
+        val createdAt: String,
+        val duration: Int?,
+        val explicitStatus: ExplicitStatus?,
+        val genres: List<Genre>,
+        val imageId: String?,
+        val imageUrl: String?,
+        val isCompilation: Boolean?,
+        val lastPlayedAt: String?,
+        val mbzId: String?,
+        val mbzReleaseGroupId: String?,
+        val name: String,
+        val originalDate: String?, // was null | PartialIsoDateString
+        val originalYear: Int,
+        val participants: Map<String, List<RelatedArtist>>?,
+        val playCount: Double?,
+        val recordLabels: List<String>,
+        val releaseDate: String?,
+        val releaseType: String?,
+        val releaseTypes: List<String>,
+        val releaseYear: Int?,
+        val size: Int?,
+        val songCount: Int?,
+        val songs: List<Song>?, // optional in TS
+        val sortName: String,
+        val tags: Map<String, List<String>>?,
+        val updatedAt: String,
+        val userFavorite: Boolean,
+        val userRating: Int?,
+        val version: String?
+    ) : MediaItem(providerId, providerType, id)
+
+    class AlbumArtist(
+        providerId: String,
+        providerType: ProviderType,
+        id: String,
+
+        val albumCount: Int?,
+        val biography: String?,
+        val duration: Int?,
+        val genres: List<Genre>,
+        val imageId: String?,
+        val imageUrl: String?,
+        val lastPlayedAt: String?,
+        val mbz: String?,
+        val name: String,
+        val playCount: Double?,
+        val similarArtists: List<RelatedArtist>?,
+        val songCount: Int?,
+        val uploadedImage: String?,
+        val userFavorite: Boolean,
+        val userRating: Int?
+    ) : MediaItem(providerId, providerType, id)
+
+    class Artist(
+        providerId: String,
+        providerType: ProviderType,
+        id: String,
+
+        val albumCount: Int?,
+        val biography: String?,
+        val duration: Int?,
+        val genres: List<Genre>,
+        val imageId: String?,
+        val imageUrl: String?,
+        val lastPlayedAt: String?,
+        val mbz: String?,
+        val name: String,
+        val playCount: Double?,
+        val similarArtists: List<RelatedArtist>?,
+        val songCount: Int?,
+        val uploadedImage: String?,
+        val userFavorite: Boolean,
+        val userRating: Int?
+    ) : MediaItem(providerId, providerType, id)
+    class Folder(
+        providerId: String,
+        providerType: ProviderType,
+        id: String,
+
+        val children: Children? = null,
+
+        val imageId: String? = null,
+        val imageUrl: String? = null,
+
+        val name: String,
+        val parentId: String? = null
+    ) : MediaItem(providerId, providerType, id) {
+        data class Children(
+            val folders: List<Folder>,
+            val songs: List<Song>
+        )
+    }
+
+    class Genre(
+        providerId: String,
+        providerType: ProviderType,
+        id: String,
+
+        val albumCount: Int?,
+        val imageId: String?,
+        val imageUrl: String?,
+        val name: String,
+        val songCount: Int?
+    ) : MediaItem(providerId, providerType, id)
+
+    class Playlist(
+        providerId: String,
+        providerType: ProviderType,
+        id: String,
+
+        val description: String?,
+        val duration: Int?,
+        val genres: List<Genre>,
+        val imageId: String?,
+        val imageUrl: String?,
+        val name: String,
+        val owner: String?,
+        val ownerId: String?,
+        val isPublic: Boolean?,
+        val rules: PlaylistRules?,
+        val size: Int?,
+        val songCount: Int?,
+        val sync: Boolean?,
+        val uploadedImage: String?
+    ) : MediaItem(providerId, providerType, id)
+
+    class QueueSong(
+        providerId: String,
+        providerType: ProviderType,
+        id: String,
+
+        val album: String?,
+        val albumArtistName: String,
+        val albumArtists: List<RelatedArtist>,
+        val albumId: String,
+        val artistName: String,
+        val artists: List<RelatedArtist>,
+        val bitDepth: Int?,
+        val bitRate: Int,
+        val bpm: Int?,
+        val channels: Int?,
+        val comment: String?,
+        val compilation: Boolean?,
+        val container: String?,
+        val createdAt: String,
+        val discNumber: Int,
+        val discSubtitle: String?,
+        val duration: Int,
+        val explicitStatus: ExplicitStatus?,
+        val gain: GainInfo?,
+        val genres: List<Genre>,
+        val imageId: String?,
+        val imageUrl: String?,
+        val lastPlayedAt: String?,
+        val lyrics: String?,
+        val mbzRecordingId: String?,
+        val mbzTrackId: String?,
+        val name: String,
+        val participants: Map<String, List<RelatedArtist>>?,
+        val path: String?,
+        val peak: GainInfo?,
+        val playCount: Int,
+        val playlistItemId: String?,
+        val releaseDate: String?,
+        val releaseYear: Int?,
+        val sampleRate: Int?,
+        val size: Int,
+        val sortName: String,
+        val tags: Map<String, List<String>>?,
+        val trackNumber: Int,
+        val trackSubtitle: String?,
+        val updatedAt: String,
+        val userFavorite: Boolean,
+        val userRating: Int?,
+        val uniqueId: String
+    ) : MediaItem(providerId, providerType, id)
+
+    class Song(
+        providerId: String,
+        providerType: ProviderType,
+        id: String,
+
+        val album: String?,
+        val albumArtistName: String,
+        val albumArtists: List<RelatedArtist>,
+        val albumId: String,
+        val artistName: String,
+        val artists: List<RelatedArtist>,
+        val bitDepth: Int?,
+        val bitRate: Int,
+        val bpm: Int?,
+        val channels: Int?,
+        val comment: String?,
+        val compilation: Boolean?,
+        val container: String?,
+        val createdAt: String,
+        val discNumber: Int,
+        val discSubtitle: String?,
+        val duration: Int,
+        val explicitStatus: ExplicitStatus?,
+        val gain: GainInfo?,
+        val genres: List<Genre>,
+        val imageId: String?,
+        val imageUrl: String?,
+        val lastPlayedAt: String?,
+        val lyrics: String?,
+        val mbzRecordingId: String?,
+        val mbzTrackId: String?,
+        val name: String,
+        val participants: Map<String, List<RelatedArtist>>?,
+        val path: String?,
+        val peak: GainInfo?,
+        val playCount: Int,
+        val playlistItemId: String?,
+        val releaseDate: String?,
+        val releaseYear: Int?,
+        val sampleRate: Int?,
+        val size: Int,
+        val sortName: String,
+        val tags: Map<String, List<String>>?,
+        val trackNumber: Int,
+        val trackSubtitle: String?,
+        val updatedAt: String,
+        val userFavorite: Boolean,
+        val userRating: Int?
+    ) : MediaItem(providerId, providerType, id) {
+        fun toMediaItem(): androidx.media3.common.MediaItem {
+            val mediaMetadata =
+                MediaMetadata.Builder()
+                    .setTitle(this.name)
+                    .setArtist(this.artistName)
+                    .setAlbumTitle(this.album)
+                    .setArtworkUri(this.imageUrl?.toUri()) // TODO("Call provider's getImageUrl")
+                    .setRecordingYear(this.releaseYear)
+                    .setDiscNumber(this.discNumber)
+                    .setTrackNumber(this.trackNumber)
+                    .setIsBrowsable(false).setIsPlayable(true)
+                    .setMediaType(MediaMetadata.MEDIA_TYPE_MUSIC)
+                    .setDurationMs(this.duration.toLong() * 1000)
+                    .setGenre(this.genres.joinToString())
+                    .build()
+
+            return androidx.media3.common.MediaItem.Builder()
+                .setMediaId(this.id)
+                .setUri(this.id.toUri()) // TODO("Call provider's getStreamUrl")
+                .setMediaMetadata(mediaMetadata)
+                .build()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/data/model/MediaQuery.kt b/app/src/main/java/com/craftworks/music/data/model/MediaQuery.kt
new file mode 100644
index 00000000..af53299a
--- /dev/null
+++ b/app/src/main/java/com/craftworks/music/data/model/MediaQuery.kt
@@ -0,0 +1,133 @@
+package com.craftworks.music.data.model
+
+abstract class MediaQuery<T> (
+    val sortBy: T,
+    val sortOrder: SortOrder,
+) {
+    class AlbumListQuery(
+        sortBy: AlbumListSort,
+        sortOrder: SortOrder,
+
+        val custom: Map<String, Any>? = null,
+        val artistIds: List<String>? = null,
+        val compilation: Boolean? = null,
+        val favorite: Boolean? = null,
+        val genreIds: List<String>? = null,
+        val limit: Int? = null,
+        val maxYear: Int? = null,
+        val minYear: Int? = null,
+        val musicFolderId: List<String>? = null,
+        val searchTerm: String? = null,
+        val startIndex: Int,
+    ) : MediaQuery<AlbumListSort>(sortBy, sortOrder)
+    class AlbumArtistListQuery(
+        sortBy: AlbumArtistListSort,
+        sortOrder: SortOrder,
+
+        val custom: Map<String, Any>? = null,
+        val favorite: Boolean? = null,
+        val limit: Int? = null,
+        val musicFolderId: List<String>? = null,
+        val searchTerm: String? = null,
+        val startIndex: Int
+    ) : MediaQuery<AlbumArtistListSort>(sortBy, sortOrder)
+    class ArtistListQuery(
+        sortBy: ArtistListSort,
+        sortOrder: SortOrder,
+
+        val custom: Map<String, Any>? = null,
+        val favorite: Boolean? = null,
+        val limit: Int? = null,
+        val musicFolderId: List<String>? = null,
+        val role: String? = null,
+        val searchTerm: String? = null,
+        val startIndex: Int
+    ) : MediaQuery<ArtistListSort>(sortBy, sortOrder)
+    class FolderQuery(
+        sortBy: SongListSort,
+        sortOrder: SortOrder,
+
+        val id: String,
+        val musicFolderId: List<String>? = null,
+        val searchTerm: String? = null,
+    ) : MediaQuery<SongListSort>(sortBy, sortOrder)
+    class GenreListQuery(
+        sortBy: GenreListSort,
+        sortOrder: SortOrder,
+
+        val custom: Map<String, Any>? = null,
+        val limit: Int? = null,
+        val musicFolderId: List<String>? = null,
+        val searchTerm: String? = null,
+        val startIndex: Int
+    ) : MediaQuery<GenreListSort>(sortBy, sortOrder)
+    class PlaylistListQuery(
+        sortBy: PlaylistListSort,
+        sortOrder: SortOrder,
+
+        val custom: Map<String, Any>? = null,
+        val excludeSmartPlaylists: Boolean = false,
+        val limit: Int? = null,
+        val searchTerm: String? = null,
+        val startIndex: Int
+    ) : MediaQuery<PlaylistListSort>(sortBy, sortOrder)
+    class SongListQuery(
+        sortBy: SongListSort,
+        sortOrder: SortOrder,
+
+        val custom: Map<String, Any>? = null,
+        val albumArtistIds: List<String>? = null,
+        val albumIds: List<String>? = null,
+        val artistIds: List<String>? = null,
+        val favorite: Boolean? = null,
+        val genreIds: List<String>? = null,
+        val hasRating: Boolean = false,
+        val imageSize: Int? = null,
+        val limit: Int? = null,
+        val maxYear: Int? = null,
+        val minYear: Int? = null,
+        val musicFolderId: List<String>? = null,
+        val searchTerm: String? = null,
+        val startIndex: Int
+    ) : MediaQuery<SongListSort>(sortBy, sortOrder)
+
+    class UserListQuery(
+        sortBy: UserListSort,
+        sortOrder: SortOrder,
+
+        val custom: Map<String, Any>? = null,
+        val albumArtistIds: List<String>? = null,
+        val limit: Int? = null,
+        val searchTerm: String? = null,
+        val startIndex: Int
+    ) : MediaQuery<UserListSort>(sortBy, sortOrder)
+
+    data class SearchQuery(
+        val albumArtistLimit: Int? = null,
+        val albumArtistStartIndex: Int? = null,
+        val albumLimit: Int? = null,
+        val albumStartIndex: Int? = null,
+        val musicFolderId: List<String>? = null,
+        val query: String? = null,
+        val songLimit: Int? = null,
+        val songStartIndex: Int? = null
+    )
+
+    data class RandomSongListQuery(
+        val genre: String? = null,
+        val limit: Int? = null,
+        val maxYear: Int? = null,
+        val minYear: Int? = null,
+        val musicFolderId: Any? = null, // String or List<String>
+        val played: Played
+    )
+
+
+
+
+    enum class Played {
+        All,
+        Never,
+        Played
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/data/model/Playlist.kt b/app/src/main/java/com/craftworks/music/data/model/Playlist.kt
deleted file mode 100755
index 7223b4db..00000000
--- a/app/src/main/java/com/craftworks/music/data/model/Playlist.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.craftworks.music.data.model
-
-import android.net.Uri
-import android.os.Bundle
-import androidx.annotation.OptIn
-import androidx.compose.runtime.mutableStateListOf
-import androidx.core.net.toUri
-import androidx.media3.common.MediaItem
-import androidx.media3.common.MediaMetadata
-import androidx.media3.common.util.UnstableApi
-
-var playlistList:MutableList<MediaData.Playlist> = mutableStateListOf()
-
-data class Playlist (
-    val name: String,
-    var coverArt: Uri,
-    var songs: List<MediaData.Song> = emptyList(),
-    val navidromeID: String? = ""
-)
-
-@OptIn(UnstableApi::class)
-fun MediaData.Playlist.toMediaItem(): MediaItem {
-    val mediaMetadata = MediaMetadata.Builder()
-        .setTitle(this@toMediaItem.name)
-        .setDescription(this@toMediaItem.comment)
-        .setArtworkUri(this@toMediaItem.coverArt?.toUri())
-        .setIsBrowsable(true)
-        .setIsPlayable(false)
-        .setMediaType(MediaMetadata.MEDIA_TYPE_PLAYLIST)
-        .setDurationMs(this@toMediaItem.duration.toLong())
-        .setExtras(Bundle().apply {
-            putString("navidromeID", this@toMediaItem.navidromeID)
-        })
-        .build()
-
-    return MediaItem.Builder()
-        .setMediaId(this@toMediaItem.navidromeID.toString())
-        .setMediaMetadata(mediaMetadata)
-        .build()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/data/model/ProviderFeatures.kt b/app/src/main/java/com/craftworks/music/data/model/ProviderFeatures.kt
new file mode 100644
index 00000000..a8e944fa
--- /dev/null
+++ b/app/src/main/java/com/craftworks/music/data/model/ProviderFeatures.kt
@@ -0,0 +1,18 @@
+package com.craftworks.music.data.model
+
+@JvmInline
+value class ProviderFeatures(val mask: Long) {
+    companion object {
+        val REPORT_PLAYBACK = ProviderFeatures(1L shl 0)
+        val FAVORITES = ProviderFeatures(1L shl 1)
+        val DOWNLOADS = ProviderFeatures(1L shl 2)
+    }
+
+    fun has (flags: ProviderFeatures): Boolean =
+        (flags.mask and mask) == flags.mask
+
+    fun any (flags: ProviderFeatures): Boolean =
+        (flags.mask and mask) != 0L
+
+    operator fun plus(other: ProviderFeatures) = ProviderFeatures(mask or other.mask)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/data/model/ProviderResponses.kt b/app/src/main/java/com/craftworks/music/data/model/ProviderResponses.kt
new file mode 100644
index 00000000..80cdaf0f
--- /dev/null
+++ b/app/src/main/java/com/craftworks/music/data/model/ProviderResponses.kt
@@ -0,0 +1,65 @@
+package com.craftworks.music.data.model
+
+data class AuthenticationResponse(
+    val credential: String,
+    val isAdmin: Boolean? = null,
+    val ndCredential: String? = null,
+    val userId: String? = null,
+    val username: String
+)
+data class AlbumArtistInfoResponse(
+    val biography: String? = null,
+    val imageUrl: String? = null,
+    val similarArtists: List<RelatedArtist>? = null
+)
+data class ImageRequest(
+    val cacheKey: String,
+    val credentials: String? = null,
+    val headers: Map<String, String>? = null,
+    val url: String
+)
+sealed interface LyricsResponse {
+    data class Plain(val text: String) : LyricsResponse
+    data class Synchronized(val lines: List<Pair<Double, String>>) : LyricsResponse
+}
+data class GetQueueResponse(
+    val changed: String,
+    val changedBy: String,
+    val currentIndex: Int,
+    val entry: List<MediaItem.Song>,
+    val positionMs: Long,
+    val username: String
+)
+data class ProviderInfo(
+    val features: ProviderFeatures,
+    val id: String? = null,
+    val version: String
+)
+data class TagListResponse(
+    val excluded: Excluded,
+    val tags: List<Tag>? = null
+) {
+    data class Excluded(
+        val album: List<String>,
+        val song: List<String>
+    )
+}
+data class UserInfoResponse(
+    val id: String,
+    val isAdmin: Boolean,
+    val name: String
+)
+data class User(
+    val createdAt: String?,
+    val email: String?,
+    val id: String,
+    val isAdmin: Boolean?,
+    val lastLoginAt: String?,
+    val name: String,
+    val updatedAt: String?
+)
+data class SearchResponse(
+    val albumArtists: List<MediaItem.AlbumArtist>,
+    val albums: List<MediaItem.Album>,
+    val songs: List<MediaItem.Song>
+)
diff --git a/app/src/main/java/com/craftworks/music/data/model/ProviderType.kt b/app/src/main/java/com/craftworks/music/data/model/ProviderType.kt
new file mode 100644
index 00000000..66525126
--- /dev/null
+++ b/app/src/main/java/com/craftworks/music/data/model/ProviderType.kt
@@ -0,0 +1,6 @@
+package com.craftworks.music.data.model
+
+enum class ProviderType {
+    LOCAL_FOLDER,
+    SUBSONIC
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/data/model/Radio.kt b/app/src/main/java/com/craftworks/music/data/model/Radio.kt
deleted file mode 100755
index b2facc91..00000000
--- a/app/src/main/java/com/craftworks/music/data/model/Radio.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.craftworks.music.data.model
-
-import android.os.Bundle
-import androidx.core.net.toUri
-import androidx.media3.common.MediaItem
-import androidx.media3.common.MediaMetadata
-import androidx.media3.common.MimeTypes
-import com.craftworks.music.R
-
-fun MediaData.Radio.toMediaItem(): MediaItem {
-    val mediaMetadata =
-        MediaMetadata.Builder()
-            .setStation(this@toMediaItem.name)
-            .setArtist(this@toMediaItem.name)
-            .setArtworkUri(
-                ("android.resource://com.craftworks.music/" + R.drawable.radioplaceholder).toUri()
-            )
-            .setIsPlayable(true)
-            .setIsBrowsable(false)
-            .setMediaType(MediaMetadata.MEDIA_TYPE_RADIO_STATION)
-            .setExtras(Bundle().apply {
-                putString("navidromeID", this@toMediaItem.navidromeID)
-                putString("homepage", this@toMediaItem.homePageUrl ?: "")
-            })
-            .build()
-
-    println(".toMediaItem() : station: ${this@toMediaItem.name} mediaitem station: ${mediaMetadata.station}")
-
-    return MediaItem.Builder()
-        .setMediaMetadata(mediaMetadata)
-        .setMediaId(this@toMediaItem.media)
-        .setUri(this@toMediaItem.media)
-        .setMimeType(MimeTypes.AUDIO_MPEG)
-        .build()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/data/model/Song.kt b/app/src/main/java/com/craftworks/music/data/model/Song.kt
deleted file mode 100755
index 6e54819c..00000000
--- a/app/src/main/java/com/craftworks/music/data/model/Song.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.craftworks.music.data.model
-
-import android.os.Bundle
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.mutableStateListOf
-import androidx.core.net.toUri
-import androidx.media3.common.MediaItem
-import androidx.media3.common.MediaMetadata
-import kotlinx.serialization.Serializable
-import java.util.UUID
-
-var songsList: MutableList<MediaData.Song> = mutableStateListOf()
-
-@Immutable
-@Serializable
-data class Genre(
-    val name: String? = ""
-)
-
-@Immutable
-@Serializable
-data class ReplayGain(
-    val trackGain: Float? = 0f,
-    //val trackPeak: Float? = 0f,
-    //val albumPeak: Float? = 0f
-)
-
-@Immutable
-@Serializable
-data class Artists(
-    val id: String? = "",
-    val name: String? = ""
-)
-
-fun MediaData.Song.toMediaItem(): MediaItem {
-    val mediaMetadata =
-        MediaMetadata.Builder()
-            .setTitle(this@toMediaItem.title)
-            .setArtist(this@toMediaItem.artist)
-            .setAlbumTitle(this@toMediaItem.album)
-            .setArtworkUri(this@toMediaItem.imageUrl.toUri())
-            .setRecordingYear(this@toMediaItem.year)
-            .setDiscNumber(this@toMediaItem.discNumber)
-            .setTrackNumber(this@toMediaItem.track)
-            .setIsBrowsable(false).setIsPlayable(true)
-            .setMediaType(MediaMetadata.MEDIA_TYPE_MUSIC)
-            .setDurationMs(this@toMediaItem.duration.times(1000).toLong())
-            .setGenre(this@toMediaItem.genres?.joinToString() { it.name ?: "" })
-            .setExtras(Bundle().apply {
-                putString("navidromeID", this@toMediaItem.navidromeID)
-                putString("lyricsArtist", if (this@toMediaItem.artists.isNotEmpty()) this@toMediaItem.artists[0].name else this@toMediaItem.artist)
-                putInt("duration", this@toMediaItem.duration)
-                putString("format", this@toMediaItem.format)
-                putLong("bitrate", this@toMediaItem.bitrate?.toLong() ?: 0)
-                putBoolean("isRadio", this@toMediaItem.isRadio == true)
-                if (this@toMediaItem.replayGain?.trackGain != null)
-                    putFloat("replayGain", this@toMediaItem.replayGain.trackGain)
-            }).build()
-
-    return MediaItem.Builder()
-        .setMediaId(this@toMediaItem.media.toString() + "&estimateContentLength=true")
-        .setUri(this@toMediaItem.media?.toUri())
-        .setMediaMetadata(mediaMetadata)
-        .build()
-}
-
-fun MediaItem.toSong(): MediaData.Song {
-    val mediaMetadata = this@toSong.mediaMetadata
-    val extras = mediaMetadata.extras
-
-    return MediaData.Song(
-        navidromeID = extras?.getString("navidromeID") ?: "",
-        title = mediaMetadata.title.toString(),
-        artist = mediaMetadata.artist.toString(),
-        artists = listOf(Artists(UUID.randomUUID().toString(), mediaMetadata.artist.toString())),
-        album = mediaMetadata.albumTitle.toString(),
-        imageUrl = mediaMetadata.artworkUri.toString(),
-        year = mediaMetadata.recordingYear ?: 0,
-        duration = mediaMetadata.durationMs?.toInt()?.div(1000) ?: 0,
-        format = extras?.getString("format") ?: "",
-        bitrate = extras?.getLong("bitrate")?.toInt(),
-        media = this@toSong.mediaId.toString(),
-        replayGain = ReplayGain(
-            trackGain = extras?.getFloat("replayGain") ?: 0f
-        ),
-        isRadio = extras?.getBoolean("isRadio"),
-        path = "",
-        parent = "",
-        dateAdded = "",
-        bpm = 0,
-        albumId = ""
-    )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/data/model/SortOrder.kt b/app/src/main/java/com/craftworks/music/data/model/SortOrder.kt
index 1a6245be..3520408b 100644
--- a/app/src/main/java/com/craftworks/music/data/model/SortOrder.kt
+++ b/app/src/main/java/com/craftworks/music/data/model/SortOrder.kt
@@ -1,9 +1,88 @@
 package com.craftworks.music.data.model
 
-enum class SortOrder(val key: String) {
-    ALPHABETICAL("alphabeticalByName"),
-    NEWEST("newest"),
-    RECENT("recent"),
-    FREQUENT("frequent"),
-    STARRED("starred")
+enum class SortOrder {
+    ASC,
+    DESC
+}
+enum class AlbumListSort {
+    ALBUM_ARTIST,
+    ARTIST,
+    COMMUNITY_RATING,
+    CRITIC_RATING,
+    DURATION,
+    EXPLICIT_STATUS,
+    FAVORITED,
+    ID,
+    NAME,
+    PLAY_COUNT,
+    RANDOM,
+    RATING,
+    RECENTLY_ADDED,
+    RECENTLY_PLAYED,
+    RELEASE_DATE,
+    SONG_COUNT,
+    SORT_NAME,
+    YEAR
+}
+enum class AlbumArtistListSort {
+    ALBUM,
+    ALBUM_COUNT,
+    DURATION,
+    FAVORITED,
+    NAME,
+    PLAY_COUNT,
+    RANDOM,
+    RATING,
+    RECENTLY_ADDED,
+    RELEASE_DATE,
+    SONG_COUNT
+}
+enum class ArtistListSort {
+    ALBUM,
+    ALBUM_COUNT,
+    DURATION,
+    FAVORITED,
+    NAME,
+    PLAY_COUNT,
+    RANDOM,
+    RATING,
+    RECENTLY_ADDED,
+    RELEASE_DATE,
+    SONG_COUNT
+}
+enum class SongListSort {
+    ALBUM,
+    ALBUM_ARTIST,
+    ARTIST,
+    BPM,
+    CHANNELS,
+    COMMENT,
+    DURATION,
+    EXPLICIT_STATUS,
+    FAVORITED,
+    GENRE,
+    ID,
+    NAME,
+    PLAY_COUNT,
+    RANDOM,
+    RATING,
+    RECENTLY_ADDED,
+    RECENTLY_PLAYED,
+    RELEASE_DATE,
+    SORT_NAME,
+    YEAR
+}
+enum class GenreListSort {
+    NAME,
+}
+enum class PlaylistListSort {
+    DURATION,
+    NAME,
+    OWNER,
+    PUBLIC,
+    SONG_COUNT,
+    UPDATED_AT
+}
+enum class UserListSort {
+    NAME,
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/data/repository/AlbumRepository.kt b/app/src/main/java/com/craftworks/music/data/repository/AlbumRepository.kt
index 7230fdee..23cf4f98 100644
--- a/app/src/main/java/com/craftworks/music/data/repository/AlbumRepository.kt
+++ b/app/src/main/java/com/craftworks/music/data/repository/AlbumRepository.kt
@@ -12,6 +12,8 @@ import kotlinx.coroutines.coroutineScope
 import javax.inject.Inject
 import javax.inject.Singleton
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Singleton
 class AlbumRepository @Inject constructor(
     private val localDataSource: LocalDataSource,
diff --git a/app/src/main/java/com/craftworks/music/data/repository/ArtistRepository.kt b/app/src/main/java/com/craftworks/music/data/repository/ArtistRepository.kt
index e6cd051b..ba213063 100644
--- a/app/src/main/java/com/craftworks/music/data/repository/ArtistRepository.kt
+++ b/app/src/main/java/com/craftworks/music/data/repository/ArtistRepository.kt
@@ -3,7 +3,7 @@ package com.craftworks.music.data.repository
 import androidx.media3.common.MediaItem
 import com.craftworks.music.data.datasource.local.LocalDataSource
 import com.craftworks.music.data.datasource.navidrome.NavidromeDataSource
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.managers.LocalProviderManager
 import com.craftworks.music.managers.NavidromeManager
 import kotlinx.coroutines.Deferred
@@ -13,6 +13,8 @@ import kotlinx.coroutines.coroutineScope
 import javax.inject.Inject
 import javax.inject.Singleton
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Singleton
 class ArtistRepository @Inject constructor(
     private val localDataSource: LocalDataSource,
@@ -24,8 +26,8 @@ class ArtistRepository @Inject constructor(
         size: Int? = 100,
         offset: Int? = 0,
         ignoreCachedResponse: Boolean = false
-    ): List<MediaData.Artist> = coroutineScope {
-        val deferredArtists = mutableListOf<Deferred<List<MediaData.Artist>>>()
+    ): List<com.craftworks.music.data.model.MediaItem.Artist> = coroutineScope {
+        val deferredArtists = mutableListOf<Deferred<List<com.craftworks.music.data.model.MediaItem.Artist>>>()
 
         if (LocalProviderManager.checkActiveFolders())
             if (offset == 0)
@@ -41,8 +43,8 @@ class ArtistRepository @Inject constructor(
     suspend fun searchArtists(
         query: String,
         ignoreCachedResponse: Boolean = false
-    ): List<MediaData.Artist> = coroutineScope {
-        val deferredArtists = mutableListOf<Deferred<List<MediaData.Artist>>>()
+    ): List<com.craftworks.music.data.model.MediaItem.Artist> = coroutineScope {
+        val deferredArtists = mutableListOf<Deferred<List<com.craftworks.music.data.model.MediaItem.Artist>>>()
 
         if (LocalProviderManager.checkActiveFolders())
             deferredArtists.add(async { localDataSource.searchLocalArtists(query) })
@@ -60,7 +62,7 @@ class ArtistRepository @Inject constructor(
             navidromeDataSource.getNavidromeArtistAlbums(artistId, ignoreCachedResponse)
     }
 
-    suspend fun getArtistInfo(artistId: String, ignoreCachedResponse: Boolean = false): MediaData.ArtistInfo? = coroutineScope {
+    suspend fun getArtistInfo(artistId: String, ignoreCachedResponse: Boolean = false): com.craftworks.music.data.model.MediaItem.ArtistInfo? = coroutineScope {
         if (artistId.startsWith("Local_"))
             null
         else
diff --git a/app/src/main/java/com/craftworks/music/data/repository/PlaylistRepository.kt b/app/src/main/java/com/craftworks/music/data/repository/PlaylistRepository.kt
index a1cb5bc3..091d97d4 100644
--- a/app/src/main/java/com/craftworks/music/data/repository/PlaylistRepository.kt
+++ b/app/src/main/java/com/craftworks/music/data/repository/PlaylistRepository.kt
@@ -11,6 +11,8 @@ import kotlinx.coroutines.coroutineScope
 import javax.inject.Inject
 import javax.inject.Singleton
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Singleton
 class PlaylistRepository @Inject constructor(
     private val localDataSource: LocalDataSource,
diff --git a/app/src/main/java/com/craftworks/music/data/repository/RadioRepository.kt b/app/src/main/java/com/craftworks/music/data/repository/RadioRepository.kt
index a81c86ff..5bed8f13 100644
--- a/app/src/main/java/com/craftworks/music/data/repository/RadioRepository.kt
+++ b/app/src/main/java/com/craftworks/music/data/repository/RadioRepository.kt
@@ -2,7 +2,7 @@ package com.craftworks.music.data.repository
 
 import com.craftworks.music.data.datasource.local.LocalDataSource
 import com.craftworks.music.data.datasource.navidrome.NavidromeDataSource
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.managers.NavidromeManager
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.async
@@ -11,14 +11,16 @@ import kotlinx.coroutines.coroutineScope
 import javax.inject.Inject
 import javax.inject.Singleton
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Singleton
 class RadioRepository @Inject constructor(
     private val localDataSource: LocalDataSource,
     private val navidromeDataSource: NavidromeDataSource
 ) {
 
-    suspend fun getRadios(ignoreCachedResponse: Boolean = false): List<MediaData.Radio> = coroutineScope {
-        val deferredRadios = mutableListOf<Deferred<List<MediaData.Radio>>>()
+    suspend fun getRadios(ignoreCachedResponse: Boolean = false): List<MediaItem.Radio> = coroutineScope {
+        val deferredRadios = mutableListOf<Deferred<List<MediaItem.Radio>>>()
 
         if (NavidromeManager.checkActiveServers())
             deferredRadios.add(async { navidromeDataSource.getNavidromeRadios(ignoreCachedResponse) })
@@ -35,7 +37,7 @@ class RadioRepository @Inject constructor(
         else
             localDataSource.createLocalRadio(name,url,homePage)
     }
-    suspend fun modifyRadio(radio: MediaData.Radio) {
+    suspend fun modifyRadio(radio: MediaItem.Radio) {
         if (NavidromeManager.checkActiveServers() && !radio.navidromeID.startsWith("Local_"))
             navidromeDataSource.updateNavidromeRadio(radio.navidromeID, radio.name, radio.media, radio.homePageUrl)
         else
diff --git a/app/src/main/java/com/craftworks/music/data/repository/SongRepository.kt b/app/src/main/java/com/craftworks/music/data/repository/SongRepository.kt
index 3fbf7de0..1dd0b32a 100644
--- a/app/src/main/java/com/craftworks/music/data/repository/SongRepository.kt
+++ b/app/src/main/java/com/craftworks/music/data/repository/SongRepository.kt
@@ -12,6 +12,8 @@ import kotlinx.coroutines.coroutineScope
 import javax.inject.Inject
 import javax.inject.Singleton
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Singleton
 class SongRepository @Inject constructor(
     private val localDataSource: LocalDataSource,
diff --git a/app/src/main/java/com/craftworks/music/data/repository/StarredRepository.kt b/app/src/main/java/com/craftworks/music/data/repository/StarredRepository.kt
index de7c2d53..7369c0d4 100644
--- a/app/src/main/java/com/craftworks/music/data/repository/StarredRepository.kt
+++ b/app/src/main/java/com/craftworks/music/data/repository/StarredRepository.kt
@@ -12,6 +12,8 @@ import kotlinx.coroutines.coroutineScope
 import javax.inject.Inject
 import javax.inject.Singleton
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Singleton
 class StarredRepository @Inject constructor(
     private val localDataSource: LocalDataSource,
diff --git a/app/src/main/java/com/craftworks/music/managers/LocalProviderManager.kt b/app/src/main/java/com/craftworks/music/managers/LocalProviderManager.kt
index 5cb4294b..805a80aa 100644
--- a/app/src/main/java/com/craftworks/music/managers/LocalProviderManager.kt
+++ b/app/src/main/java/com/craftworks/music/managers/LocalProviderManager.kt
@@ -9,6 +9,8 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.serialization.json.Json
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 object LocalProviderManager {
     private val _allFolders = MutableStateFlow<List<String>>(emptyList())
     val allFolders: StateFlow<List<String>> = _allFolders.asStateFlow()
diff --git a/app/src/main/java/com/craftworks/music/managers/MediaProviderManager.kt b/app/src/main/java/com/craftworks/music/managers/MediaProviderManager.kt
new file mode 100644
index 00000000..ad76b853
--- /dev/null
+++ b/app/src/main/java/com/craftworks/music/managers/MediaProviderManager.kt
@@ -0,0 +1,15 @@
+package com.craftworks.music.managers
+
+import com.craftworks.music.providers.MediaProvider
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+object MediaProviderManager {
+    private val providers = mutableMapOf<String, MediaProvider>()
+
+    private var _currentProvider = MutableStateFlow<MediaProvider?>(null)
+    val currentProvider: StateFlow<MediaProvider?> = _currentProvider.asStateFlow()
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/managers/NavidromeManager.kt b/app/src/main/java/com/craftworks/music/managers/NavidromeManager.kt
index a973bb1b..6a7cf189 100644
--- a/app/src/main/java/com/craftworks/music/managers/NavidromeManager.kt
+++ b/app/src/main/java/com/craftworks/music/managers/NavidromeManager.kt
@@ -16,6 +16,8 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.serialization.json.Json
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 object NavidromeManager {
     private val servers = mutableMapOf<String, NavidromeProvider>()
 
diff --git a/app/src/main/java/com/craftworks/music/managers/settings/LocalDataSettingsManager.kt b/app/src/main/java/com/craftworks/music/managers/settings/LocalDataSettingsManager.kt
index ad56ab5d..065f8242 100644
--- a/app/src/main/java/com/craftworks/music/managers/settings/LocalDataSettingsManager.kt
+++ b/app/src/main/java/com/craftworks/music/managers/settings/LocalDataSettingsManager.kt
@@ -8,7 +8,7 @@ import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.media3.common.MediaItem
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.session.MediaSession
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.model.SortOrder
 import com.craftworks.music.data.model.toMediaItem
 import com.craftworks.music.data.model.toSong
@@ -37,13 +37,13 @@ class LocalDataSettingsManager @Inject constructor(
         private val SORT_ALBUM_ORDER = stringPreferencesKey("sort_album_order")
     }
 
-    val localRadios: Flow<MutableList<MediaData.Radio>> =
+    val localRadios: Flow<MutableList<com.craftworks.music.data.model.MediaItem.Radio>> =
         context.dataStore.data.map { preferences ->
-            Json.decodeFromString<List<MediaData.Radio>>(preferences[LOCAL_RADIOS] ?: "[]")
+            Json.decodeFromString<List<com.craftworks.music.data.model.MediaItem.Radio>>(preferences[LOCAL_RADIOS] ?: "[]")
                 .toMutableList()
         }
 
-    suspend fun saveLocalRadios(radios: List<MediaData.Radio>) {
+    suspend fun saveLocalRadios(radios: List<com.craftworks.music.data.model.MediaItem.Radio>) {
         withContext(NonCancellable) {
             val radiosListJson =
                 Json.encodeToString(radios.filter { it.navidromeID.startsWith("Local_") })
@@ -53,13 +53,13 @@ class LocalDataSettingsManager @Inject constructor(
         }
     }
 
-    val localPlaylists: Flow<MutableList<MediaData.Playlist>> =
+    val localPlaylists: Flow<MutableList<com.craftworks.music.data.model.MediaItem.Playlist>> =
         context.dataStore.data.map { preferences ->
-            Json.decodeFromString<List<MediaData.Playlist>>(preferences[LOCAL_PLAYLISTS] ?: "[]")
+            Json.decodeFromString<List<com.craftworks.music.data.model.MediaItem.Playlist>>(preferences[LOCAL_PLAYLISTS] ?: "[]")
                 .toMutableList()
         }
 
-    suspend fun saveLocalPlaylists(playlists: List<MediaData.Playlist>) {
+    suspend fun saveLocalPlaylists(playlists: List<com.craftworks.music.data.model.MediaItem.Playlist>) {
         withContext(NonCancellable) {
             val playlistJson =
                 Json.encodeToString(playlists.filter { it.navidromeID.startsWith("Local_") })
@@ -85,7 +85,7 @@ class LocalDataSettingsManager @Inject constructor(
     val playbackResumptionPlaylistWithStartPosition: Flow<MediaSession.MediaItemsWithStartPosition> = context.dataStore.data.map { preferences ->
         withContext(NonCancellable) {
             MediaSession.MediaItemsWithStartPosition(
-                Json.decodeFromString<List<MediaData.Song>>(
+                Json.decodeFromString<List<com.craftworks.music.data.model.MediaItem.Song>>(
                     preferences[MEDIA_RESUMPTION_PLAYLIST] ?: "[]"
                 ).map { it.toMediaItem() },
                 preferences[MEDIA_RESUMPTION_INDEX] ?: 0,
diff --git a/app/src/main/java/com/craftworks/music/player/SongHelper.kt b/app/src/main/java/com/craftworks/music/player/SongHelper.kt
index a3c7a240..9cf7e03c 100755
--- a/app/src/main/java/com/craftworks/music/player/SongHelper.kt
+++ b/app/src/main/java/com/craftworks/music/player/SongHelper.kt
@@ -1,20 +1,20 @@
 @file:OptIn(UnstableApi::class) package com.craftworks.music.player
 
 import androidx.annotation.OptIn
-import androidx.media3.common.MediaItem
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.session.MediaController
+import com.craftworks.music.data.model.MediaItem
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 class SongHelper {
     companion object{
-        suspend fun play(mediaItems: List<MediaItem>, index: Int, mediaController: MediaController?) {
+        suspend fun play(mediaItems: List<MediaItem.Song>, index: Int, mediaController: MediaController?) {
             if (mediaItems.isEmpty())
                 return
 
             withContext(Dispatchers.Main) {
-                mediaController?.setMediaItems(mediaItems, index, 0)
+                mediaController?.setMediaItems(mediaItems.map { it.toMediaItem() }, index, 0)
                 mediaController?.prepare()
                 mediaController?.play()
             }
diff --git a/app/src/main/java/com/craftworks/music/providers/MediaProvider.kt b/app/src/main/java/com/craftworks/music/providers/MediaProvider.kt
new file mode 100644
index 00000000..3e4d4943
--- /dev/null
+++ b/app/src/main/java/com/craftworks/music/providers/MediaProvider.kt
@@ -0,0 +1,83 @@
+package com.craftworks.music.providers
+
+import com.craftworks.music.data.model.AlbumArtistInfoResponse
+import com.craftworks.music.data.model.AlbumInfo
+import com.craftworks.music.data.model.AuthenticationResponse
+import com.craftworks.music.data.model.GetQueueResponse
+import com.craftworks.music.data.model.ImageRequest
+import com.craftworks.music.data.model.InternetRadioStation
+import com.craftworks.music.data.model.LibraryType
+import com.craftworks.music.data.model.LyricsResponse
+import com.craftworks.music.data.model.MediaItem
+import com.craftworks.music.data.model.MediaQuery
+import com.craftworks.music.data.model.PlaylistRules
+import com.craftworks.music.data.model.ProviderFeatures
+import com.craftworks.music.data.model.ProviderInfo
+import com.craftworks.music.data.model.SearchResponse
+import com.craftworks.music.data.model.TagListResponse
+import com.craftworks.music.data.model.User
+import com.craftworks.music.data.model.UserInfoResponse
+import com.craftworks.music.providers.navidrome.MusicFolder
+import kotlinx.coroutines.flow.StateFlow
+
+interface MediaProvider {
+    val featureFlags: StateFlow<ProviderFeatures>
+
+    fun addToPlaylist(songIds: List<String>, playlistId: String) : Boolean
+    fun authenticate(username: String, password: String) : AuthenticationResponse
+    fun createFavorite(ids: List<String>, type: LibraryType) : Boolean
+    fun createInternetRadioStation(homepageUrl: String?, name: String, streamUrl: String) : Boolean
+    fun createPlaylist(name: String, comment: String = "", ownerId: String = "", public: Boolean = false, queryBuilderRules: PlaylistRules?, sync: Boolean = false) : String?
+    fun deleteFavorite(ids: List<String>, type: LibraryType) : Boolean
+    fun deleteInternetRadioStation(id: String): Boolean
+    fun deletePlaylist(id: String): Boolean
+    fun getAlbumArtistDetail(id: String): MediaItem.AlbumArtist?
+    fun getAlbumArtistInfo(id: String, limit: Int? = null): AlbumArtistInfoResponse?
+    fun getAlbumArtistList(query: MediaQuery.AlbumArtistListQuery): List<MediaItem.AlbumArtist>
+    fun getAlbumArtistListCount(query: MediaQuery.AlbumArtistListQuery): Int
+    fun getAlbumDetail(id: String): MediaItem.Album
+    fun getAlbumInfo(id: String): AlbumInfo
+    fun getAlbumList(query: MediaQuery.AlbumListQuery): List<MediaItem.Album>
+    fun getAlbumListCount(query: MediaQuery.AlbumListQuery): Int
+    fun getAlbumRadio(albumId: String, count: Int? = null): List<MediaItem.Song>
+    fun getArtistList(query: MediaQuery.ArtistListQuery): List<MediaItem.AlbumArtist>
+    fun getArtistListCount(query: MediaQuery.ArtistListQuery): Int
+    fun getArtistRadio(artistId: String, count: Int? = null): List<MediaItem.Song>
+    fun getDownloadUrl(id: String): String
+    fun getFolder(query: MediaQuery.FolderQuery): MediaItem.Folder
+    fun getGenreList(query: MediaQuery.GenreListQuery): List<MediaItem.Genre>
+    fun getImageRequest(id: String, itemType: LibraryType, size: Int? = null, baseUrl: String? = null): ImageRequest?
+    fun getImageUrl(id: String, itemType: LibraryType, size: Int? = null, baseUrl: String? = null): String?
+    fun getInternetRadioStations(): List<InternetRadioStation>
+    fun getLyrics(songId: String): LyricsResponse
+    fun getMusicFolderList(): List<MusicFolder>
+    fun getPlaylistDetail(id: String): MediaItem.Playlist
+    fun getPlaylistList(query: MediaQuery.PlaylistListQuery): List<MediaItem.Playlist>
+    fun getPlaylistListCount(query: MediaQuery.PlaylistListQuery): Int
+    fun getPlaylistSongList(id: String): List<MediaItem.Song>
+    fun getPlayQueue(): GetQueueResponse
+    fun getRandomSongList(query: MediaQuery.RandomSongListQuery): List<MediaItem.Song>
+    fun getRoles(): List<String>
+    fun getProviderInfo(): ProviderInfo
+    fun getSimilarSongs(songId: String, count: Int? = null, musicFolderId: List<String>? = null): List<MediaItem.Song>
+    fun getSongDetail(id: String): MediaItem.Song
+    fun getSongList(query: MediaQuery.SongListQuery): List<MediaItem.Song>
+    fun getSongListCount(query: MediaQuery.SongListQuery): Int
+    fun getStreamUrl(id: String, transcode: Boolean, bitrate: Int? = null, format: String? = null, mediaType: String? = null, offset: Int? = null, skipAutoTranscode: Boolean? = null): String
+    fun getTagList(type: LibraryType, folder: String? = null, tagName: String? = null): TagListResponse
+    fun getTopSongs(artist: String, artistId: String, limit: Int? = null, type: String? = null): List<MediaItem.Song>
+    fun getUserInfo(id: String, username: String): UserInfoResponse
+    fun getUserList(query: MediaQuery.UserListQuery): List<User>
+    fun movePlaylistItem(playlistId: String, trackId: String, startingIndex: Int, endingIndex: Int)
+    fun ping() : Boolean
+    fun removeFromPlaylist(id: String, songIds: List<String>): Boolean
+    fun replacePlaylist(id: String, songIds: List<String>): Boolean
+    fun savePlayQueue(songs: List<String>, currentIndex: Int? = null, positionMs: Int? = null)
+    fun scrobble(id: String, mediaType: String, playbackRate: Float, submission: Boolean, albumId: String? = null, event: String? = null, position: Int? = null)
+    fun search(query: MediaQuery.SearchQuery): SearchResponse
+    fun setPlaylistSongs(id: String, songIds: List<String>)
+    fun setRating(ids: List<String>, rating: Int, type: LibraryType): Boolean
+    fun shareItem(description: String, downloadable: Boolean, expires: Long, resourceIds: String, resourceType: String): String?
+    fun updateInternetRadioStation(id: String, name: String, streamUrl: String, homepageUrl: String? = null): Boolean
+    fun updatePlaylist(id: String, name: String, comment: String? = null, ownerId: String? = null, public: Boolean? = null, queryBuilderRules: PlaylistRules? = null, sync: Boolean? = null): Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/providers/local/LocalPlaylistImage.kt b/app/src/main/java/com/craftworks/music/providers/local/LocalPlaylistImage.kt
index 13a3e606..bbe20685 100755
--- a/app/src/main/java/com/craftworks/music/providers/local/LocalPlaylistImage.kt
+++ b/app/src/main/java/com/craftworks/music/providers/local/LocalPlaylistImage.kt
@@ -16,6 +16,8 @@ import java.io.ByteArrayOutputStream
 import java.net.HttpURLConnection
 import java.net.URL
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 /**
  * Generates a bitmap for playlist cover art by combining up to 4 album art images.
  * If less than 4 songs are available, it fills the grid by repeating images.
diff --git a/app/src/main/java/com/craftworks/music/providers/local/LocalProvider.kt b/app/src/main/java/com/craftworks/music/providers/local/LocalProvider.kt
index c3bf32f3..b51f80bd 100644
--- a/app/src/main/java/com/craftworks/music/providers/local/LocalProvider.kt
+++ b/app/src/main/java/com/craftworks/music/providers/local/LocalProvider.kt
@@ -13,13 +13,15 @@ import androidx.core.net.toUri
 import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import com.craftworks.music.R
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.managers.LocalProviderManager
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 class LocalProvider @Inject constructor(
     @ApplicationContext private val context: Context
 ) {
@@ -454,8 +456,8 @@ class LocalProvider @Inject constructor(
         return songs
     }
 
-    fun getLocalArtists(): List<MediaData.Artist> {
-        val artists = mutableSetOf<MediaData.Artist>()
+    fun getLocalArtists(): List<com.craftworks.music.data.model.MediaItem.Artist> {
+        val artists = mutableSetOf<com.craftworks.music.data.model.MediaItem.Artist>()
         val songs = getLocalSongs()
 
         songs.forEach { song ->
@@ -464,7 +466,7 @@ class LocalProvider @Inject constructor(
             "$LOCAL_PREFIX${artistName.hashCode()}"
 
             artists.add(
-                MediaData.Artist(
+                MediaItem.Artist(
                     navidromeID = artistId,
                     name = artistName.toString(),
                     description = "",
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/DownloadNavidromeAlbums.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/DownloadNavidromeAlbums.kt
index 38ef5d6f..7f2ae55e 100644
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/DownloadNavidromeAlbums.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/DownloadNavidromeAlbums.kt
@@ -3,6 +3,8 @@ package com.craftworks.music.providers.navidrome
 import android.content.Context
 import androidx.media3.common.MediaItem
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 fun downloadNavidromeAlbum(context: Context, albumTitle: String, songs: List<MediaItem>) {
     songs.forEach { song ->
         downloadNavidromeSong(context, song.mediaMetadata, albumTitle)
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/DownloadNavidromeSongs.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/DownloadNavidromeSongs.kt
index c78f2626..a92a57b6 100755
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/DownloadNavidromeSongs.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/DownloadNavidromeSongs.kt
@@ -12,6 +12,8 @@ import com.craftworks.music.data.datasource.navidrome.NavidromeDataSource
 import com.craftworks.music.managers.NavidromeManager.getCurrentServer
 import java.io.File
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @OptIn(UnstableApi::class)
 fun downloadNavidromeSong(
     context: Context,
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeAlbums.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeAlbums.kt
index 3f63d166..d6c3ecc5 100644
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeAlbums.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeAlbums.kt
@@ -5,12 +5,14 @@ import androidx.core.net.toUri
 import androidx.media3.common.MediaItem
 import androidx.media3.common.util.UnstableApi
 import com.craftworks.music.data.datasource.navidrome.NavidromeDataSource
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.model.toMediaItem
 import kotlinx.serialization.Serializable
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Serializable
-data class albumList(val album: List<MediaData.Album>? = listOf())
+data class albumList(val album: List<com.craftworks.music.data.model.MediaItem.Album>? = listOf())
 
 fun parseNavidromeAlbumListJSON(
     response: String,
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeArtists.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeArtists.kt
index d5d1858a..fb017372 100755
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeArtists.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeArtists.kt
@@ -3,25 +3,27 @@ package com.craftworks.music.providers.navidrome
 import android.util.Log
 import androidx.media3.common.MediaItem
 import com.craftworks.music.data.datasource.navidrome.NavidromeDataSource
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.model.artistList
 import com.craftworks.music.data.model.toMediaItem
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Serializable
 @SerialName("artists")
 data class Artists(val index: List<index>)
 
 @Serializable
-data class index(val artist: List<MediaData.Artist>? = listOf())
+data class index(val artist: List<com.craftworks.music.data.model.MediaItem.Artist>? = listOf())
 
 fun parseNavidromeArtistsJSON(
     response: String
-) : List<MediaData.Artist> {
+) : List<com.craftworks.music.data.model.MediaItem.Artist> {
     val subsonicResponse = parseSubsonicResponse(response)
 
-    val mediaDataArtists = mutableListOf<MediaData.Artist>()
+    val mediaDataArtists = mutableListOf<com.craftworks.music.data.model.MediaItem.Artist>()
 
     subsonicResponse.artists?.index?.forEach { index ->
         index.artist?.filterNot { newArtist ->
@@ -58,10 +60,10 @@ fun parseNavidromeArtistAlbumsJSON(
 
 fun parseNavidromeArtistBiographyJSON(
     response: String
-) : MediaData.ArtistInfo {
+) : com.craftworks.music.data.model.MediaItem.ArtistInfo {
     val subsonicResponse = parseSubsonicResponse(response)
 
-    val mediaDataArtist = MediaData.ArtistInfo(
+    val mediaDataArtist = MediaItem.ArtistInfo(
         biography = subsonicResponse.artistInfo?.biography,
         musicBrainzId = subsonicResponse.artistInfo?.musicBrainzId,
         similarArtist = subsonicResponse.artistInfo?.similarArtist
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeFavourites.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeFavourites.kt
index 3938f009..09ac66d5 100644
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeFavourites.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeFavourites.kt
@@ -3,17 +3,19 @@ package com.craftworks.music.providers.navidrome
 import android.util.Log
 import androidx.media3.common.MediaItem
 import com.craftworks.music.data.datasource.navidrome.NavidromeDataSource
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.model.toMediaItem
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Serializable
 @SerialName("starred")
 data class Starred(
-    val song: List<MediaData.Song>? = null,
-    val album: List<MediaData.Album>? = null,
-    val artist: List<MediaData.Artist>? = null
+    val song: List<com.craftworks.music.data.model.MediaItem.Song>? = null,
+    val album: List<com.craftworks.music.data.model.MediaItem.Album>? = null,
+    val artist: List<com.craftworks.music.data.model.MediaItem.Artist>? = null
 )
 
 fun parseNavidromeFavouritesJSON(
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeLibraries.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeLibraries.kt
index 1cde3a15..b8c9cdf2 100644
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeLibraries.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeLibraries.kt
@@ -3,6 +3,8 @@ package com.craftworks.music.providers.navidrome
 import com.craftworks.music.data.NavidromeLibrary
 import kotlinx.serialization.Serializable
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Serializable
 data class MusicFolder(
     val musicFolder: List<NavidromeLibrary>
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeLyrics.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeLyrics.kt
index 33cf1f79..817995ee 100644
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeLyrics.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeLyrics.kt
@@ -1,11 +1,13 @@
 package com.craftworks.music.providers.navidrome
 
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import kotlinx.serialization.Serializable
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Serializable
 data class LyricsList(
-    val structuredLyrics: List<MediaData.StructuredLyrics>? = null
+    val structuredLyrics: List<MediaItem.StructuredLyrics>? = null
 )
 
 @Serializable
@@ -16,7 +18,7 @@ data class SyncedLyrics(
 
 fun parseNavidromePlainLyricsJSON(
     response: String
-): MediaData.PlainLyrics {
+): MediaItem.PlainLyrics {
     val subsonicResponse = parseSubsonicResponse(response)
 
     val mediaDataPlainLyrics = subsonicResponse.lyrics!!
@@ -26,7 +28,7 @@ fun parseNavidromePlainLyricsJSON(
 
 fun parseNavidromeSyncedLyricsJSON(
     response: String
-): List<MediaData.StructuredLyrics> {
+): List<MediaItem.StructuredLyrics> {
     val subsonicResponse = parseSubsonicResponse(response)
 
     val mediaDataSyncedLyrics = subsonicResponse.lyricsList?.structuredLyrics ?: emptyList()
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromePlaylists.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromePlaylists.kt
index a7df4ba4..64e90400 100755
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromePlaylists.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromePlaylists.kt
@@ -2,13 +2,15 @@ package com.craftworks.music.providers.navidrome
 
 import androidx.media3.common.MediaItem
 import com.craftworks.music.data.datasource.navidrome.NavidromeDataSource
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.model.playlistList
 import com.craftworks.music.data.model.toMediaItem
 import kotlinx.serialization.Serializable
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Serializable
-data class PlaylistContainer(val playlist: List<MediaData.Playlist>? = listOf())
+data class PlaylistContainer(val playlist: List<com.craftworks.music.data.model.MediaItem.Playlist>? = listOf())
 
 fun parseNavidromePlaylistsJSON(
     response: String,
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeRadios.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeRadios.kt
index 27254449..67c3da12 100755
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeRadios.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeRadios.kt
@@ -1,17 +1,19 @@
 package com.craftworks.music.providers.navidrome
 
 import android.util.Log
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Serializable
 @SerialName("artists")
-data class internetRadioStations(val internetRadioStation: List<MediaData.Radio>)
+data class internetRadioStations(val internetRadioStation: List<MediaItem.Radio>)
 
 fun parseNavidromeRadioJSON(
     response: String
-) : List<MediaData.Radio> {
+) : List<MediaItem.Radio> {
     val subsonicResponse = parseSubsonicResponse(response)
 
     val mediaDataRadios = subsonicResponse.internetRadioStations?.internetRadioStation ?: emptyList()
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeSimilarTracks.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeSimilarTracks.kt
index 34f420c7..38df0d9b 100644
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeSimilarTracks.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeSimilarTracks.kt
@@ -3,10 +3,11 @@ package com.craftworks.music.providers.navidrome
 import androidx.core.net.toUri
 import androidx.media3.common.MediaItem
 import com.craftworks.music.data.datasource.navidrome.NavidromeDataSource
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.model.toMediaItem
-import kotlinx.serialization.Serializable
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 fun parseNavidromeSimilarSongsJSON(
     response: String,
     navidromeUrl: String,
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeSongs.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeSongs.kt
index 7fa06373..82ba3be2 100755
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeSongs.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeSongs.kt
@@ -4,18 +4,19 @@ import androidx.annotation.OptIn
 import androidx.media3.common.MediaItem
 import androidx.media3.common.util.UnstableApi
 import com.craftworks.music.data.datasource.navidrome.NavidromeDataSource
-import com.craftworks.music.data.model.MediaData
-import com.craftworks.music.data.model.albumList
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.model.artistList
 import com.craftworks.music.data.model.songsList
 import com.craftworks.music.data.model.toMediaItem
 import kotlinx.serialization.Serializable
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Serializable
 data class SearchResult3(
-    val song: List<MediaData.Song>? = listOf(),
-    val album: List<MediaData.Album>? = listOf(),
-    val artist: List<MediaData.Artist>? = listOf(),
+    val song: List<com.craftworks.music.data.model.MediaItem.Song>? = listOf(),
+    val album: List<com.craftworks.music.data.model.MediaItem.Album>? = listOf(),
+    val artist: List<com.craftworks.music.data.model.MediaItem.Artist>? = listOf(),
 )
 
 @OptIn(UnstableApi::class)
@@ -42,7 +43,7 @@ fun parseNavidromeSearch3JSON(
 
     var mediaDataSongs = emptyList<MediaItem>()
     var mediaDataAlbums = emptyList<MediaItem>()
-    var mediaDataArtists = emptyList<MediaData.Artist>()
+    var mediaDataArtists = emptyList<com.craftworks.music.data.model.MediaItem.Artist>()
 
     subsonicResponse.searchResult3?.song?.filterNot { newSong ->
         songsList.any { existingSong ->
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeStatus.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeStatus.kt
index 7e7c53f4..7c1c91ec 100644
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeStatus.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/GetNavidromeStatus.kt
@@ -13,6 +13,8 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.jsonObject
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 var navidromeStatus = mutableStateOf("")
 
 suspend fun getNavidromeStatus(server: NavidromeProvider) {
diff --git a/app/src/main/java/com/craftworks/music/providers/navidrome/NavidromeConnection.kt b/app/src/main/java/com/craftworks/music/providers/navidrome/NavidromeConnection.kt
index 23d30767..0fcecfbe 100644
--- a/app/src/main/java/com/craftworks/music/providers/navidrome/NavidromeConnection.kt
+++ b/app/src/main/java/com/craftworks/music/providers/navidrome/NavidromeConnection.kt
@@ -1,13 +1,15 @@
 package com.craftworks.music.providers.navidrome
 
 import android.util.Log
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.jsonObject
 
+// LEGACY CODE! MUST NOT BE USED
+// TODO("Delete legacy file")
 @Serializable
 @SerialName("subsonic-response")
 data class SubsonicResponse(
@@ -22,33 +24,33 @@ data class SubsonicResponse(
     val musicFolders: MusicFolder? = null,
 
     // Songs
-    val song: MediaData.Song? = null,
+    val song: MediaItem.Song? = null,
     val searchResult3: SearchResult3? = null,
 
     // Albums
     val albumList: albumList? = null,
-    val album: MediaData.Album? = null,
+    val album: MediaItem.Album? = null,
 
     // Artists
     val artists: Artists? = null,
-    val artist: MediaData.Artist? = null,
-    val artistInfo: MediaData.ArtistInfo? = null,
+    val artist: MediaItem.Artist? = null,
+    val artistInfo: MediaItem.ArtistInfo? = null,
 
     // Radios
     val internetRadioStations: internetRadioStations? = null,
 
     // Playlists
-    val playlist: MediaData.Playlist? = null,
+    val playlist: MediaItem.Playlist? = null,
     val playlists: PlaylistContainer? = null,
 
     //Lyrics
-    val lyrics: MediaData.PlainLyrics? = null,
+    val lyrics: MediaItem.PlainLyrics? = null,
     val lyricsList: LyricsList? = null,
 
     // Favourites
     val starred: Starred? = null,
 
-    val sonicMatch: List<MediaData.Song>? = null
+    val sonicMatch: List<MediaItem.Song>? = null
 )
 
 private val jsonParser = Json { ignoreUnknownKeys = true }
diff --git a/app/src/main/java/com/craftworks/music/providers/subsonic/SubsonicMediaProvider.kt b/app/src/main/java/com/craftworks/music/providers/subsonic/SubsonicMediaProvider.kt
new file mode 100644
index 00000000..f5d249c4
--- /dev/null
+++ b/app/src/main/java/com/craftworks/music/providers/subsonic/SubsonicMediaProvider.kt
@@ -0,0 +1,510 @@
+package com.craftworks.music.providers.subsonic
+
+import android.annotation.SuppressLint
+import android.util.Log
+import com.craftworks.music.data.model.AlbumArtistInfoResponse
+import com.craftworks.music.data.model.AlbumInfo
+import com.craftworks.music.data.model.AuthenticationResponse
+import com.craftworks.music.data.model.GetQueueResponse
+import com.craftworks.music.data.model.ImageRequest
+import com.craftworks.music.data.model.InternetRadioStation
+import com.craftworks.music.data.model.LibraryType
+import com.craftworks.music.data.model.LyricsResponse
+import com.craftworks.music.data.model.MediaItem
+import com.craftworks.music.data.model.MediaQuery
+import com.craftworks.music.data.model.PlaylistRules
+import com.craftworks.music.data.model.ProviderFeatures
+import com.craftworks.music.data.model.ProviderInfo
+import com.craftworks.music.data.model.SearchResponse
+import com.craftworks.music.data.model.TagListResponse
+import com.craftworks.music.data.model.User
+import com.craftworks.music.data.model.UserInfoResponse
+import com.craftworks.music.providers.MediaProvider
+import com.craftworks.music.providers.navidrome.MusicFolder
+import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.engine.okhttp.OkHttp
+import io.ktor.client.plugins.cache.HttpCache
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.client.plugins.logging.Logger
+import io.ktor.client.plugins.logging.Logging
+import io.ktor.client.plugins.logging.SIMPLE
+import io.ktor.client.request.get
+import io.ktor.client.request.headers
+import io.ktor.client.statement.bodyAsText
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.URLBuilder
+import io.ktor.serialization.kotlinx.json.json
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.json.Json
+import java.net.ConnectException
+import java.nio.channels.UnresolvedAddressException
+import java.security.MessageDigest
+import java.security.SecureRandom
+import java.security.cert.X509Certificate
+import javax.net.ssl.TrustManager
+import javax.net.ssl.X509TrustManager
+
+class SubsonicMediaProvider : MediaProvider {
+    private val _featureFlags: MutableStateFlow<ProviderFeatures> = MutableStateFlow(
+        ProviderFeatures.REPORT_PLAYBACK +
+                ProviderFeatures.DOWNLOADS +
+                ProviderFeatures.FAVORITES
+    )
+    override val featureFlags: StateFlow<ProviderFeatures> = _featureFlags.asStateFlow()
+
+    var serverInfo: SubsonicServerInfo? = null
+
+    companion object {
+        fun md5Hash(input: String): String {
+            val md = MessageDigest.getInstance("MD5")
+            val hashBytes = md.digest(input.toByteArray())
+            return hashBytes.joinToString("") { "%02x".format(it) }
+        }
+
+        fun generateSalt(length: Int): String {
+            val allowedChars = ('a'..'z') + ('A'..'Z') + ('0'..'9')
+            return (1..length).map { allowedChars.random() }.joinToString("")
+        }
+    }
+
+    private val json = Json { ignoreUnknownKeys = true }
+    private val client: HttpClient by lazy {
+        HttpClient(OkHttp) {
+            install(ContentNegotiation) {
+                json(json)
+            }
+            install(HttpCache)
+            install(Logging) {
+                level = LogLevel.ALL
+                logger = Logger.SIMPLE
+            }
+        }
+    }
+
+    private val insecureClient: HttpClient by lazy { buildInsecureClient() }
+    private fun buildInsecureClient(): HttpClient {
+        val trustAllCerts = arrayOf<TrustManager>(
+            @SuppressLint("CustomX509TrustManager")
+            object : X509TrustManager {
+                @SuppressLint("TrustAllX509TrustManager")
+                override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {}
+                @SuppressLint("TrustAllX509TrustManager")
+                override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {}
+                override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
+            }
+        )
+
+        return HttpClient(OkHttp.create {
+            config {
+                val sslContext = javax.net.ssl.SSLContext.getInstance("SSL")
+                sslContext.init(null, trustAllCerts, SecureRandom())
+                sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)
+                hostnameVerifier { _, _ -> true }
+            }
+        }) {
+            install(ContentNegotiation) {
+                json(json)
+            }
+            install(HttpCache)
+            install(Logging) {
+                level = LogLevel.ALL
+                logger = Logger.SIMPLE
+            }
+        }
+    }
+
+    private var _salt: String? = null;
+    private var _token: String? = null;
+    private suspend fun getRequest(
+        endpoint: String,
+        musicFolderIds: List<Int>? = null,
+        ignoreCachedResponse: Boolean = false
+    ): SubsonicApiResponse = withContext(Dispatchers.IO) {
+        if (serverInfo == null || _salt == null || _token == null) return@withContext SubsonicApiResponse(HttpStatusCode(0, ""), "", null);
+
+
+        val url = URLBuilder("${serverInfo!!.url}/rest/${endpoint.replace(" ", "%20")}").apply {
+            parameters.append("u", serverInfo!!.username)
+            parameters.append("t", _token!!)
+            parameters.append("s", _salt!!)
+            musicFolderIds?.forEach { parameters.append("musicFolderId", it.toString()) }
+            parameters.append("v", "1.16.1")
+            parameters.append("c", "Chora")
+            parameters.append("f", "json")
+        }.build()
+
+        val activeClient = if (serverInfo!!.allowSelfSignedCert) insecureClient else client
+
+        try {
+            val res = activeClient.get(url) {
+                // Force network request if ignoreCachedResponse is true
+                if (ignoreCachedResponse) {
+                    headers {
+                        append("Cache-Control", "no-cache")
+                    }
+                }
+            }
+
+            val body = res.bodyAsText()
+
+            return@withContext SubsonicApiResponse(res.status, body, res.headers)
+
+        } catch (e: Exception) {
+            Log.e("NAVIDROME", "Network error for URL: $url", e)
+        }
+
+        SubsonicApiResponse(HttpStatusCode(0, ""), "", null)
+    }
+
+    override fun addToPlaylist(
+        songIds: List<String>,
+        playlistId: String
+    ): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun authenticate(
+        username: String,
+        password: String
+    ): AuthenticationResponse {
+        if (serverInfo == null) return AuthenticationResponse("", username="");
+        _salt = generateSalt(8)
+        _token = md5Hash(serverInfo?.password + _salt)
+        TODO("Finish auth implementation")
+    }
+
+    override fun createFavorite(
+        ids: List<String>,
+        type: LibraryType
+    ): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun createInternetRadioStation(
+        homepageUrl: String?,
+        name: String,
+        streamUrl: String
+    ): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun createPlaylist(
+        name: String,
+        comment: String,
+        ownerId: String,
+        public: Boolean,
+        queryBuilderRules: PlaylistRules?,
+        sync: Boolean
+    ): String? {
+        TODO("Not yet implemented")
+    }
+
+    override fun deleteFavorite(
+        ids: List<String>,
+        type: LibraryType
+    ): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun deleteInternetRadioStation(id: String): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun deletePlaylist(id: String): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAlbumArtistDetail(id: String): MediaItem.AlbumArtist? {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAlbumArtistInfo(
+        id: String,
+        limit: Int?
+    ): AlbumArtistInfoResponse? {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAlbumArtistList(query: MediaQuery.AlbumArtistListQuery): List<MediaItem.AlbumArtist> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAlbumArtistListCount(query: MediaQuery.AlbumArtistListQuery): Int {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAlbumDetail(id: String): MediaItem.Album {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAlbumInfo(id: String): AlbumInfo {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAlbumList(query: MediaQuery.AlbumListQuery): List<MediaItem.Album> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAlbumListCount(query: MediaQuery.AlbumListQuery): Int {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAlbumRadio(
+        albumId: String,
+        count: Int?
+    ): List<MediaItem.Song> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getArtistList(query: MediaQuery.ArtistListQuery): List<MediaItem.AlbumArtist> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getArtistListCount(query: MediaQuery.ArtistListQuery): Int {
+        TODO("Not yet implemented")
+    }
+
+    override fun getArtistRadio(
+        artistId: String,
+        count: Int?
+    ): List<MediaItem.Song> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getDownloadUrl(id: String): String {
+        TODO("Not yet implemented")
+    }
+
+    override fun getFolder(query: MediaQuery.FolderQuery): MediaItem.Folder {
+        TODO("Not yet implemented")
+    }
+
+    override fun getGenreList(query: MediaQuery.GenreListQuery): List<MediaItem.Genre> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getImageRequest(
+        id: String,
+        itemType: LibraryType,
+        size: Int?,
+        baseUrl: String?
+    ): ImageRequest? {
+        TODO("Not yet implemented")
+    }
+
+    override fun getImageUrl(
+        id: String,
+        itemType: LibraryType,
+        size: Int?,
+        baseUrl: String?
+    ): String? {
+        TODO("Not yet implemented")
+    }
+
+    override fun getInternetRadioStations(): List<InternetRadioStation> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getLyrics(songId: String): LyricsResponse {
+        TODO("Not yet implemented")
+    }
+
+    override fun getMusicFolderList(): List<MusicFolder> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getPlaylistDetail(id: String): MediaItem.Playlist {
+        TODO("Not yet implemented")
+    }
+
+    override fun getPlaylistList(query: MediaQuery.PlaylistListQuery): List<MediaItem.Playlist> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getPlaylistListCount(query: MediaQuery.PlaylistListQuery): Int {
+        TODO("Not yet implemented")
+    }
+
+    override fun getPlaylistSongList(id: String): List<MediaItem.Song> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getPlayQueue(): GetQueueResponse {
+        TODO("Not yet implemented")
+    }
+
+    override fun getRandomSongList(query: MediaQuery.RandomSongListQuery): List<MediaItem.Song> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getRoles(): List<String> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getProviderInfo(): ProviderInfo {
+        TODO("Not yet implemented")
+    }
+
+    override fun getSimilarSongs(
+        songId: String,
+        count: Int?,
+        musicFolderId: List<String>?
+    ): List<MediaItem.Song> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getSongDetail(id: String): MediaItem.Song {
+        TODO("Not yet implemented")
+    }
+
+    override fun getSongList(query: MediaQuery.SongListQuery): List<MediaItem.Song> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getSongListCount(query: MediaQuery.SongListQuery): Int {
+        TODO("Not yet implemented")
+    }
+
+    override fun getStreamUrl(
+        id: String,
+        transcode: Boolean,
+        bitrate: Int?,
+        format: String?,
+        mediaType: String?,
+        offset: Int?,
+        skipAutoTranscode: Boolean?
+    ): String {
+        TODO("Not yet implemented")
+    }
+
+    override fun getTagList(
+        type: LibraryType,
+        folder: String?,
+        tagName: String?
+    ): TagListResponse {
+        TODO("Not yet implemented")
+    }
+
+    override fun getTopSongs(
+        artist: String,
+        artistId: String,
+        limit: Int?,
+        type: String?
+    ): List<MediaItem.Song> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getUserInfo(
+        id: String,
+        username: String
+    ): UserInfoResponse {
+        TODO("Not yet implemented")
+    }
+
+    override fun getUserList(query: MediaQuery.UserListQuery): List<User> {
+        TODO("Not yet implemented")
+    }
+
+    override fun movePlaylistItem(
+        playlistId: String,
+        trackId: String,
+        startingIndex: Int,
+        endingIndex: Int
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun ping(): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun removeFromPlaylist(
+        id: String,
+        songIds: List<String>
+    ): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun replacePlaylist(
+        id: String,
+        songIds: List<String>
+    ): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun savePlayQueue(
+        songs: List<String>,
+        currentIndex: Int?,
+        positionMs: Int?
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun scrobble(
+        id: String,
+        mediaType: String,
+        playbackRate: Float,
+        submission: Boolean,
+        albumId: String?,
+        event: String?,
+        position: Int?
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun search(query: MediaQuery.SearchQuery): SearchResponse {
+        TODO("Not yet implemented")
+    }
+
+    override fun setPlaylistSongs(
+        id: String,
+        songIds: List<String>
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun setRating(
+        ids: List<String>,
+        rating: Int,
+        type: LibraryType
+    ): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun shareItem(
+        description: String,
+        downloadable: Boolean,
+        expires: Long,
+        resourceIds: String,
+        resourceType: String
+    ): String? {
+        TODO("Not yet implemented")
+    }
+
+    override fun updateInternetRadioStation(
+        id: String,
+        name: String,
+        streamUrl: String,
+        homepageUrl: String?
+    ): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun updatePlaylist(
+        id: String,
+        name: String,
+        comment: String?,
+        ownerId: String?,
+        public: Boolean?,
+        queryBuilderRules: PlaylistRules?,
+        sync: Boolean?
+    ): Boolean {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/providers/subsonic/SubsonicTypes.kt b/app/src/main/java/com/craftworks/music/providers/subsonic/SubsonicTypes.kt
new file mode 100644
index 00000000..7e87ea35
--- /dev/null
+++ b/app/src/main/java/com/craftworks/music/providers/subsonic/SubsonicTypes.kt
@@ -0,0 +1,16 @@
+package com.craftworks.music.providers.subsonic
+
+import io.ktor.http.Headers
+import io.ktor.http.HttpStatusCode
+import kotlinx.serialization.Serializable
+
+data class SubsonicApiResponse(val status: HttpStatusCode, val body: String, val headers: Headers?)
+
+
+@Serializable
+data class SubsonicServerInfo (
+    var url:String,
+    var username:String,
+    val password:String,
+    var allowSelfSignedCert: Boolean = false
+)
diff --git a/app/src/main/java/com/craftworks/music/ui/elements/ArtistCard.kt b/app/src/main/java/com/craftworks/music/ui/elements/ArtistCard.kt
index b4fa12d3..02cc9b72 100755
--- a/app/src/main/java/com/craftworks/music/ui/elements/ArtistCard.kt
+++ b/app/src/main/java/com/craftworks/music/ui/elements/ArtistCard.kt
@@ -29,11 +29,11 @@ import androidx.compose.ui.unit.dp
 import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
 import com.craftworks.music.R
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 
 @Stable
 @Composable
-fun ArtistCard(artist: MediaData.Artist, onClick: () -> Unit) {
+fun ArtistCard(artist: MediaItem.Artist, onClick: () -> Unit) {
     Column(
         modifier = Modifier
             //.padding(12.dp)
diff --git a/app/src/main/java/com/craftworks/music/ui/elements/SongCard.kt b/app/src/main/java/com/craftworks/music/ui/elements/SongCard.kt
index a7f584ee..a7111d5a 100755
--- a/app/src/main/java/com/craftworks/music/ui/elements/SongCard.kt
+++ b/app/src/main/java/com/craftworks/music/ui/elements/SongCard.kt
@@ -42,12 +42,12 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
 import com.craftworks.music.R
-import com.craftworks.music.formatMilliseconds
+import com.craftworks.music.data.model.MediaItem
+import com.craftworks.music.formatSeconds
 import com.craftworks.music.providers.navidrome.downloadNavidromeSong
 import com.craftworks.music.ui.elements.dialogs.showAddSongToPlaylistDialog
 import com.craftworks.music.ui.elements.dialogs.songToAddToPlaylist
@@ -55,7 +55,7 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun HorizontalSongCard(
-    song: MediaItem,
+    song: MediaItem.Song,
     modifier: Modifier = Modifier,
     showTrackNumber: Boolean = false,
     onClick: () -> Unit
@@ -142,7 +142,7 @@ fun HorizontalSongCard(
             }
             val formattedDuration by remember(song.mediaMetadata.durationMs) {
                 derivedStateOf {
-                    formatMilliseconds((song.mediaMetadata.durationMs?.div(1000))?.toInt() ?: 0)
+                    formatSeconds((song.mediaMetadata.durationMs?.div(1000))?.toInt() ?: 0)
                 }
             }
             Text(
diff --git a/app/src/main/java/com/craftworks/music/ui/elements/SongLazyLists.kt b/app/src/main/java/com/craftworks/music/ui/elements/SongLazyLists.kt
index ce676964..da80dd21 100755
--- a/app/src/main/java/com/craftworks/music/ui/elements/SongLazyLists.kt
+++ b/app/src/main/java/com/craftworks/music/ui/elements/SongLazyLists.kt
@@ -47,7 +47,7 @@ import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import androidx.media3.session.MediaController
 import com.craftworks.music.R
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.model.albumList
 import com.craftworks.music.data.model.songsList
 import com.craftworks.music.data.model.toAlbum
@@ -149,7 +149,7 @@ fun SongsHorizontalColumn(
 fun AlbumGrid(
     albums: List<MediaItem>,
     mediaController: MediaController?,
-    onAlbumSelected: (album: MediaData.Album) -> Unit,
+    onAlbumSelected: (album: com.craftworks.music.data.model.MediaItem.Album) -> Unit,
     isSearch: Boolean? = false,
     viewModel: AlbumScreenViewModel = viewModel(),
 ){
@@ -267,7 +267,7 @@ fun AlbumGrid(
 fun AlbumGrid(
     albums: List<MediaItem>,
     mediaController: MediaController?,
-    onAlbumSelected: (album: MediaData.Album) -> Unit,
+    onAlbumSelected: (album: com.craftworks.music.data.model.MediaItem.Album) -> Unit,
     onGetAlbum: (albumID: String) -> List<MediaItem>
 ) {
     val gridState = rememberLazyGridState()
@@ -365,7 +365,7 @@ fun AlbumGrid(
 @Composable
 fun AlbumRow(
     albums: List<MediaItem>,
-    onAlbumSelected: (album: MediaData.Album) -> Unit,
+    onAlbumSelected: (album: com.craftworks.music.data.model.MediaItem.Album) -> Unit,
     onPlay: (album: MediaItem) -> Unit,
 ){
     val showProviderDividers by AppearanceSettingsManager(LocalContext.current).showProviderDividersFlow.collectAsStateWithLifecycle(true)
@@ -424,8 +424,8 @@ fun AlbumRow(
 @ExperimentalFoundationApi
 @Composable
 fun ArtistsGrid(
-    artists: List<MediaData.Artist>,
-    onArtistSelected: (artist: MediaData.Artist) -> Unit
+    artists: List<com.craftworks.music.data.model.MediaItem.Artist>,
+    onArtistSelected: (artist: com.craftworks.music.data.model.MediaItem.Artist) -> Unit
 ){
     val gridState = rememberLazyGridState()
     val showProviderDividers by AppearanceSettingsManager(LocalContext.current).showProviderDividersFlow.collectAsStateWithLifecycle(true)
diff --git a/app/src/main/java/com/craftworks/music/ui/elements/tv/TvArtistCard.kt b/app/src/main/java/com/craftworks/music/ui/elements/tv/TvArtistCard.kt
index aed49177..089710cc 100644
--- a/app/src/main/java/com/craftworks/music/ui/elements/tv/TvArtistCard.kt
+++ b/app/src/main/java/com/craftworks/music/ui/elements/tv/TvArtistCard.kt
@@ -17,12 +17,12 @@ import androidx.tv.material3.Text
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import com.craftworks.music.R
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 
 @OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun TvArtistCard(
-    artist: MediaData.Artist,
+    artist: MediaItem.Artist,
     onClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
diff --git a/app/src/main/java/com/craftworks/music/ui/playing/NowPlayingElements.kt b/app/src/main/java/com/craftworks/music/ui/playing/NowPlayingElements.kt
index 753bc982..def28c7a 100755
--- a/app/src/main/java/com/craftworks/music/ui/playing/NowPlayingElements.kt
+++ b/app/src/main/java/com/craftworks/music/ui/playing/NowPlayingElements.kt
@@ -69,7 +69,7 @@ import androidx.media3.ui.compose.state.rememberRepeatButtonState
 import androidx.media3.ui.compose.state.rememberShuffleButtonState
 import com.craftworks.music.R
 import com.craftworks.music.data.repository.LyricsState
-import com.craftworks.music.formatMilliseconds
+import com.craftworks.music.formatSeconds
 import com.craftworks.music.providers.navidrome.downloadNavidromeSong
 import com.craftworks.music.ui.elements.bounceClick
 import com.craftworks.music.ui.elements.moveClick
@@ -204,7 +204,7 @@ fun PlaybackProgressSlider(
                 .fillMaxWidth()
         ) {
             Text(
-                text = remember(currentValue) { formatMilliseconds(currentValue.toInt() / 1000) },
+                text = remember(currentValue) { formatSeconds(currentValue.toInt() / 1000) },
                 fontWeight = FontWeight.Light,
                 textAlign = TextAlign.Start,
                 color = color.copy(alpha = 0.5f),
@@ -214,7 +214,7 @@ fun PlaybackProgressSlider(
                 maxLines = 1
             )
             Text(
-                text = remember(currentDuration) { formatMilliseconds(currentDuration?.toInt()?.div(1000) ?: (currentValue/1000).toInt()) },
+                text = remember(currentDuration) { formatSeconds(currentDuration?.toInt()?.div(1000) ?: (currentValue/1000).toInt()) },
                 fontWeight = FontWeight.Light,
                 textAlign = TextAlign.End,
                 color = color.copy(alpha = 0.5f),
diff --git a/app/src/main/java/com/craftworks/music/ui/playing/tv/NowPlayingElements.kt b/app/src/main/java/com/craftworks/music/ui/playing/tv/NowPlayingElements.kt
index acd5c795..2e0ed254 100755
--- a/app/src/main/java/com/craftworks/music/ui/playing/tv/NowPlayingElements.kt
+++ b/app/src/main/java/com/craftworks/music/ui/playing/tv/NowPlayingElements.kt
@@ -65,7 +65,7 @@ import androidx.tv.material3.IconButtonDefaults
 import androidx.tv.material3.OutlinedIconButtonDefaults
 import androidx.tv.material3.Text
 import com.craftworks.music.R
-import com.craftworks.music.formatMilliseconds
+import com.craftworks.music.formatSeconds
 import com.craftworks.music.providers.navidrome.downloadNavidromeSong
 import com.craftworks.music.ui.elements.bounceClick
 import com.craftworks.music.ui.elements.moveClick
@@ -200,7 +200,7 @@ fun PlaybackProgressSlider(
                 .fillMaxWidth()
         ) {
             Text(
-                text = remember(currentValue) { formatMilliseconds(currentValue.toInt() / 1000) },
+                text = remember(currentValue) { formatSeconds(currentValue.toInt() / 1000) },
                 fontWeight = FontWeight.Light,
                 textAlign = TextAlign.Start,
                 color = color.copy(alpha = 0.5f),
@@ -211,7 +211,7 @@ fun PlaybackProgressSlider(
             )
             Text(
                 text = remember(currentDuration) {
-                    formatMilliseconds(
+                    formatSeconds(
                         currentDuration?.toInt()?.div(1000) ?: (currentValue / 1000).toInt()
                     )
                 },
diff --git a/app/src/main/java/com/craftworks/music/ui/screens/AlbumDetailsScreen.kt b/app/src/main/java/com/craftworks/music/ui/screens/AlbumDetailsScreen.kt
index bae3aac2..a43fdfd0 100755
--- a/app/src/main/java/com/craftworks/music/ui/screens/AlbumDetailsScreen.kt
+++ b/app/src/main/java/com/craftworks/music/ui/screens/AlbumDetailsScreen.kt
@@ -69,8 +69,10 @@ import androidx.navigation.compose.rememberNavController
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import com.craftworks.music.R
+import com.craftworks.music.data.model.MediaItem
+import com.craftworks.music.data.model.ProviderFeatures
 import com.craftworks.music.fadingEdge
-import com.craftworks.music.formatMilliseconds
+import com.craftworks.music.formatSeconds
 import com.craftworks.music.managers.settings.AppearanceSettingsManager
 import com.craftworks.music.player.SongHelper
 import com.craftworks.music.providers.navidrome.downloadNavidromeAlbum
@@ -95,7 +97,7 @@ fun AlbumDetails(
     val imageFadingEdge = Brush.verticalGradient(listOf(Color.Red.copy(0.75f), Color.Transparent))
 
     var showLoading by remember { mutableStateOf(false) }
-    val currentAlbum = viewModel.songsInAlbum.collectAsStateWithLifecycle().value
+    val currentAlbum = viewModel.albumDetails.collectAsStateWithLifecycle().value
     val showTrackNumbers by AppearanceSettingsManager(LocalContext.current).showTrackNumbersFlow.collectAsStateWithLifecycle(false)
 
     val context = LocalContext.current
@@ -132,10 +134,9 @@ fun AlbumDetails(
 
     // Main Content
     AnimatedVisibility(
-        visible = currentAlbum.isNotEmpty(),
+        visible = currentAlbum != null,
         enter = fadeIn()
     ) {
-        var isStarred by remember { mutableStateOf(currentAlbum[0].mediaMetadata.extras?.getString("starred")?.isNotEmpty() ?: false) }
         val requester = remember { FocusRequester() }
 
         val coroutineScope = rememberCoroutineScope()
@@ -195,7 +196,7 @@ fun AlbumDetails(
                     // Album Name and Artist
                     Column(modifier = Modifier.align(Alignment.BottomCenter)){
                         Text(
-                            text = currentAlbum[0].mediaMetadata.title.toString(),
+                            text = currentAlbum?.name ?: "",
                             color = MaterialTheme.colorScheme.onBackground,
                             style = MaterialTheme.typography.headlineMedium,
                             textAlign = TextAlign.Center,
@@ -204,7 +205,7 @@ fun AlbumDetails(
                         )
                         Spacer(Modifier.height(8.dp))
                         Text(
-                            text = currentAlbum[0].mediaMetadata.artist.toString() + " • " + formatMilliseconds(currentAlbum[0].mediaMetadata.durationMs?.div(1000)?.toInt() ?: 0),
+                            text = currentAlbum?.albumArtistName.toString() + " • " + formatSeconds(currentAlbum?.duration?.div(1000) ?: 0),
                             color = MaterialTheme.colorScheme.onBackground,
                             fontWeight = FontWeight.Normal,
                             fontSize = MaterialTheme.typography.titleMedium.fontSize,
@@ -214,29 +215,30 @@ fun AlbumDetails(
 
                         // Genres
                         Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
-                            if (!currentAlbum[0].mediaMetadata.genre.isNullOrEmpty()) {
-                                currentAlbum[0].mediaMetadata.genre?.split(",")?.forEach {
+                            if (!currentAlbum?.genres.isNullOrEmpty()) {
+                                currentAlbum.genres.forEach {
                                     GenrePill(it.toString())
                                 }
                             }
                         }
                     }
 
-                    // Star/unstar button and download album, NAVIDROME ONLY
-                    if (currentAlbum[0].mediaMetadata.extras?.getString("navidromeID")?.startsWith("Local_") == false) {
+                    // Star/unstar button
+                    if (viewModel.provider?.featureFlags?.value?.any(ProviderFeatures.FAVORITES)?:false) {
                         Button(
                             onClick = {
                                 coroutineScope.launch {
-                                    if (isStarred)
+                                    if (currentAlbum == null) return@launch
+                                    if (currentAlbum.userFavorite ?: false)
                                         viewModel.unstarAlbum(
-                                            currentAlbum[0].mediaMetadata.extras?.getString("navidromeID").toString()
+                                            currentAlbum.id
                                         )
                                     else
                                         viewModel.starAlbum(
-                                            currentAlbum[0].mediaMetadata.extras?.getString("navidromeID").toString()
+                                            currentAlbum.id
                                         )
+                                    currentAlbum.userFavorite != currentAlbum.userFavorite;
                                     viewModel.loadAlbumDetails(selectedAlbumId)
-                                    isStarred = !isStarred
                                 }
                             },
                             shape = RoundedCornerShape(12.dp),
@@ -245,10 +247,13 @@ fun AlbumDetails(
                                 .padding(top = 12.dp, end = 12.dp)
                                 .size(32.dp),
                             contentPadding = PaddingValues(4.dp),
-                            colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.background, contentColor = MaterialTheme.colorScheme.onBackground)
+                            colors = ButtonDefaults.buttonColors(
+                                containerColor = MaterialTheme.colorScheme.background,
+                                contentColor = MaterialTheme.colorScheme.onBackground
+                            )
                         ) {
                             Crossfade(
-                                targetState = isStarred
+                                targetState = currentAlbum!!.userFavorite
                             ) {
                                 if (it) Icon(
                                     imageVector = ImageVector.vectorResource(R.drawable.round_favorite_24),
@@ -268,11 +273,15 @@ fun AlbumDetails(
                                     )
                             }
                         }
+                    }
 
+                    // Download album
+                    if (viewModel.provider?.featureFlags?.value?.any(ProviderFeatures.DOWNLOADS)?:false) {
                         Button(
                             onClick = {
                                 coroutineScope.launch {
-                                    downloadNavidromeAlbum(context, currentAlbum[0].mediaMetadata.title.toString(), currentAlbum.subList(1, currentAlbum.size))
+                                    TODO("Download album")
+                                    //downloadNavidromeAlbum(context, currentAlbum?.name.toString(), currentAlbum?.subList(1, currentAlbum.size))
                                 }
                             },
                             shape = RoundedCornerShape(12.dp),
@@ -293,7 +302,6 @@ fun AlbumDetails(
                             )
                         }
                     }
-
                 }
             }
 
@@ -308,7 +316,7 @@ fun AlbumDetails(
                         onClick = {
                             coroutineScope.launch {
                                 SongHelper.play(
-                                    currentAlbum.subList(1, currentAlbum.size),
+                                    currentAlbum?.songs?:listOf(),
                                     0,
                                     mediaController
                                 )
@@ -329,10 +337,9 @@ fun AlbumDetails(
                         onClick = {
                             mediaController?.shuffleModeEnabled = true
                             coroutineScope.launch {
-                            val random = currentAlbum.subList(1, currentAlbum.size).indices.random()
                             SongHelper.play(
-                                currentAlbum.subList(1, currentAlbum.size),
-                                random,
+                                (currentAlbum?.songs?:listOf()).shuffled(),
+                                0,
                                 mediaController
                             )
                                 }
@@ -348,13 +355,13 @@ fun AlbumDetails(
             }
 
             // Album Songs
-            val groupedAlbums = currentAlbum.subList(1, currentAlbum.size).groupBy { song ->
-                song.mediaMetadata.discNumber
+            val groupedAlbums = (currentAlbum?.songs ?: listOf()).groupBy { song ->
+                song.discNumber
             }
 
             if (groupedAlbums.size > 1) {
-                groupedAlbums.forEach { (discNumber, albumsInGroup) ->
-                    item() {
+                groupedAlbums.forEach { (discNumber, songsInGroup) ->
+                    item {
                         Column {
                             Text(
                                 text = stringResource(R.string.Album_Disc_Number) + discNumber.toString(),
@@ -372,16 +379,16 @@ fun AlbumDetails(
                             )
                         }
                     }
-                    items(albumsInGroup) { song ->
+                    items(songsInGroup) {
                         HorizontalSongCard(
-                            song = song,
+                            song = it,
                             modifier = Modifier.animateItem(),
                             showTrackNumber = showTrackNumbers,
                             onClick = {
                                 coroutineScope.launch {
                                     SongHelper.play(
-                                        currentAlbum.subList(1, currentAlbum.size),
-                                        currentAlbum.subList(1, currentAlbum.size).indexOf(song),
+                                        currentAlbum?.songs?:listOf(),
+                                        currentAlbum?.songs?.indexOf(it)?:0,
                                         mediaController
                                     )
                                 }
@@ -391,16 +398,16 @@ fun AlbumDetails(
                 }
             }
             else {
-                items(currentAlbum.subList(1, currentAlbum.size)) { song ->
+                items(currentAlbum?.songs?:listOf()) {
                     HorizontalSongCard(
-                        song = song,
+                        song = it,
                         modifier = Modifier.animateItem(),
                         showTrackNumber = showTrackNumbers,
                         onClick = {
                             coroutineScope.launch {
                                 SongHelper.play(
-                                    currentAlbum.subList(1, currentAlbum.size),
-                                    currentAlbum.subList(1, currentAlbum.size).indexOf(song),
+                                    currentAlbum?.songs?:listOf(),
+                                    currentAlbum?.songs?.indexOf(it)?:0,
                                     mediaController
                                 )
                             }
diff --git a/app/src/main/java/com/craftworks/music/ui/screens/PlaylistDetailsScreen.kt b/app/src/main/java/com/craftworks/music/ui/screens/PlaylistDetailsScreen.kt
index 6722ef10..e0bea806 100755
--- a/app/src/main/java/com/craftworks/music/ui/screens/PlaylistDetailsScreen.kt
+++ b/app/src/main/java/com/craftworks/music/ui/screens/PlaylistDetailsScreen.kt
@@ -62,7 +62,7 @@ import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
 import com.craftworks.music.R
 import com.craftworks.music.fadingEdge
-import com.craftworks.music.formatMilliseconds
+import com.craftworks.music.formatSeconds
 import com.craftworks.music.player.SongHelper
 import com.craftworks.music.player.rememberManagedMediaController
 import com.craftworks.music.providers.navidrome.downloadNavidromeAlbum
@@ -226,7 +226,7 @@ fun PlaylistDetails(
                             lineHeight = 32.sp,
                         )
                         Text(
-                            text = formatMilliseconds((playlistDuration / 1000).toInt()),
+                            text = formatSeconds((playlistDuration / 1000).toInt()),
                             color = MaterialTheme.colorScheme.onBackground,
                             fontWeight = FontWeight.Normal,
                             fontSize = MaterialTheme.typography.headlineSmall.fontSize,
diff --git a/app/src/main/java/com/craftworks/music/ui/screens/tv/TvAlbumDetailsScreen.kt b/app/src/main/java/com/craftworks/music/ui/screens/tv/TvAlbumDetailsScreen.kt
index 6cb8c3c9..231e9ca3 100644
--- a/app/src/main/java/com/craftworks/music/ui/screens/tv/TvAlbumDetailsScreen.kt
+++ b/app/src/main/java/com/craftworks/music/ui/screens/tv/TvAlbumDetailsScreen.kt
@@ -18,7 +18,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.PlayArrow
@@ -65,7 +64,7 @@ import coil.request.CachePolicy
 import coil.request.ImageRequest
 import com.craftworks.music.R
 import com.craftworks.music.data.model.Screen
-import com.craftworks.music.formatMilliseconds
+import com.craftworks.music.formatSeconds
 import com.craftworks.music.managers.settings.AppearanceSettingsManager
 import com.craftworks.music.player.SongHelper
 import com.craftworks.music.ui.elements.dialogs.tv.SongDialog
@@ -174,7 +173,7 @@ fun TvAlbumDetails(
                     Text(
                         text = (currentAlbum[0].mediaMetadata.artist?.toString() ?: "") +
                                 " · " +
-                                formatMilliseconds(
+                                formatSeconds(
                                     currentAlbum[0].mediaMetadata.durationMs
                                         ?.div(1000)?.toInt() ?: 0
                                 ),
diff --git a/app/src/main/java/com/craftworks/music/ui/screens/tv/TvHomeScreen.kt b/app/src/main/java/com/craftworks/music/ui/screens/tv/TvHomeScreen.kt
index 0129cd9f..5af7c6a6 100644
--- a/app/src/main/java/com/craftworks/music/ui/screens/tv/TvHomeScreen.kt
+++ b/app/src/main/java/com/craftworks/music/ui/screens/tv/TvHomeScreen.kt
@@ -77,7 +77,7 @@ import coil.request.SuccessResult
 import com.craftworks.music.R
 import com.craftworks.music.data.model.Screen
 import com.craftworks.music.data.model.toAlbum
-import com.craftworks.music.formatMilliseconds
+import com.craftworks.music.formatSeconds
 import com.craftworks.music.managers.settings.AppearanceSettingsManager
 import com.craftworks.music.player.SongHelper
 import com.craftworks.music.ui.elements.tv.TvAlbumCard
@@ -281,7 +281,7 @@ private fun CarouselItem(
     val title = album.mediaMetadata.title?.toString() ?: ""
     val artist = album.mediaMetadata.artist?.toString() ?: ""
     val genre = album.mediaMetadata.genre?.toString() ?: ""
-    val duration = formatMilliseconds(
+    val duration = formatSeconds(
         album.mediaMetadata.durationMs?.div(1000)?.toInt() ?: 0
     )
     val subtitle = listOf(genre, artist, duration)
diff --git a/app/src/main/java/com/craftworks/music/ui/screens/tv/TvPlaylistDetailsScreen.kt b/app/src/main/java/com/craftworks/music/ui/screens/tv/TvPlaylistDetailsScreen.kt
index d9be20e4..14dabc6d 100644
--- a/app/src/main/java/com/craftworks/music/ui/screens/tv/TvPlaylistDetailsScreen.kt
+++ b/app/src/main/java/com/craftworks/music/ui/screens/tv/TvPlaylistDetailsScreen.kt
@@ -59,7 +59,7 @@ import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import com.craftworks.music.R
 import com.craftworks.music.data.model.Screen
-import com.craftworks.music.formatMilliseconds
+import com.craftworks.music.formatSeconds
 import com.craftworks.music.player.SongHelper
 import com.craftworks.music.player.rememberManagedMediaController
 import com.craftworks.music.ui.elements.dialogs.tv.SongDialog
@@ -148,7 +148,7 @@ fun TvPlaylistDetails(
 
                     // duration
                     Text(
-                        text = formatMilliseconds((playlistDuration / 1000).toInt()),
+                        text = formatSeconds((playlistDuration / 1000).toInt()),
                         style = MaterialTheme.typography.bodySmall,
                         color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f),
                         textAlign = TextAlign.Center,
diff --git a/app/src/main/java/com/craftworks/music/ui/viewmodels/AlbumDetailsViewModel.kt b/app/src/main/java/com/craftworks/music/ui/viewmodels/AlbumDetailsViewModel.kt
index a5944eba..1f95c711 100644
--- a/app/src/main/java/com/craftworks/music/ui/viewmodels/AlbumDetailsViewModel.kt
+++ b/app/src/main/java/com/craftworks/music/ui/viewmodels/AlbumDetailsViewModel.kt
@@ -2,9 +2,9 @@ package com.craftworks.music.ui.viewmodels
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import androidx.media3.common.MediaItem
-import com.craftworks.music.data.repository.AlbumRepository
-import com.craftworks.music.data.repository.StarredRepository
+import com.craftworks.music.data.model.LibraryType
+import com.craftworks.music.data.model.MediaItem
+import com.craftworks.music.managers.MediaProviderManager
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -15,11 +15,11 @@ import javax.inject.Inject
 
 @HiltViewModel
 class AlbumDetailsViewModel @Inject constructor(
-    private val albumRepository: AlbumRepository,
-    private val starredRepository: StarredRepository
+    private val mediaProviderManager: MediaProviderManager,
 ) : ViewModel() {
-    private val _songsInAlbum = MutableStateFlow<List<MediaItem>>(listOf())
-    val songsInAlbum: StateFlow<List<MediaItem>> = _songsInAlbum.asStateFlow()
+    val provider = mediaProviderManager.currentProvider.value;
+    private val _albumDetails = MutableStateFlow<MediaItem.Album?>(null)
+    val albumDetails: StateFlow<MediaItem.Album?> = _albumDetails.asStateFlow()
 
     private val _isLoading = MutableStateFlow(false)
     val isLoading: StateFlow<Boolean> = _isLoading.asStateFlow()
@@ -28,12 +28,12 @@ class AlbumDetailsViewModel @Inject constructor(
         viewModelScope.launch {
             val loadingJob = launch {
                 delay(500)
-                if (_songsInAlbum.value.isEmpty()) {
+                if (_albumDetails.value == null) {
                     _isLoading.value = true
                 }
             }
 
-            _songsInAlbum.value = albumRepository.getAlbum(albumId) ?: listOf(MediaItem.EMPTY)
+            _albumDetails.value = provider?.getAlbumDetail(albumId)
 
             loadingJob.cancel()
             _isLoading.value = false
@@ -42,12 +42,12 @@ class AlbumDetailsViewModel @Inject constructor(
 
     fun starAlbum(id: String) {
         viewModelScope.launch {
-            starredRepository.starItem(albumId = id, ignoreCachedResponse = true)
+            provider?.createFavorite(listOf(id),LibraryType.ALBUM)
         }
     }
     fun unstarAlbum(id: String) {
         viewModelScope.launch {
-            starredRepository.unStarItem(albumId = id, ignoreCachedResponse = true)
+            provider?.deleteFavorite(listOf(id),LibraryType.ALBUM)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/craftworks/music/ui/viewmodels/ArtistsScreenViewModel.kt b/app/src/main/java/com/craftworks/music/ui/viewmodels/ArtistsScreenViewModel.kt
index 6ea6a2e1..02a0bc5d 100644
--- a/app/src/main/java/com/craftworks/music/ui/viewmodels/ArtistsScreenViewModel.kt
+++ b/app/src/main/java/com/craftworks/music/ui/viewmodels/ArtistsScreenViewModel.kt
@@ -3,7 +3,7 @@ package com.craftworks.music.ui.viewmodels
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.media3.common.MediaItem
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.repository.AlbumRepository
 import com.craftworks.music.data.repository.ArtistRepository
 import com.craftworks.music.managers.DataRefreshManager
@@ -27,11 +27,11 @@ class ArtistsScreenViewModel @Inject constructor(
     private val artistRepository: ArtistRepository,
     private val albumRepository: AlbumRepository
 ) : ViewModel() {
-    private val _allArtists = MutableStateFlow<List<MediaData.Artist>>(emptyList())
-    val allArtists: StateFlow<List<MediaData.Artist>> = _allArtists.asStateFlow()
+    private val _allArtists = MutableStateFlow<List<com.craftworks.music.data.model.MediaItem.Artist>>(emptyList())
+    val allArtists: StateFlow<List<com.craftworks.music.data.model.MediaItem.Artist>> = _allArtists.asStateFlow()
 
-    private val _selectedArtist = MutableStateFlow<MediaData.Artist?>(null)
-    val selectedArtist: StateFlow<MediaData.Artist?> = _selectedArtist
+    private val _selectedArtist = MutableStateFlow<com.craftworks.music.data.model.MediaItem.Artist?>(null)
+    val selectedArtist: StateFlow<com.craftworks.music.data.model.MediaItem.Artist?> = _selectedArtist
 
     private val _artistAlbums = MutableStateFlow<List<MediaItem>>(emptyList())
     val artistAlbums: StateFlow<List<MediaItem>> = _artistAlbums.asStateFlow()
@@ -72,7 +72,7 @@ class ArtistsScreenViewModel @Inject constructor(
     }
 
     @OptIn(FlowPreview::class)
-    val searchResults: StateFlow<List<MediaData.Artist>> = searchQuery
+    val searchResults: StateFlow<List<com.craftworks.music.data.model.MediaItem.Artist>> = searchQuery
         .debounce(300L) // Adds a small delay to avoid searching on every keystroke.
         .combine(allArtists) { query, artists ->
             if (query.isBlank()) {
@@ -90,7 +90,7 @@ class ArtistsScreenViewModel @Inject constructor(
         )
 
 
-    fun setSelectedArtist(artist: MediaData.Artist) {
+    fun setSelectedArtist(artist: com.craftworks.music.data.model.MediaItem.Artist) {
         _selectedArtist.value = artist
         viewModelScope.launch {
             val loadingJob = launch {
diff --git a/app/src/main/java/com/craftworks/music/ui/viewmodels/RadioScreenViewModel.kt b/app/src/main/java/com/craftworks/music/ui/viewmodels/RadioScreenViewModel.kt
index f1979e36..e8da1f6d 100644
--- a/app/src/main/java/com/craftworks/music/ui/viewmodels/RadioScreenViewModel.kt
+++ b/app/src/main/java/com/craftworks/music/ui/viewmodels/RadioScreenViewModel.kt
@@ -3,7 +3,7 @@ package com.craftworks.music.ui.viewmodels
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.media3.common.MediaItem
-import com.craftworks.music.data.model.MediaData
+import com.craftworks.music.data.model.MediaItem
 import com.craftworks.music.data.model.toMediaItem
 import com.craftworks.music.data.repository.RadioRepository
 import com.craftworks.music.managers.DataRefreshManager
@@ -62,7 +62,7 @@ class RadioScreenViewModel @Inject constructor(
     fun modifyRadioStation(id: String, name: String, url: String, homepage: String) {
         viewModelScope.launch {
             _isLoading.value = true
-            radioRepository.modifyRadio(MediaData.Radio(id, name, url, homepage))
+            radioRepository.modifyRadio(MediaItem.Radio(id, name, url, homepage))
             _isLoading.value = false
             getRadioStations()
         }