Update: Dependencies (#86)

Author: Rolf-Smit

composeApp/build.gradle.kts

@@ -11,10 +11,7 @@
  */
 
 import com.google.devtools.ksp.gradle.KspAATask
-import com.google.devtools.ksp.gradle.KspTask
-import org.gradle.configurationcache.extensions.capitalized
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
@@ -116,6 +113,9 @@ kotlin {
             implementation(libs.androidx.datastore)
             implementation(libs.androidx.datastore.preferences)
 
+            // Collections
+            implementation(libs.kotlinx.collections.immutable)
+
             // File IO
             implementation(libs.okio)
 
@@ -169,6 +169,9 @@ android {
     }
 
     buildTypes {
+        getByName("debug") {
+            applicationIdSuffix = ".debug"
+        }
         getByName("release") {
             isMinifyEnabled = true
             proguardFiles(
@@ -178,6 +181,7 @@ android {
             signingConfig = signingConfigs.getByName("release")
         }
         create("development") {
+            applicationIdSuffix = ".development"
             initWith(getByName("debug"))
             matchingFallbacks += listOf("release")
             isMinifyEnabled = true
@@ -283,15 +287,11 @@ abstract class GenerateVersionInfoTask @Inject constructor(
     }
 }
 
-
 val versionInfoProvider = tasks.register<GenerateVersionInfoTask>("generateVersionInfo") {
     buildNumber.set(abysnerBuildNumber)
     versionName.set(abysnerVersion)
 }
 
-tasks.withType(KspTask::class.java).configureEach {
-    dependsOn(versionInfoProvider)
-}
 tasks.withType(KspAATask::class.java).configureEach {
     dependsOn(versionInfoProvider)
 }

composeApp/src/androidDebug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Abysner Debug</string>
+</resources>

composeApp/src/androidDevelopment/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Abysner Development</string>
+</resources>

composeApp/src/androidMain/res/values/strings.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Abysner</string>
 </resources>

composeApp/src/commonMain/kotlin/org/neotech/app/abysner/presentation/component/DropDown.kt

@@ -15,9 +15,9 @@ package org.neotech.app.abysner.presentation.component
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenuAnchorType
 import androidx.compose.material3.ExposedDropdownMenuDefaults
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.MenuAnchorType
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -31,6 +31,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
+import kotlinx.collections.immutable.ImmutableList
 
 /**
  * This is quite rudimentary still, for example even though the internal TextField is readOnly it
@@ -43,7 +44,7 @@ fun <T> DropDown(
     modifier: Modifier = Modifier,
     label: String? = null,
     selectedValue: T? = null,
-    items: List<T>,
+    items: ImmutableList<T>,
     selectedText: @Composable (value: T?) -> AnnotatedString,
     visualTransformation: VisualTransformation = VisualTransformation.None,
     dropdownRow: @Composable (index: Int, value: T) -> Unit,
@@ -75,7 +76,7 @@ fun <T> DropDown(
                 }
             },
             modifier = Modifier.fillMaxWidth()
-                .menuAnchor(type = MenuAnchorType.PrimaryNotEditable),
+                .menuAnchor(type = ExposedDropdownMenuAnchorType.PrimaryNotEditable),
             readOnly = true,
             trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
         )

composeApp/src/commonMain/kotlin/org/neotech/app/abysner/presentation/component/IconButton.kt

@@ -31,7 +31,6 @@ import androidx.compose.ui.unit.dp
 import org.jetbrains.compose.ui.tooling.preview.Preview
 import org.neotech.app.abysner.presentation.theme.AbysnerTheme
 
-
 @Composable
 @Preview
 fun IconAndTextButtonPreview() {

composeApp/src/commonMain/kotlin/org/neotech/app/abysner/presentation/component/MultiChoiceSegmentedButtonRowComponent.kt

@@ -21,25 +21,29 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.compose.runtime.toMutableStateList
 import androidx.compose.ui.Modifier
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 
 @Stable
-class MultiChoiceSegmentedButtonRowState(initialCheckedItemIndexes: Array<Int>) {
-    var checkedItemIndexes: SnapshotStateList<Int> = mutableStateListOf(*initialCheckedItemIndexes)
+class MultiChoiceSegmentedButtonRowState(initialCheckedItemIndexes: ImmutableList<Int>) {
+    var checkedItemIndexes: SnapshotStateList<Int> = initialCheckedItemIndexes.toMutableStateList()
 }
 
 @Composable
-fun rememberMultiChoiceSegmentedButtonRowState(initialCheckedItemIndexes: Array<Int> = emptyArray()): MultiChoiceSegmentedButtonRowState {
-    return remember {
+fun rememberMultiChoiceSegmentedButtonRowState(initialCheckedItemIndexes: ImmutableList<Int> = persistentListOf()): MultiChoiceSegmentedButtonRowState {
+    return remember(initialCheckedItemIndexes) {
         MultiChoiceSegmentedButtonRowState(initialCheckedItemIndexes)
     }
 }
 
 @Composable
 fun <T> MultiChoiceSegmentedButtonRow(
     modifier: Modifier = Modifier,
-    items: List<T>,
-    multiChoiceSegmentedButtonRowState: MultiChoiceSegmentedButtonRowState = rememberMultiChoiceSegmentedButtonRowState(emptyArray()),
+    items: ImmutableList<T>,
+    multiChoiceSegmentedButtonRowState: MultiChoiceSegmentedButtonRowState = rememberMultiChoiceSegmentedButtonRowState(),
     onChecked: (item: T, index: Int, checked: Boolean) -> Unit =  { _, _, _ -> },
     label: @Composable (item: T, index: Int) -> Unit = { item, _ ->
         Text(text = item.toString(), maxLines = 1)
@@ -71,7 +75,7 @@ fun <T> MultiChoiceSegmentedButtonRow(
 @Composable
 private fun MultiChoiceSegmentedButtonRowPreview() {
     MultiChoiceSegmentedButtonRow(
-        items = listOf("+3min", "+3m"),
+        items = persistentListOf("+3min", "+3m"),
         onChecked = { _, _, _ ->
 
         }

composeApp/src/commonMain/kotlin/org/neotech/app/abysner/presentation/component/SingleChoiceSegmentedButtonRowComponent.kt

@@ -23,6 +23,8 @@ import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 
 @Stable
 class SingleChoiceSegmentedButtonRowState(initialSelectedIndex: Int) {
@@ -39,7 +41,7 @@ fun rememberSingleChoiceSegmentedButtonRowState(initialSelectedIndex: Int): Sing
 @Composable
 fun <T> SingleChoiceSegmentedButtonRow(
     modifier: Modifier = Modifier,
-    items: List<T>,
+    items: ImmutableList<T>,
     singleChoiceSegmentedButtonRowState: SingleChoiceSegmentedButtonRowState = rememberSingleChoiceSegmentedButtonRowState(0),
     onClick: (item: T, index: Int) -> Unit =  { _, _ -> },
     label: @Composable (item: T, index: Int) -> Unit = { item, _ ->
@@ -68,7 +70,7 @@ fun <T> SingleChoiceSegmentedButtonRow(
 @Composable
 private fun SingleChoiceSegmentedButtonRowPreview() {
     SingleChoiceSegmentedButtonRow(
-        items = listOf("All", "Basics"),
+        items = persistentListOf("All", "Basics"),
         onClick = { _, _ ->
 
         }

composeApp/src/commonMain/kotlin/org/neotech/app/abysner/presentation/component/core/ResourceExtensions.kt

@@ -18,26 +18,28 @@ import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.pluralStringResource
 import org.jetbrains.compose.resources.stringResource
 
+private data class PluralData(val resource: PluralStringResource, val quantity: Int, val value: Any)
+
 interface PluralBuilder {
 
-    @Composable
     fun pluralArgument(resource: PluralStringResource, quantity: Int, value: Any)
 
-    @Composable
     fun pluralInt(resource: PluralStringResource, quantity: Int) =
         pluralArgument(resource, quantity, quantity)
 }
 
-
 @Composable
-fun pluralsStringBuilder(resource: StringResource, build: @Composable PluralBuilder.() -> Unit): String {
-    val arguments = mutableListOf<String>()
-    val builder = object: PluralBuilder {
-        @Composable
+fun pluralsStringBuilder(resource: StringResource, build: PluralBuilder.() -> Unit): String {
+    val pluralArgs = mutableListOf<PluralData>()
+    val builder = object : PluralBuilder {
         override fun pluralArgument(resource: PluralStringResource, quantity: Int, value: Any) {
-            arguments.add(pluralStringResource(resource, quantity, value))
+            pluralArgs.add(PluralData(resource, quantity, value))
         }
     }
     builder.build()
+
+    val arguments = pluralArgs.map { (resource, quantity, value) ->
+        pluralStringResource(resource, quantity, value)
+    }
     return stringResource(resource, *arguments.toTypedArray())
 }

composeApp/src/commonMain/kotlin/org/neotech/app/abysner/presentation/component/graphs/BarChart.kt

@@ -27,6 +27,7 @@ import androidx.compose.ui.text.drawText
 import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.dp
+import kotlinx.collections.immutable.ImmutableList
 import kotlin.math.max
 import kotlin.math.min
 
@@ -41,6 +42,9 @@ internal fun GasBarChartLayout(
     graph: @Composable (modifier: Modifier) -> Unit,
 ) {
     // ConstraintLayout uses this internally, but is not yet available on Compose MultiPlatform
+    // In this specific case, using the MultiMeasureLayout is actually beneficial to achieve the
+    // desired layout in a performant way.
+    @Suppress("DEPRECATION")
     MultiMeasureLayout(
         modifier = modifier,
         content = {
@@ -111,7 +115,7 @@ internal fun StackedHorizontalBar(
     minValue: Float = 0f,
     maxValue: Float = 200f,
     offset: Float = 0f,
-    values: List<BarSection>,
+    values: ImmutableList<BarSection>,
     valueTransformation: (Int, Float) -> String = { _, value -> value.toString() }
 ) {
     // TextMeasurer for text measurement