Skip to content
Snippets Groups Projects
Verified Commit 9cb1cda7 authored by Mikolai Gütschow's avatar Mikolai Gütschow
Browse files

bump Compose version to latest stable (alpha) release

parent bd086da3
No related branches found
No related tags found
1 merge request!14Update Compose to newest version
...@@ -3,9 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat ...@@ -3,9 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
kotlin("jvm") version "1.5.10" kotlin("jvm") version "1.5.21"
kotlin("kapt") version "1.5.10" kotlin("kapt") version "1.5.21"
id("org.jetbrains.compose") version "0.4.0" id("org.jetbrains.compose") version "1.0.0-alpha3"
id("java") id("java")
id("idea") id("idea")
id("org.jlleitschuh.gradle.ktlint") version("10.1.0") id("org.jlleitschuh.gradle.ktlint") version("10.1.0")
...@@ -17,11 +17,13 @@ version = "0.1" ...@@ -17,11 +17,13 @@ version = "0.1"
repositories { repositories {
mavenCentral() mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
google()
jcenter() jcenter()
} }
dependencies { dependencies {
implementation(compose.desktop.currentOs) implementation(compose.desktop.currentOs)
implementation(compose.uiTooling)
implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0") implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0")
implementation("com.github.ajalt:clikt:2.2.0") implementation("com.github.ajalt:clikt:2.2.0")
......
...@@ -28,6 +28,8 @@ import androidx.compose.ui.draw.clip ...@@ -28,6 +28,8 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.imageFromResource import androidx.compose.ui.graphics.imageFromResource
import androidx.compose.ui.graphics.vector.ImageVector 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 androidx.compose.ui.unit.dp
import org.briarproject.briar.desktop.paul.theme.briarBlack import org.briarproject.briar.desktop.paul.theme.briarBlack
import org.briarproject.briar.desktop.paul.theme.briarBlue import org.briarproject.briar.desktop.paul.theme.briarBlue
...@@ -41,7 +43,7 @@ fun BriarSidebar(uiMode: UiModes, setUiMode: (UiModes) -> Unit) { ...@@ -41,7 +43,7 @@ fun BriarSidebar(uiMode: UiModes, setUiMode: (UiModes) -> Unit) {
onClick = {} onClick = {}
) { ) {
Image( Image(
bitmap = imageFromResource("images/profile_images/p0.png"), bitmap = useResource("images/profile_images/p0.png") { loadImageBitmap(it) },
"my_profile_image", "my_profile_image",
modifier = Modifier.size(44.dp).align(Alignment.CenterHorizontally).clip( modifier = Modifier.size(44.dp).align(Alignment.CenterHorizontally).clip(
CircleShape CircleShape
......
...@@ -32,6 +32,7 @@ import androidx.compose.material.CircularProgressIndicator ...@@ -32,6 +32,7 @@ import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material.Divider import androidx.compose.material.Divider
import androidx.compose.material.DropdownMenu import androidx.compose.material.DropdownMenu
import androidx.compose.material.DropdownMenuItem import androidx.compose.material.DropdownMenuItem
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.Icon import androidx.compose.material.Icon
import androidx.compose.material.IconButton import androidx.compose.material.IconButton
import androidx.compose.material.Scaffold import androidx.compose.material.Scaffold
...@@ -129,6 +130,7 @@ fun PrivateMessageView( ...@@ -129,6 +130,7 @@ fun PrivateMessageView(
} }
} }
@OptIn(ExperimentalMaterialApi::class)
@Composable @Composable
fun AddContactDialog(isVisible: Boolean, onCancel: (Boolean) -> Unit) { fun AddContactDialog(isVisible: Boolean, onCancel: (Boolean) -> Unit) {
if (!isVisible) { if (!isVisible) {
...@@ -194,11 +196,12 @@ fun AddContactDialog(isVisible: Boolean, onCancel: (Boolean) -> Unit) { ...@@ -194,11 +196,12 @@ fun AddContactDialog(isVisible: Boolean, onCancel: (Boolean) -> Unit) {
backgroundColor = briarBlue, backgroundColor = briarBlue,
contentColor = Color.White, contentColor = Color.White,
modifier = Modifier.border(1.dp, color = divider), modifier = Modifier.border(1.dp, color = divider).size(600.dp, 300.dp),
properties = DialogProperties(resizable = false, undecorated = true, size = IntSize(600, 300))
) )
} }
@OptIn(ExperimentalMaterialApi::class)
@Composable @Composable
fun SearchTextField(searchValue: String, onValueChange: (String) -> Unit, onContactAdd: (Boolean) -> Unit) { fun SearchTextField(searchValue: String, onValueChange: (String) -> Unit, onContactAdd: (Boolean) -> Unit) {
TextField( TextField(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment