feat: add custom title bar with window control functionality and update dependencies

Author: maxrave-dev

composeApp/build.gradle.kts

@@ -159,6 +159,7 @@ kotlin {
             implementation(compose.desktop.currentOs)
             implementation(libs.kotlinx.coroutinesSwing)
             implementation(libs.sentry.jvm)
+            implementation(libs.native.tray)
             implementation(projects.mediaJvmUi)
         }
     }

composeApp/src/commonMain/kotlin/com/maxrave/simpmusic/viewModel/SharedViewModel.kt

@@ -98,7 +98,6 @@ import simpmusic.composeapp.generated.resources.shared
 import simpmusic.composeapp.generated.resources.updated
 import simpmusic.composeapp.generated.resources.vote_submitted
 import java.io.FileOutputStream
-import java.lang.Exception
 import kotlin.math.abs
 import kotlin.reflect.KClass
 
@@ -1671,6 +1670,7 @@ class SharedViewModel(
                             _lyricsVoteState.update {
                                 it?.copy(
                                     state = VoteState.Success(upvote),
+                                    vote = it.vote + if (upvote) 1 else -1
                                 )
                             }
                             makeToast(getString(Res.string.vote_submitted))
@@ -1722,7 +1722,12 @@ class SharedViewModel(
 
                         is Resource.Success -> {
                             Logger.d(tag, "Vote SimpMusic Translated Lyrics Success")
-                            _translatedVoteState.update { it?.copy(state = VoteState.Success(upvote)) }
+                            _translatedVoteState.update {
+                                it?.copy(
+                                    state = VoteState.Success(upvote),
+                                    vote = it.vote + if (upvote) 1 else -1
+                                )
+                            }
                             makeToast(getString(Res.string.vote_submitted))
                         }
                     }

composeApp/src/jvmMain/kotlin/com/maxrave/simpmusic/main.kt

@@ -1,6 +1,15 @@
 package com.maxrave.simpmusic
 
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
@@ -13,11 +22,13 @@ import coil3.disk.DiskCache
 import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import coil3.request.CachePolicy
 import coil3.request.crossfade
+import com.kdroid.composetray.tray.api.Tray
 import com.maxrave.data.di.loader.loadAllModules
 import com.maxrave.domain.manager.DataStoreManager
 import com.maxrave.domain.mediaservice.handler.MediaPlayerHandler
 import com.maxrave.domain.mediaservice.handler.ToastType
 import com.maxrave.simpmusic.di.viewModelModule
+import com.maxrave.simpmusic.ui.component.CustomTitleBar
 import com.maxrave.simpmusic.ui.mini_player.MiniPlayerManager
 import com.maxrave.simpmusic.ui.mini_player.MiniPlayerWindow
 import com.maxrave.simpmusic.utils.VersionManager
@@ -40,6 +51,7 @@ import org.koin.mp.KoinPlatform.getKoin
 import simpmusic.composeapp.generated.resources.Res
 import simpmusic.composeapp.generated.resources.circle_app_icon
 import simpmusic.composeapp.generated.resources.explicit_content_blocked
+import simpmusic.composeapp.generated.resources.mono
 import simpmusic.composeapp.generated.resources.time_out_check_internet_connection_or_change_piped_instance_in_settings
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -103,41 +115,84 @@ fun main() {
             rememberWindowState(
                 size = DpSize(1280.dp, 720.dp),
             )
-        Window(
-            onCloseRequest = {
+        var isVisible by remember { mutableStateOf(true) }
+        Tray(
+            icon = painterResource(Res.drawable.mono),
+            tooltip = "SimpMusic",
+            primaryAction = {
+                isVisible = true
+                windowState.isMinimized = false
+            }
+        ) {
+            if (!isVisible) {
+                Item("Open SimpMusic") {
+                    isVisible = true
+                    windowState.isMinimized = false
+                }
+            }
+            if (MiniPlayerManager.isOpen) {
+                Item("Close Miniplayer") {
+                    MiniPlayerManager.isOpen = false
+                }
+            } else {
+                Item("Open Miniplayer") {
+                    MiniPlayerManager.isOpen = true
+                }
+            }
+            Divider()
+            Item("Quit app") {
                 mediaPlayerHandler.release()
                 exitApplication()
+            }
+        }
+        Window(
+            onCloseRequest = {
+                isVisible = false
             },
             title = "SimpMusic",
             icon = painterResource(Res.drawable.circle_app_icon),
-            undecorated = false,
+            undecorated = true,
+            transparent = true,
             state = windowState,
+            visible = isVisible,
         ) {
-            val context = LocalPlatformContext.current
-            setSingletonImageLoaderFactory {
-                ImageLoader
-                    .Builder(context)
-                    .components {
-                        add(
-                            OkHttpNetworkFetcherFactory(
-                                callFactory = {
-                                    OkHttpClient()
-                                },
-                            ),
-                        )
-                    }.diskCachePolicy(CachePolicy.ENABLED)
-                    .networkCachePolicy(CachePolicy.ENABLED)
-                    .diskCache(
-                        DiskCache
-                            .Builder()
-                            .directory(FileSystem.SYSTEM_TEMPORARY_DIRECTORY / "image_cache")
-                            .maxSizeBytes(512L * 1024 * 1024)
-                            .build(),
-                    ).crossfade(true)
-                    .build()
+            Column(modifier = Modifier.fillMaxSize()
+                .clip(RoundedCornerShape(12.dp))) {
+                CustomTitleBar(
+                    title = "SimpMusic",
+                    windowState = windowState,
+                    window = window,
+                    onCloseRequest = {
+                        isVisible = false
+                    },
+                )
+                
+                val context = LocalPlatformContext.current
+                setSingletonImageLoaderFactory {
+                    ImageLoader
+                        .Builder(context)
+                        .components {
+                            add(
+                                OkHttpNetworkFetcherFactory(
+                                    callFactory = {
+                                        OkHttpClient()
+                                    },
+                                ),
+                            )
+                        }.diskCachePolicy(CachePolicy.ENABLED)
+                        .networkCachePolicy(CachePolicy.ENABLED)
+                        .diskCache(
+                            DiskCache
+                                .Builder()
+                                .directory(FileSystem.SYSTEM_TEMPORARY_DIRECTORY / "image_cache")
+                                .maxSizeBytes(512L * 1024 * 1024)
+                                .build(),
+                        ).crossfade(true)
+                        .build()
+                }
+                App()
+                ToastHost()
             }
-            App()
-            ToastHost()
         }
 
         // Mini Player Window (separate window)