# HG changeset patch # User Da Risk # Date 1745532764 14400 # Node ID 4e2dd3a58b748a4e70166ee1f10f8a51ff7caefc # Parent d69bdf1ad4911399af497b75dc5cb01ff13c7ee3 ui:material2: use BrowserLauncher diff -r d69bdf1ad491 -r 4e2dd3a58b74 gradle/libs.versions.toml --- a/gradle/libs.versions.toml Thu Apr 24 18:10:07 2025 -0400 +++ b/gradle/libs.versions.toml Thu Apr 24 18:12:44 2025 -0400 @@ -35,6 +35,7 @@ androidx-lifecycle = "2.8.7" org-jetbrains-androidx-lifecycle = "2.8.4" org-jetbrains-androidx-navigation = "2.8.0-alpha11" +org-jetbrains-compose-material-icons-core = "1.7.3" geekdroid = "geekttrss-1.6.7" @@ -62,6 +63,7 @@ androidx-compose-material = { module = "androidx.compose.material:material" } androidx-compose-material-icons-core = { module = "androidx.compose.material:material-icons-core" } +org-jetbrains-compose-material-icons-core = { module = "org.jetbrains.compose.material:material-icons-core", version.ref = "org-jetbrains-compose-material-icons-core" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } diff -r d69bdf1ad491 -r 4e2dd3a58b74 ui/material2/build.gradle.kts --- a/ui/material2/build.gradle.kts Thu Apr 24 18:10:07 2025 -0400 +++ b/ui/material2/build.gradle.kts Thu Apr 24 18:12:44 2025 -0400 @@ -59,6 +59,7 @@ implementation(project(":core")) implementation(compose.material) implementation(compose.components.resources) + implementation(libs.org.jetbrains.compose.material.icons.core) implementation(libs.org.jetbrains.androidx.navigation.compose) } diff -r d69bdf1ad491 -r 4e2dd3a58b74 ui/material2/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material/OpenSourceLicenseScreen.kt --- a/ui/material2/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material/OpenSourceLicenseScreen.kt Thu Apr 24 18:10:07 2025 -0400 +++ b/ui/material2/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material/OpenSourceLicenseScreen.kt Thu Apr 24 18:12:44 2025 -0400 @@ -57,7 +57,9 @@ import androidx.compose.ui.text.withAnnotation import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp +import com.geekorum.aboutoss.ui.common.BrowserLauncher import com.geekorum.aboutoss.ui.common.OpenSourceLicensesViewModel +import com.geekorum.aboutoss.ui.common.rememberBrowserLauncher /** * Display the opensource license of a dependency @@ -71,6 +73,7 @@ viewModel: OpenSourceLicensesViewModel, dependency: String, onUpClick: () -> Unit, + browserLauncher: BrowserLauncher = rememberBrowserLauncher() ) { val license by viewModel.getLicenseDependency(dependency).collectAsState("") OpenSourceLicenseScreen( @@ -78,10 +81,10 @@ license = license, onUpClick = onUpClick, onUrlClick = { - viewModel.openLinkInBrowser(it) + browserLauncher.launchUrl(it) }, onUrlsFound = { - viewModel.mayLaunchUrl(*it.toTypedArray()) + browserLauncher.mayLaunchUrl(*it.toTypedArray()) } ) }