fix(update): The update pop-up window supports displaying multiple versions of the update content between the latest version and the current version

Author: Jankin-Wu

composeApp/src/commonMain/kotlin/com/jankinwu/fntv/client/ui/component/common/AnimatedScrollbar.kt

@@ -50,6 +50,7 @@ fun AnimatedScrollbarLazyColumn(
     modifier: Modifier = Modifier,
     scrollbarWidth: Dp = 6.dp,
     scrollbarOffsetX: Dp = (-1).dp,
+    autoHidden: Boolean = true,
     content: LazyListScope.() -> Unit
 ) {
     var isHovered by remember { mutableStateOf(false) }
@@ -74,6 +75,7 @@ fun AnimatedScrollbarLazyColumn(
                                 isHovered = false
                             }
                         }
+
                         PointerEventType.Exit -> {
                             hideScrollbarJob?.cancel()
                             isHovered = false
@@ -91,7 +93,7 @@ fun AnimatedScrollbarLazyColumn(
         }
 
         AnimatedVisibility(
-            visible = listState.isScrollInProgress || isHovered || isDragging || isScrollbarHovered,
+            visible = if (autoHidden) listState.isScrollInProgress || isHovered || isDragging || isScrollbarHovered else true,
             enter = fadeIn(),
             exit = fadeOut(),
             modifier = Modifier.align(Alignment.CenterEnd)
@@ -103,7 +105,8 @@ fun AnimatedScrollbarLazyColumn(
             if (visibleItemsInfo.isNotEmpty() && layoutInfo.totalItemsCount > 0) {
                 val viewportHeight = layoutInfo.viewportSize.height.toFloat()
 
-                val averageItemHeight = visibleItemsInfo.sumOf { it.size } / visibleItemsInfo.size.toFloat()
+                val averageItemHeight =
+                    visibleItemsInfo.sumOf { it.size } / visibleItemsInfo.size.toFloat()
                 val totalContentHeight = averageItemHeight * layoutInfo.totalItemsCount
 
                 if (totalContentHeight <= viewportHeight) return@AnimatedVisibility
@@ -115,8 +118,10 @@ fun AnimatedScrollbarLazyColumn(
                 val scrollableDistance = totalContentHeight - viewportHeight
                 val scrollbarMaxOffset = viewportHeight - scrollbarHeightPx
 
-                val currentScrollPosition = listState.firstVisibleItemIndex * averageItemHeight + listState.firstVisibleItemScrollOffset
-                val scrollbarOffsetPx = if (scrollableDistance > 0) (currentScrollPosition / scrollableDistance * scrollbarMaxOffset) else 0f
+                val currentScrollPosition =
+                    listState.firstVisibleItemIndex * averageItemHeight + listState.firstVisibleItemScrollOffset
+                val scrollbarOffsetPx =
+                    if (scrollableDistance > 0) (currentScrollPosition / scrollableDistance * scrollbarMaxOffset) else 0f
                 val scrollbarOffset = with(density) { scrollbarOffsetPx.toDp() }
                 // 修改这里的颜色逻辑，根据是否悬浮显示不同颜色
                 val scrollbarColor = if (isScrollbarHovered || isDragging) {
@@ -138,6 +143,7 @@ fun AnimatedScrollbarLazyColumn(
                                             isScrollbarHovered = true
                                             hideScrollbarJob?.cancel()
                                         }
+
                                         PointerEventType.Exit -> {
                                             isScrollbarHovered = false
                                         }
@@ -165,7 +171,8 @@ fun AnimatedScrollbarLazyColumn(
                                     change.consume()
                                     coroutineScope.launch {
                                         if (scrollbarMaxOffset > 0) {
-                                            val scrollDelta = (dragAmount.y / scrollbarMaxOffset) * scrollableDistance
+                                            val scrollDelta =
+                                                (dragAmount.y / scrollbarMaxOffset) * scrollableDistance
                                             listState.scrollBy(scrollDelta)
                                         }
                                     }
@@ -229,7 +236,8 @@ fun AnimatedScrollbarColumn(
                 val scrollableDistance = contentHeight - viewportHeight
                 val scrollbarMaxOffset = viewportHeight - scrollbarHeightPx
 
-                val scrollbarOffsetPx = (scrollState.value.toFloat() / scrollableDistance * scrollbarMaxOffset)
+                val scrollbarOffsetPx =
+                    (scrollState.value.toFloat() / scrollableDistance * scrollbarMaxOffset)
                 val scrollbarOffset = with(density) { scrollbarOffsetPx.toDp() }
 
                 Box(
@@ -250,7 +258,8 @@ fun AnimatedScrollbarColumn(
                                     change.consume()
                                     coroutineScope.launch {
                                         if (scrollbarMaxOffset > 0) {
-                                            val scrollDelta = (dragAmount.y / scrollbarMaxOffset) * scrollableDistance
+                                            val scrollDelta =
+                                                (dragAmount.y / scrollbarMaxOffset) * scrollableDistance
                                             scrollState.scrollBy(scrollDelta)
                                         }
                                     }

composeApp/src/commonMain/kotlin/com/jankinwu/fntv/client/ui/component/common/dialog/UpdateDialog.kt

@@ -67,8 +67,9 @@ fun UpdateDialog(
                         AnimatedScrollbarLazyColumn(
                             listState = lazyListState,
                             modifier = Modifier.height(290.dp),
-                            scrollbarWidth = 2.dp,
-                            scrollbarOffsetX = (-2).dp
+                            scrollbarWidth = 4.dp,
+                            scrollbarOffsetX = (-2).dp,
+                            autoHidden = false
                         ) {
                             item {
                                 Markdown(
@@ -105,8 +106,9 @@ fun UpdateDialog(
                         AnimatedScrollbarLazyColumn(
                             listState = lazyListState,
                             modifier = Modifier.height(290.dp).padding(horizontal = 8.dp),
-                            scrollbarWidth = 2.dp,
-                            scrollbarOffsetX = (-2).dp
+                            scrollbarWidth = 4.dp,
+                            scrollbarOffsetX = (-2).dp,
+                            autoHidden = false
                         ) {
                             item {
                                 Markdown(

composeApp/src/jvmMain/kotlin/com/jankinwu/fntv/client/manager/DesktopUpdateManager.kt

@@ -87,14 +87,14 @@ class DesktopUpdateManager : UpdateManager {
         scope.launch {
             _status.value = UpdateStatus.Checking
             try {
-                val releases = fetchReleases(includePrerelease)
+                val releases = fetchReleases()
 
                 if (releases.isEmpty()) {
                     handleNoReleasesFound()
                     return@launch
                 }
 
-                val bestReleaseInfo = findBestRelease(releases)
+                val bestReleaseInfo = findBestRelease(releases, includePrerelease)
                 if (bestReleaseInfo != null) {
                     processUpdateInfo(bestReleaseInfo, isManual, autoDownload, proxyUrl)
                 } else {
@@ -107,12 +107,8 @@ class DesktopUpdateManager : UpdateManager {
         }
     }
 
-    private suspend fun fetchReleases(includePrerelease: Boolean): List<GitHubRelease> {
-        return if (includePrerelease) {
-            fetchReleasesWithPagination()
-        } else {
-            fetchLatestRelease()
-        }
+    private suspend fun fetchReleases(): List<GitHubRelease> {
+        return fetchReleasesWithPagination()
     }
 
     private suspend fun fetchReleasesWithPagination(): List<GitHubRelease> {
@@ -167,17 +163,6 @@ class DesktopUpdateManager : UpdateManager {
         }
     }
 
-    private suspend fun fetchLatestRelease(): List<GitHubRelease> {
-        val targetUrl = "https://api.github.com/repos/FNOSP/fntv-client-multiplatform/releases/latest"
-        logger.i("Checking update from: $targetUrl")
-        val response = client.get(targetUrl)
-        return if (response.status == HttpStatusCode.NotFound) {
-            emptyList()
-        } else {
-            listOf(response.body<GitHubRelease>())
-        }
-    }
-
     private fun handleNoReleasesFound() {
         logger.i("No releases found")
         _status.value = UpdateStatus.UpToDate
@@ -190,7 +175,7 @@ class DesktopUpdateManager : UpdateManager {
         _latestVersion.value = null
     }
 
-    private fun findBestRelease(releases: List<GitHubRelease>): UpdateInfo? {
+    private fun findBestRelease(releases: List<GitHubRelease>, includePrerelease: Boolean): UpdateInfo? {
         val currentVersion = BuildConfig.VERSION_NAME
         val arch = getSystemArch()
         val osName = getSystemOS()
@@ -202,44 +187,66 @@ class DesktopUpdateManager : UpdateManager {
                 asset.name.contains(arch, ignoreCase = true) &&
                 (targetExtension == null || asset.name.endsWith(targetExtension, ignoreCase = true))
             }
-        }
-
-        if (validReleases.isEmpty()) return null
-
-        val sortedReleases = validReleases.sortedWith { r1, r2 ->
+        }.sortedWith { r1, r2 ->
             val v1 = r1.name.removePrefix("v").trim()
             val v2 = r2.name.removePrefix("v").trim()
             compareVersions(v2, v1) // Descending
         }
 
+        if (validReleases.isEmpty()) return null
+
         val skippedVersions = AppSettingsStore.skippedVersions
-        var bestRelease: GitHubRelease? = null
-        var remoteVersion = ""
+        var targetRelease: GitHubRelease? = null
+        var targetVersionString = ""
 
-        for (release in sortedReleases) {
+        for (release in validReleases) {
             val v = release.name.removePrefix("v").trim()
+            
             if (skippedVersions.contains(v)) {
                 logger.i("Skipping version: $v")
                 continue
             }
-            if (compareVersions(v, currentVersion) > 0) {
-                bestRelease = release
-                remoteVersion = v
+            
+            if (compareVersions(v, currentVersion) <= 0) {
                 break
             }
+
+            if (!includePrerelease && release.prerelease) {
+                continue
+            }
+
+            targetRelease = release
+            targetVersionString = v
+            break
+        }
+
+        if (targetRelease == null) return null
+
+        val notesBuilder = StringBuilder()
+        var addedCount = 0
+        for (release in validReleases) {
+            val v = release.name.removePrefix("v").trim()
+            if (compareVersions(v, targetVersionString) <= 0 && compareVersions(v, currentVersion) > 0) {
+                if (addedCount > 0) {
+                    notesBuilder.append("\n\n")
+                }
+                notesBuilder.append("#### ${release.name}\n")
+                notesBuilder.append(release.body)
+                addedCount++
+            }
         }
 
-        return bestRelease?.let { release ->
-            logger.i("Current version: $currentVersion, Best remote version: $remoteVersion")
+        return targetRelease.let { release ->
+            logger.i("Current version: $currentVersion, Target version: $targetVersionString")
             val asset = release.assets.find {
                 it.name.contains(osName, ignoreCase = true) &&
                 it.name.contains(arch, ignoreCase = true) &&
                 (targetExtension == null || it.name.endsWith(targetExtension, ignoreCase = true))
             }
             asset?.let {
                 UpdateInfo(
-                    version = remoteVersion,
-                    releaseNotes = release.body,
+                    version = targetVersionString,
+                    releaseNotes = notesBuilder.toString(),
                     downloadUrl = it.browserDownloadUrl,
                     hash = it.digest?.removePrefix("sha256:"),
                     fileName = it.name,