From e98db8bfb8ec3b9bb89860199fd987d6d8f5c0bc Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Tue, 9 Apr 2019 16:31:57 -0700
Subject: [PATCH] For #1430 - Adds a changelog entry

---
 CHANGELOG.md                                             | 1 +
 .../java/org/mozilla/fenix/browser/BrowserFragment.kt    | 9 +++------
 .../java/org/mozilla/fenix/components/FenixSnackbar.kt   | 4 ++--
 app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 2 --
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ab25504c..36bf9df59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - #1239 - Added the ability to move bookmark folders
 - #1068 - Adds the ability to quickly copy the URL by long clicking the URLBar
 - #1170: Allow user to add a new site exception to site permissions
+- #1430 - Adds the Fenix Snackbar
 ### Changed
 - #1429 - Updated site permissions ui for MVP
 ### Removed
\ No newline at end of file
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 b784d3c53..accba6ae7 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -65,7 +65,6 @@ import org.mozilla.fenix.components.toolbar.ToolbarIntegration
 import org.mozilla.fenix.components.toolbar.ToolbarMenu
 import org.mozilla.fenix.components.toolbar.ToolbarUIView
 import org.mozilla.fenix.customtabs.CustomTabsIntegration
-import org.mozilla.fenix.ext.asActivity
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.share
@@ -310,6 +309,9 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
                     }
                     is SearchAction.ToolbarLongClicked -> {
                         getSessionByIdOrUseSelectedSession().copyUrl(requireContext())
+                        FenixSnackbar.make(view!!, Snackbar.LENGTH_LONG)
+                            .setText(resources.getString(R.string.url_copied))
+                            .show()
                     }
                 }
             }
@@ -514,11 +516,6 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
         val clipBoard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val uri = Uri.parse(url)
         clipBoard.primaryClip = ClipData.newRawUri("Uri", uri)
-
-        val rootView = context.asActivity()?.window?.decorView?.findViewById<View>(android.R.id.content) as ViewGroup
-        FenixSnackbar.make(rootView, Snackbar.LENGTH_LONG)
-            .setText(context.getString(R.string.url_copied))
-            .show()
     }
 
     companion object {
diff --git a/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt b/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
index da515cf6c..e1f38944d 100644
--- a/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
@@ -51,7 +51,6 @@ class FenixSnackbar private constructor(
         }
     }
 
-
     companion object {
         const val LENGTH_LONG = Snackbar.LENGTH_LONG
         const val LENGTH_SHORT = Snackbar.LENGTH_SHORT
@@ -77,6 +76,7 @@ class FenixSnackbar private constructor(
             }
         }
 
+        // Use the same implementation of `Snackbar`
         private fun findSuitableParent(_view: View?): ViewGroup? {
             var view = _view
             var fallback: ViewGroup? = null
@@ -87,7 +87,7 @@ class FenixSnackbar private constructor(
                 }
 
                 if (view is FrameLayout) {
-                    if (view.id == 16908290) {
+                    if (view.id == R.id.content) {
                         return view
                     }
 
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 b4a4a10f5..d050fe455 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -19,7 +19,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.navigation.Navigation
-import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.fragment_home.*
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.coroutines.CoroutineScope
@@ -36,7 +35,6 @@ import org.mozilla.fenix.BrowsingModeManager
 import org.mozilla.fenix.DefaultThemeManager
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
-import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.utils.ItsNotBrokenSnack
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.ext.archive