@ -105,9 +105,7 @@ import org.mozilla.fenix.components.StoreProvider
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.components.toolbar.BrowserFragmentState
import org.mozilla.fenix.components.toolbar.BrowserFragmentState
import org.mozilla.fenix.components.toolbar.BrowserFragmentStore
import org.mozilla.fenix.components.toolbar.BrowserFragmentStore
import org.mozilla.fenix.components.toolbar.BrowserInteractor
import org.mozilla.fenix.components.toolbar.BrowserToolbarView
import org.mozilla.fenix.components.toolbar.BrowserToolbarView
import org.mozilla.fenix.components.toolbar.BrowserToolbarViewInteractor
import org.mozilla.fenix.components.toolbar.DefaultBrowserToolbarController
import org.mozilla.fenix.components.toolbar.DefaultBrowserToolbarController
import org.mozilla.fenix.components.toolbar.DefaultBrowserToolbarMenuController
import org.mozilla.fenix.components.toolbar.DefaultBrowserToolbarMenuController
import org.mozilla.fenix.components.toolbar.ToolbarIntegration
import org.mozilla.fenix.components.toolbar.ToolbarIntegration
@ -137,6 +135,8 @@ import mozilla.components.support.base.feature.ActivityResultHandler
import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
import mozilla.components.support.ktx.android.view.enterToImmersiveMode
import mozilla.components.support.ktx.android.view.enterToImmersiveMode
import org.mozilla.fenix.GleanMetrics.PerfStartup
import org.mozilla.fenix.GleanMetrics.PerfStartup
import org.mozilla.fenix.components.toolbar.interactor.BrowserToolbarInteractor
import org.mozilla.fenix.components.toolbar.interactor.DefaultBrowserToolbarInteractor
import org.mozilla.fenix.ext.measureNoInline
import org.mozilla.fenix.ext.measureNoInline
import org.mozilla.fenix.ext.secure
import org.mozilla.fenix.ext.secure
import org.mozilla.fenix.settings.biometric.BiometricPromptFeature
import org.mozilla.fenix.settings.biometric.BiometricPromptFeature
@ -155,9 +155,9 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
private lateinit var browserFragmentStore : BrowserFragmentStore
private lateinit var browserFragmentStore : BrowserFragmentStore
private lateinit var browserAnimator : BrowserAnimator
private lateinit var browserAnimator : BrowserAnimator
private var _browser Interactor: BrowserToolbar View Interactor? = null
private var _browser Toolbar Interactor: BrowserToolbar Interactor? = null
protected val browser Interactor: BrowserToolbar View Interactor
protected val browser Toolbar Interactor: BrowserToolbar Interactor
get ( ) = _browser Interactor!!
get ( ) = _browser Toolbar Interactor!!
@VisibleForTesting
@VisibleForTesting
@Suppress ( " VariableNaming " )
@Suppress ( " VariableNaming " )
@ -357,7 +357,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
browserStore = store
browserStore = store
)
)
_browser Interactor = BrowserInteractor(
_browser Toolbar Interactor = Default BrowserToolba rInteractor(
browserToolbarController ,
browserToolbarController ,
browserToolbarMenuController
browserToolbarMenuController
)
)
@ -365,7 +365,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
_browserToolbarView = BrowserToolbarView (
_browserToolbarView = BrowserToolbarView (
container = view . browserLayout ,
container = view . browserLayout ,
toolbarPosition = context . settings ( ) . toolbarPosition ,
toolbarPosition = context . settings ( ) . toolbarPosition ,
interactor = browser Interactor,
interactor = browser Toolbar Interactor,
customTabSession = customTabSessionId ?. let { store . state . findCustomTab ( it ) } ,
customTabSession = customTabSessionId ?. let { store . state . findCustomTab ( it ) } ,
lifecycleOwner = viewLifecycleOwner
lifecycleOwner = viewLifecycleOwner
)
)
@ -1343,7 +1343,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
requireContext ( ) . accessibilityManager . removeAccessibilityStateChangeListener ( this )
requireContext ( ) . accessibilityManager . removeAccessibilityStateChangeListener ( this )
_browserToolbarView = null
_browserToolbarView = null
_browser Interactor = null
_browser Toolbar Interactor = null
}
}
override fun onAttach ( context : Context ) {
override fun onAttach ( context : Context ) {