Build: Update to Kotlin 2.0 and Compose Material 3 1.3.0-beta01

zhanghai · May 22, 2024 · 933fed3 · 933fed3
1 parent 23483a8
commit 933fed3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 43 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,6 +17,7 @@
 plugins {
     id("com.android.application")
     kotlin("android")
+    kotlin("plugin.compose")
     kotlin("plugin.serialization")
     id("com.mikepenz.aboutlibraries.plugin")
 }
@@ -76,7 +77,7 @@ dependencies {
     implementation(platform("androidx.compose:compose-bom:2024.05.00"))
     implementation("androidx.compose.animation:animation-graphics")
     implementation("androidx.compose.material:material-icons-extended")
-    implementation("androidx.compose.material3:material3:1.3.0-alpha06")
+    implementation("androidx.compose.material3:material3:1.3.0-beta01")
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")

diff --git a/app/src/main/java/me/zhanghai/android/untracker/ui/component/MaterialClickableText.kt b/app/src/main/java/me/zhanghai/android/untracker/ui/component/MaterialClickableText.kt
diff --git a/app/src/main/java/me/zhanghai/android/untracker/ui/rule/RuleView.kt b/app/src/main/java/me/zhanghai/android/untracker/ui/rule/RuleView.kt
@@ -28,6 +28,7 @@ import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -83,12 +84,18 @@ fun RuleView(
                 val supportingText =
                     AnnotatedString.fromHtml(
                         stringResource(R.string.rule_script_supporting_text),
-                        SpanStyle(
-                            color = MaterialTheme.colorScheme.secondary,
-                            textDecoration = TextDecoration.Underline
-                        )
                     )
-                Text(text = supportingText)
+                Text(
+                    text = supportingText,
+                    linkStyles =
+                        TextDefaults.linkStyles(
+                            linkStyle =
+                                SpanStyle(
+                                    color = MaterialTheme.colorScheme.secondary,
+                                    textDecoration = TextDecoration.Underline
+                                )
+                        )
+                )
             }
         )
     }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,8 +17,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id("com.android.application") version "8.4.1" apply false
-    val kotlinVersion = "1.9.22"
+    val kotlinVersion = "2.0.0"
     kotlin("android") version kotlinVersion apply false
+    kotlin("plugin.compose") version kotlinVersion apply false
     kotlin("plugin.serialization") version kotlinVersion apply false
     id("com.mikepenz.aboutlibraries.plugin") version "10.9.2" apply false
 }