diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt index 240a6317a..92a045228 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt @@ -99,12 +99,6 @@ class BookmarkFragment : Fragment(), BackHandler, AccountObserver { return view } - // Fill out our title map once we have context. - override fun onAttach(context: Context) { - super.onAttach(context) - setRootTitles(context) - } - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) activity?.title = getString(R.string.library_bookmarks) @@ -113,6 +107,8 @@ class BookmarkFragment : Fragment(), BackHandler, AccountObserver { override fun onResume() { super.onResume() + context?.let { setRootTitles(it) } + (activity as? AppCompatActivity)?.supportActionBar?.show() checkIfSignedIn() diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt index 145953845..b04249c63 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt @@ -4,7 +4,6 @@ package org.mozilla.fenix.library.bookmarks.edit -import android.content.Context import android.content.DialogInterface import android.graphics.PorterDuff.Mode.SRC_IN import android.graphics.PorterDuffColorFilter @@ -62,13 +61,12 @@ class EditBookmarkFragment : Fragment() { return inflater.inflate(R.layout.fragment_edit_bookmark, container, false) } - override fun onAttach(context: Context) { - super.onAttach(context) - setRootTitles(context, showMobileRoot = true) - } - override fun onResume() { super.onResume() + context?.let { + setRootTitles(it, showMobileRoot = true) + } + val activity = activity as? AppCompatActivity activity?.supportActionBar?.show() diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt index d32c24a1d..652697d76 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt @@ -4,7 +4,6 @@ package org.mozilla.fenix.library.bookmarks.selectfolder -import android.content.Context import android.graphics.PorterDuff.Mode.SRC_IN import android.graphics.PorterDuffColorFilter import android.os.Bundle @@ -56,12 +55,6 @@ class SelectBookmarkFolderFragment : Fragment(), AccountObserver { private lateinit var signInComponent: SignInComponent - // Fill out our title map once we have context. - override fun onAttach(context: Context) { - super.onAttach(context) - setRootTitles(context, showMobileRoot = true) - } - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setHasOptionsMenu(true) @@ -99,6 +92,9 @@ class SelectBookmarkFolderFragment : Fragment(), AccountObserver { override fun onResume() { super.onResume() + context?.let { + setRootTitles(it, showMobileRoot = true) + } (activity as AppCompatActivity).title = getString(R.string.bookmark_select_folder_fragment_label) (activity as AppCompatActivity).supportActionBar?.show()