From c2db7042c4d4d47e17cedae01ad4ced8950186ce Mon Sep 17 00:00:00 2001
From: vfsfitvnm <vfsfitvnm@protonmail.com>
Date: Fri, 17 Jun 2022 15:27:12 +0200
Subject: [PATCH] Tweak code

---
 .../vimusic/services/PlayerService.kt         | 33 +++++++------------
 .../screens/settings/PlayerSettingsScreen.kt  |  1 -
 .../vfsfitvnm/vimusic/utils/YoutubePlayer.kt  |  1 -
 .../it/vfsfitvnm/youtubemusic/YouTube.kt      |  3 --
 4 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/services/PlayerService.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/services/PlayerService.kt
index f202bb9..a4d9594 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/services/PlayerService.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/services/PlayerService.kt
@@ -103,7 +103,7 @@ class PlayerService : MediaSessionService(), MediaSession.Callback, MediaNotific
     override fun onCreate() {
         super.onCreate()
 
-        notificationThumbnailSize = (96 * resources.displayMetrics.density).roundToInt()
+        notificationThumbnailSize = (256 * resources.displayMetrics.density).roundToInt()
 
         createNotificationChannel()
         setMediaNotificationProvider(this)
@@ -288,15 +288,15 @@ class PlayerService : MediaSessionService(), MediaSession.Callback, MediaNotific
     override fun onAddMediaItems(
         mediaSession: MediaSession,
         controller: MediaSession.ControllerInfo,
-        mediaItems: MutableList<MediaItem>
-    ): ListenableFuture<MutableList<MediaItem>> {
+        mediaItems: List<MediaItem>
+    ): ListenableFuture<List<MediaItem>> {
         return Futures.immediateFuture(
             mediaItems.map { mediaItem ->
                 mediaItem.buildUpon()
                     .setUri(mediaItem.mediaId)
                     .setCustomCacheKey(mediaItem.mediaId)
                     .build()
-            }.toMutableList()
+            }
         )
     }
 
@@ -360,21 +360,12 @@ class PlayerService : MediaSessionService(), MediaSession.Callback, MediaNotific
                 R.drawable.play_skip_back,
                 R.string.media3_controls_seek_to_previous_description,
                 Player.COMMAND_SEEK_TO_PREVIOUS
-            ).run {
-                if (mediaSession.player.playbackState == Player.STATE_ENDED || !mediaSession.player.playWhenReady) {
-                    addMediaAction(
-                        R.drawable.play,
-                        R.string.media3_controls_play_description,
-                        Player.COMMAND_PLAY_PAUSE
-                    )
-                } else {
-                    addMediaAction(
-                        R.drawable.pause,
-                        R.string.media3_controls_pause_description,
-                        Player.COMMAND_PLAY_PAUSE
-                    )
-                }
-            }.addMediaAction(
+            ).addMediaAction(
+                if (mediaSession.player.playbackState == Player.STATE_ENDED || !mediaSession.player.playWhenReady) R.drawable.play else R.drawable.pause,
+                if (mediaSession.player.playbackState == Player.STATE_ENDED || !mediaSession.player.playWhenReady) R.string.media3_controls_play_description else R.string.media3_controls_pause_description,
+                Player.COMMAND_PLAY_PAUSE
+            )
+            .addMediaAction(
                 R.drawable.play_skip_forward,
                 R.string.media3_controls_seek_to_next_description,
                 Player.COMMAND_SEEK_TO_NEXT
@@ -405,9 +396,7 @@ class PlayerService : MediaSessionService(), MediaSession.Callback, MediaNotific
         session: MediaSession,
         action: String,
         extras: Bundle
-    ): Boolean {
-        return false
-    }
+    ): Boolean = false
 
     private fun createNotificationChannel() {
         notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/PlayerSettingsScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/PlayerSettingsScreen.kt
index 3a86dac..829b7ff 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/PlayerSettingsScreen.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/PlayerSettingsScreen.kt
@@ -90,7 +90,6 @@ fun PlayerSettingsScreen() {
 
             LaunchedEffect(mediaController) {
                 while (isActive) {
-                    println("mediaController: $mediaController")
                     sleepTimerMillisLeft =
                         mediaController?.syncCommand(GetSleepTimerMillisLeftCommand)
                             ?.takeIf { it.resultCode == SessionResult.RESULT_SUCCESS }
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/YoutubePlayer.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/YoutubePlayer.kt
index 91e3851..8249c13 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/YoutubePlayer.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/YoutubePlayer.kt
@@ -20,7 +20,6 @@ class YoutubePlayer(mediaController: MediaController) : PlayerState(mediaControl
         var nextContinuation by mutableStateOf<Outcome<String?>>(Outcome.Initial)
 
         suspend fun process(): List<MediaItem> {
-            println("process: ${nextContinuation.valueOrNull}")
             val token = nextContinuation.valueOrNull
 
             nextContinuation = Outcome.Loading
diff --git a/youtube-music/src/main/kotlin/it/vfsfitvnm/youtubemusic/YouTube.kt b/youtube-music/src/main/kotlin/it/vfsfitvnm/youtubemusic/YouTube.kt
index 585d5ca..3a7de43 100644
--- a/youtube-music/src/main/kotlin/it/vfsfitvnm/youtubemusic/YouTube.kt
+++ b/youtube-music/src/main/kotlin/it/vfsfitvnm/youtubemusic/YouTube.kt
@@ -617,9 +617,6 @@ object YouTube {
                                 thumbnail = renderer
                                     .thumbnail
                                     .thumbnails
-                                    .also {
-                                        println(it)
-                                    }
                                     .firstOrNull(),
                                 durationText = renderer
                                     .lengthText