ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #3364: Set bookmark root titles onResume (#3828)

This commit is contained in:
Colin Lee 2019-07-03 13:13:53 -05:00 committed by GitHub
parent cad6345c89
commit 6bb67a9de7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
View File

@ -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()

10
app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt
View File

@ -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()

10
app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt
View File

@ -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()