blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #10504 - Show tab dialog on browserfragment

master
Jeff Boek 2020-05-20 21:24:05 -07:00
parent 90cef752b0
commit cc6a380d45
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,7 @@ import org.mozilla.fenix.ext.requireComponents
import org.mozilla.fenix.ext.sessionsOfType import org.mozilla.fenix.ext.sessionsOfType
import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.home.SharedViewModel import org.mozilla.fenix.home.SharedViewModel
import org.mozilla.fenix.tabtray.TabTrayDialogFragment
import org.mozilla.fenix.theme.ThemeManager import org.mozilla.fenix.theme.ThemeManager
import org.mozilla.fenix.wifi.SitePermissionsWifiIntegration import org.mozilla.fenix.wifi.SitePermissionsWifiIntegration
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
@ -208,7 +209,11 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
scope = viewLifecycleOwner.lifecycleScope, scope = viewLifecycleOwner.lifecycleScope,
tabCollectionStorage = requireComponents.core.tabCollectionStorage, tabCollectionStorage = requireComponents.core.tabCollectionStorage,
topSiteStorage = requireComponents.core.topSiteStorage, topSiteStorage = requireComponents.core.topSiteStorage,
sharedViewModel = sharedViewModel sharedViewModel = sharedViewModel,
onTabCounterClicked = {
val tabTrayDialog = TabTrayDialogFragment()
tabTrayDialog.show(parentFragmentManager, null)
}
) )
_browserInteractor = BrowserInteractor( _browserInteractor = BrowserInteractor(

8
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
View File

@ -74,7 +74,8 @@ class DefaultBrowserToolbarController(
private val scope: CoroutineScope, private val scope: CoroutineScope,
private val tabCollectionStorage: TabCollectionStorage, private val tabCollectionStorage: TabCollectionStorage,
private val topSiteStorage: TopSiteStorage, private val topSiteStorage: TopSiteStorage,
private val sharedViewModel: SharedViewModel private val sharedViewModel: SharedViewModel,
private val onTabCounterClicked: () -> Unit
) : BrowserToolbarController { ) : BrowserToolbarController {
private val currentSession private val currentSession
@ -324,8 +325,9 @@ class DefaultBrowserToolbarController(
private fun animateTabAndNavigateHome() { private fun animateTabAndNavigateHome() {
if (activity.settings().useNewTabTray) { if (activity.settings().useNewTabTray) {
val directions = BrowserFragmentDirections.actionBrowserFragmentToTabsTrayFragment() // val directions = BrowserFragmentDirections.actionBrowserFragmentToTabsTrayFragment()
navController.navigate(directions) // navController.navigate(directions)
onTabCounterClicked.invoke()
return return
} }

2
app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
View File

@ -4,7 +4,6 @@
package org.mozilla.fenix.tabtray package org.mozilla.fenix.tabtray
import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -52,7 +51,6 @@ class TabTrayView(
behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() { behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
override fun onSlide(bottomSheet: View, slideOffset: Float) { override fun onSlide(bottomSheet: View, slideOffset: Float) {
if (slideOffset > -0.4) { if (slideOffset > -0.4) {
fabView.new_tab_button.show() fabView.new_tab_button.show()
} else { } else {