commit 0f1f1dfb96e36742bf51ead04dbd753377c5f27b
parent 4d5f0433ca3f85d0cdae1eef447403e460c4609d
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date: Mon, 24 Nov 2025 08:48:39 +0000
Bug 2000327 - Part 1: Migrate SetToDefaultMainImage to use M3 Acorn color tokens r=android-reviewers,007
- Mapping borderPrimary to outlineVariant due to similarities to Dividers
- Divider: https://www.figma.com/design/MjufE1X5fvkxZ0YneX4kRd/Android-Library--2025-?node-id=63874-14771&m=dev
Differential Revision: https://phabricator.services.mozilla.com/D273036
Diffstat:
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -72,7 +73,7 @@ private fun RowScope.BrowserDetailsRow(selected: Boolean = false) {
modifier = Modifier
.fillMaxHeight()
.weight(1f)
- .border(3.dp, FirefoxTheme.colors.borderPrimary, RoundedCornerShape(10.dp))
+ .border(3.dp, MaterialTheme.colorScheme.outlineVariant, RoundedCornerShape(10.dp))
.padding(start = 12.dp),
horizontalArrangement = Arrangement.spacedBy(12.dp),
verticalAlignment = Alignment.CenterVertically,
@@ -88,7 +89,7 @@ private fun RowScope.BrowserDetailsRow(selected: Boolean = false) {
modifier = Modifier
.size(20.dp)
.clip(CircleShape)
- .background(FirefoxTheme.colors.borderPrimary),
+ .background(MaterialTheme.colorScheme.outlineVariant),
)
}
}
@@ -120,7 +121,7 @@ private fun SelectedCheckmark(selected: Boolean = false) {
.size(24.dp)
.border(
width = 3.dp,
- color = FirefoxTheme.colors.borderPrimary,
+ color = MaterialTheme.colorScheme.outlineVariant,
shape = CircleShape,
),
contentAlignment = Alignment.Center,
@@ -132,7 +133,7 @@ private fun SelectedCheckmark(selected: Boolean = false) {
@Composable
private fun SetToDefaultMainImagePreview() {
FirefoxTheme {
- Box(Modifier.background(FirefoxTheme.colors.layer1)) {
+ Surface {
SetToDefaultMainImage()
}
}