For mozilla-mobile#26690 - Dismiss search dialog when opening recent …

…synced tab dropdown menu
Alexandru2909 · Sep 2, 2022 · 58b1094 · 58b1094
1 parent df9c60b
commit 58b1094
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 2 deletions.
diff --git a/...main/java/org/mozilla/fenix/home/recentsyncedtabs/controller/RecentSyncedTabController.kt b/...main/java/org/mozilla/fenix/home/recentsyncedtabs/controller/RecentSyncedTabController.kt
@@ -25,6 +25,11 @@ interface RecentSyncedTabController {
      */
     fun handleRecentSyncedTabClick(tab: RecentSyncedTab)
 
+    /**
+     * @see [RecentSyncedTabInteractor.onRecentSyncedTabLongClick]
+     */
+    fun handleRecentSyncedTabLongClick()
+
     /**
      * @see [RecentSyncedTabInteractor.onRecentSyncedTabClicked]
      */
@@ -66,6 +71,12 @@ class DefaultRecentSyncedTabController(
         )
     }
 
+    override fun handleRecentSyncedTabLongClick() {
+        if (navController.currentDestination?.id == R.id.searchDialogFragment) {
+            navController.navigateUp()
+        }
+    }
+
     override fun handleRecentSyncedTabRemoved(tab: RecentSyncedTab) {
         appStore.dispatch(AppAction.RemoveRecentSyncedTab(tab))
     }

diff --git a/...main/java/org/mozilla/fenix/home/recentsyncedtabs/interactor/RecentSyncedTabInteractor.kt b/...main/java/org/mozilla/fenix/home/recentsyncedtabs/interactor/RecentSyncedTabInteractor.kt
@@ -17,6 +17,11 @@ interface RecentSyncedTabInteractor {
      */
     fun onRecentSyncedTabClicked(tab: RecentSyncedTab)
 
+    /**
+     * Called when opening the dropdown menu on a recent tab by long press.
+     */
+    fun onRecentSyncedTabLongClick()
+
     /**
      * Opens the tabs tray to the synced tab page. Called when a user clicks on the "See all synced
      * tabs" button.

diff --git a/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTab.kt b/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTab.kt
@@ -59,6 +59,7 @@ import org.mozilla.fenix.theme.Theme
  * @param onRecentSyncedTabClick Invoked when the user clicks on the recent synced tab.
  * @param onSeeAllSyncedTabsButtonClick Invoked when user clicks on the "See all" button in the synced tab card.
  * @param onRemoveSyncedTab Invoked when user clicks on the "Remove" dropdown menu option.
+ * @param onRecentSyncedTabLongClick Invoked when user long presses the recent synced tab.
  */
 @OptIn(ExperimentalFoundationApi::class)
 @Suppress("LongMethod")
@@ -68,6 +69,7 @@ fun RecentSyncedTab(
     onRecentSyncedTabClick: (RecentSyncedTab) -> Unit,
     onSeeAllSyncedTabsButtonClick: () -> Unit,
     onRemoveSyncedTab: (RecentSyncedTab) -> Unit,
+    onRecentSyncedTabLongClick: () -> Unit,
 ) {
     var isDropdownExpanded by remember { mutableStateOf(false) }
 
@@ -82,7 +84,10 @@ fun RecentSyncedTab(
             .height(180.dp)
             .combinedClickable(
                 onClick = { tab?.let { onRecentSyncedTabClick(tab) } },
-                onLongClick = { isDropdownExpanded = true }
+                onLongClick = {
+                    onRecentSyncedTabLongClick()
+                    isDropdownExpanded = true
+                }
             ),
         shape = RoundedCornerShape(8.dp),
         backgroundColor = FirefoxTheme.colors.layer2,
@@ -285,6 +290,7 @@ private fun LoadedRecentSyncedTab() {
             onRecentSyncedTabClick = {},
             onSeeAllSyncedTabsButtonClick = {},
             onRemoveSyncedTab = {},
+            onRecentSyncedTabLongClick = {},
         )
     }
 }
@@ -298,6 +304,7 @@ private fun LoadingRecentSyncedTab() {
             onRecentSyncedTabClick = {},
             onSeeAllSyncedTabsButtonClick = {},
             onRemoveSyncedTab = {},
+            onRecentSyncedTabLongClick = {},
         )
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTabViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTabViewHolder.kt
@@ -54,7 +54,8 @@ class RecentSyncedTabViewHolder(
                 tab = syncedTab,
                 onRecentSyncedTabClick = recentSyncedTabInteractor::onRecentSyncedTabClicked,
                 onSeeAllSyncedTabsButtonClick = recentSyncedTabInteractor::onSyncedTabShowAllClicked,
-                onRemoveSyncedTab = recentSyncedTabInteractor::onRemovedRecentSyncedTab
+                onRemoveSyncedTab = recentSyncedTabInteractor::onRemovedRecentSyncedTab,
+                onRecentSyncedTabLongClick = recentSyncedTabInteractor::onRecentSyncedTabLongClick
             )
         }
     }

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt
@@ -374,6 +374,10 @@ class SessionControlInteractor(
         recentSyncedTabController.handleRecentSyncedTabClick(tab)
     }
 
+    override fun onRecentSyncedTabLongClick() {
+        recentSyncedTabController.handleRecentSyncedTabLongClick()
+    }
+
     override fun onSyncedTabShowAllClicked() {
         recentSyncedTabController.handleSyncedTabShowAllClicked()
     }

diff --git a/...rg/mozilla/fenix/home/recentsyncedtabs/controller/DefaultRecentSyncedTabControllerTest.kt b/...rg/mozilla/fenix/home/recentsyncedtabs/controller/DefaultRecentSyncedTabControllerTest.kt
@@ -150,6 +150,20 @@ class DefaultRecentSyncedTabControllerTest {
         }
     }
 
+    @Test
+    fun `GIVEN search dialog is displayed WHEN recent synced tab is long clicked THEN dismiss search dialog`() {
+        every { navController.navigateUp() } returns true
+        every { navController.currentDestination } returns mockk {
+            every { id } returns R.id.searchDialogFragment
+        }
+
+        controller.handleRecentSyncedTabLongClick()
+
+        verify {
+            navController.navigateUp()
+        }
+    }
+
     @Test
     fun `WHEN synced tab clicked THEN metric counter labeled by device type is incremented`() {
         val url = "https://mozilla.org"