tor-browser

commit 901796eddf475e61e1bef195b09d8f61b5a5af95
parent 4b0c7da0b66659c20c41c131542c3731adf0cac1
Author: t-p-white <towhite@mozilla.com>
Date:   Fri, 21 Nov 2025 18:00:33 +0000

Bug 2001355 - Part 2 move the secondary button inside the Card. r=android-reviewers,mavduevskiy

Differential Revision: https://phabricator.services.mozilla.com/D273548

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/MarketingDataOnboardingPageRedesign.kt
 | 
1
-
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingPageRedesign.kt
 | 
10
+++++-----
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
 | 
1
-
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt
 | 
1
-

4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/MarketingDataOnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/MarketingDataOnboardingPageRedesign.kt
@@ -67,7 +67,6 @@ fun MarketingDataOnboardingPageRedesign(
     onMarketingDataContinueClick: (allowMarketingDataCollection: Boolean) -> Unit,
 ) {
     Card(
-        modifier = Modifier.padding(bottom = 60.dp),
         elevation = CardDefaults.cardElevation(defaultElevation = 6.dp),
     ) {
         Column(
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingPageRedesign.kt
@@ -62,10 +62,6 @@ fun OnboardingPageRedesign(
             pageState = pageState,
             mainImage = mainImage,
         )
-
-        pageState.secondaryButton?.let {
-            SecondaryButton(title = pageState.title, secondaryButton = it)
-        }
     }
 
     LaunchedEffect(pageState) {
@@ -87,7 +83,7 @@ private fun SecondaryButton(
         text = secondaryButton.text,
         onClick = secondaryButton.onClick,
         colors = ButtonDefaults.textButtonColors(
-            contentColor = FirefoxTheme.colors.textActionPrimary,
+            contentColor = FirefoxTheme.colors.textActionSecondary,
         ),
     )
 }
@@ -123,6 +119,10 @@ private fun CardView(
                 text = pageState.primaryButton.text,
                 onClick = pageState.primaryButton.onClick,
             )
+
+            pageState.secondaryButton?.let {
+                SecondaryButton(title = pageState.title, secondaryButton = it)
+            }
         }
     }
 }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
@@ -53,7 +53,6 @@ fun TermsOfServiceOnboardingPageRedesign(
     eventHandler: OnboardingTermsOfServiceEventHandler,
 ) {
     Card(
-        modifier = Modifier.padding(bottom = 60.dp),
         elevation = CardDefaults.cardElevation(defaultElevation = 6.dp),
     ) {
         Column(
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt
@@ -67,7 +67,6 @@ fun ToolbarOnboardingPageRedesign(
     onToolbarSelectionClicked: (ToolbarOptionType) -> Unit,
 ) {
     Card(
-        modifier = Modifier.padding(bottom = 60.dp),
         elevation = CardDefaults.cardElevation(defaultElevation = 6.dp),
     ) {
         Column(