blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No issue: Update navigation library

master
Emily Kager 2019-09-26 11:04:42 -07:00 committed by Emily Kager
parent 11baabb63a
commit 3f41a4e9c6
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
View File

@ -222,7 +222,7 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
contextMenuFeature.set(
feature = ContextMenuFeature(
fragmentManager = requireFragmentManager(),
fragmentManager = parentFragmentManager,
store = store,
candidates = FenixContextMenuCandidate.defaultCandidates(
context,
@ -271,7 +271,7 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
sessionManager = sessionManager,
sessionId = customTabSessionId,
interceptLinkClicks = true,
fragmentManager = requireFragmentManager()
fragmentManager = parentFragmentManager
),
owner = this,
view = view
@ -282,7 +282,7 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
fragment = this,
sessionManager = sessionManager,
sessionId = customTabSessionId,
fragmentManager = requireFragmentManager(),
fragmentManager = parentFragmentManager,
onNeedToRequestPermissions = { permissions ->
requestPermissions(permissions, REQUEST_CODE_PROMPT_PERMISSIONS)
}),
@ -308,7 +308,7 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
feature = SitePermissionsFeature(
context = context,
sessionManager = sessionManager,
fragmentManager = requireFragmentManager(),
fragmentManager = parentFragmentManager,
promptsStyling = SitePermissionsFeature.PromptsStyling(
gravity = getAppropriateLayoutGravity(),
shouldWidthMatchParent = true,

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

@ -94,7 +94,7 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), BackHandler, Accou
bookmarkView = BookmarkView(view.bookmarkLayout, bookmarkInteractor)
signInView = SignInView(view.bookmarkLayout, bookmarkInteractor)
viewLifecycleOwner.lifecycle.addObserver(
lifecycle.addObserver(
BookmarkDeselectNavigationListener(
findNavController(),
sharedViewModel,

2
app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
View File

@ -141,7 +141,7 @@ class SearchFragment : Fragment(), BackHandler {
qrFeature.set(
QrFeature(
requireContext(),
fragmentManager = requireFragmentManager(),
fragmentManager = parentFragmentManager,
onNeedToRequestPermissions = { permissions ->
requestPermissions(permissions, REQUEST_CODE_CAMERA_PERMISSIONS)
},

2
app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt
View File

@ -40,7 +40,7 @@ class PairFragment : Fragment(), BackHandler {
qrFeature.set(
QrFeature(
requireContext(),
fragmentManager = requireFragmentManager(),
fragmentManager = parentFragmentManager,
onNeedToRequestPermissions = { permissions ->
requestPermissions(permissions, REQUEST_CODE_CAMERA_PERMISSIONS)
},

2
buildSrc/src/main/java/Dependencies.kt
View File

@ -25,7 +25,7 @@ object Versions {
const val androidx_annotation = "1.1.0"
const val androidx_lifecycle = "2.2.0-alpha04"
const val androidx_fragment = "1.2.0-alpha03"
const val androidx_navigation = "2.2.0-alpha02"
const val androidx_navigation = "2.2.0-alpha03"
const val androidx_recyclerview = "1.1.0-beta04"
const val androidx_testing = "1.2.1-alpha02"
const val androidx_test_ext = "1.0.0"