tor-browser

commit 7d653e24b3b136314438b3cace0c2c21b688c280
parent f5eae8beb35db492376dbe3543050f2ac8b6fd6e
Author: mcarare <48995920+mcarare@users.noreply.github.com>
Date:   Mon,  6 Oct 2025 15:29:27 +0000

Bug 1992724 - Move TopAppBar into Scaffold topBar parameter r=android-reviewers,giorga

This patch refactors `BaseComposeFragment` to correctly place the `FocusTopAppBar` within the `topBar` parameter of the `Scaffold` composable.

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

Diffstat:
M
mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/BaseComposeFragment.kt
 | 
14
+++++++-------

1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/BaseComposeFragment.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/BaseComposeFragment.kt
@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@file:Suppress("UnusedMaterialScaffoldPaddingParameter")
-
 package org.mozilla.focus.settings
 
 import android.os.Bundle
@@ -97,17 +95,19 @@ abstract class BaseComposeFragment : Fragment() {
             FocusTheme {
                 Scaffold(
                     modifier = Modifier.systemBarsPadding(),
+                    topBar = {
+                        FocusTopAppBar(
+                            title = title,
+                            modifier = Modifier,
+                            onNavigateUpClick = onNavigateUp(),
+                        )
+                    },
                 ) { paddingValues ->
                     Column(
                         modifier = Modifier
                             .background(colorResource(id = backgroundColorResource))
                             .padding(paddingValues),
                     ) {
-                        FocusTopAppBar(
-                            title = title,
-                            modifier = Modifier,
-                            onNavigateUpClick = onNavigateUp(),
-                        )
                         this@BaseComposeFragment.Content()
                     }
                 }