tor-browser

commit fd7ba824dc9f1dd2222a86348f0249da777cacf8
parent 7311d6cc2b2b1f4e46d9ce804c0236051de3063d
Author: t-p-white <towhite@mozilla.com>
Date:   Wed, 26 Nov 2025 08:02:14 +0000

Bug 2001968 - Part 7: "Top" and "Bottom" were not visible in the ToolbarOnboardingPageRedesign r=android-reviewers,gmalekpour

| Current | Patch |
|{F42713036}|{F42713057}

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

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt
 | 
28
+++++++++++-----------------

1 file changed, 11 insertions(+), 17 deletions(-)
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
@@ -91,9 +91,7 @@ fun ToolbarOnboardingPageRedesign(
                 )
 
                 Box(
-                    modifier = Modifier
-                        .height(CONTENT_IMAGE_HEIGHT)
-                        .fillMaxWidth(),
+                    modifier = Modifier.fillMaxWidth(),
                     contentAlignment = Alignment.Center,
                 ) {
                     ToolbarPositionOptions(
@@ -127,20 +125,15 @@ private fun ToolbarPositionOptions(
     pageState: OnboardingPageState,
     onToolbarSelectionClicked: (ToolbarOptionType) -> Unit,
 ) {
-    Box(
-        modifier = Modifier.height(CONTENT_IMAGE_HEIGHT),
-        contentAlignment = Alignment.Center,
-    ) {
-        val state by onboardingStore.observeAsState(initialValue = onboardingStore.state) { it }
-        pageState.toolbarOptions?.let { options ->
-            Row(horizontalArrangement = Arrangement.spacedBy(26.dp)) {
-                options.forEach {
-                    ToolbarPositionOption(
-                        option = it,
-                        isSelected = it.toolbarType == state.toolbarOptionSelected,
-                        onClick = { onToolbarSelectionClicked(it.toolbarType) },
-                    )
-                }
+    val state by onboardingStore.observeAsState(initialValue = onboardingStore.state) { it }
+    pageState.toolbarOptions?.let { options ->
+        Row(horizontalArrangement = Arrangement.spacedBy(26.dp)) {
+            options.forEach {
+                ToolbarPositionOption(
+                    option = it,
+                    isSelected = it.toolbarType == state.toolbarOptionSelected,
+                    onClick = { onToolbarSelectionClicked(it.toolbarType) },
+                )
             }
         }
     }
@@ -181,6 +174,7 @@ private fun ToolbarPositionImage(
 
     Box(
         modifier = Modifier
+            .height(CONTENT_IMAGE_HEIGHT)
             .aspectRatio(aspectRatio)
             .clickable(role = Role.Button, onClick = onClick)
             .clip(shape = cardShape)