commit 62d1629fbd27d55b17a054e4ed72a946e36a5a1d parent 2182ab7d4e98ba48416df8b9137f006fb01d80c0 Author: Gabriel Luong <gabriel.luong@gmail.com> Date: Thu, 4 Dec 2025 05:30:49 +0000 Bug 1993368 - Part 41: Migrate CustomPlacementPopup content to use M3 color tokens r=android-reviewers,petru,007 - Menu: https://www.figma.com/design/MjufE1X5fvkxZ0YneX4kRd/Android-Library--2025-?node-id=63982-26985&m=dev - Related https://searchfox.org/firefox-main/rev/5ccf4a7d77a329f237d3a41e400049f9c47dc71f/mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/ui/PopupToMenuItemsMapper.kt#80 Differential Revision: https://phabricator.services.mozilla.com/D274706 Diffstat:
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/menu/CustomPlacementPopupHorizontalContent.kt b/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/menu/CustomPlacementPopupHorizontalContent.kt @@ -8,10 +8,10 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.height import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.LazyRow +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import mozilla.components.compose.base.theme.AcornTheme /** * [LazyRow] wrapper over [content] configuring it to be shown inside of [CustomPlacementPopup]. @@ -24,7 +24,7 @@ inline fun CustomPlacementPopup.CustomPlacementPopupHorizontalContent( ) { LazyRow( modifier = Modifier - .background(AcornTheme.colors.layer2) + .background(MaterialTheme.colorScheme.surfaceContainerLowest) .height(48.dp), ) { content() diff --git a/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/menu/CustomPlacementPopupVerticalContent.kt b/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/menu/CustomPlacementPopupVerticalContent.kt @@ -12,10 +12,10 @@ import androidx.compose.foundation.layout.requiredWidthIn import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import mozilla.components.compose.base.theme.AcornTheme /** * [Column] wrapper over [content] configuring it to be shown inside of [CustomPlacementPopup]. @@ -28,7 +28,7 @@ inline fun CustomPlacementPopup.CustomPlacementPopupVerticalContent( ) { Column( modifier = Modifier - .background(AcornTheme.colors.layer2) + .background(MaterialTheme.colorScheme.surfaceContainerLowest) .requiredWidthIn(min = 250.dp) .width(IntrinsicSize.Max) .verticalScroll(rememberScrollState()),