diff --git a/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMatchOptionWidth.png b/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMatchOptionWidth.png index 7838654cd5..c1bddb8daf 100644 Binary files a/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMatchOptionWidth.png and b/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMatchOptionWidth.png differ diff --git a/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMatchSelectWidth.png b/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMatchSelectWidth.png index d1ea390456..35d3b611a8 100644 Binary files a/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMatchSelectWidth.png and b/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMatchSelectWidth.png differ diff --git a/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMaxWidth.png b/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMaxWidth.png index 47a17faf97..4de480c393 100644 Binary files a/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMaxWidth.png and b/app/screenshots/oss/debug/rtl/net.skyscanner.backpack.compose.select.BpkSelectTest_dropdownlistMaxWidth.png differ diff --git a/app/src/main/java/net/skyscanner/backpack/demo/compose/ChipGroupStory.kt b/app/src/main/java/net/skyscanner/backpack/demo/compose/ChipGroupStory.kt index 01102b90c8..38cad58671 100644 --- a/app/src/main/java/net/skyscanner/backpack/demo/compose/ChipGroupStory.kt +++ b/app/src/main/java/net/skyscanner/backpack/demo/compose/ChipGroupStory.kt @@ -86,9 +86,9 @@ fun SingleSelectChipGroupStoryWrap(modifier: Modifier = Modifier) = @ChipGroupComponent @ComposeStory("Multi Select Rail") fun MultiSelectChipGroupStoryRail(modifier: Modifier = Modifier) { - val context = LocalContext.current val floatingNotification = LocalFloatingNotification.current val scope = rememberCoroutineScope() + val stickyChipActionMessage = stringResource(R.string.sticky_chip_action) ChipGroupDemo( modifier, ) { style -> @@ -100,7 +100,7 @@ fun MultiSelectChipGroupStoryRail(modifier: Modifier = Modifier) { icon = BpkIcon.Filter, ) { scope.launch { - floatingNotification.show(context.getString(R.string.sticky_chip_action)) + floatingNotification.show(stickyChipActionMessage) } }, ), diff --git a/app/src/main/java/net/skyscanner/backpack/demo/compose/RatingStory.kt b/app/src/main/java/net/skyscanner/backpack/demo/compose/RatingStory.kt index b85b2016e4..4b929711cb 100644 --- a/app/src/main/java/net/skyscanner/backpack/demo/compose/RatingStory.kt +++ b/app/src/main/java/net/skyscanner/backpack/demo/compose/RatingStory.kt @@ -26,7 +26,7 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalResources import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import net.skyscanner.backpack.compose.rating.BpkRating @@ -191,11 +191,11 @@ internal fun BpkRatingLargeCustomContentNoSubtitleSample(modifier: Modifier = Mo private fun CustomContent( modifier: Modifier = Modifier, ) { - val context = LocalContext.current + val resources = LocalResources.current BpkStarRating( rating = RatingValue, contentDescription = { _, max -> - context.getString(R.string.star_rating_accessibility_status, RatingValue, max) + resources.getString(R.string.star_rating_accessibility_status, RatingValue, max) }, modifier = modifier, ) diff --git a/backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/select/internal/BpkSelectImpl.kt b/backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/select/internal/BpkSelectImpl.kt index 9669b5a14a..eb33778163 100644 --- a/backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/select/internal/BpkSelectImpl.kt +++ b/backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/select/internal/BpkSelectImpl.kt @@ -24,9 +24,9 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.rememberScrollState import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExposedDropdownMenuAnchorType import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuDefaults -import androidx.compose.material3.MenuAnchorType import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -79,7 +79,7 @@ internal fun BpkSelectImpl( onExpandedChange = { expanded = !expanded }, ) { BpkTextFieldImpl( - modifier = modifier.menuAnchor(MenuAnchorType.PrimaryNotEditable), + modifier = modifier.menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable), value = selectText, onValueChange = {}, type = BpkTextFieldType.Select, @@ -96,7 +96,7 @@ internal fun BpkSelectImpl( .applyIf(dropDownWidth == BpkDropDownWidth.MaxWidth) { fillMaxWidth() }, - matchTextFieldWidth = dropDownWidth == BpkDropDownWidth.MatchSelectWidth, + matchAnchorWidth = dropDownWidth == BpkDropDownWidth.MatchSelectWidth, onDismissRequest = { expanded = false focusManager.clearFocus() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 00e8925fe3..3d0fb3aadd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -76,7 +76,7 @@ kotlin-compilerTestingKsp = { module = "dev.zacsweers.kctfork:ksp", version.ref 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 = "2025.11.01" } +compose-bom = { group = "androidx.compose", name = "compose-bom", version = "2025.12.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" }