diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index 9a3d51f34..4fb217a0f 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -93,6 +93,7 @@ import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.sessionsOfType import org.mozilla.fenix.ext.settings import org.mozilla.fenix.home.SharedViewModel +import org.mozilla.fenix.tabtray.TabTrayDialogFragment import org.mozilla.fenix.theme.ThemeManager import org.mozilla.fenix.wifi.SitePermissionsWifiIntegration import java.lang.ref.WeakReference @@ -208,7 +209,11 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session scope = viewLifecycleOwner.lifecycleScope, tabCollectionStorage = requireComponents.core.tabCollectionStorage, topSiteStorage = requireComponents.core.topSiteStorage, - sharedViewModel = sharedViewModel + sharedViewModel = sharedViewModel, + onTabCounterClicked = { + val tabTrayDialog = TabTrayDialogFragment() + tabTrayDialog.show(parentFragmentManager, null) + } ) _browserInteractor = BrowserInteractor( diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt index 887071805..7d0339b55 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt @@ -74,7 +74,8 @@ class DefaultBrowserToolbarController( private val scope: CoroutineScope, private val tabCollectionStorage: TabCollectionStorage, private val topSiteStorage: TopSiteStorage, - private val sharedViewModel: SharedViewModel + private val sharedViewModel: SharedViewModel, + private val onTabCounterClicked: () -> Unit ) : BrowserToolbarController { private val currentSession @@ -324,8 +325,9 @@ class DefaultBrowserToolbarController( private fun animateTabAndNavigateHome() { if (activity.settings().useNewTabTray) { - val directions = BrowserFragmentDirections.actionBrowserFragmentToTabsTrayFragment() - navController.navigate(directions) +// val directions = BrowserFragmentDirections.actionBrowserFragmentToTabsTrayFragment() +// navController.navigate(directions) + onTabCounterClicked.invoke() return } diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt index 7750bbd2c..9acc9e08f 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt @@ -4,7 +4,6 @@ package org.mozilla.fenix.tabtray -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -52,7 +51,6 @@ class TabTrayView( behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() { override fun onSlide(bottomSheet: View, slideOffset: Float) { - if (slideOffset > -0.4) { fabView.new_tab_button.show() } else {