Skip to content

Commit

Permalink
Fixed #345
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxrave-dev
maxrave-dev committed Jun 25, 2024
1 parent fb29ae6 commit 5875cd4
Show file tree
Hide file tree
Showing 7 changed files with 1,411 additions and 1,395 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/com/maxrave/simpmusic/ui/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ class MainActivity : AppCompatActivity() {
viewModel.activityRecreate()
}

fun onCloseMiniplayer() {
private fun onCloseMiniplayer() {
viewModel.stopPlayer()
viewModel.isServiceRunning.postValue(false)
viewModel.videoId.postValue(null)
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/com/maxrave/simpmusic/ui/fragment/SearchFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import androidx.fragment.app.activityViewModels
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.media3.common.MediaItem
import androidx.media3.common.util.UnstableApi
import androidx.media3.exoplayer.offline.Download
import androidx.media3.exoplayer.offline.DownloadRequest
Expand Down Expand Up @@ -69,7 +68,6 @@ import dev.chrisbanes.insetter.applyInsetter
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.launch
import java.time.LocalDateTime
import javax.inject.Inject
Expand Down Expand Up @@ -866,7 +864,7 @@ class SearchFragment : Fragment() {
}
}
val job2 = launch {
combine(sharedViewModel.simpleMediaServiceHandler?.nowPlaying ?: flowOf<MediaItem?>(null), sharedViewModel.isPlaying) { nowPlaying, isPlaying ->
combine(sharedViewModel.nowPlayingMediaItem, sharedViewModel.isPlaying) { nowPlaying, isPlaying ->
Pair(nowPlaying, isPlaying)
}.collect {
if (it.first != null && it.second) {
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/com/maxrave/simpmusic/ui/fragment/library/DownloadedFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import androidx.fragment.app.viewModels
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.media3.common.MediaItem
import androidx.media3.common.util.UnstableApi
import androidx.media3.exoplayer.offline.DownloadService
import androidx.navigation.fragment.findNavController
Expand Down Expand Up @@ -49,7 +48,6 @@ import dev.chrisbanes.insetter.applyInsetter
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.launch
import java.time.LocalDateTime

Expand Down Expand Up @@ -385,7 +383,7 @@ class DownloadedFragment : Fragment() {
}
}
val job2 = launch {
combine(sharedViewModel.simpleMediaServiceHandler?.nowPlaying ?: flowOf<MediaItem?>(null), sharedViewModel.isPlaying) { nowPlaying, isPlaying ->
combine(sharedViewModel.nowPlayingMediaItem, sharedViewModel.isPlaying) { nowPlaying, isPlaying ->
Pair(nowPlaying, isPlaying)
}.collect {
if (it.first != null && it.second) {
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/com/maxrave/simpmusic/ui/fragment/library/FavoriteFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import androidx.fragment.app.viewModels
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.media3.common.MediaItem
import androidx.media3.common.util.UnstableApi
import androidx.media3.exoplayer.offline.Download
import androidx.media3.exoplayer.offline.DownloadRequest
Expand Down Expand Up @@ -52,7 +51,6 @@ import dev.chrisbanes.insetter.applyInsetter
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.launch
import java.time.LocalDateTime

Expand Down Expand Up @@ -438,7 +436,7 @@ class FavoriteFragment : Fragment() {
}
}
val job2 = launch {
combine(sharedViewModel.simpleMediaServiceHandler?.nowPlaying ?: flowOf<MediaItem?>(null), sharedViewModel.isPlaying) { nowPlaying, isPlaying ->
combine(sharedViewModel.nowPlayingMediaItem, sharedViewModel.isPlaying) { nowPlaying, isPlaying ->
Pair(nowPlaying, isPlaying)
}.collect {
if (it.first != null && it.second) {
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/com/maxrave/simpmusic/ui/fragment/library/LibraryFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import androidx.fragment.app.viewModels
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.media3.common.MediaItem
import androidx.media3.common.util.UnstableApi
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.LinearLayoutManager
Expand Down Expand Up @@ -52,7 +51,6 @@ import dev.chrisbanes.insetter.applyInsetter
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.launch
import java.time.LocalDateTime

Expand Down Expand Up @@ -367,7 +365,7 @@ class LibraryFragment : Fragment() {
}
}
lifecycleScope.launch {
if (sharedViewModel.simpleMediaServiceHandler?.nowPlaying?.first()?.mediaId == song.videoId) {
if (sharedViewModel.nowPlayingMediaItem.first()?.mediaId == song.videoId) {
delay(500)
sharedViewModel.refreshSongDB()
}
Expand Down Expand Up @@ -616,7 +614,7 @@ class LibraryFragment : Fragment() {
val job2 =
launch {
combine(
sharedViewModel.simpleMediaServiceHandler?.nowPlaying ?: flowOf<MediaItem?>(null),
sharedViewModel.nowPlayingMediaItem,
sharedViewModel.isPlaying,
) { nowPlaying, isPlaying ->
Pair(nowPlaying, isPlaying)
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/com/maxrave/simpmusic/ui/fragment/library/MostPlayedFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import androidx.fragment.app.viewModels
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.media3.common.MediaItem
import androidx.media3.common.util.UnstableApi
import androidx.media3.exoplayer.offline.Download
import androidx.media3.exoplayer.offline.DownloadRequest
Expand Down Expand Up @@ -52,7 +51,6 @@ import dev.chrisbanes.insetter.applyInsetter
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.launch
import java.time.LocalDateTime

Expand Down Expand Up @@ -458,7 +456,7 @@ class MostPlayedFragment: Fragment() {
}
}
val job2 = launch {
combine(sharedViewModel.simpleMediaServiceHandler?.nowPlaying ?: flowOf<MediaItem?>(null), sharedViewModel.isPlaying) { nowPlaying, isPlaying ->
combine(sharedViewModel.nowPlayingMediaItem, sharedViewModel.isPlaying) { nowPlaying, isPlaying ->
Pair(nowPlaying, isPlaying)
}.collect {
if (it.first != null && it.second) {
Expand Down
Loading

0 comments on commit 5875cd4

Please sign in to comment.