Dan Ballard pushed to branch tor-browser-153.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: ecded608 by clairehurst at 2026-07-21T16:14:06-06:00 fixup! [android] Modify UI/UX Bug 45067: Clean up our TorHomePage padding - - - - - 2 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorHomePage.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -575,7 +575,7 @@ class HomeFragment : Fragment(), UserInteractionHandler { private fun initComposeTorHomePageView(view: ComposeView) { view.setContent { FirefoxTheme { - val isToolbarAtTop = requireComponents.settings.toolbarPosition == ToolbarPosition.TOP + val isToolbarAtTop = components.settings.toolbarPosition == ToolbarPosition.TOP Scaffold( modifier = Modifier .fillMaxSize() @@ -591,8 +591,8 @@ class HomeFragment : Fragment(), UserInteractionHandler { } }, containerColor = Color.Transparent, - ) { _ -> - TorHomePage(toolBarAtTop = isToolbarAtTop) + ) { innerPadding -> + TorHomePage(innerPadding = innerPadding) } } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorHomePage.kt ===================================== @@ -2,6 +2,7 @@ package org.mozilla.fenix.tor import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize @@ -20,29 +21,34 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.painter.BrushPainter import androidx.compose.ui.res.colorResource -import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.PreviewParameter +import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import mozilla.components.compose.base.annotation.FlexibleWindowLightDarkPreview import org.mozilla.fenix.R +class PaddingValuesParameterProvider : PreviewParameterProvider<PaddingValues> { + override val values = sequenceOf( + PaddingValues(top = 60.dp), + PaddingValues(bottom = 60.dp), + ) +} + @Composable @FlexibleWindowLightDarkPreview fun TorHomePage( - toolBarAtTop: Boolean = true, + @PreviewParameter(PaddingValuesParameterProvider::class) innerPadding: PaddingValues, ) { Column( modifier = Modifier .fillMaxSize() - .padding( - top = if (toolBarAtTop) dimensionResource(R.dimen.browser_navbar_height) else 0.dp, - bottom = if (!toolBarAtTop) dimensionResource(R.dimen.browser_navbar_height) else 0.dp, - ) + .padding(innerPadding) .paint( BrushPainter( Brush.linearGradient( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ecded608... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ecded608... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help
participants (1)
-
Dan Ballard (@dan)