|
|
|
@ -78,7 +78,6 @@ import mozilla.components.ui.tabcounter.TabCounterMenu
|
|
|
|
import org.mozilla.fenix.BrowserDirection
|
|
|
|
import org.mozilla.fenix.BrowserDirection
|
|
|
|
import org.mozilla.fenix.Config
|
|
|
|
import org.mozilla.fenix.Config
|
|
|
|
import org.mozilla.fenix.FeatureFlags
|
|
|
|
import org.mozilla.fenix.FeatureFlags
|
|
|
|
import org.mozilla.fenix.GleanMetrics.PerfStartup
|
|
|
|
|
|
|
|
import org.mozilla.fenix.HomeActivity
|
|
|
|
import org.mozilla.fenix.HomeActivity
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.browser.BrowserAnimator.Companion.getToolbarNavOptions
|
|
|
|
import org.mozilla.fenix.browser.BrowserAnimator.Companion.getToolbarNavOptions
|
|
|
|
@ -97,7 +96,6 @@ import org.mozilla.fenix.components.toolbar.FenixTabCounterMenu
|
|
|
|
import org.mozilla.fenix.components.toolbar.ToolbarPosition
|
|
|
|
import org.mozilla.fenix.components.toolbar.ToolbarPosition
|
|
|
|
import org.mozilla.fenix.ext.components
|
|
|
|
import org.mozilla.fenix.ext.components
|
|
|
|
import org.mozilla.fenix.ext.hideToolbar
|
|
|
|
import org.mozilla.fenix.ext.hideToolbar
|
|
|
|
import org.mozilla.fenix.ext.measureNoInline
|
|
|
|
|
|
|
|
import org.mozilla.fenix.ext.metrics
|
|
|
|
import org.mozilla.fenix.ext.metrics
|
|
|
|
import org.mozilla.fenix.ext.nav
|
|
|
|
import org.mozilla.fenix.ext.nav
|
|
|
|
import org.mozilla.fenix.ext.requireComponents
|
|
|
|
import org.mozilla.fenix.ext.requireComponents
|
|
|
|
@ -200,7 +198,7 @@ class HomeFragment : Fragment() {
|
|
|
|
inflater: LayoutInflater,
|
|
|
|
inflater: LayoutInflater,
|
|
|
|
container: ViewGroup?,
|
|
|
|
container: ViewGroup?,
|
|
|
|
savedInstanceState: Bundle?
|
|
|
|
savedInstanceState: Bundle?
|
|
|
|
): View? = PerfStartup.homeFragmentOnCreateView.measureNoInline {
|
|
|
|
): View? {
|
|
|
|
val view = inflater.inflate(R.layout.fragment_home, container, false)
|
|
|
|
val view = inflater.inflate(R.layout.fragment_home, container, false)
|
|
|
|
val activity = activity as HomeActivity
|
|
|
|
val activity = activity as HomeActivity
|
|
|
|
val components = requireComponents
|
|
|
|
val components = requireComponents
|
|
|
|
@ -339,7 +337,7 @@ class HomeFragment : Fragment() {
|
|
|
|
appBarLayout = view.homeAppBar
|
|
|
|
appBarLayout = view.homeAppBar
|
|
|
|
|
|
|
|
|
|
|
|
activity.themeManager.applyStatusBarTheme(activity)
|
|
|
|
activity.themeManager.applyStatusBarTheme(activity)
|
|
|
|
view
|
|
|
|
return view
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
override fun onConfigurationChanged(newConfig: Configuration) {
|
|
|
|
override fun onConfigurationChanged(newConfig: Configuration) {
|
|
|
|
@ -421,87 +419,86 @@ class HomeFragment : Fragment() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Suppress("LongMethod", "ComplexMethod")
|
|
|
|
@Suppress("LongMethod", "ComplexMethod")
|
|
|
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) =
|
|
|
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
|
|
|
PerfStartup.homeFragmentOnViewCreated.measureNoInline {
|
|
|
|
super.onViewCreated(view, savedInstanceState)
|
|
|
|
super.onViewCreated(view, savedInstanceState)
|
|
|
|
context?.metrics?.track(Event.HomeScreenDisplayed)
|
|
|
|
context?.metrics?.track(Event.HomeScreenDisplayed)
|
|
|
|
|
|
|
|
|
|
|
|
observeSearchEngineChanges()
|
|
|
|
observeSearchEngineChanges()
|
|
|
|
createHomeMenu(requireContext(), WeakReference(view.menuButton))
|
|
|
|
createHomeMenu(requireContext(), WeakReference(view.menuButton))
|
|
|
|
createTabCounterMenu(view)
|
|
|
|
createTabCounterMenu(view)
|
|
|
|
|
|
|
|
|
|
|
|
view.menuButton.setColorFilter(
|
|
|
|
view.menuButton.setColorFilter(
|
|
|
|
ContextCompat.getColor(
|
|
|
|
ContextCompat.getColor(
|
|
|
|
requireContext(),
|
|
|
|
requireContext(),
|
|
|
|
ThemeManager.resolveAttribute(R.attr.primaryText, requireContext())
|
|
|
|
ThemeManager.resolveAttribute(R.attr.primaryText, requireContext())
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
view.toolbar.compoundDrawablePadding =
|
|
|
|
view.toolbar.compoundDrawablePadding =
|
|
|
|
view.resources.getDimensionPixelSize(R.dimen.search_bar_search_engine_icon_padding)
|
|
|
|
view.resources.getDimensionPixelSize(R.dimen.search_bar_search_engine_icon_padding)
|
|
|
|
view.toolbar_wrapper.setOnClickListener {
|
|
|
|
view.toolbar_wrapper.setOnClickListener {
|
|
|
|
navigateToSearch()
|
|
|
|
navigateToSearch()
|
|
|
|
requireComponents.analytics.metrics.track(Event.SearchBarTapped(Event.SearchBarTapped.Source.HOME))
|
|
|
|
requireComponents.analytics.metrics.track(Event.SearchBarTapped(Event.SearchBarTapped.Source.HOME))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
view.toolbar_wrapper.setOnLongClickListener {
|
|
|
|
view.toolbar_wrapper.setOnLongClickListener {
|
|
|
|
ToolbarPopupWindow.show(
|
|
|
|
ToolbarPopupWindow.show(
|
|
|
|
WeakReference(it),
|
|
|
|
WeakReference(it),
|
|
|
|
handlePasteAndGo = sessionControlInteractor::onPasteAndGo,
|
|
|
|
handlePasteAndGo = sessionControlInteractor::onPasteAndGo,
|
|
|
|
handlePaste = sessionControlInteractor::onPaste,
|
|
|
|
handlePaste = sessionControlInteractor::onPaste,
|
|
|
|
copyVisible = false
|
|
|
|
copyVisible = false
|
|
|
|
)
|
|
|
|
)
|
|
|
|
true
|
|
|
|
true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
view.tab_button.setOnClickListener {
|
|
|
|
view.tab_button.setOnClickListener {
|
|
|
|
if (FeatureFlags.showStartOnHomeSettings) {
|
|
|
|
if (FeatureFlags.showStartOnHomeSettings) {
|
|
|
|
requireComponents.analytics.metrics.track(Event.StartOnHomeOpenTabsTray)
|
|
|
|
requireComponents.analytics.metrics.track(Event.StartOnHomeOpenTabsTray)
|
|
|
|
}
|
|
|
|
|
|
|
|
openTabsTray()
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
openTabsTray()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PrivateBrowsingButtonView(
|
|
|
|
PrivateBrowsingButtonView(
|
|
|
|
privateBrowsingButton,
|
|
|
|
privateBrowsingButton,
|
|
|
|
browsingModeManager
|
|
|
|
browsingModeManager
|
|
|
|
) { newMode ->
|
|
|
|
) { newMode ->
|
|
|
|
if (newMode == BrowsingMode.Private) {
|
|
|
|
if (newMode == BrowsingMode.Private) {
|
|
|
|
requireContext().settings().incrementNumTimesPrivateModeOpened()
|
|
|
|
requireContext().settings().incrementNumTimesPrivateModeOpened()
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (onboarding.userHasBeenOnboarded()) {
|
|
|
|
|
|
|
|
homeFragmentStore.dispatch(
|
|
|
|
|
|
|
|
HomeFragmentAction.ModeChange(Mode.fromBrowsingMode(newMode))
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
consumeFrom(requireComponents.core.store) {
|
|
|
|
if (onboarding.userHasBeenOnboarded()) {
|
|
|
|
updateTabCounter(it)
|
|
|
|
homeFragmentStore.dispatch(
|
|
|
|
|
|
|
|
HomeFragmentAction.ModeChange(Mode.fromBrowsingMode(newMode))
|
|
|
|
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
homeViewModel.sessionToDelete?.also {
|
|
|
|
consumeFrom(requireComponents.core.store) {
|
|
|
|
if (it == ALL_NORMAL_TABS || it == ALL_PRIVATE_TABS) {
|
|
|
|
updateTabCounter(it)
|
|
|
|
removeAllTabsAndShowSnackbar(it)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
|
|
|
|
removeTabAndShowSnackbar(it)
|
|
|
|
homeViewModel.sessionToDelete?.also {
|
|
|
|
}
|
|
|
|
if (it == ALL_NORMAL_TABS || it == ALL_PRIVATE_TABS) {
|
|
|
|
|
|
|
|
removeAllTabsAndShowSnackbar(it)
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
removeTabAndShowSnackbar(it)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
homeViewModel.sessionToDelete = null
|
|
|
|
homeViewModel.sessionToDelete = null
|
|
|
|
|
|
|
|
|
|
|
|
updateTabCounter(requireComponents.core.store.state)
|
|
|
|
updateTabCounter(requireComponents.core.store.state)
|
|
|
|
|
|
|
|
|
|
|
|
if (bundleArgs.getBoolean(FOCUS_ON_ADDRESS_BAR)) {
|
|
|
|
if (bundleArgs.getBoolean(FOCUS_ON_ADDRESS_BAR)) {
|
|
|
|
navigateToSearch()
|
|
|
|
navigateToSearch()
|
|
|
|
} else if (bundleArgs.getLong(FOCUS_ON_COLLECTION, -1) >= 0) {
|
|
|
|
} else if (bundleArgs.getLong(FOCUS_ON_COLLECTION, -1) >= 0) {
|
|
|
|
// No need to scroll to async'd loaded TopSites if we want to scroll to collections.
|
|
|
|
// No need to scroll to async'd loaded TopSites if we want to scroll to collections.
|
|
|
|
homeViewModel.shouldScrollToTopSites = false
|
|
|
|
homeViewModel.shouldScrollToTopSites = false
|
|
|
|
/* Triggered when the user has added a tab to a collection and has tapped
|
|
|
|
/* Triggered when the user has added a tab to a collection and has tapped
|
|
|
|
* the View action on the [TabsTrayDialogFragment] snackbar.*/
|
|
|
|
* the View action on the [TabsTrayDialogFragment] snackbar.*/
|
|
|
|
scrollAndAnimateCollection(bundleArgs.getLong(FOCUS_ON_COLLECTION, -1))
|
|
|
|
scrollAndAnimateCollection(bundleArgs.getLong(FOCUS_ON_COLLECTION, -1))
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private fun observeSearchEngineChanges() {
|
|
|
|
private fun observeSearchEngineChanges() {
|
|
|
|
consumeFlow(store) { flow ->
|
|
|
|
consumeFlow(store) { flow ->
|
|
|
|
|
Rohan Maity
3 years ago
committed by
mergify[bot]