使用新的超链接API

Author: zerofancy

build.gradle.kts

@@ -26,15 +26,16 @@ kotlin {
     sourceSets {
         val desktopMain by getting
         commonMain.dependencies {
-            implementation(compose.components.resources)
-        }
-
-        desktopMain.dependencies {
             implementation(compose.runtime)
             implementation(compose.foundation)
             implementation(compose.material)
             implementation(compose.ui)
             implementation(compose.components.uiToolingPreview)
+            implementation(compose.components.resources)
+        }
+
+        desktopMain.dependencies {
+            implementation(compose.desktop.currentOs)
             implementation("org.apache.commons:commons-lang3:3.12.0")
             implementation("org.mapdb:mapdb:3.0.8") {
                 exclude("org.jetbrains.kotlin", "kotlin-stdlib")

src/desktopMain/kotlin/top/ntutn/floatclock/AboutDialog.kt

@@ -1,26 +1,22 @@
 package top.ntutn.floatclock
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.text.ClickableText
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.text.withLink
 import androidx.compose.ui.unit.dp
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.painterResource
 import top.ntutn.floatclock.generated.resources.Res
 import top.ntutn.floatclock.generated.resources.clock
-import top.ntutn.floatclock.util.DesktopBrowse
-import java.net.URI
 
 @Composable
 fun AboutContent() {
@@ -37,16 +33,10 @@ fun AboutContent() {
             Spacer(modifier.height(8.dp))
             Text("${BuildConfig.APP_NAME} ${BuildConfig.APP_VERSION}", modifier = modifier)
             Spacer(modifier.height(8.dp))
-            ClickableText(buildAnnotatedString {
-                pushStringAnnotation(tag = "URL", annotation = url)
-                withStyle(style = SpanStyle(color = Color.Blue, fontWeight = FontWeight.Bold)) {
+            Text(buildAnnotatedString {
+                withLink(LinkAnnotation.Url(url)) {
                     append(url)
                 }
-                pop()
-            }, modifier = modifier, onClick = {
-                GlobalScope.launch(Dispatchers.Default) {
-                    DesktopBrowse.browse(URI.create(url))
-                }
-            })
+            }, modifier = modifier)
         }
 }