From 6a53127ef9a8028b6678628c02abf88870083657 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Tue, 28 May 2019 15:43:44 -0700
Subject: [PATCH] For #2948: Adds menu button add tab to collection

---
 .../collections/CollectionCreationUIView.kt   | 20 ++++++++++++++-----
 .../org/mozilla/fenix/home/HomeFragment.kt    |  5 +++--
 buildSrc/src/main/java/Dependencies.kt        |  1 -
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
index ff532c59f..b2e2a77af 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
@@ -95,10 +95,6 @@ class CollectionCreationUIView(
             false
         }
 
-        view.save_button.setOnClickListener {
-            actionEmitter.onNext(CollectionCreationAction.SaveTabsToCollection(selectedTabs.toList()))
-        }
-
         view.add_collection_button.setOnClickListener {
             actionEmitter.onNext(CollectionCreationAction.AddNewCollection)
         }
@@ -118,6 +114,7 @@ class CollectionCreationUIView(
     override fun updateView() = Consumer<CollectionCreationState> {
         step = it.saveCollectionStep
         selectedTabs = it.selectedTabs
+        selectedCollection = it.selectedTabCollection
 
         when (it.saveCollectionStep) {
             is SaveCollectionStep.SelectTabs -> {
@@ -158,8 +155,22 @@ class CollectionCreationUIView(
                         it.selectedTabs.size
                     )
                 }
+
                 view.select_tabs_layout_text.text = selectTabsText
 
+                save_button.setOnClickListener { _ ->
+                    if (selectedCollection != null) {
+                        actionEmitter.onNext(
+                            CollectionCreationAction.SelectCollection(
+                                selectedCollection!!,
+                                it.selectedTabs.toList()
+                            )
+                        )
+                    } else {
+                        actionEmitter.onNext(CollectionCreationAction.SaveTabsToCollection(selectedTabs.toList()))
+                    }
+                }
+
                 save_button.visibility = if (it.selectedTabs.isEmpty()) {
                     View.GONE
                 } else {
@@ -221,7 +232,6 @@ class CollectionCreationUIView(
             }
             is SaveCollectionStep.RenameCollection -> {
                 it.selectedTabCollection?.let { tabCollection ->
-                    selectedCollection = tabCollection
                     tabCollection.tabs.map { tab ->
                         Tab(
                             tab.id.toString(),
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 e68b456c5..7d30e28d8 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -71,7 +71,6 @@ import org.mozilla.fenix.mvi.getManagedEmitter
 import org.mozilla.fenix.onboarding.FenixOnboarding
 import org.mozilla.fenix.settings.SupportUtils
 import org.mozilla.fenix.share.ShareTab
-import org.mozilla.fenix.utils.ItsNotBrokenSnack
 import kotlin.coroutines.CoroutineContext
 import kotlin.math.roundToInt
 
@@ -410,7 +409,9 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
                 createDeleteCollectionPrompt(action.collection)
             }
             is CollectionAction.AddTab -> {
-                ItsNotBrokenSnack(context!!).showSnackbar(issueNumber = "1575")
+                showCollectionCreationFragment(
+                    selectedTabCollection = action.collection
+                )
             }
             is CollectionAction.Rename -> {
                 showCollectionCreationFragment(
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 43cb92239..59c1b8836 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -37,7 +37,6 @@ private object Versions {
     // be kept in sync with the version used by android-components above.
     const val mozilla_appservices = "0.28.1"
 
-
     const val autodispose = "1.1.0"
     const val adjust = "4.11.4"
     const val installreferrer = "1.0"