From 14c4d12e491ee772eb0c789c640d08eae33afde6 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Mon, 29 Apr 2019 11:14:24 -0700
Subject: [PATCH] For #1573 - Add Browsing Menu Item Add To Collections

---
 .../java/org/mozilla/fenix/browser/BrowserFragment.kt     | 5 +++++
 .../java/org/mozilla/fenix/components/metrics/Metrics.kt  | 3 ++-
 .../fenix/components/toolbar/DefaultToolbarMenu.kt        | 8 ++++++++
 .../org/mozilla/fenix/components/toolbar/ToolbarMenu.kt   | 1 +
 app/src/main/res/values/strings.xml                       | 2 ++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index c1dc660933..fe7651834e 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -477,6 +477,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
             ToolbarMenu.Item.NewTab -> Item.NEW_TAB
             ToolbarMenu.Item.OpenInFenix -> Item.OPEN_IN_FENIX
             ToolbarMenu.Item.Share -> Item.SHARE
+            ToolbarMenu.Item.SaveToCollection -> Item.SAVE_TO_COLLECTION
         }
 
         requireComponents.analytics.metrics.track(Event.BrowserMenuItemTapped(item))
@@ -527,6 +528,10 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
                 Navigation.findNavController(view!!).navigate(directions)
                 (activity as HomeActivity).browsingModeManager.mode = BrowsingModeManager.Mode.Normal
             }
+            ToolbarMenu.Item.SaveToCollection -> {
+                ItsNotBrokenSnack(requireContext())
+                    .showSnackbar("1843")
+            }
             ToolbarMenu.Item.OpenInFenix -> {
                 val intent = Intent(context, IntentReceiverActivity::class.java)
                 intent.action = Intent.ACTION_VIEW
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
index ffcacc46ea..d0aeef43d8 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
@@ -195,7 +195,8 @@ sealed class Event {
     data class BrowserMenuItemTapped(val item: Item) : Event() {
         enum class Item {
             SETTINGS, LIBRARY, HELP, DESKTOP_VIEW_ON, DESKTOP_VIEW_OFF, FIND_IN_PAGE, NEW_TAB,
-            NEW_PRIVATE_TAB, SHARE, REPORT_SITE_ISSUE, BACK, FORWARD, RELOAD, STOP, OPEN_IN_FENIX
+            NEW_PRIVATE_TAB, SHARE, REPORT_SITE_ISSUE, BACK, FORWARD, RELOAD, STOP, OPEN_IN_FENIX,
+            SAVE_TO_COLLECTION
         }
 
         override val extras: Map<String, String>?
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
index 858772feb2..17faa9aa66 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -164,6 +164,14 @@ class DefaultToolbarMenu(
                 onItemTapped.invoke(ToolbarMenu.Item.ReportIssue)
             },
 
+            BrowserMenuImageText(
+                context.getString(R.string.browser_menu_save_to_collection),
+                R.drawable.ic_archive,
+                DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
+            ) {
+                onItemTapped.invoke(ToolbarMenu.Item.SaveToCollection)
+            },
+
             BrowserMenuDivider(),
 
             menuToolbar
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt
index eebbe72864..2a8b742bef 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt
@@ -19,6 +19,7 @@ interface ToolbarMenu {
         object Stop : Item()
         object ReportIssue : Item()
         object OpenInFenix : Item()
+        object SaveToCollection : Item()
     }
 
     val menuBuilder: BrowserMenuBuilder
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c9b23e24d3..99b7740bc7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,6 +54,8 @@
     <string name="browser_menu_private_tab">Private tab</string>
     <!-- Browser menu button that creates a new tab -->
     <string name="browser_menu_new_tab">New tab</string>
+    <!-- Browser menu button that saves the current tab to a collection -->
+    <string name="browser_menu_save_to_collection">Save to Collection</string>
     <!-- Browser menu button that opens a dialog to report issues with the current site -->
     <string name="browser_menu_report_issue">Report site issue</string>
     <!-- Browser menu button that open a share menu to share the current site -->