Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

For FNXV2-17067: always show home in background behind search dialog (#20573)

Browse Source 
* Navigate to home on toolbar click. Handle back press from search dialog

Update tests to show home behind search dialog. Remove unused test.

Jump back in show all button is clickable behind search dialog

Recently saved bookmarks show all button is clickable behind search dialog

* Add feature flag

* Past explorations show all button is clickable behind search dialog

Handle keyboard in controllers instead of viewholders. Update tests.

Allow collections to be visible behind search dialog

Dismiss keyboard and search dialog with navigateUp instead of just dismissing the keyboard

Verify navigateUp in tests

Adding ignore for flaky UI test

Only resize home behind search dialog

Add ignore for collection intermittent test

Cleanup
upstream-sync
Elise Richards 3 years ago committed by GitHub
parent 003a2ce81a
commit 7fdad978a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 169 additions and 52 deletions
Show Stats Download Patch File Download Diff File

2
app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
Unescape Escape View File

@ -9,6 +9,7 @@ import androidx.test.uiautomator.UiDevice
import okhttp3.mockwebserver.MockWebServer
import org.junit.After
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.mozilla.fenix.helpers.AndroidAssetDispatcher
@ -165,6 +166,7 @@ class CollectionTest {
}
@Test
@Ignore("To be fixed in https://github.com/mozilla-mobile/fenix/issues/20702")
fun swipeToRemoveTabFromCollectionTest() {
val firstWebPage = getGenericAsset(mockWebServer, 1)
val secondWebPage = getGenericAsset(mockWebServer, 2)

3
app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
Unescape Escape View File

@ -575,6 +575,7 @@ class SmokeTest {
@Test
// Saves a login, then changes it and verifies the update
@Ignore("To be fixed in https://github.com/mozilla-mobile/fenix/issues/20702")
fun updateSavedLoginTest() {
val saveLoginTest =
TestAssetHelper.getSaveLoginAsset(mockWebServer)
@ -601,7 +602,7 @@ class SmokeTest {
verifySavedLoginFromPrompt()
viewSavedLoginDetails()
revealPassword()
verifyPasswordSaved("test")
verifyPasswordSaved("test") // failing here locally
}
}

5
app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
Unescape Escape View File

@ -66,4 +66,9 @@ object FeatureFlags {
* type need to present.
*/
val androidAutofill = Config.channel.isNightlyOrDebug || Config.channel.isBeta
/**
* Enables showing the home screen behind the search dialog
*/
val showHomeBehindSearch = Config.channel.isNightlyOrDebug
}

9
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
Unescape Escape View File

@ -15,6 +15,7 @@ import mozilla.components.concept.engine.EngineView
import mozilla.components.feature.tabs.TabsUseCases
import mozilla.components.support.ktx.kotlin.isUrl
import mozilla.components.ui.tabcounter.TabCounterMenu
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.browser.BrowserAnimator.Companion.getToolbarNavOptions
@ -91,8 +92,12 @@ class DefaultBrowserToolbarController(
override fun handleToolbarClick() {
metrics.track(Event.SearchBarTapped(Event.SearchBarTapped.Source.BROWSER))
navController.nav(
R.id.browserFragment,
if (FeatureFlags.showHomeBehindSearch) {
navController.navigate(
BrowserFragmentDirections.actionGlobalHome()
)
}
navController.navigate(
BrowserFragmentDirections.actionGlobalSearchDialog(
currentSession?.id
),

15
app/src/main/java/org/mozilla/fenix/historymetadata/controller/HistoryMetadataController.kt
Unescape Escape View File

@ -4,13 +4,14 @@
package org.mozilla.fenix.historymetadata.controller
import androidx.annotation.VisibleForTesting
import androidx.annotation.VisibleForTesting.PRIVATE
import androidx.navigation.NavController
import mozilla.components.concept.storage.HistoryMetadataKey
import mozilla.components.feature.tabs.TabsUseCases
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.historymetadata.HistoryMetadataGroup
import org.mozilla.fenix.historymetadata.interactor.HistoryMetadataInteractor
import org.mozilla.fenix.home.HomeFragmentAction
@ -67,7 +68,10 @@ class DefaultHistoryMetadataController(
}
override fun handleHistoryShowAllClicked() {
navController.nav(R.id.homeFragment, HomeFragmentDirections.actionGlobalHistoryFragment())
dismissSearchDialogIfDisplayed()
navController.navigate(
HomeFragmentDirections.actionGlobalHistoryFragment()
)
}
override fun handleToggleHistoryMetadataGroupExpanded(historyMetadataGroup: HistoryMetadataGroup) {
@ -77,4 +81,11 @@ class DefaultHistoryMetadataController(
)
)
}
@VisibleForTesting(otherwise = PRIVATE)
fun dismissSearchDialogIfDisplayed() {
if (navController.currentDestination?.id == R.id.searchDialogFragment) {
navController.navigateUp()
}
}
}

17
app/src/main/java/org/mozilla/fenix/home/recentbookmarks/controller/RecentBookmarksController.kt
Unescape Escape View File

@ -4,13 +4,14 @@
package org.mozilla.fenix.home.recentbookmarks.controller
import androidx.annotation.VisibleForTesting
import androidx.annotation.VisibleForTesting.PRIVATE
import androidx.navigation.NavController
import mozilla.appservices.places.BookmarkRoot
import mozilla.components.concept.storage.BookmarkNode
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.home.HomeFragmentDirections
import org.mozilla.fenix.home.recentbookmarks.interactor.RecentBookmarksInteractor
@ -40,6 +41,7 @@ class DefaultRecentBookmarksController(
) : RecentBookmarksController {
override fun handleBookmarkClicked(bookmark: BookmarkNode) {
dismissSearchDialogIfDisplayed()
activity.openToBrowserAndLoad(
searchTermOrURL = bookmark.url!!,
newTab = true,
@ -48,7 +50,16 @@ class DefaultRecentBookmarksController(
}
override fun handleShowAllBookmarksClicked() {
val directions = HomeFragmentDirections.actionGlobalBookmarkFragment(BookmarkRoot.Mobile.id)
navController.nav(R.id.homeFragment, directions)
dismissSearchDialogIfDisplayed()
navController.navigate(
HomeFragmentDirections.actionGlobalBookmarkFragment(BookmarkRoot.Mobile.id)
)
}
@VisibleForTesting(otherwise = PRIVATE)
fun dismissSearchDialogIfDisplayed() {
if (navController.currentDestination?.id == R.id.searchDialogFragment) {
navController.navigateUp()
}
}
}

17
app/src/main/java/org/mozilla/fenix/home/recenttabs/controller/RecentTabController.kt
Unescape Escape View File

@ -4,6 +4,8 @@
package org.mozilla.fenix.home.recenttabs.controller
import androidx.annotation.VisibleForTesting
import androidx.annotation.VisibleForTesting.PRIVATE
import androidx.navigation.NavController
import mozilla.components.browser.state.store.BrowserStore
import mozilla.components.feature.tabs.TabsUseCases.SelectTabUseCase
@ -11,7 +13,6 @@ import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.ext.inProgressMediaTab
import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.home.HomeFragmentDirections
import org.mozilla.fenix.home.recenttabs.interactor.RecentTabInteractor
@ -45,7 +46,6 @@ class DefaultRecentTabsController(
) : RecentTabController {
override fun handleRecentTabClicked(tabId: String) {
if (tabId == store.state.inProgressMediaTab?.id) {
metrics.track(Event.OpenInProgressMediaTab)
} else {
@ -57,10 +57,15 @@ class DefaultRecentTabsController(
}
override fun handleRecentTabShowAllClicked() {
dismissSearchDialogIfDisplayed()
metrics.track(Event.ShowAllRecentTabs)
navController.nav(
R.id.homeFragment,
HomeFragmentDirections.actionGlobalTabsTrayFragment()
)
navController.navigate(HomeFragmentDirections.actionGlobalTabsTrayFragment())
}
@VisibleForTesting(otherwise = PRIVATE)
fun dismissSearchDialogIfDisplayed() {
if (navController.currentDestination?.id == R.id.searchDialogFragment) {
navController.navigateUp()
}
}
}

27
app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
Unescape Escape View File

@ -57,6 +57,7 @@ import mozilla.components.support.ktx.android.view.hideKeyboard
import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
import mozilla.components.ui.autocomplete.InlineAutocompleteEditText
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.Event
@ -86,10 +87,20 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
override fun onStart() {
super.onStart()
// https://github.com/mozilla-mobile/fenix/issues/14279
// To prevent GeckoView from resizing we're going to change the softInputMode to not adjust
// the size of the window.
requireActivity().window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
if (FeatureFlags.showHomeBehindSearch) {
// This will need to be handled for the update to R. We need to resize here in order to
// see the whole homescreen behind the search dialog.
@Suppress("DEPRECATION")
requireActivity().window.setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
)
} else {
// https://github.com/mozilla-mobile/fenix/issues/14279
// To prevent GeckoView from resizing we're going to change the softInputMode to not adjust
// the size of the window.
requireActivity().window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
}
// Refocus the toolbar editing and show keyboard if the QR fragment isn't showing
if (childFragmentManager.findFragmentByTag(QR_FRAGMENT_TAG) == null) {
toolbarView.view.edit.focus()
@ -400,6 +411,14 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
true
}
else -> {
if (FeatureFlags.showHomeBehindSearch) {
val args by navArgs<SearchDialogFragmentArgs>()
args.sessionId?.let {
findNavController().navigate(
SearchDialogFragmentDirections.actionGlobalBrowser(null)
)
}
}
view?.hideKeyboard()
dismissAllowingStateLoss()
true

1
app/src/main/res/layout/collection_header.xml
Unescape Escape View File

@ -7,5 +7,6 @@
android:layout_width="wrap_content"
android:layout_height="56dp"
android:gravity="center_vertical"
android:layout_marginTop="40dp"
android:text="@string/collections_header"
android:textAppearance="@style/HeaderTextStyle" />

2
app/src/main/res/layout/fragment_home.xml
Unescape Escape View File

@ -68,7 +68,7 @@
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
android:layout_marginBottom="48dp"
android:layout_marginBottom="88dp"
android:padding="16dp"
android:scrollbars="none"
android:transitionGroup="false"

26
app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
Unescape Escape View File

@ -223,25 +223,19 @@ class DefaultBrowserToolbarControllerTest {
val controller = createController()
controller.handleToolbarClick()
val expected = BrowserFragmentDirections.actionGlobalSearchDialog(
val homeDirections = BrowserFragmentDirections.actionGlobalHome()
val searchDialogDirections = BrowserFragmentDirections.actionGlobalSearchDialog(
sessionId = "1"
)
verify { metrics.track(Event.SearchBarTapped(Event.SearchBarTapped.Source.BROWSER)) }
verify { navController.navigate(expected, any<NavOptions>()) }
}
@Test
fun handleToolbarClick_useNewSearchExperience() {
val controller = createController()
controller.handleToolbarClick()
val expected = BrowserFragmentDirections.actionGlobalSearchDialog(
sessionId = "1"
)
verify { metrics.track(Event.SearchBarTapped(Event.SearchBarTapped.Source.BROWSER)) }
verify { navController.navigate(expected, any<NavOptions>()) }
verify {
metrics.track(Event.SearchBarTapped(Event.SearchBarTapped.Source.BROWSER))
}
verify {
// shows the home screen "behind" the search dialog
navController.navigate(homeDirections)
navController.navigate(searchDialogDirections, any<NavOptions>())
}
}
@Test

12
app/src/test/java/org/mozilla/fenix/historymetadata/controller/HistoryMetadataControllerTest.kt
Unescape Escape View File

@ -5,6 +5,7 @@
package org.mozilla.fenix.historymetadata.controller
import androidx.navigation.NavController
import io.mockk.every
import io.mockk.mockk
import io.mockk.spyk
import io.mockk.verify
@ -22,7 +23,6 @@ import org.junit.Test
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.historymetadata.HistoryMetadataGroup
import org.mozilla.fenix.home.HomeFragmentAction
import org.mozilla.fenix.home.HomeFragmentDirections
@ -43,10 +43,14 @@ class HistoryMetadataControllerTest {
private val selectOrAddUseCase: SelectOrAddUseCase = mockk(relaxed = true)
private val navController = mockk<NavController>(relaxed = true)
private lateinit var controller: HistoryMetadataController
private lateinit var controller: DefaultHistoryMetadataController
@Before
fun setup() {
every { navController.currentDestination } returns mockk {
every { id } returns R.id.homeFragment
}
controller = spyk(
DefaultHistoryMetadataController(
activity = activity,
@ -87,8 +91,8 @@ class HistoryMetadataControllerTest {
controller.handleHistoryShowAllClicked()
verify {
navController.nav(
R.id.homeFragment,
controller.dismissSearchDialogIfDisplayed()
navController.navigate(
HomeFragmentDirections.actionGlobalHistoryFragment()
)
}

42
app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt
Unescape Escape View File

@ -5,7 +5,6 @@
package org.mozilla.fenix.home.recentbookmarks
import androidx.navigation.NavController
import androidx.navigation.NavOptions
import io.mockk.Runs
import io.mockk.every
import io.mockk.just
@ -38,14 +37,13 @@ class DefaultRecentBookmarksControllerTest {
private val activity: HomeActivity = mockk(relaxed = true)
private val navController: NavController = mockk(relaxUnitFun = true)
private lateinit var controller: DefaultRecentBookmarksController
@Before
fun setup() {
every { activity.openToBrowserAndLoad(any(), any(), any()) } just Runs
every { navController.currentDestination } returns mockk {
every { id } returns R.id.homeFragment
}
every { navController.navigateUp() } returns true
controller = spyk(
DefaultRecentBookmarksController(
@ -62,6 +60,10 @@ class DefaultRecentBookmarksControllerTest {
@Test
fun `WHEN a recently saved bookmark is clicked THEN the selected bookmark is opened`() {
every { navController.currentDestination } returns mockk {
every { id } returns R.id.homeFragment
}
val bookmark = BookmarkNode(
type = BookmarkNodeType.ITEM,
guid = "guid#${Math.random() * 1000}",
@ -76,19 +78,49 @@ class DefaultRecentBookmarksControllerTest {
controller.handleBookmarkClicked(bookmark)
verify {
controller.dismissSearchDialogIfDisplayed()
activity.openToBrowserAndLoad(
searchTermOrURL = bookmark.url!!,
newTab = true,
from = BrowserDirection.FromHome
)
}
verify(exactly = 0) {
navController.navigateUp()
}
}
@Test
fun `WHEN show all recently saved bookmark is clicked THEN the bookmarks root is opened`() {
every { navController.currentDestination } returns mockk {
every { id } returns R.id.homeFragment
}
controller.handleShowAllBookmarksClicked()
val directions = HomeFragmentDirections.actionGlobalBookmarkFragment(BookmarkRoot.Mobile.id)
verify { navController.navigate(directions, any<NavOptions>()) }
verify {
controller.dismissSearchDialogIfDisplayed()
navController.navigate(directions)
}
verify(exactly = 0) {
navController.navigateUp()
}
}
@Test
fun `WHEN show all is clicked from behind search dialog THEN open bookmarks root`() {
every { navController.currentDestination } returns mockk {
every { id } returns R.id.searchDialogFragment
}
controller.handleShowAllBookmarksClicked()
val directions = HomeFragmentDirections.actionGlobalBookmarkFragment(BookmarkRoot.Mobile.id)
verify {
controller.dismissSearchDialogIfDisplayed()
navController.navigateUp()
navController.navigate(directions)
}
}
}

43
app/src/test/java/org/mozilla/fenix/home/recenttabs/controller/RecentTabControllerTest.kt
Unescape Escape View File

@ -39,7 +39,8 @@ class RecentTabControllerTest {
private val metrics: MetricController = mockk(relaxed = true)
private lateinit var store: BrowserStore
private lateinit var controller: RecentTabController
private lateinit var controller: DefaultRecentTabsController
@Before
fun setup() {
@ -51,17 +52,18 @@ class RecentTabControllerTest {
selectTabUseCase = selectTabUseCase.selectTab,
navController = navController,
metrics = metrics,
store = store
store = store,
)
)
every { navController.navigateUp() } returns true
}
@Test
fun handleRecentTabClicked() {
every { navController.currentDestination } returns mockk {
every { id } returns R.id.homeFragment
}
}
@Test
fun handleRecentTabClicked() {
val tab = createTab(
url = "https://mozilla.org",
title = "Mozilla"
@ -79,13 +81,38 @@ class RecentTabControllerTest {
}
@Test
fun handleRecentTabShowAllClicked() {
fun handleRecentTabShowAllClickedFromHome() {
every { navController.currentDestination } returns mockk {
every { id } returns R.id.homeFragment
}
controller.handleRecentTabShowAllClicked()
verify {
controller.dismissSearchDialogIfDisplayed()
navController.navigate(
match<NavDirections> { it.actionId == R.id.action_global_tabsTrayFragment }
)
metrics.track(Event.ShowAllRecentTabs)
}
verify(exactly = 0) {
navController.navigateUp()
}
}
@Test
fun handleRecentTabShowAllClickedFromSearchDialog() {
every { navController.currentDestination } returns mockk {
every { id } returns R.id.searchDialogFragment
}
controller.handleRecentTabShowAllClicked()
verify {
controller.dismissSearchDialogIfDisplayed()
navController.navigateUp()
navController.navigate(
match<NavDirections> { it.actionId == R.id.action_global_tabsTrayFragment },
null
match<NavDirections> { it.actionId == R.id.action_global_tabsTrayFragment }
)
metrics.track(Event.ShowAllRecentTabs)
}

Write Preview
Loading…
Cancel
Save