Closes mozilla-mobile#11488: Add a long press listener to nav bar

mavduevskiy · Jan 6, 2022 · 4b6b1d4 · 4b6b1d4
1 parent da14d39
commit 4b6b1d4
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 0 deletions.
diff --git a/...rowser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt b/...rowser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt
@@ -267,6 +267,30 @@ class DisplayToolbar internal constructor(
         }
     }
 
+    /**
+     * Sets a listener to be invoked when the site security indicator icon is clicked and held.
+     */
+    fun setOnSiteSecurityLongClickListener(listener: (() -> Unit)?) {
+        if (listener == null) {
+            views.securityIndicator.setOnLongClickListener(null)
+            views.securityIndicator.background = null
+        } else {
+            views.securityIndicator.setOnLongClickListener {
+                listener.invoke()
+                true
+            }
+
+            val outValue = TypedValue()
+            context.theme.resolveAttribute(
+                android.R.attr.selectableItemBackgroundBorderless,
+                outValue,
+                true
+            )
+
+            views.securityIndicator.setBackgroundResource(outValue.resourceId)
+        }
+    }
+
     /**
      * Sets a listener to be invoked when the site tracking protection indicator icon is clicked.
      */

diff --git a/...er/toolbar/src/test/java/mozilla/components/browser/toolbar/display/DisplayToolbarTest.kt b/...er/toolbar/src/test/java/mozilla/components/browser/toolbar/display/DisplayToolbarTest.kt
@@ -735,6 +735,39 @@ class DisplayToolbarTest {
         assertNull(displayToolbar.views.securityIndicator.background)
     }
 
+    @Test
+    fun `clicking and holding the site security indicator invokes listener`() {
+        var listenerInvoked = false
+
+        val (_, displayToolbar) = createDisplayToolbar()
+
+        assertNull(displayToolbar.views.securityIndicator.background)
+
+        displayToolbar.setOnSiteSecurityLongClickListener {
+            listenerInvoked = true
+        }
+
+        assertNotNull(displayToolbar.views.securityIndicator.background)
+
+        displayToolbar.views.securityIndicator.performLongClick()
+
+        assertTrue(listenerInvoked)
+
+        listenerInvoked = false
+
+        displayToolbar.setOnSiteSecurityLongClickListener { }
+
+        assertNotNull(displayToolbar.views.securityIndicator.background)
+
+        displayToolbar.views.securityIndicator.performLongClick()
+
+        assertFalse(listenerInvoked)
+
+        displayToolbar.setOnSiteSecurityLongClickListener(null)
+
+        assertNull(displayToolbar.views.securityIndicator.background)
+    }
+
     @Test
     fun `Security icon has proper content description`() {
         val (_, displayToolbar) = createDisplayToolbar()