Bug 1990283 - Migrate TopAppBar to Material 3 in BaseComposeFragment r=android-reviewers,avirvara

This commit refactors the `TopAppBar` in `BaseComposeFragment.kt` to use the Material 3 version.

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

Author: mcarare

mobile/android/focus-android/app/lint-baseline.xml

@@ -133,17 +133,6 @@
             column="20"/>
     </issue>
 
-    <issue
-        id="UsingMaterialAndMaterial3Libraries"
-        message="Using a material import while also using the material3 library"
-        errorLine1="import androidx.compose.material.TopAppBar"
-        errorLine2="       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/mozilla/focus/settings/BaseComposeFragment.kt"
-            line="17"
-            column="8"/>
-    </issue>
-
     <issue
         id="DataExtractionRules"
         message="The attribute `android:allowBackup` is deprecated from Android 12 and higher and may be removed in future versions. Consider adding the attribute `android:dataExtractionRules` specifying an `@xml` resource which configures cloud backups and device transfers on Android 12 and higher."

mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/BaseComposeFragment.kt

@@ -14,19 +14,20 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.material.TopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import org.mozilla.focus.R
@@ -102,7 +103,7 @@ abstract class BaseComposeFragment : Fragment() {
                             .background(colorResource(id = backgroundColorResource))
                             .padding(paddingValues),
                     ) {
-                        TopAppBar(
+                        FocusTopAppBar(
                             title = title,
                             modifier = Modifier,
                             onNavigateUpClick = onNavigateUp(),
@@ -122,8 +123,9 @@ abstract class BaseComposeFragment : Fragment() {
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-private fun TopAppBar(
+private fun FocusTopAppBar(
     title: String,
     modifier: Modifier = Modifier,
     onNavigateUpClick: () -> Unit,
@@ -132,7 +134,6 @@ private fun TopAppBar(
         title = {
             Text(
                 text = title,
-                color = focusColors.toolbarColor,
             )
         },
         modifier = modifier,
@@ -143,11 +144,14 @@ private fun TopAppBar(
                 Icon(
                     painterResource(id = iconsR.drawable.mozac_ic_back_24),
                     stringResource(R.string.go_back),
-                    tint = focusColors.toolbarColor,
                 )
             }
         },
-        backgroundColor = colorResource(R.color.settings_background),
-        elevation = 0.dp,
+        colors = TopAppBarDefaults.topAppBarColors(
+            containerColor = colorResource(R.color.settings_background),
+            scrolledContainerColor = colorResource(R.color.settings_background),
+            navigationIconContentColor = focusColors.toolbarColor,
+            titleContentColor = focusColors.toolbarColor,
+        ),
     )
 }