From eef960877837b731d14afbeaa55c457c8c54786c Mon Sep 17 00:00:00 2001 From: Anand Bose Date: Tue, 31 Dec 2024 19:48:54 +0530 Subject: [PATCH] Replace Kotlin browser APIs with common APIs --- .../commonMain/kotlin/dev/anandbose/ui/app/App.kt | 13 ------------- .../dev/anandbose/ui/widget/UrlButtonLarge.kt | 5 +++-- .../dev/anandbose/ui/widget/UrlButtonSmall.kt | 5 +++-- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/dev/anandbose/ui/app/App.kt b/composeApp/src/commonMain/kotlin/dev/anandbose/ui/app/App.kt index 58d067d..db9e4f6 100644 --- a/composeApp/src/commonMain/kotlin/dev/anandbose/ui/app/App.kt +++ b/composeApp/src/commonMain/kotlin/dev/anandbose/ui/app/App.kt @@ -1,32 +1,19 @@ package dev.anandbose.ui.app -import anandbose.composeapp.generated.resources.Res -import anandbose.composeapp.generated.resources.social_bluesky -import anandbose.composeapp.generated.resources.social_github -import anandbose.composeapp.generated.resources.social_linkedin -import anandbose.composeapp.generated.resources.social_mastodon -import anandbose.composeapp.generated.resources.social_medium -import anandbose.composeapp.generated.resources.social_twitter import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxWithConstraints -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn -import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.GridItemSpan import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.items -import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.verticalScroll import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text diff --git a/composeApp/src/commonMain/kotlin/dev/anandbose/ui/widget/UrlButtonLarge.kt b/composeApp/src/commonMain/kotlin/dev/anandbose/ui/widget/UrlButtonLarge.kt index 8cba1c2..1d6f601 100644 --- a/composeApp/src/commonMain/kotlin/dev/anandbose/ui/widget/UrlButtonLarge.kt +++ b/composeApp/src/commonMain/kotlin/dev/anandbose/ui/widget/UrlButtonLarge.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp -import kotlinx.browser.window @Composable fun UrlButtonLarge( @@ -22,6 +22,7 @@ fun UrlButtonLarge( text: String, url: String, ) { + val uriHandler = LocalUriHandler.current Button( modifier = modifier, shape = MaterialTheme.shapes.medium, @@ -45,7 +46,7 @@ fun UrlButtonLarge( } }, onClick = { - window.open(url, "_blank") + uriHandler.openUri(url) } ) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/dev/anandbose/ui/widget/UrlButtonSmall.kt b/composeApp/src/commonMain/kotlin/dev/anandbose/ui/widget/UrlButtonSmall.kt index 78f752f..471f0bf 100644 --- a/composeApp/src/commonMain/kotlin/dev/anandbose/ui/widget/UrlButtonSmall.kt +++ b/composeApp/src/commonMain/kotlin/dev/anandbose/ui/widget/UrlButtonSmall.kt @@ -10,8 +10,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp -import kotlinx.browser.window @Composable fun UrlButtonSmall( @@ -20,6 +20,7 @@ fun UrlButtonSmall( text: String, url: String, ) { + val uriHandler = LocalUriHandler.current Button( modifier = modifier, content = { @@ -38,7 +39,7 @@ fun UrlButtonSmall( ) }, onClick = { - window.open(url, "_blank") + uriHandler.openUri(url) } ) } \ No newline at end of file