chore: Update kotlin libraries

Signed-off-by: Felix Hilgers <[email protected]>
amosproj · Dec 2, 2024 · 1e67911 · 1e67911
1 parent e8b52f5
commit 1e67911
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/frontend/app/src/main/java/de/amosproj3/ziofa/ui/visualization/composables/MetricDropdown.kt b/frontend/app/src/main/java/de/amosproj3/ziofa/ui/visualization/composables/MetricDropdown.kt
@@ -1,3 +1,4 @@
+// SPDX-FileCopyrightText: 2024 Felix Hilgers <[email protected]>
 // SPDX-FileCopyrightText: 2024 Luca Bretting <[email protected]>
 //
 // SPDX-License-Identifier: MIT
@@ -12,6 +13,7 @@ import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExposedDropdownMenuBox
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MenuAnchorType
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
@@ -46,7 +48,7 @@ fun MetricDropdown(
                 readOnly = true,
                 label = { Text(title) },
                 trailingIcon = { Icon(Icons.Default.ArrowDropDown, contentDescription = null) },
-                modifier = Modifier.menuAnchor().fillMaxWidth(),
+                modifier = Modifier.menuAnchor(MenuAnchorType.PrimaryNotEditable).fillMaxWidth(),
             )
             ExposedDropdownMenu(
                 modifier = modifier,

diff --git a/frontend/app/src/main/java/de/amosproj3/ziofa/ui/visualization/composables/VicoBarChart.kt b/frontend/app/src/main/java/de/amosproj3/ziofa/ui/visualization/composables/VicoBarChart.kt
@@ -1,3 +1,4 @@
+// SPDX-FileCopyrightText: 2024 Felix Hilgers <[email protected]>
 // SPDX-FileCopyrightText: 2024 Luca Bretting <[email protected]>
 //
 // SPDX-License-Identifier: MIT
@@ -27,6 +28,7 @@ import com.patrykandpatrick.vico.compose.common.component.rememberShapeComponent
 import com.patrykandpatrick.vico.compose.common.component.rememberTextComponent
 import com.patrykandpatrick.vico.compose.common.component.shapeComponent
 import com.patrykandpatrick.vico.compose.common.dimensions
+import com.patrykandpatrick.vico.compose.common.fill
 import com.patrykandpatrick.vico.core.cartesian.axis.HorizontalAxis
 import com.patrykandpatrick.vico.core.cartesian.axis.VerticalAxis
 import com.patrykandpatrick.vico.core.cartesian.data.CartesianChartModelProducer
@@ -74,7 +76,7 @@ private fun CartesianChartModelProducer.TimeSeriesChart(
                     ColumnCartesianLayer.ColumnProvider.series(
                         xLabels.map { _ ->
                             rememberLineComponent(
-                                color = Color(0xff6438a7),
+                                fill = fill(Color(0xff6438a7)),
                                 shape =
                                     CorneredShape.rounded(
                                         bottomLeftPercent = 40,
@@ -94,8 +96,8 @@ private fun CartesianChartModelProducer.TimeSeriesChart(
                                 padding = dimensions(8.dp, 2.dp),
                                 background =
                                     rememberShapeComponent(
-                                        MaterialTheme.colorScheme.secondary,
-                                        CorneredShape.Pill,
+                                        fill = fill(MaterialTheme.colorScheme.secondary),
+                                        shape = CorneredShape.Pill,
                                     ),
                             ),
                         title = chartMetadata.yLabel,
@@ -109,8 +111,8 @@ private fun CartesianChartModelProducer.TimeSeriesChart(
                                 padding = dimensions(8.dp, 2.dp),
                                 background =
                                     shapeComponent(
-                                        MaterialTheme.colorScheme.primary,
-                                        CorneredShape.Pill,
+                                        fill = fill(MaterialTheme.colorScheme.primary),
+                                        shape = CorneredShape.Pill,
                                     ),
                             ),
                         title = chartMetadata.xLabel,

diff --git a/frontend/app/src/main/java/de/amosproj3/ziofa/ui/visualization/composables/VicoTimeSeries.kt b/frontend/app/src/main/java/de/amosproj3/ziofa/ui/visualization/composables/VicoTimeSeries.kt
@@ -1,3 +1,4 @@
+// SPDX-FileCopyrightText: 2024 Felix Hilgers <[email protected]>
 // SPDX-FileCopyrightText: 2024 Luca Bretting <[email protected]>
 //
 // SPDX-License-Identifier: MIT
@@ -82,8 +83,8 @@ private fun CartesianChartModelProducer.TimeSeriesChart(
                                 padding = dimensions(8.dp, 2.dp),
                                 background =
                                     rememberShapeComponent(
-                                        MaterialTheme.colorScheme.secondary,
-                                        CorneredShape.Pill,
+                                        fill = fill(MaterialTheme.colorScheme.secondary),
+                                        shape = CorneredShape.Pill,
                                     ),
                             ),
                         title = chartMetadata.yLabel,
@@ -97,8 +98,8 @@ private fun CartesianChartModelProducer.TimeSeriesChart(
                                 padding = dimensions(8.dp, 2.dp),
                                 background =
                                     shapeComponent(
-                                        MaterialTheme.colorScheme.primary,
-                                        CorneredShape.Pill,
+                                        fill = fill(MaterialTheme.colorScheme.primary),
+                                        shape = CorneredShape.Pill,
                                     ),
                             ),
                         title = chartMetadata.xLabel,

diff --git a/frontend/gradle/libs.versions.toml b/frontend/gradle/libs.versions.toml
@@ -6,25 +6,24 @@
 [versions]
 accompanistDrawablepainter = "0.36.0"
 activityCompose = "1.9.3"
-# @pin incompatible otherwise
-agp = "8.6.0"
+agp = "8.7.2"
 benmanes-versions = "0.51.0"
-compose-navigation = "2.8.0"
-composeBom = "2024.10.01"
+compose-navigation = "2.8.4"
+composeBom = "2024.11.00"
 coreKtx = "1.15.0"
 cyclonedx = "1.10.0"
 espressoCore = "3.6.1"
 jna = "5.15.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 koin = "4.0.0"
-kotlin = "2.0.21"
-ktfmt = "0.20.1"
+kotlin = "2.1.0"
+ktfmt = "0.21.0"
 lifecycleRuntimeKtx = "2.8.7"
-rust-android = "0.9.4"
 timber = "5.0.1"
 versioncatalogueupdate = "0.8.5"
-vico = "2.0.0-beta.2"
+vico = "2.0.0-beta.3"
+coroutines = "1.9.0"
 
 [libraries]
 accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanistDrawablepainter" }