fixup: ui: Details dialog refactor [2/2]

* We were passing in the player song's play count instead of the selected song's
DD3Boh · Jan 5, 2025 · f4e9332 · f4e9332
1 parent 7acaa4d
commit f4e9332
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/app/src/main/java/com/dd3boh/outertune/playback/PlayerConnection.kt b/app/src/main/java/com/dd3boh/outertune/playback/PlayerConnection.kt
@@ -62,9 +62,6 @@ class PlayerConnection(
     val currentFormat = mediaMetadata.flatMapLatest { mediaMetadata ->
         database.format(mediaMetadata?.id)
     }
-    val currentPlayCount = mediaMetadata.flatMapLatest { mediaMetadata ->
-        database.getLifetimePlayCount(mediaMetadata?.id)
-    }
 
     private val currentMediaItemIndex = MutableStateFlow(-1)
 

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/menu/PlayerMenu.kt b/app/src/main/java/com/dd3boh/outertune/ui/menu/PlayerMenu.kt
@@ -60,6 +60,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.util.fastSumBy
 import androidx.compose.ui.window.DialogProperties
 import androidx.media3.common.PlaybackParameters
 import androidx.media3.exoplayer.offline.DownloadService
@@ -107,7 +108,6 @@ fun PlayerMenu(
     val playerConnection = LocalPlayerConnection.current ?: return
     val playerVolume = playerConnection.service.playerVolume.collectAsState()
     val currentFormat by playerConnection.currentFormat.collectAsState(initial = null)
-    val currentPlayCount by playerConnection.currentPlayCount.collectAsState(initial = null)
     val librarySong by database.song(mediaMetadata.id).collectAsState(initial = null)
     val coroutineScope = rememberCoroutineScope()
 
@@ -292,7 +292,7 @@ fun PlayerMenu(
         DetailsDialog(
             mediaMetadata = mediaMetadata,
             currentFormat = currentFormat,
-            currentPlayCount = currentPlayCount,
+            currentPlayCount = librarySong?.playCount?.fastSumBy { it.count }?: 0,
             volume = playerConnection.player.volume,
             clipboardManager = clipboardManager,
             setVisibility = {showDetailsDialog = it }

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/menu/SongMenu.kt b/app/src/main/java/com/dd3boh/outertune/ui/menu/SongMenu.kt
@@ -53,6 +53,7 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.util.fastSumBy
 import androidx.media3.exoplayer.offline.DownloadService
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
@@ -102,7 +103,6 @@ fun SongMenu(
     val coroutineScope = rememberCoroutineScope()
 
     val currentFormat by playerConnection.currentFormat.collectAsState(initial = null)
-    val currentPlayCount by playerConnection.currentPlayCount.collectAsState(initial = null)
 
     var showEditDialog by rememberSaveable {
         mutableStateOf(false)
@@ -220,7 +220,7 @@ fun SongMenu(
         DetailsDialog(
             mediaMetadata = song.toMediaMetadata(),
             currentFormat = currentFormat,
-            currentPlayCount = currentPlayCount,
+            currentPlayCount = song.playCount?.fastSumBy { it.count }?: 0,
             volume = playerConnection.player.volume,
             clipboardManager = clipboardManager,
             setVisibility = {showDetailsDialog = it }