Bug 1929332 - Set max width for onboarding buttons r=android-reviewers,007

nicholaspoon03 · nicholaspoon03 · commit 8ea55e4df056 · 2025-02-04T19:47:40.000Z
Differential Revision: https://phabricator.services.mozilla.com/D236546
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/AddOnsOnboardingPage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/AddOnsOnboardingPage.kt
@@ -112,7 +112,7 @@ fun AddOnsOnboardingPage(
             PrimaryButton(
                 text = primaryButton.text,
                 modifier = Modifier
-                    .fillMaxWidth()
+                    .width(width = FirefoxTheme.layout.size.maxWidth.small)
                     .semantics { testTag = title + "onboarding_card.positive_button" },
                 onClick = primaryButton.onClick,
             )
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/MarketingDataOnboardingPage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/MarketingDataOnboardingPage.kt
@@ -12,10 +12,10 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Checkbox
@@ -156,7 +156,7 @@ fun MarketingDataOnboardingPage(
 
                 PrimaryButton(
                     modifier = Modifier
-                        .fillMaxWidth()
+                        .width(width = FirefoxTheme.layout.size.maxWidth.small)
                         .semantics { testTag = state.title + "onboarding_card.positive_button" },
                     text = state.primaryButton.text,
                     onClick = { onMarketingDataContinueClick(checkboxChecked) },
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt
@@ -12,9 +12,9 @@ import androidx.compose.foundation.layout.BoxWithConstraintsScope
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Icon
@@ -31,7 +31,7 @@ import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import mozilla.components.compose.base.annotation.LightDarkPreview
+import mozilla.components.compose.base.annotation.FlexibleWindowLightDarkPreview
 import org.mozilla.fenix.R
 import org.mozilla.fenix.compose.LinkText
 import org.mozilla.fenix.compose.button.PrimaryButton
@@ -142,7 +142,7 @@ fun OnboardingPage(
             ) {
                 PrimaryButton(
                     modifier = Modifier
-                        .fillMaxWidth()
+                        .width(width = FirefoxTheme.layout.size.maxWidth.small)
                         .semantics {
                             testTag = pageState.title + "onboarding_card.positive_button"
                         },
@@ -154,7 +154,7 @@ fun OnboardingPage(
                     Spacer(modifier = Modifier.height(8.dp))
                     SecondaryButton(
                         modifier = Modifier
-                            .fillMaxWidth()
+                            .width(width = FirefoxTheme.layout.size.maxWidth.small)
                             .semantics {
                                 testTag = pageState.title + "onboarding_card.negative_button"
                             },
@@ -183,7 +183,7 @@ fun imageHeight(boxWithConstraintsScope: BoxWithConstraintsScope): Dp {
     return boxWithConstraintsScope.maxHeight.times(imageHeightRatio)
 }
 
-@LightDarkPreview
+@FlexibleWindowLightDarkPreview
 @Composable
 private fun OnboardingPagePreview() {
     FirefoxTheme {
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt
@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
@@ -110,7 +109,7 @@ fun TermsOfServiceOnboardingPage(
                     PrimaryButton(
                         text = primaryButton.text,
                         modifier = Modifier
-                            .fillMaxWidth()
+                            .width(width = FirefoxTheme.layout.size.maxWidth.small)
                             .semantics { testTag = title + "onboarding_card.positive_button" },
                         onClick = primaryButton.onClick,
                     )
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/ThemeOnboardingPage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/ThemeOnboardingPage.kt
@@ -126,7 +126,7 @@ fun ThemeOnboardingPage(
             PrimaryButton(
                 text = primaryButton.text,
                 modifier = Modifier
-                    .fillMaxWidth()
+                    .width(width = FirefoxTheme.layout.size.maxWidth.small)
                     .semantics { testTag = title + "onboarding_card.positive_button" },
                 onClick = { primaryButton.onClick() },
             )
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/ToolbarOnboardingPage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/ToolbarOnboardingPage.kt
@@ -115,7 +115,7 @@ fun ToolbarOnboardingPage(
             PrimaryButton(
                 text = primaryButton.text,
                 modifier = Modifier
-                    .fillMaxWidth()
+                    .width(width = FirefoxTheme.layout.size.maxWidth.small)
                     .semantics { testTag = title + "onboarding_card.positive_button" },
                 onClick = primaryButton.onClick,
             )

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ fun AddOnsOnboardingPage(`
`112`	`112`	`PrimaryButton(`
`113`	`113`	`text = primaryButton.text,`
`114`	`114`	`modifier = Modifier`
`115`		`- .fillMaxWidth()`
	`115`	`+ .width(width = FirefoxTheme.layout.size.maxWidth.small)`
`116`	`116`	`.semantics { testTag = title + "onboarding_card.positive_button" },`
`117`	`117`	`onClick = primaryButton.onClick,`
`118`	`118`	`)`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ fun ThemeOnboardingPage(`
`126`	`126`	`PrimaryButton(`
`127`	`127`	`text = primaryButton.text,`
`128`	`128`	`modifier = Modifier`
`129`		`- .fillMaxWidth()`
	`129`	`+ .width(width = FirefoxTheme.layout.size.maxWidth.small)`
`130`	`130`	`.semantics { testTag = title + "onboarding_card.positive_button" },`
`131`	`131`	`onClick = { primaryButton.onClick() },`
`132`	`132`	`)`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ fun ToolbarOnboardingPage(`
`115`	`115`	`PrimaryButton(`
`116`	`116`	`text = primaryButton.text,`
`117`	`117`	`modifier = Modifier`
`118`		`- .fillMaxWidth()`
	`118`	`+ .width(width = FirefoxTheme.layout.size.maxWidth.small)`
`119`	`119`	`.semantics { testTag = title + "onboarding_card.positive_button" },`
`120`	`120`	`onClick = primaryButton.onClick,`
`121`	`121`	`)`