From 02e7a3294af771e21e8b9ecb6b05a4304f4aae40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Fri, 14 Apr 2023 16:33:32 +0200
Subject: [PATCH] Upgrade compose to 1.4.0 and apply API fixes
---
briar-desktop/build.gradle.kts | 2 +-
.../briar/desktop/contact/add/remote/AddContactDialog.kt | 4 ++--
.../briar/desktop/conversation/ConversationInput.kt | 4 ++--
.../conversation/ThreadedGroupConversationInput.kt | 4 ++--
.../org/briarproject/briar/desktop/ui/ColoredIconButton.kt | 6 +++---
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/briar-desktop/build.gradle.kts b/briar-desktop/build.gradle.kts
index 094b167067..6e9b7f787f 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 43795303df..74c50bcb63 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 3fe54c14d4..6bd8d46df0 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 89b77665cb..b0339307f2 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 870c8ce0a4..ed3e291d09 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,
--
GitLab