Merge remote-tracking branch 'origin' into BPKR-215_Android_Graphic_p…

…romo_contribution
Skyscanner · Sep 22, 2023 · 8c37f39 · 8c37f39
2 parents 9fb961b + dcf06d1
commit 8c37f39
Show file tree

Hide file tree

Showing 67 changed files with 27 additions and 22 deletions.
diff --git a/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithStickyChip.png b/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithStickyChip.png
diff --git a/...compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithoutStickyChip.png b/...compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithoutStickyChip.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_default.Wrap.png b/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_default.Wrap.png
diff --git a/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithStickyChip.png b/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithStickyChip.png
diff --git a/...compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithoutStickyChip.png b/...compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithoutStickyChip.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.Wrap.png b/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.Wrap.png
diff --git a/...k.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithStickyChip.png b/...k.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithStickyChip.png
diff --git a/...ompose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithoutStickyChip.png b/...ompose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithoutStickyChip.png
diff --git a/...canner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.Wrap.png b/...canner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.Wrap.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Rail.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Rail.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Wrap.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Wrap.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Rail.png b/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Rail.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Wrap.png b/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Wrap.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Rail.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Rail.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Wrap.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Wrap.png
diff --git a/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithStickyChip.png b/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithStickyChip.png
diff --git a/...compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithoutStickyChip.png b/...compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithoutStickyChip.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_default.Wrap.png b/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_default.Wrap.png
diff --git a/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithStickyChip.png b/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithStickyChip.png
diff --git a/...compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithoutStickyChip.png b/...compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithoutStickyChip.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.Wrap.png b/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.Wrap.png
diff --git a/...k.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithStickyChip.png b/...k.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithStickyChip.png
diff --git a/...ompose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithoutStickyChip.png b/...ompose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithoutStickyChip.png
diff --git a/...canner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.Wrap.png b/...canner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.Wrap.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Rail.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Rail.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Wrap.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Wrap.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Rail.png b/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Rail.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Wrap.png b/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Wrap.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Rail.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Rail.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Wrap.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Wrap.png
diff --git a/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithStickyChip.png b/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithStickyChip.png
diff --git a/...compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithoutStickyChip.png b/...compose.chipgroup.BpkMultiSelectChipGroupTest_default.RailWithoutStickyChip.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_default.Wrap.png b/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_default.Wrap.png
diff --git a/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithStickyChip.png b/...ck.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithStickyChip.png
diff --git a/...compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithoutStickyChip.png b/...compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.RailWithoutStickyChip.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.Wrap.png b/...scanner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_dark.Wrap.png
diff --git a/...k.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithStickyChip.png b/...k.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithStickyChip.png
diff --git a/...ompose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithoutStickyChip.png b/...ompose.chipgroup.BpkMultiSelectChipGroupTest_on_image.RailWithoutStickyChip.png
diff --git a/...canner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.Wrap.png b/...canner.backpack.compose.chipgroup.BpkMultiSelectChipGroupTest_on_image.Wrap.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Rail.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Rail.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Wrap.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_default.Wrap.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Rail.png b/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Rail.png
diff --git a/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Wrap.png b/...scanner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onDark.Wrap.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Rail.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Rail.png
diff --git a/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Wrap.png b/...canner.backpack.compose.chipgroup.BpkSingleSelectChipGroupTest_onImage.Wrap.png
diff --git a/app/src/main/java/net/skyscanner/backpack/demo/compose/MapStory.kt b/app/src/main/java/net/skyscanner/backpack/demo/compose/MapStory.kt
@@ -64,7 +64,7 @@ fun PriceMapMarkerStory(modifier: Modifier = Modifier) {
                 title = stringArrayResource(R.array.map_marker_prices)[index],
                 status = markerStatus(index),
                 state = rememberMarkerState(position = latLng),
-                onClick = { focusedMarker = index; viewedMarkers += index },
+                onClick = { focusedMarker = index; viewedMarkers += index; false },
             )
         }
     }
@@ -88,7 +88,7 @@ fun IconMapMarkerStory(modifier: Modifier = Modifier) {
                 status = markerStatus(index),
                 icon = if (index == 2) BpkIcon.Cafe else BpkIcon.Landmark,
                 state = rememberMarkerState(position = latLng),
-                onClick = { focusedMarker = index },
+                onClick = { focusedMarker = index; false },
             )
         }
     }

diff --git a/...et/skyscanner/backpack/compose/chipgroup/multiple/internal/BpkMultiSelectChipGroupImpl.kt b/...et/skyscanner/backpack/compose/chipgroup/multiple/internal/BpkMultiSelectChipGroupImpl.kt
@@ -21,10 +21,10 @@ package net.skyscanner.backpack.compose.chipgroup.multiple.internal
 import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.height
@@ -69,13 +69,13 @@ internal fun BpkMultiSelectChipGroupImpl(
                 LazyRow(
                     modifier = Modifier.selectableGroup(),
                     state = rememberLazyListState(),
+                    horizontalArrangement = Arrangement.spacedBy(BpkSpacing.Md),
                 ) {
                     items(items = chips) { chip ->
                         ChipItem(
                             chip = chip,
                             style = style,
                             modifier = Modifier
-                                .padding(PaddingValues(BpkSpacing.Sm))
                                 .semantics { role = Role.Checkbox },)
                     }
                 }
@@ -85,13 +85,14 @@ internal fun BpkMultiSelectChipGroupImpl(
         BpkMultiChipGroupType.Wrap -> {
             FlowRow(
                 modifier = modifier.selectableGroup(),
+                horizontalArrangement = Arrangement.spacedBy(BpkSpacing.Md),
+                verticalArrangement = Arrangement.spacedBy(BpkSpacing.Md),
             ) {
                 chips.forEach { chip ->
                     ChipItem(
                         chip = chip,
                         style = style,
                         modifier = Modifier
-                            .padding(PaddingValues(BpkSpacing.Sm))
                             .semantics { role = Role.Checkbox },)
                 }
             }
@@ -108,12 +109,12 @@ private fun StickyChip(
     val interactionSource = remember { MutableInteractionSource() }
     Row(
         modifier = modifier
-            .padding(PaddingValues(BpkSpacing.Sm))
+            .padding(end = BpkSpacing.Md)
             .height(IntrinsicSize.Min),
     ) {
         BpkChipImpl(
             modifier = Modifier
-                .padding(PaddingValues(end = BpkSpacing.Md))
+                .padding(end = BpkSpacing.Md)
                 .semantics {
                     role = Role.Button
                     contentDescription = chip.text

diff --git a/...net/skyscanner/backpack/compose/chipgroup/single/internal/BpkSingleSelectChipGroupImpl.kt b/...net/skyscanner/backpack/compose/chipgroup/single/internal/BpkSingleSelectChipGroupImpl.kt
@@ -18,10 +18,9 @@
 
 package net.skyscanner.backpack.compose.chipgroup.single.internal
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -52,6 +51,7 @@ internal fun BpkSingleSelectChipGroupImpl(
             LazyRow(
                 modifier = modifier.selectableGroup(),
                 state = rememberLazyListState(),
+                horizontalArrangement = Arrangement.spacedBy(BpkSpacing.Md),
             ) {
                 itemsIndexed(items = chips) { index, chip ->
                     ChipItem(chip, index == selectedIndex, style) {
@@ -64,6 +64,8 @@ internal fun BpkSingleSelectChipGroupImpl(
         BpkSingleChipGroupType.Wrap -> {
             FlowRow(
                 modifier = modifier.selectableGroup(),
+                horizontalArrangement = Arrangement.spacedBy(BpkSpacing.Md),
+                verticalArrangement = Arrangement.spacedBy(BpkSpacing.Md),
             ) {
                 chips.forEachIndexed { index, chip ->
                     ChipItem(chip, index == selectedIndex, style) {
@@ -85,7 +87,6 @@ private fun ChipItem(
 ) {
     BpkChip(
         modifier = modifier
-            .padding(PaddingValues(BpkSpacing.Sm))
             .semantics { role = Role.RadioButton },
         text = chip.text,
         icon = chip.icon,

diff --git a/backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/map/BpkIconMapMarker.kt b/backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/map/BpkIconMapMarker.kt
@@ -47,6 +47,9 @@ enum class BpkIconMarkerStatus {
     Disabled,
 }
 
+/**
+ * @param onClick Callback invoked when the marker is clicked. Return true to consume the event, for example to disable the default centre map on marker behaviour.
+ */
 @Composable
 fun BpkIconMapMarker(
     contentDescription: String,
@@ -55,8 +58,8 @@ fun BpkIconMapMarker(
     state: MarkerState = rememberMarkerState(),
     tag: Any? = null,
     visible: Boolean = true,
-    zIndex: Float = 0.0f,
-    onClick: (Marker) -> Unit = {},
+    zIndex: Float? = null,
+    onClick: (Marker) -> Boolean = { false },
 ) {
     val iconBitmap = rememberCapturedComposeBitmapDescriptor(icon, status) {
         IconMarkerLayout(status = status, icon = icon)
@@ -67,9 +70,9 @@ fun BpkIconMapMarker(
         tag = tag,
         title = contentDescription,
         visible = visible,
-        zIndex = zIndex,
+        zIndex = if (status == BpkIconMarkerStatus.Focused && zIndex == null) 1.0f else zIndex ?: 0.0f,
         icon = iconBitmap,
-        onClick = { onClick(it); false },
+        onClick = onClick,
     ) {}
 }
 

diff --git a/backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/map/BpkPriceMapMarker.kt b/backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/map/BpkPriceMapMarker.kt
@@ -58,8 +58,8 @@ fun BpkPriceMapMarker(
     state: MarkerState = rememberMarkerState(),
     tag: Any? = null,
     visible: Boolean = true,
-    zIndex: Float = 0.0f,
-    onClick: (Marker) -> Unit = {},
+    zIndex: Float? = null,
+    onClick: (Marker) -> Boolean = { false },
 ) {
     val icon = rememberCapturedComposeBitmapDescriptor(title, status) {
         PriceMarkerLayout(title = title, status = status)
@@ -70,9 +70,9 @@ fun BpkPriceMapMarker(
         tag = tag,
         title = title,
         visible = visible,
-        zIndex = if (status == BpkPriceMarkerStatus.Focused && zIndex == 0.0f) 1.0f else zIndex,
+        zIndex = if (status == BpkPriceMarkerStatus.Focused && zIndex == null) 1.0f else zIndex ?: 0.0f,
         icon = icon,
-        onClick = { onClick(it); false },
+        onClick = onClick,
     ) {}
 }
 

diff --git a/docs/compose/Chip/screenshots/default.png b/docs/compose/Chip/screenshots/default.png
diff --git a/docs/compose/Chip/screenshots/default_dm.png b/docs/compose/Chip/screenshots/default_dm.png
diff --git a/docs/compose/Chip/screenshots/on-dark.png b/docs/compose/Chip/screenshots/on-dark.png
diff --git a/docs/compose/Chip/screenshots/on-dark_dm.png b/docs/compose/Chip/screenshots/on-dark_dm.png
diff --git a/docs/compose/Chip/screenshots/on-image.png b/docs/compose/Chip/screenshots/on-image.png
diff --git a/docs/compose/Chip/screenshots/on-image_dm.png b/docs/compose/Chip/screenshots/on-image_dm.png
diff --git a/docs/compose/ChipGroup/screenshots/multi-select-rail-with-no-sticky-chip.png b/docs/compose/ChipGroup/screenshots/multi-select-rail-with-no-sticky-chip.png
diff --git a/docs/compose/ChipGroup/screenshots/multi-select-rail-with-no-sticky-chip_dm.png b/docs/compose/ChipGroup/screenshots/multi-select-rail-with-no-sticky-chip_dm.png
diff --git a/docs/compose/ChipGroup/screenshots/multi-select-rail.png b/docs/compose/ChipGroup/screenshots/multi-select-rail.png
diff --git a/docs/compose/ChipGroup/screenshots/multi-select-rail_dm.png b/docs/compose/ChipGroup/screenshots/multi-select-rail_dm.png
diff --git a/docs/compose/ChipGroup/screenshots/multi-select-wrap.png b/docs/compose/ChipGroup/screenshots/multi-select-wrap.png
diff --git a/docs/compose/ChipGroup/screenshots/multi-select-wrap_dm.png b/docs/compose/ChipGroup/screenshots/multi-select-wrap_dm.png
diff --git a/docs/compose/ChipGroup/screenshots/single-select-rail.png b/docs/compose/ChipGroup/screenshots/single-select-rail.png
diff --git a/docs/compose/ChipGroup/screenshots/single-select-rail_dm.png b/docs/compose/ChipGroup/screenshots/single-select-rail_dm.png
diff --git a/docs/compose/ChipGroup/screenshots/single-select-wrap.png b/docs/compose/ChipGroup/screenshots/single-select-wrap.png
diff --git a/docs/compose/ChipGroup/screenshots/single-select-wrap_dm.png b/docs/compose/ChipGroup/screenshots/single-select-wrap_dm.png
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ lint = "31.1.1"  # android plugin, lint and sdk-common need to be updated togeth
 androidSdkCommon = "31.1.1" # if the Gradle plugin version is X.Y.Z, then the lint version is (X+23).Y.Z.
 
 detekt = "1.23.1"
-lifecycle = "2.6.1"
+lifecycle = "2.6.2"
 threeTenAbp = "1.4.5"
 androidXJunit = "1.1.5"
 coroutines = "1.7.3"
@@ -27,7 +27,7 @@ plugin-nexusPublishing = "io.github.gradle-nexus:publish-plugin:1.3.0"
 plugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 plugin-ksp = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
 
-detektRules-compose = "io.nlopez.compose.rules:detekt:0.2.2"
+detektRules-compose = "io.nlopez.compose.rules:detekt:0.2.3"
 detektRules-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
 detektRules-libraries = { module = "io.gitlab.arturbosch.detekt:detekt-rules-libraries", version.ref = "detekt" }
 
@@ -36,7 +36,7 @@ androidx-annotations = "androidx.annotation:annotation:1.7.0"
 androidx-cardView = "androidx.cardview:cardview:1.0.0"
 androidx-constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
 androidx-swiperefreshLayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-androidx-coreKts = "androidx.core:core-ktx:1.10.1"
+androidx-coreKts = "androidx.core:core-ktx:1.12.0"
 
 androidx-lifecycleKtx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
 androidx-lifecycleViewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "lifecycle" }
@@ -80,7 +80,7 @@ kotlin-compilerTestingKsp = { module = "com.github.tschuchortdev:kotlin-compile-
 lint-lint = { module = "com.android.tools.lint:lint", version.ref = "lint" }
 lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "lint" }
 
-compose-bom = { group = "androidx.compose", name = "compose-bom", version = "2023.09.00" }
+compose-bom = { group = "androidx.compose", name = "compose-bom", version = "2023.09.01" }
 compose-ui = { group = "androidx.compose.ui", name = "ui" }
 compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
 compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }