diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index 82c65b24b..1242d1c7c 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -102,8 +102,6 @@ class BrowserFragment : Fragment(), BackHandler { sessionId = BrowserFragmentArgs.fromBundle(arguments!!).sessionId - (activity as AppCompatActivity).supportActionBar?.hide() - val sessionManager = requireComponents.core.sessionManager contextMenuFeature.set( @@ -169,6 +167,11 @@ class BrowserFragment : Fragment(), BackHandler { view = view) } + override fun onResume() { + super.onResume() + (activity as AppCompatActivity).supportActionBar?.hide() + } + override fun onStart() { super.onStart() getAutoDisposeObservable() diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index a72f117d9..9de67ac57 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -62,7 +62,6 @@ class HomeFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - (activity as AppCompatActivity).supportActionBar?.hide() setupHomeMenu() val searchIcon = requireComponents.search.searchEngineManager.getDefaultSearchEngine(requireContext()).let { @@ -122,6 +121,11 @@ class HomeFragment : Fragment() { } } + override fun onResume() { + super.onResume() + (activity as AppCompatActivity).supportActionBar?.hide() + } + override fun onStart() { super.onStart() if (isAdded) { diff --git a/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt index c298bee84..e627d4ee5 100644 --- a/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt @@ -30,6 +30,10 @@ class LibraryFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setHasOptionsMenu(true) + } + + override fun onResume() { + super.onResume() (activity as AppCompatActivity).supportActionBar?.show() } diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt index 7ae78f8f8..6d160a3b2 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt @@ -51,6 +51,10 @@ class HistoryFragment : Fragment(), CoroutineScope, BackHandler { job = Job() setHasOptionsMenu(true) + } + + override fun onResume() { + super.onResume() (activity as AppCompatActivity).supportActionBar?.show() } diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt index 4832cf0dc..fec3171f9 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt @@ -66,8 +66,6 @@ class SearchFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - (activity as AppCompatActivity).supportActionBar?.hide() - layoutComponents(view.search_layout) lifecycle.addObserver((toolbarComponent.uiView as ToolbarUIView).toolbarIntegration) @@ -75,6 +73,11 @@ class SearchFragment : Fragment() { view.toolbar_wrapper.clipToOutline = false } + override fun onResume() { + super.onResume() + (activity as AppCompatActivity).supportActionBar?.hide() + } + override fun onStart() { super.onStart() getAutoDisposeObservable() diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt index d1f66d56d..cc9097679 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt @@ -40,7 +40,6 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) job = Job() - (activity as AppCompatActivity).supportActionBar?.show() } override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { @@ -50,6 +49,7 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope { override fun onResume() { super.onResume() + (activity as AppCompatActivity).supportActionBar?.show() generateWordmark() setupPreferences() }