diff --git a/build.gradle.kts b/build.gradle.kts index e4463ef21a48ab10e35b29566fb57d13711e7abb..83f58b0232736da42cf0efaf0184f2871995d8fe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,9 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.5.10" - kotlin("kapt") version "1.5.10" - id("org.jetbrains.compose") version "0.4.0" + kotlin("jvm") version "1.5.21" + kotlin("kapt") version "1.5.21" + id("org.jetbrains.compose") version "1.0.0-alpha3" id("java") id("idea") id("org.jlleitschuh.gradle.ktlint") version("10.1.0") @@ -17,11 +17,13 @@ version = "0.1" repositories { mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + google() jcenter() } dependencies { implementation(compose.desktop.currentOs) + implementation(compose.uiTooling) implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0") implementation("com.github.ajalt:clikt:2.2.0") diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt index c50621da2fa56c7ed88d3f7bc33c95d46111c265..11faa1253f0a3127bcc030691e328a55a0f89906 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt @@ -28,6 +28,8 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.imageFromResource import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.loadImageBitmap +import androidx.compose.ui.res.useResource import androidx.compose.ui.unit.dp import org.briarproject.briar.desktop.paul.theme.briarBlack import org.briarproject.briar.desktop.paul.theme.briarBlue @@ -41,7 +43,7 @@ fun BriarSidebar(uiMode: UiModes, setUiMode: (UiModes) -> Unit) { onClick = {} ) { Image( - bitmap = imageFromResource("images/profile_images/p0.png"), + bitmap = useResource("images/profile_images/p0.png") { loadImageBitmap(it) }, "my_profile_image", modifier = Modifier.size(44.dp).align(Alignment.CenterHorizontally).clip( CircleShape diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt index 3eeb5c95741464d9fb2194f5f091b5e961cf60a3..a9687d02e1ba7d11b8537796ca3203c678a4f55d 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt @@ -32,6 +32,7 @@ import androidx.compose.material.CircularProgressIndicator import androidx.compose.material.Divider import androidx.compose.material.DropdownMenu import androidx.compose.material.DropdownMenuItem +import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.Icon import androidx.compose.material.IconButton import androidx.compose.material.Scaffold @@ -129,6 +130,7 @@ fun PrivateMessageView( } } +@OptIn(ExperimentalMaterialApi::class) @Composable fun AddContactDialog(isVisible: Boolean, onCancel: (Boolean) -> Unit) { if (!isVisible) { @@ -194,11 +196,12 @@ fun AddContactDialog(isVisible: Boolean, onCancel: (Boolean) -> Unit) { backgroundColor = briarBlue, contentColor = Color.White, - modifier = Modifier.border(1.dp, color = divider), - properties = DialogProperties(resizable = false, undecorated = true, size = IntSize(600, 300)) + modifier = Modifier.border(1.dp, color = divider).size(600.dp, 300.dp), ) } + +@OptIn(ExperimentalMaterialApi::class) @Composable fun SearchTextField(searchValue: String, onValueChange: (String) -> Unit, onContactAdd: (Boolean) -> Unit) { TextField(