blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fixes #10674: Add SignInView only once

master
ValentinTimisica 2020-05-15 09:23:04 +03:00 committed by Emily Kager
parent 96b015771b
commit 03284e2da0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,7 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
private lateinit var bookmarkStore: BookmarkFragmentStore
private lateinit var bookmarkView: BookmarkView
private lateinit var signInView: SignInView
private var _bookmarkInteractor: BookmarkFragmentInteractor? = null
protected val bookmarkInteractor: BookmarkFragmentInteractor
get() = _bookmarkInteractor!!
@ -97,6 +98,8 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
)
bookmarkView = BookmarkView(view.bookmarkLayout, bookmarkInteractor)
signInView = SignInView(view.bookmarkLayout, findNavController())
signInView.view.visibility = View.GONE
viewLifecycleOwner.lifecycle.addObserver(
BookmarkDeselectNavigationListener(
@ -147,7 +150,9 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
if (currentGuid == BookmarkRoot.Root.id &&
requireComponents.backgroundServices.accountManager.authenticatedAccount() == null
) {
view?.let { SignInView(it.bookmarkLayout, findNavController()) }
signInView.view.visibility = View.VISIBLE
} else {
signInView.view.visibility = View.GONE
}
initialJob = loadInitialBookmarkFolder(currentGuid)

2
app/src/main/java/org/mozilla/fenix/library/bookmarks/SignInView.kt
View File

@ -21,7 +21,7 @@ class SignInView(
override val containerView: View?
get() = container
private val view: MaterialButton = LayoutInflater.from(container.context)
val view: MaterialButton = LayoutInflater.from(container.context)
.inflate(R.layout.component_sign_in, container, true)
.findViewById(R.id.bookmark_folders_sign_in)