Skip to content
Snippets Groups Projects
Verified Commit 02e7a329 authored by Sebastian's avatar Sebastian
Browse files

Upgrade compose to 1.4.0 and apply API fixes

parent c8c06dff
No related tags found
1 merge request!256Automated screenshots via testing API
Pipeline #14194 passed
......@@ -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"
......
......@@ -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)
)
}
)
......
......@@ -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),
)
}
)
......
......@@ -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),
)
}
)
......
......@@ -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,
......
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