Skip to content

Commit

Permalink
feat(library): like is the new add to library, fix #58 and fix #57
Browse files Browse the repository at this point in the history
  • Loading branch information
@Malopieds
Malopieds committed Apr 8, 2024
1 parent d382f52 commit 943b8ed
Showing 1 changed file with 9 additions and 75 deletions.
84 changes: 9 additions & 75 deletions app/src/main/java/com/zionhuang/music/viewmodels/LibraryViewModels.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,16 @@

package com.zionhuang.music.viewmodels

import android.app.LauncherActivity
import android.content.Context
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.media3.exoplayer.offline.Download
import com.zionhuang.innertube.YouTube
import com.zionhuang.innertube.models.ArtistItem
import com.zionhuang.music.constants.*
import com.zionhuang.music.db.MusicDatabase
import com.zionhuang.music.db.entities.LocalItem
import com.zionhuang.music.extensions.reversed
import com.zionhuang.music.extensions.toEnum
import com.zionhuang.music.playback.DownloadUtil
import com.zionhuang.music.utils.dataStore
import com.zionhuang.music.utils.reportException
import dagger.hilt.android.lifecycle.HiltViewModel
Expand All @@ -34,42 +28,17 @@ import javax.inject.Inject
class LibrarySongsViewModel @Inject constructor(
@ApplicationContext context: Context,
database: MusicDatabase,
downloadUtil: DownloadUtil,
) : ViewModel() {
val allSongs = context.dataStore.data
.map {
Triple(
it[SongFilterKey].toEnum(SongFilter.LIBRARY),
Pair(
it[SongSortTypeKey].toEnum(SongSortType.CREATE_DATE),
(it[SongSortDescendingKey] ?: true)
)
}
.distinctUntilChanged()
.flatMapLatest { (filter, sortType, descending) ->
when (filter) {
SongFilter.LIBRARY -> database.songs(sortType, descending)
SongFilter.LIKED -> database.likedSongs(sortType, descending)
SongFilter.DOWNLOADED -> downloadUtil.downloads.flatMapLatest { downloads ->
database.allSongs()
.flowOn(Dispatchers.IO)
.map { songs ->
songs.filter {
downloads[it.id]?.state == Download.STATE_COMPLETED
}
}
.map { songs ->
when (sortType) {
SongSortType.CREATE_DATE -> songs.sortedBy { downloads[it.id]?.updateTimeMs ?: 0L }
SongSortType.NAME -> songs.sortedBy { it.song.title }
SongSortType.ARTIST -> songs.sortedBy { song ->
song.artists.joinToString(separator = "") { it.name }
}

SongSortType.PLAY_TIME -> songs.sortedBy { it.song.totalPlayTime }
}.reversed(descending)
}
}
}
.flatMapLatest { (sortType, descending) ->
database.likedSongs(sortType, descending)
}.stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
}

Expand All @@ -80,18 +49,14 @@ class LibraryArtistsViewModel @Inject constructor(
) : ViewModel() {
val allArtists = context.dataStore.data
.map {
Triple(
it[ArtistFilterKey].toEnum(ArtistFilter.LIBRARY),
Pair(
it[ArtistSortTypeKey].toEnum(ArtistSortType.CREATE_DATE),
it[ArtistSortDescendingKey] ?: true
)
}
.distinctUntilChanged()
.flatMapLatest { (filter, sortType, descending) ->
when (filter) {
ArtistFilter.LIBRARY -> database.artists(sortType, descending)
ArtistFilter.LIKED -> database.artistsBookmarked(sortType, descending)
}
.flatMapLatest { (sortType, descending) ->
database.artistsBookmarked(sortType, descending)
}
.stateIn(viewModelScope, SharingStarted.Lazily, emptyList())

Expand Down Expand Up @@ -122,18 +87,14 @@ class LibraryAlbumsViewModel @Inject constructor(
) : ViewModel() {
val allAlbums = context.dataStore.data
.map {
Triple(
it[AlbumFilterKey].toEnum(AlbumFilter.LIBRARY),
Pair(
it[AlbumSortTypeKey].toEnum(AlbumSortType.CREATE_DATE),
it[AlbumSortDescendingKey] ?: true
)
}
.distinctUntilChanged()
.flatMapLatest { (filter, sortType, descending) ->
when (filter) {
AlbumFilter.LIBRARY -> database.albums(sortType, descending)
AlbumFilter.LIKED -> database.albumsLiked(sortType, descending)
}
.flatMapLatest { (sortType, descending) ->
database.albumsLiked(sortType, descending)
}
.stateIn(viewModelScope, SharingStarted.Lazily, emptyList())

Expand Down Expand Up @@ -164,21 +125,8 @@ class LibraryAlbumsViewModel @Inject constructor(
@HiltViewModel
class LibraryPlaylistsViewModel @Inject constructor(
@ApplicationContext context: Context,
downloadUtil: DownloadUtil,
database: MusicDatabase,
) : ViewModel() {
val likedSongs = database.likedSongs(SongSortType.CREATE_DATE, true)
.stateIn(viewModelScope, SharingStarted.Lazily, null)
val downloadSongs =
downloadUtil.downloads.flatMapLatest { downloads ->
database.allSongs()
.flowOn(Dispatchers.IO)
.map { songs ->
songs.filter {
downloads[it.id]?.state == Download.STATE_COMPLETED
}
}
}
@OptIn(ExperimentalCoroutinesApi::class)
val allPlaylists = context.dataStore.data
.map {
Expand Down Expand Up @@ -218,22 +166,8 @@ class ArtistSongsViewModel @Inject constructor(
class LibraryMixViewModel @Inject constructor(
@ApplicationContext context: Context,
database: MusicDatabase,
downloadUtil: DownloadUtil,
) : ViewModel() {
val topValue = context.dataStore.data.map { it[TopSize] ?: "50"}.distinctUntilChanged()
val likedSongs = database.likedSongs(SongSortType.CREATE_DATE, true)
.stateIn(viewModelScope, SharingStarted.Lazily, null)
val downloadSongs =
downloadUtil.downloads.flatMapLatest { downloads ->
database.allSongs()
.flowOn(Dispatchers.IO)
.map { songs ->
songs.filter {
downloads[it.id]?.state == Download.STATE_COMPLETED
}
}
}
val topSongs = database.mostPlayedSongs(0, 100)
val artists = database.artists(ArtistSortType.CREATE_DATE, true).stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
val albums = database.albums(AlbumSortType.CREATE_DATE, true).stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
val playlists = database.playlists(PlaylistSortType.CREATE_DATE, true).stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
Expand Down

0 comments on commit 943b8ed

Please sign in to comment.