deps: update dependency org.jetbrains.compose to v1.7.0

build.gradle.kts

@@ -45,7 +45,9 @@ repositories {
 }
 
 dependencies {
+    implementation(compose.components.resources)
     implementation(compose.desktop.currentOs)
+    implementation(compose.materialIconsExtended)
     implementation(libs.bundles.ort)
     implementation(libs.bundles.richtext)
     implementation(libs.dataTableMaterial)

detekt.yml

@@ -23,6 +23,8 @@ formatting:
     active: false
   MaximumLineLength:
     active: false
+  NoWildcardImports:
+    active: false
 
 naming:
   FunctionNaming:
@@ -42,6 +44,11 @@ style:
   UnusedPrivateMember:
     active: true
     ignoreAnnotated: ['Preview']
+  WildcardImport:
+    excludeImports:
+      - 'androidx.compose.material.icons.automirrored.filled.*'
+      - 'androidx.compose.material.icons.filled.*'
+      - 'org.ossreviewtoolkit.workbench.ort_workbench.generated.resources.*'
 
 ORT:
   OrtImportOrder:

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 detektPlugin = "1.23.7"
-composePlugin = "1.6.11"
+composePlugin = "1.7.0"
 kotlinPlugin = "2.0.21"
 versionsPlugin = "0.51.0"
 

src/main/kotlin/Main.kt

@@ -1,25 +1,34 @@
 package org.ossreviewtoolkit.workbench
 
 import androidx.compose.ui.graphics.painter.BitmapPainter
-import androidx.compose.ui.res.loadImageBitmap
-import androidx.compose.ui.res.useResource
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.WindowState
 import androidx.compose.ui.window.singleWindowApplication
 
+import java.net.URI
+
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.decodeToImageBitmap
+
+import org.ossreviewtoolkit.workbench.ort_workbench.generated.resources.Res
 import org.ossreviewtoolkit.workbench.ui.App
 import org.ossreviewtoolkit.workbench.ui.WorkbenchController
 
+@OptIn(ExperimentalResourceApi::class)
 fun main() {
     val workbenchController = WorkbenchController()
 
+    // See https://github.com/JetBrains/compose-multiplatform/issues/2369.
+    val iconBytes = URI.create(Res.getUri("drawable/app-icon/icon.png")).toURL().readBytes()
+    val icon = BitmapPainter(iconBytes.decodeToImageBitmap())
+
     singleWindowApplication(
         title = "ORT Workbench",
         state = WindowState(
             size = DpSize(1440.dp, 810.dp)
         ),
-        icon = BitmapPainter(useResource("app-icon/icon.png", ::loadImageBitmap))
+        icon = icon
     ) {
         App(workbenchController)
     }

src/main/kotlin/composables/Expandable.kt

@@ -10,13 +10,12 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-
-import org.ossreviewtoolkit.workbench.utils.MaterialIcon
 
 @Composable
 fun Expandable(
@@ -35,8 +34,8 @@ fun Expandable(
             onClick = { expanded.targetState = !expanded.currentState },
             modifier = Modifier.align(Alignment.Top)
         ) {
-            val resource = (if (expanded.currentState) MaterialIcon.EXPAND_LESS else MaterialIcon.EXPAND_MORE).resource
-            Icon(painterResource(resource), "expand")
+            val image = if (expanded.currentState) Icons.Default.ExpandLess else Icons.Default.ExpandMore
+            Icon(image, "expand")
         }
     }
 

src/main/kotlin/composables/ExpandableText.kt

@@ -7,22 +7,21 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
 import com.halilibo.richtext.markdown.Markdown
 import com.halilibo.richtext.ui.material.RichText
 
-import org.ossreviewtoolkit.workbench.utils.MaterialIcon
-
 @Composable
 fun ExpandableText(text: String, unexpandedHeight: Dp = 20.dp, fontFamily: FontFamily? = null) {
     var expanded by rememberSaveable { mutableStateOf(false) }
@@ -31,8 +30,8 @@ fun ExpandableText(text: String, unexpandedHeight: Dp = 20.dp, fontFamily: FontF
     Row(modifier = modifier.animateContentSize()) {
         Text(text, modifier = Modifier.weight(1f), fontFamily = fontFamily)
 
-        val resource = (if (expanded) MaterialIcon.EXPAND_LESS else MaterialIcon.EXPAND_MORE).resource
-        Icon(painterResource(resource), "expand", modifier = Modifier.clickable { expanded = !expanded })
+        val image = if (expanded) Icons.Default.ExpandLess else Icons.Default.ExpandMore
+        Icon(image, "expand", modifier = Modifier.clickable { expanded = !expanded })
     }
 }
 
@@ -46,7 +45,7 @@ fun ExpandableMarkdown(text: String, unexpandedHeight: Dp = 20.dp) {
             Markdown(text)
         }
 
-        val resource = (if (expanded) MaterialIcon.EXPAND_LESS else MaterialIcon.EXPAND_MORE).resource
-        Icon(painterResource(resource), "expand", modifier = Modifier.clickable { expanded = !expanded })
+        val image = if (expanded) Icons.Default.ExpandLess else Icons.Default.ExpandMore
+        Icon(image, "expand", modifier = Modifier.clickable { expanded = !expanded })
     }
 }

src/main/kotlin/composables/FilterTextField.kt

@@ -9,27 +9,26 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.TextField
 import androidx.compose.material.TextFieldDefaults
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 
-import org.ossreviewtoolkit.workbench.utils.MaterialIcon
-
 @Composable
 fun FilterTextField(
     filterText: String,
     label: String = "Filter",
-    icon: MaterialIcon = MaterialIcon.FILTER,
+    image: ImageVector = Icons.Default.Filter,
     modifier: Modifier = Modifier,
     onFilterChange: (String) -> Unit
 ) {
-    val filterIcon = painterResource(icon.resource)
     var localFilterText by remember(filterText) { mutableStateOf(filterText) }
 
     TextField(
@@ -40,7 +39,7 @@ fun FilterTextField(
         },
         placeholder = { Text(label) },
         singleLine = true,
-        leadingIcon = { Icon(filterIcon, label) },
+        leadingIcon = { Icon(image, label) },
         shape = RoundedCornerShape(10.dp),
         colors = TextFieldDefaults.textFieldColors(
             focusedIndicatorColor = Color.Transparent,

src/main/kotlin/composables/IconText.kt

@@ -4,14 +4,14 @@ import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.layout.Row
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.res.painterResource
-
-import org.ossreviewtoolkit.workbench.utils.MaterialIcon
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
 
 private const val ICON_SCALE = 0.6f
 
@@ -36,7 +36,7 @@ fun IconText(
 private fun IconTextPreview() {
     Preview {
         IconText(
-            icon = painterResource(MaterialIcon.BUG_REPORT.resource),
+            icon = rememberVectorPainter(Icons.Default.BugReport),
             text = "Issues"
         )
     }

src/main/kotlin/composables/Link.kt

@@ -13,17 +13,18 @@ import androidx.compose.material.Icon
 import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.unit.dp
 
 import java.io.File
 
-import org.ossreviewtoolkit.workbench.utils.MaterialIcon
 import org.ossreviewtoolkit.workbench.utils.browseDirectory
 import org.ossreviewtoolkit.workbench.utils.editFile
 import org.ossreviewtoolkit.workbench.utils.openUrlInBrowser
@@ -75,21 +76,21 @@ private fun LinkPreview() {
 
 @Composable
 fun BrowseDirectoryLink(text: String, file: File) {
-    Link(text, tooltip = file.path, icon = painterResource(MaterialIcon.OPEN_IN_NEW.resource)) {
+    Link(text, tooltip = file.path, icon = rememberVectorPainter(Icons.AutoMirrored.Default.OpenInNew)) {
         browseDirectory(file)
     }
 }
 
 @Composable
 fun EditFileLink(text: String, file: File) {
-    Link(text, tooltip = file.path, icon = painterResource(MaterialIcon.OPEN_IN_NEW.resource)) {
+    Link(text, tooltip = file.path, icon = rememberVectorPainter(Icons.AutoMirrored.Default.OpenInNew)) {
         editFile(file)
     }
 }
 
 @Composable
 fun WebLink(text: String, url: String) {
-    Link(text, tooltip = url, icon = painterResource(MaterialIcon.OPEN_IN_NEW.resource)) {
+    Link(text, tooltip = url, icon = rememberVectorPainter(Icons.AutoMirrored.Default.OpenInNew)) {
         openUrlInBrowser(url)
     }
 }

src/main/kotlin/composables/ListScreenAppBar.kt

@@ -6,13 +6,12 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 
-import org.ossreviewtoolkit.workbench.utils.MaterialIcon
-
 @Composable
 fun ListScreenAppBar(
     filterText: String,
@@ -27,7 +26,7 @@ fun ListScreenAppBar(
 
                 IconButton(onClick = onToggleFilter) {
                     Icon(
-                        painterResource(MaterialIcon.FILTER_LIST.resource),
+                        Icons.Default.FilterList,
                         contentDescription = "Filter",
                         modifier = Modifier.size(32.dp)
                     )

src/main/kotlin/composables/SeverityIcon.kt

@@ -4,9 +4,10 @@ import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.Icon
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
@@ -15,14 +16,13 @@ import org.ossreviewtoolkit.workbench.theme.Error
 import org.ossreviewtoolkit.workbench.theme.Hint
 import org.ossreviewtoolkit.workbench.theme.LightGray
 import org.ossreviewtoolkit.workbench.theme.Warning
-import org.ossreviewtoolkit.workbench.utils.MaterialIcon
 
 @Composable
 fun SeverityIcon(severity: Severity, resolved: Boolean = false, size: Dp = 24.dp) {
     val icon = when (severity) {
-        Severity.HINT -> MaterialIcon.INFO
-        Severity.WARNING -> MaterialIcon.WARNING
-        Severity.ERROR -> MaterialIcon.ERROR
+        Severity.HINT -> Icons.Default.Info
+        Severity.WARNING -> Icons.Default.Warning
+        Severity.ERROR -> Icons.Default.Error
     }
 
     val tint = if (resolved) {
@@ -36,7 +36,7 @@ fun SeverityIcon(severity: Severity, resolved: Boolean = false, size: Dp = 24.dp
     }
 
     Icon(
-        painterResource(icon.resource),
+        icon,
         contentDescription = severity.name,
         tint = tint,
         modifier = Modifier.size(size)

src/main/kotlin/composables/tree/Tree.kt

@@ -12,23 +12,25 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.input.key.KeyEventType
 import androidx.compose.ui.input.key.key
 import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.input.key.type
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
 import org.ossreviewtoolkit.workbench.composables.Preview
-import org.ossreviewtoolkit.workbench.utils.MaterialIcon
 
 @Composable
 fun <VALUE> Tree(
@@ -37,8 +39,8 @@ fun <VALUE> Tree(
     startExpanded: Boolean = false,
     listState: LazyListState = rememberLazyListState(),
     indentation: Dp = 5.dp,
-    expandIcon: MaterialIcon = MaterialIcon.CHEVRON_RIGHT,
-    expandedIcon: MaterialIcon = MaterialIcon.EXPAND_MORE,
+    expandIcon: ImageVector = Icons.Default.ChevronRight,
+    expandedIcon: ImageVector = Icons.Default.ExpandMore,
     iconSize: Dp = 12.dp,
     itemContent: @Composable (item: TreeItem<VALUE>, isSelected: Boolean) -> Unit = { item, isSelected ->
         DefaultItemContent(item, isSelected)
@@ -62,8 +64,8 @@ fun <VALUE> Tree(
     state: TreeState<VALUE>,
     listState: LazyListState = rememberLazyListState(),
     indentation: Dp = 5.dp,
-    expandIcon: MaterialIcon = MaterialIcon.CHEVRON_RIGHT,
-    expandedIcon: MaterialIcon = MaterialIcon.EXPAND_MORE,
+    expandIcon: ImageVector = Icons.Default.ChevronRight,
+    expandedIcon: ImageVector = Icons.Default.ExpandMore,
     iconSize: Dp = 12.dp,
     itemContent: @Composable (item: TreeItem<VALUE>, isSelected: Boolean) -> Unit = { item, isSelected ->
         DefaultItemContent(item, isSelected)
@@ -127,7 +129,7 @@ fun <VALUE> Tree(
 
                 if (icon != null) {
                     Icon(
-                        painter = painterResource(icon.resource),
+                        painter = rememberVectorPainter(icon),
                         contentDescription = null,
                         modifier = Modifier.size(iconSize).clickable { state.toggleExpanded(item) }
                     )