From 00d1be97acdd442018c6f9dc279a01f883ae78cc Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Fri, 20 Sep 2019 12:13:54 -0700 Subject: [PATCH] For #561 - Wires up add tab button inside the bottom bar --- .../org/mozilla/fenix/home/HomeFragment.kt | 18 ++++++++++-------- .../sessioncontrol/SessionControlComponent.kt | 1 - 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index 174adcc84..8c3686349 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -262,6 +262,15 @@ class HomeFragment : Fragment() { requireComponents.analytics.metrics.track(Event.SearchBarTapped(Event.SearchBarTapped.Source.HOME)) } + view.add_tab_button.setOnClickListener { + invokePendingDeleteJobs() + val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment( + sessionId = null, + showShortcutEnginePicker = true + ) + nav(R.id.homeFragment, directions) + } + PrivateBrowsingButtonView( privateBrowsingButton, browsingModeManager @@ -421,14 +430,7 @@ class HomeFragment : Fragment() { from = BrowserDirection.FromHome ) } - is TabAction.Add -> { - invokePendingDeleteJobs() - val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment( - sessionId = null, - showShortcutEnginePicker = true - ) - nav(R.id.homeFragment, directions) - } + is TabAction.ShareTabs -> { invokePendingDeleteJobs() val shareTabs = sessionManager diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlComponent.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlComponent.kt index 25b563fc9..6fc8720d6 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlComponent.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlComponent.kt @@ -74,7 +74,6 @@ typealias TabCollection = ACTabCollection sealed class TabAction : Action { data class SaveTabGroup(val selectedTabSessionId: String?) : TabAction() - object Add : TabAction() object ShareTabs : TabAction() data class CloseAll(val private: Boolean) : TabAction() data class Select(val tabView: View, val sessionId: String) : TabAction()