Fix toolbar placement and app theming

jonalmeida · mergify[bot] · commit 83c61ca807cb · 2025-07-18T08:22:52.000Z
Closes #3691
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -76,7 +76,7 @@
             android:parentActivityName=".BrowserActivity" />
 
         <activity
-            android:theme="@style/Theme.AppCompat.Light"
+            android:theme="@style/AppTheme"
             android:name=".addons.AddonDetailsActivity"
             android:exported="false"
             android:label="@string/mozac_feature_addons_addons" />
@@ -85,24 +85,24 @@
             android:label="@string/mozac_feature_addons_addons"
             android:parentActivityName=".addons.AddonsActivity"
             android:exported="false"
-            android:theme="@style/Theme.AppCompat.Light" />
+            android:theme="@style/AppTheme" />
 
         <activity
             android:name=".addons.PermissionsDetailsActivity"
             android:label="@string/mozac_feature_addons_addons"
             android:exported="false"
-            android:theme="@style/Theme.AppCompat.Light" />
+            android:theme="@style/AppTheme" />
 
         <activity
             android:name=".addons.AddonSettingsActivity"
             android:label="@string/mozac_feature_addons_addons"
             android:exported="false"
-            android:theme="@style/Theme.AppCompat.Light" />
+            android:theme="@style/AppTheme" />
 
         <activity
             android:name=".addons.WebExtensionActionPopupActivity"
             android:label="@string/mozac_feature_addons_addons"
-            android:theme="@style/Theme.AppCompat.Light"/>
+            android:theme="@style/AppTheme"/>
 
         <activity
             android:name=".IntentReceiverActivity"
diff --git a/app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt b/app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt
@@ -50,10 +50,10 @@ open class BrowserActivity : AppCompatActivity() {
     open fun createBrowserFragment(sessionId: String?): Fragment = BrowserFragment.create(sessionId)
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setContentView(R.layout.activity_main)
         super.onCreate(savedInstanceState)
         enableEdgeToEdge(SystemBarStyle.dark(Color.TRANSPARENT))
         window.setupPersistentInsets()
-        setContentView(R.layout.activity_main)
 
         components.notificationsDelegate.bindToActivity(this)
 
diff --git a/app/src/main/java/org/mozilla/reference/browser/CrashListActivity.kt b/app/src/main/java/org/mozilla/reference/browser/CrashListActivity.kt
@@ -25,7 +25,6 @@ class CrashListActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         window.setupPersistentInsets()
 
-        packageName
         supportFragmentManager
             .beginTransaction()
             .add(android.R.id.content, CrashListFragment())
diff --git a/app/src/main/java/org/mozilla/reference/browser/addons/AddonSettingsActivity.kt b/app/src/main/java/org/mozilla/reference/browser/addons/AddonSettingsActivity.kt
@@ -30,11 +30,10 @@ import org.mozilla.reference.browser.ext.components
  */
 class AddonSettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        setContentView(R.layout.activity_add_on_settings)
         enableEdgeToEdge(SystemBarStyle.dark(Color.TRANSPARENT))
         super.onCreate(savedInstanceState)
-        window.setupPersistentInsets()
-
-        setContentView(R.layout.activity_add_on_settings)
+        window.setupPersistentInsets(true)
 
         val addon = requireNotNull(
             intent.getParcelableExtraCompat("add_on", Addon::class.java),
diff --git a/app/src/main/java/org/mozilla/reference/browser/addons/AddonsActivity.kt b/app/src/main/java/org/mozilla/reference/browser/addons/AddonsActivity.kt
@@ -17,11 +17,10 @@ import org.mozilla.reference.browser.R
  */
 class AddonsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge(SystemBarStyle.dark(Color.TRANSPARENT))
-        super.onCreate(savedInstanceState)
-        window.setupPersistentInsets()
-
         setContentView(R.layout.activity_main)
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge(SystemBarStyle.dark(Color.TRANSPARENT))
+        window.setupPersistentInsets(true)
 
         if (savedInstanceState == null) {
             supportFragmentManager.beginTransaction().apply {
diff --git a/app/src/main/java/org/mozilla/reference/browser/addons/InstalledAddonDetailsActivity.kt b/app/src/main/java/org/mozilla/reference/browser/addons/InstalledAddonDetailsActivity.kt
@@ -35,7 +35,7 @@ class InstalledAddonDetailsActivity : AppCompatActivity() {
         enableEdgeToEdge(SystemBarStyle.dark(Color.TRANSPARENT))
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_installed_add_on_details)
-        window.setupPersistentInsets()
+        window.setupPersistentInsets(true)
 
         val addon = requireNotNull(
             intent.getParcelableExtraCompat("add_on", Addon::class.java),
diff --git a/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionActionPopupActivity.kt b/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionActionPopupActivity.kt
@@ -31,9 +31,9 @@ class WebExtensionActionPopupActivity : AppCompatActivity() {
     private lateinit var webExtensionId: String
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setContentView(R.layout.activity_add_on_settings)
         enableEdgeToEdge(SystemBarStyle.dark(Color.TRANSPARENT))
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_add_on_settings)
         window.setupPersistentInsets()
 
         webExtensionId = requireNotNull(intent.getStringExtra("web_extension_id"))
diff --git a/app/src/main/java/org/mozilla/reference/browser/settings/SettingsActivity.kt b/app/src/main/java/org/mozilla/reference/browser/settings/SettingsActivity.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.reference.browser.settings
 
-import android.R.id.content
 import android.graphics.Color
 import android.os.Bundle
 import android.view.MenuItem
@@ -13,18 +12,20 @@ import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.ktx.android.view.setupPersistentInsets
+import org.mozilla.reference.browser.R
 
 class SettingsActivity :
     AppCompatActivity(),
     SettingsFragment.ActionBarUpdater {
     override fun onCreate(savedInstanceState: Bundle?) {
+        setContentView(R.layout.activity_main)
         enableEdgeToEdge(SystemBarStyle.dark(Color.TRANSPARENT))
         super.onCreate(savedInstanceState)
         window.setupPersistentInsets(true)
 
         if (savedInstanceState == null) {
             with(supportFragmentManager.beginTransaction()) {
-                replace(content, SettingsFragment())
+                replace(R.id.container, SettingsFragment())
                 commit()
             }
         }
diff --git a/app/src/main/java/org/mozilla/reference/browser/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/reference/browser/settings/SettingsFragment.kt
@@ -143,7 +143,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         OnPreferenceClickListener {
             parentFragmentManager
                 .beginTransaction()
-                .replace(android.R.id.content, PairSettingsFragment())
+                .replace(R.id.container, PairSettingsFragment())
                 .addToBackStack(null)
                 .commit()
             getActionBarUpdater().apply {
@@ -156,7 +156,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         OnPreferenceClickListener {
             parentFragmentManager
                 .beginTransaction()
-                .replace(android.R.id.content, AccountSettingsFragment())
+                .replace(R.id.container, AccountSettingsFragment())
                 .addToBackStack(null)
                 .commit()
             getActionBarUpdater().apply {
@@ -169,7 +169,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         OnPreferenceClickListener {
             parentFragmentManager
                 .beginTransaction()
-                .replace(android.R.id.content, PrivacySettingsFragment())
+                .replace(R.id.container, PrivacySettingsFragment())
                 .addToBackStack(null)
                 .commit()
             getActionBarUpdater().apply {
@@ -188,7 +188,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         OnPreferenceClickListener {
             parentFragmentManager
                 .beginTransaction()
-                .replace(android.R.id.content, AboutFragment())
+                .replace(R.id.container, AboutFragment())
                 .addToBackStack(null)
                 .commit()
             true
diff --git a/app/src/main/java/org/mozilla/reference/browser/tabs/synced/SyncedTabsActivity.kt b/app/src/main/java/org/mozilla/reference/browser/tabs/synced/SyncedTabsActivity.kt
@@ -16,7 +16,7 @@ class SyncedTabsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge(SystemBarStyle.dark(Color.TRANSPARENT))
         super.onCreate(savedInstanceState)
-        window.setupPersistentInsets()
+        window.setupPersistentInsets(true)
 
         setContentView(R.layout.activity_main)
 
diff --git a/app/src/main/res/drawable/addon_textview_selector.xml b/app/src/main/res/drawable/addon_textview_selector.xml
diff --git a/app/src/main/res/layout/activity_add_on_details.xml b/app/src/main/res/layout/activity_add_on_details.xml
@@ -114,7 +114,7 @@
                 android:layout_alignParentEnd="true"
                 android:contentDescription="@string/mozac_feature_addons_home_page"
                 android:src="@drawable/mozac_ic_link_24"
-                app:tint="@android:color/black" />
+                app:tint="@color/icons" />
 
         <View
                 android:id="@+id/home_page_divider"
diff --git a/app/src/main/res/layout/activity_add_on_permissions.xml b/app/src/main/res/layout/activity_add_on_permissions.xml
@@ -26,7 +26,6 @@
             android:paddingEnd="16dp"
             android:background="?attr/selectableItemBackground"
             android:text="@string/mozac_feature_addons_learn_more"
-            app:drawableTint="@android:color/black"
-            android:textColor="@android:color/black" />
+            app:drawableTint="@color/icons" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_add_on_settings.xml b/app/src/main/res/layout/activity_add_on_settings.xml
@@ -1,11 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
+<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
    - 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/. -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/addonSettingsContainer"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:ignore="MergeRootFrame" />
+    android:layout_height="match_parent">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/addonSettingsContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_installed_add_on_details.xml b/app/src/main/res/layout/activity_installed_add_on_details.xml
@@ -38,10 +38,9 @@
                 android:drawablePadding="10dp"
                 android:padding="16dp"
                 android:text="@string/mozac_feature_addons_settings"
-                android:textColor="@drawable/addon_textview_selector"
                 android:textSize="18sp"
                 app:drawableStartCompat="@drawable/mozac_ic_preferences"
-                app:drawableTint="@android:color/black" />
+                app:drawableTint="@color/icons" />
 
         <TextView
                 android:id="@+id/details"
@@ -52,10 +51,9 @@
                 android:drawablePadding="6dp"
                 android:padding="16dp"
                 android:text="@string/mozac_feature_addons_details"
-                android:textColor="@drawable/addon_textview_selector"
                 android:textSize="18sp"
                 app:drawableStartCompat="@drawable/mozac_ic_information_24"
-                app:drawableTint="@android:color/black" />
+                app:drawableTint="@color/icons" />
 
         <TextView
                 android:id="@+id/permissions"
@@ -66,7 +64,6 @@
                 android:drawablePadding="6dp"
                 android:padding="16dp"
                 android:text="@string/mozac_feature_addons_permissions"
-                android:textColor="@drawable/addon_textview_selector"
                 android:textSize="18sp"
                 app:drawableStartCompat="@drawable/mozac_ic_permissions" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -2,10 +2,14 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - 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/. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:ignore="MergeRootFrame" />
+    android:layout_height="match_parent">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/add_ons_permission_item.xml b/app/src/main/res/layout/add_ons_permission_item.xml
@@ -19,7 +19,6 @@
             android:layout_height="wrap_content"
             android:paddingTop="16dp"
             android:paddingBottom="16dp"
-            android:textColor="@android:color/black"
             tools:text="Access your data for all websites" />
 
     <View
@@ -28,4 +27,4 @@
             android:background="@color/photonGrey40"
             android:importantForAccessibility="no" />
 
-</LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
@@ -27,7 +27,7 @@
         <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
 
-    <style name="AddonsActivityTheme" parent="Theme.AppCompat.Light">
+    <style name="AddonsActivityTheme" parent="AppTheme">
         <item name="mozac_primary_text_color">@color/photonDarkGrey90</item>
         <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
