Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85d31b76 authored by Natnael Belay's avatar Natnael Belay Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Fix TextLinkStyles in LinkAnnotation.Url" into main

parents 56e98354 314b5570

packages/SettingsLib/Spa/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ val androidTop: String = File(rootDir, "../../../../..").canonicalPath 


allprojects {

    extra["androidTop"] = androidTop

    extra["jetpackComposeVersion"] = "1.7.0-alpha08"

    extra["jetpackComposeVersion"] = "1.7.0-SNAPSHOT"

}



subprojects {

packages/SettingsLib/Spa/settings.gradle.kts

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ dependencyResolutionManagement { 
            }

        }

        mavenCentral()

        maven {

            url = uri("https://androidx.dev/snapshots/builds/11846308/artifacts/repository")

        }

        maven {

            url = uri("https://jitpack.io")

            content {

packages/SettingsLib/Spa/spa/build.gradle.kts

+2 −2
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ dependencies { 
    api("androidx.slice:slice-builders:1.1.0-alpha02")

    api("androidx.slice:slice-core:1.1.0-alpha02")

    api("androidx.slice:slice-view:1.1.0-alpha02")

    api("androidx.compose.material3:material3:1.3.0-alpha06")

    api("androidx.compose.material3:material3:1.3.0-SNAPSHOT")

    api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion")

    api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion")

    api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion")

    api("androidx.lifecycle:lifecycle-livedata-ktx")

    api("androidx.lifecycle:lifecycle-runtime-compose")

    api("androidx.navigation:navigation-compose:2.8.0-alpha08")

    api("androidx.navigation:navigation-compose:2.8.0-beta01")

    api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha")

    api("com.google.android.material:material:1.11.0")

    debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion")

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/AnnotatedStringResource.kt

+4 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import androidx.compose.ui.platform.LocalContext 
import androidx.compose.ui.text.AnnotatedString

import androidx.compose.ui.text.LinkAnnotation

import androidx.compose.ui.text.SpanStyle

import androidx.compose.ui.text.TextLinkStyles

import androidx.compose.ui.text.buildAnnotatedString

import androidx.compose.ui.text.font.FontStyle

import androidx.compose.ui.text.font.FontWeight
@@ -98,7 +99,9 @@ private fun AnnotatedString.Builder.addUrlSpan( 
) {

    val url = LinkAnnotation.Url(

        url = urlSpan.url,

        styles = TextLinkStyles(

            style = SpanStyle(color = urlSpanColor, textDecoration = TextDecoration.Underline),

        ),

    )

    addLink(url, start, end)

}

packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/framework/util/AnnotatedStringResourceTest.kt

+6 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import androidx.compose.ui.test.junit4.createComposeRule 
import androidx.compose.ui.text.AnnotatedString

import androidx.compose.ui.text.LinkAnnotation

import androidx.compose.ui.text.SpanStyle

import androidx.compose.ui.text.TextLinkStyles

import androidx.compose.ui.text.font.FontStyle

import androidx.compose.ui.text.font.FontWeight

import androidx.compose.ui.text.style.TextDecoration
@@ -47,11 +48,13 @@ class AnnotatedStringResourceTest { 
                AnnotatedString.Range(

                    item = LinkAnnotation.Url(

                        url = "https://www.android.com/",

                        styles = TextLinkStyles(

                            style = SpanStyle(

                                color = MaterialTheme.colorScheme.primary,

                                textDecoration = TextDecoration.Underline,

                            ),

                        ),

                    ),

                    start = 31,

                    end = 35,

                )