diff --git a/briar-desktop/build.gradle.kts b/briar-desktop/build.gradle.kts index 094b167067e580f3b50b3c5d38d11eea32c202b4..6e9b7f787f7af786f73622d1b6117d52889ee9fc 100644 --- a/briar-desktop/build.gradle.kts +++ b/briar-desktop/build.gradle.kts @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") version "1.7.20" kotlin("kapt") version "1.7.20" - id("org.jetbrains.compose") version "1.3.0" + id("org.jetbrains.compose") version "1.4.0" id("de.mobanisto.pinpit") version "0.3.0" id("java") id("org.jlleitschuh.gradle.ktlint") version "10.1.0" diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/add/remote/AddContactDialog.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/add/remote/AddContactDialog.kt index 43795303df5094fbec9d930f6cdc372fc21ce62a..74c50bcb63248de0743c46634234a9b87bc856cc 100644 --- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/add/remote/AddContactDialog.kt +++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/add/remote/AddContactDialog.kt @@ -64,7 +64,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.input.pointer.PointerIconDefaults +import androidx.compose.ui.input.pointer.PointerIcon import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.platform.ClipboardManager import androidx.compose.ui.platform.LocalClipboardManager @@ -420,7 +420,7 @@ private fun ContactLink( } } }, - modifier = Modifier.pointerHoverIcon(PointerIconDefaults.Default) + modifier = Modifier.pointerHoverIcon(PointerIcon.Default) ) } ) diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt index 3fe54c14d46c0e09c0d26a63f7799d2e3b232455..6bd8d46df0d1132e8912222ee4b1600fa0a87f7a 100644 --- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt +++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt @@ -45,7 +45,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ImageBitmap -import androidx.compose.ui.input.pointer.PointerIconDefaults +import androidx.compose.ui.input.pointer.PointerIcon import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.res.ResourceLoader import androidx.compose.ui.res.loadImageBitmap @@ -132,7 +132,7 @@ fun ConversationInput( iconTint = MaterialTheme.colors.sendButton, contentDescription = i18n("access.message.send"), onClick = onSend, - modifier = Modifier.padding(4.dp).size(32.dp).pointerHoverIcon(PointerIconDefaults.Default), + modifier = Modifier.padding(4.dp).size(32.dp).pointerHoverIcon(PointerIcon.Default), ) } ) diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/conversation/ThreadedGroupConversationInput.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/conversation/ThreadedGroupConversationInput.kt index 89b77665cb5f6c0d40571853fca21bf753ca2a0c..b0339307f2adb3c90f7b53187c89dee758eadac9 100644 --- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/conversation/ThreadedGroupConversationInput.kt +++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/threadedgroup/conversation/ThreadedGroupConversationInput.kt @@ -41,7 +41,7 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Alignment.Companion.Top import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier -import androidx.compose.ui.input.pointer.PointerIconDefaults +import androidx.compose.ui.input.pointer.PointerIcon import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.unit.dp import org.briarproject.bramble.util.StringUtils.utf8IsTooLong @@ -137,7 +137,7 @@ fun ThreadedGroupConversationInput( modifier = Modifier .padding(4.dp) .size(32.dp) - .pointerHoverIcon(PointerIconDefaults.Default), + .pointerHoverIcon(PointerIcon.Default), ) } ) diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/ColoredIconButton.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/ColoredIconButton.kt index 870c8ce0a492e9718afc8d43704568d8f814ab36..ed3e291d09eec9bbeee6f6093a44bd13e04f53d6 100644 --- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/ColoredIconButton.kt +++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/ColoredIconButton.kt @@ -34,7 +34,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.input.pointer.PointerIconDefaults +import androidx.compose.ui.input.pointer.PointerIcon import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp @@ -52,7 +52,7 @@ fun ColoredIconButton( ) = IconButton( onClick = onClick, modifier = modifier - .pointerHoverIcon(PointerIconDefaults.Default) + .pointerHoverIcon(PointerIcon.Default) .background(color, CircleShape) .then(Modifier.size(32.dp)), enabled = enabled, @@ -82,7 +82,7 @@ fun ColoredIconButton( contentDescription = contentDescription, onClick = onClick, modifier = modifier - .pointerHoverIcon(PointerIconDefaults.Default) + .pointerHoverIcon(PointerIcon.Default) .background(color, CircleShape) .then(Modifier.size(32.dp)), iconSize = iconSize,