Merge remote-tracking branch 'origin/main' into chore-updated-icons

Author: SimonMarquis

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-* @soulcramer @SimonMarquis @kazaky @adevinta/spark-contributors-android
-/.github/ @soulcramer @SimonMarquis @kazaky
-/gradle/ @soulcramer @SimonMarquis @kazaky
-/build-logic/ @soulcramer @SimonMarquis @kazaky
+* @soulcramer @SimonMarquis @adevinta/spark-contributors-android
+/.github/ @soulcramer @SimonMarquis
+/gradle/ @soulcramer @SimonMarquis
+/build-logic/ @soulcramer @SimonMarquis

.github/actions/setup-gradle/action.yml

@@ -3,7 +3,7 @@ description: 'Gradle setup and wrapper validation'
 runs:
   using: composite
   steps:
-    - uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
+    - uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4.0.1
       with:
         validate-wrappers: true
         gradle-home-cache-cleanup: true

.github/workflows/ci.yml

@@ -113,7 +113,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: '🌋 Run Lava Vulnerability Scanner'
-        uses: adevinta/lava-action@9bfefe8e57b0bc9f90528edf385a01b6ecbed761 # v0.3.3
+        uses: adevinta/lava-action@ddeeddd8ccf45b403741359471a5627644a0c5f6 # v0.3.4
         with:
           version: latest
           config: lava.yaml

.github/workflows/firebase-app-distribution.yml

@@ -87,14 +87,14 @@ jobs:
 
       - name: '📋 Prepare release note for scheduled build'
         if: github.event_name == 'schedule'
-        run: git log --topo-order --since="24 hours ago" --format="• %s" --no-merges >> release-notes.txt
+        run: git log --no-merges --topo-order --since="24 hours ago" --format="• %s" >> release-notes.txt
 
       - name: '📋 Prepare release note for tagged build'
         if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
         run: |
           from="$(git for-each-ref --sort=-v:refname --count=2 --format='%(tag)' refs/tags | tail -n +2)"
           to="$(git for-each-ref --sort=-v:refname --count=1 --format='%(tag)' refs/tags)"
-          git log --topo-order --format="• %s" "$from..$to" --no-merges >> release-notes.txt
+          git log --no-merges --topo-order --format="• %s" "$from..$to" >> release-notes.txt
 
       - name: '📦 Archive release-notes.txt'
         uses: actions/upload-artifact@v4

CHANGELOG.md

@@ -6,14 +6,49 @@
 
 ### Spark
 
-- 🎨 The Avatar component was using the color icon without tinting it rendering them incompatible with the dark mode
-
 ### Catalog App
 
-- 🎨 KA theme colors for outline has been changed in light mode and in dark mode it's the background + variants color.
-
 ### CI
 
+## 0.11.0
+
+_2024-08-13_
+
+### Spark
+
+#### 🆕 Divider
+> [!WARNING]
+> The Divider Component has been deprecated to use the `HorizontalDivider`
+
+The divider component now has 2 fixed colors, `outline` and `outlineHigh`. I now accept a slot has a label indicator if you need to place a decorative text when separating your sections.
+
+#### 🆕 New Dropdown specs
+> [!WARNING]
+> The previous SelectTextField Api has been deprecated but should still be used in Combobox usecases.
+
+The Dropdown replace the existing SelectTextfield in readonly mode. It adds new api to handle item groupings with a proper title and remove the necessity to provide the `onValueChange` callback.
+
+#### 🆕 Snackbar
+> [!CAUTION]
+> `SnackbarColors` & every colored Snackbar override have been deprecated as error as their api is not compatible with the new one. You'll need to migrate them to use this version.
+
+The new Snackbar loses its title and icon slot to accept only a `SparkIcon`.
+It has 2 styles, intents and the new dismiss action that are also available on the `showSnackbar` function.
+
+
+- ⬆️ Spark now use Kotlin 2.0
+- ⬆️ Compose BOM has been increased from 2024.05.00 to 2024.06.00
+- 🐛 The Avatar component was using the color icon without tinting it rendering them incompatible with the dark mode
+- 🐛 Chip doesn't have a max width anymore.
+- 🐛 Textfield doesn't have a max width anymore.
+- 🐛 Progress Tracker Indicator size now follow the font scaling
+- 🐛 Textfield now correctly show the required indicator when the label fold in multiples lines
+
+### Catalog App
+
+- 🎨 KA theme colors for outline has been changed in light mode and in dark mode it's the background + variants color
+- 🆕 Examples on how to make a Button Toggle has been added
+
 ## [0.10.1]
 
 _2024-06-18_
@@ -298,7 +333,9 @@ _2023-03-29_
 
 <!-- Links -->
 
-[Unreleased]: https://github.com/adevinta/spark-android/compare/0.10.1...HEAD
+[Unreleased]: https://github.com/adevinta/spark-android/compare/0.11.0...HEAD
+
+[0.11.0]: https://github.com/adevinta/spark-android/releases/tag/0.11.0
 
 [0.10.1]: https://github.com/adevinta/spark-android/releases/tag/0.10.1
 

catalog/src/main/kotlin/com/adevinta/spark/catalog/configurator/samples/tags/TagsConfigurator.kt

@@ -71,12 +71,12 @@ private fun ColumnScope.TagSample() {
     var icon: SparkIcon? by remember { mutableStateOf(null) }
     var style by remember { mutableStateOf(TagStyle.Filled) }
     var intent by remember { mutableStateOf(TagIntent.Main) }
-    var buttonText by remember { mutableStateOf("Filled Tag") }
+    var tagText by remember { mutableStateOf("Filled Tag") }
 
     ConfigedTag(
         modifier = Modifier.align(Alignment.CenterHorizontally),
         style = style,
-        tagText = buttonText,
+        tagText = tagText,
         intent = intent,
         icon = icon,
     )
@@ -151,10 +151,8 @@ private fun ColumnScope.TagSample() {
 
     TextField(
         modifier = Modifier.fillMaxWidth(),
-        value = buttonText,
-        onValueChange = {
-            buttonText = it
-        },
+        value = tagText,
+        onValueChange = { tagText = it },
         label = "Tag text",
         placeholder = "Vérifier les Disponibilité",
     )

catalog/src/main/kotlin/com/adevinta/spark/catalog/examples/example/Example.kt

@@ -22,6 +22,7 @@
 package com.adevinta.spark.catalog.examples.example
 
 import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
@@ -73,6 +74,7 @@ public fun Example(example: Example) {
         } else {
             Column(
                 modifier = commonModifier.verticalScroll(scrollState),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
             ) {
                 with(example) {
                     columnContent?.let { content -> this@Column.content(snackbarHostState) }

catalog/src/main/kotlin/com/adevinta/spark/catalog/examples/samples/tokens/TokensExamples.kt

@@ -22,6 +22,8 @@
 package com.adevinta.spark.catalog.examples.samples.tokens
 
 import com.adevinta.spark.catalog.examples.samples.tokens.colors.ColorSample
+import com.adevinta.spark.catalog.examples.samples.tokens.elevation.ElevationCustomSample
+import com.adevinta.spark.catalog.examples.samples.tokens.elevation.ElevationSample
 import com.adevinta.spark.catalog.model.Example
 import com.adevinta.spark.catalog.util.SampleSourceUrl
 
@@ -34,4 +36,18 @@ public val TokensExamples: List<Example> = listOf(
     ) {
         ColorSample()
     },
+    Example(
+        name = "Elevations",
+        description = "Showcase the elevation tokens",
+        sourceUrl = TokensExampleSourceUrl,
+    ) {
+        ElevationSample()
+    },
+    Example(
+        name = "Elevation showcase",
+        description = "Showcase the elevation tokens",
+        sourceUrl = TokensExampleSourceUrl,
+    ) {
+        ElevationCustomSample()
+    },
 )

catalog/src/main/kotlin/com/adevinta/spark/catalog/examples/samples/tokens/elevation/ElevationCustomSample.kt

@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2023-2024 Adevinta
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.adevinta.spark.catalog.examples.samples.tokens.elevation
+
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+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.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.adevinta.spark.SparkTheme
+import com.adevinta.spark.catalog.R
+import com.adevinta.spark.catalog.util.PreviewTheme
+import com.adevinta.spark.components.menu.DropdownMenuItem
+import com.adevinta.spark.components.slider.Slider
+import com.adevinta.spark.components.surface.Surface
+import com.adevinta.spark.components.text.Text
+import com.adevinta.spark.components.textfields.Dropdown
+import com.adevinta.spark.tokens.ElevationTokens
+import com.adevinta.spark.tokens.highlight
+import kotlin.math.roundToInt
+
+@Composable
+internal fun ColumnScope.ElevationCustomSample() {
+    val tokensElevationsGroups by remember {
+        mutableStateOf(
+            listOf(
+                "Level0" to ElevationTokens.Level0,
+                "Level1" to ElevationTokens.Level1,
+                "Level2" to ElevationTokens.Level2,
+                "Level3" to ElevationTokens.Level3,
+                "Level4" to ElevationTokens.Level4,
+                "Level5" to ElevationTokens.Level5,
+            ),
+        )
+    }
+    var selectedElevation by remember { mutableStateOf(ElevationTokens.Level1) }
+
+    var expanded by remember { mutableStateOf(false) }
+    Dropdown(
+        modifier = Modifier.fillMaxWidth(),
+        value = tokensElevationsGroups.firstOrNull {
+            it.second == selectedElevation
+        }?.first ?: "Custom",
+        label = "Elevation",
+        expanded = expanded,
+        onExpandedChange = { expanded = !expanded },
+        onDismissRequest = { expanded = false },
+        dropdownContent = {
+            tokensElevationsGroups.forEach { (title, elevation) ->
+                DropdownMenuItem(
+                    text = { Text("$title $elevation") },
+                    onClick = {
+                        selectedElevation = elevation
+                        expanded = false
+                    },
+                )
+            }
+        },
+    )
+
+    Text(
+        text = stringResource(
+            id = R.string.example_tokens_elevation_label,
+            selectedElevation.value.roundToInt(),
+        ),
+        style = SparkTheme.typography.body2.highlight,
+    )
+
+    Slider(
+        value = selectedElevation.value,
+        steps = 23,
+        onValueChange = { selectedElevation = Dp(it) },
+        valueRange = 0f..24f,
+    )
+
+    ElevationItem(selectedElevation)
+}
+
+@Composable
+private fun ColumnScope.ElevationItem(elevation: Dp) {
+    val animatedElevation by animateDpAsState(elevation)
+    Surface(
+        modifier = Modifier
+            .padding(8.dp)
+            .width(104.dp)
+            .heightIn(min = 104.dp)
+            .align(Alignment.CenterHorizontally),
+        elevation = animatedElevation,
+        shape = SparkTheme.shapes.extraLarge,
+    ) {
+        Box(
+            modifier = Modifier.padding(8.dp),
+            contentAlignment = Alignment.Center,
+        ) {
+            Text(
+                text = "Elevated surface",
+                textAlign = TextAlign.Center,
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun ElevationCustomSamplePreview() {
+    PreviewTheme {
+        ElevationCustomSample()
+    }
+}