feat: show song name as title in media rpc (#425)

Verygafanhot · web-flow · commit a133ef8e3590 · 2025-07-13T18:13:32.000+05:30
diff --git a/common/preference/src/main/java/com/my/kizzy/preference/Prefs.kt b/common/preference/src/main/java/com/my/kizzy/preference/Prefs.kt
@@ -152,6 +152,7 @@ object Prefs {
     const val MEDIA_RPC_ENABLE_TIMESTAMPS = "enable_timestamps"
     const val MEDIA_RPC_HIDE_ON_PAUSE = "hide_on_pause"
     const val MEDIA_RPC_SHOW_PLAYBACK_STATE = "show_playback_state"
+    const val MEDIA_RPC_SHOW_SONG_AS_TITLE = "show_song_as_title"
 
     //Rpc Setting Preferences
     const val USE_RPC_BUTTONS = "use_saved_rpc_buttons"
diff --git a/common/resources/src/main/res/values-ar/strings.xml b/common/resources/src/main/res/values-ar/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-de/strings.xml b/common/resources/src/main/res/values-de/strings.xml
@@ -218,4 +218,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-es/strings.xml b/common/resources/src/main/res/values-es/strings.xml
@@ -215,4 +215,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-fa/strings.xml b/common/resources/src/main/res/values-fa/strings.xml
@@ -218,4 +218,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-fil/strings.xml b/common/resources/src/main/res/values-fil/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-fr/strings.xml b/common/resources/src/main/res/values-fr/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-he/strings.xml b/common/resources/src/main/res/values-he/strings.xml
@@ -218,5 +218,6 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 
 </resources>
diff --git a/common/resources/src/main/res/values-hi/strings.xml b/common/resources/src/main/res/values-hi/strings.xml
@@ -218,4 +218,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Imgur Client ID सेट करे</string>
     <string name="set_imgur_client_id_desc">अगर  पिक्चर नहीं दिख रहे है तो आप अपने Imgur Client ID सेट कर सकते है</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-hr/strings.xml b/common/resources/src/main/res/values-hr/strings.xml
@@ -218,4 +218,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-in/strings.xml b/common/resources/src/main/res/values-in/strings.xml
@@ -218,4 +218,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-it/strings.xml b/common/resources/src/main/res/values-it/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-ja/strings.xml b/common/resources/src/main/res/values-ja/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-kr/strings.xml b/common/resources/src/main/res/values-kr/strings.xml
@@ -218,4 +218,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-mm/strings.xml b/common/resources/src/main/res/values-mm/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-nl/strings.xml b/common/resources/src/main/res/values-nl/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-pl/strings.xml b/common/resources/src/main/res/values-pl/strings.xml
@@ -218,4 +218,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Ustaw Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">Jeśli obrazy nie będą wyświetlane poprzez Imgur, możesz spróbować ustawić swój własny Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-pt/strings.xml b/common/resources/src/main/res/values-pt/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-ru/strings.xml b/common/resources/src/main/res/values-ru/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Установить Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">Если изображения с Imgur не показываются, вы можете попробовать установить свой Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-th/strings.xml b/common/resources/src/main/res/values-th/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-tr/strings.xml b/common/resources/src/main/res/values-tr/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Imgur Client ID ayarla</string>
     <string name="set_imgur_client_id_desc">Imgur kullanırken görseller görünmüyorsa, kendi Client ID\'ni ayarlamayı deneyebilirsin</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-vi/strings.xml b/common/resources/src/main/res/values-vi/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Đặt Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">Nếu hình ảnh không hiện lên khi sử dụng Imgur, bạn có thể sử dung Client ID của mình</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-zh-rCN/strings.xml b/common/resources/src/main/res/values-zh-rCN/strings.xml
@@ -217,4 +217,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values-zh-rTW/strings.xml b/common/resources/src/main/res/values-zh-rTW/strings.xml
@@ -218,4 +218,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/common/resources/src/main/res/values/strings.xml b/common/resources/src/main/res/values/strings.xml
@@ -218,4 +218,5 @@
     <string name="imgur_client_id">Imgur Client ID</string>
     <string name="set_imgur_client_id">Set Imgur Client ID</string>
     <string name="set_imgur_client_id_desc">If images aren\'t showing using Imgur, you can try setting your own Client ID</string>
+    <string name="show_song_as_title">Show Song as Title</string>
 </resources>
diff --git a/data/src/main/java/com/my/kizzy/data/get_current_data/media/GetCurrentlyPlayingMedia.kt b/data/src/main/java/com/my/kizzy/data/get_current_data/media/GetCurrentlyPlayingMedia.kt
@@ -112,15 +112,31 @@ class GetCurrentPlayingMedia @Inject constructor(
                     smallText = null
                 }
 
-                return CommonRpc(name = appName,
-                    details = title,
-                    state = author,
-                    largeImage = largeIcon,
-                    smallImage = smallIcon,
-                    largeText = album,
-                    smallText = smallText,
-                    packageName = "$title::${mediaController.packageName}",
-                    time = timestamps.takeIf { it != null })
+                return if (Prefs[Prefs.MEDIA_RPC_SHOW_SONG_AS_TITLE, false]) {
+                    CommonRpc(
+                        name = title,
+                        details = author,
+                        state = album,
+                        largeImage = largeIcon,
+                        smallImage = smallIcon,
+                        largeText = appName,
+                        smallText = smallText,
+                        packageName = "$title::${mediaController.packageName}",
+                        time = timestamps.takeIf { it != null }
+                    )
+                } else {
+                    CommonRpc(
+                        name = appName,
+                        details = title,
+                        state = author,
+                        largeImage = largeIcon,
+                        smallImage = smallIcon,
+                        largeText = album,
+                        smallText = smallText,
+                        packageName = "$title::${mediaController.packageName}",
+                        time = timestamps.takeIf { it != null }
+                    )
+                }
             }
         }
         return CommonRpc()
diff --git a/feature_media_rpc/src/main/java/com/my/kizzy/feature_media_rpc/MediaRpc.kt b/feature_media_rpc/src/main/java/com/my/kizzy/feature_media_rpc/MediaRpc.kt
@@ -32,6 +32,7 @@ import androidx.compose.material.icons.filled.PlayCircle
 import androidx.compose.material.icons.filled.Timer
 import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material.icons.outlined.Search
+import androidx.compose.material.icons.filled.PlaylistAddCircle
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -65,6 +66,7 @@ import com.my.kizzy.preference.Prefs.MEDIA_RPC_ARTIST_NAME
 import com.my.kizzy.preference.Prefs.MEDIA_RPC_ENABLE_TIMESTAMPS
 import com.my.kizzy.preference.Prefs.MEDIA_RPC_HIDE_ON_PAUSE
 import com.my.kizzy.preference.Prefs.MEDIA_RPC_SHOW_PLAYBACK_STATE
+import com.my.kizzy.preference.Prefs.MEDIA_RPC_SHOW_SONG_AS_TITLE
 import com.my.kizzy.resources.R
 import com.my.kizzy.ui.components.AppsItem
 import com.my.kizzy.ui.components.BackButton
@@ -90,6 +92,7 @@ fun MediaRPC(
     var isTimestampsEnabled by remember { mutableStateOf(Prefs[MEDIA_RPC_ENABLE_TIMESTAMPS, false]) }
     var hideOnPause by remember { mutableStateOf(Prefs[MEDIA_RPC_HIDE_ON_PAUSE, false]) }
     var isShowPlaybackState by remember { mutableStateOf(Prefs[MEDIA_RPC_SHOW_PLAYBACK_STATE, false]) }
+    var showSongAsTitle by remember { mutableStateOf(Prefs[Prefs.MEDIA_RPC_SHOW_SONG_AS_TITLE, false]) }
 
     val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
         rememberTopAppBarState(),
@@ -232,6 +235,16 @@ fun MediaRPC(
                         Prefs[MEDIA_RPC_HIDE_ON_PAUSE] = hideOnPause
                     }
                 }
+                item {
+                    PreferenceSwitch(
+                        title = stringResource(id = R.string.show_song_as_title),
+                        icon = Icons.Default.PlaylistAddCircle,
+                        isChecked = showSongAsTitle,
+                    ) {
+                        showSongAsTitle = !showSongAsTitle
+                        Prefs[MEDIA_RPC_SHOW_SONG_AS_TITLE] = showSongAsTitle
+                    }
+                }
                 item {
                     Subtitle(
                         text = "Apps",
