For #17772 - Collapse browser menu to "Add to Home screen"

The menu will start as collapsed.
Users can then swipe up to expand it.
upstream-sync
Mugurell 3 years ago
parent 1008ca2b4a
commit 0f0c319896

@ -319,6 +319,7 @@ class SettingsPrivacyTest {
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) { }.enterURLAndEnterToBrowser(defaultWebPage.url) {
}.openThreeDotMenu { }.openThreeDotMenu {
expandMenu()
}.openAddToHomeScreen { }.openAddToHomeScreen {
addShortcutName(pageShortcutName) addShortcutName(pageShortcutName)
clickAddShortcutButton() clickAddShortcutButton()

@ -269,6 +269,7 @@ class SmokeTest {
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) { }.enterURLAndEnterToBrowser(defaultWebPage.url) {
}.openThreeDotMenu { }.openThreeDotMenu {
expandMenu()
}.addToFirefoxHome { }.addToFirefoxHome {
verifySnackBarText("Added to top sites!") verifySnackBarText("Added to top sites!")
}.openTabDrawer { }.openTabDrawer {
@ -287,12 +288,14 @@ class SmokeTest {
}.openNavigationToolbar { }.openNavigationToolbar {
}.enterURLAndEnterToBrowser(website.url) { }.enterURLAndEnterToBrowser(website.url) {
}.openThreeDotMenu { }.openThreeDotMenu {
expandMenu()
}.openAddToHomeScreen { }.openAddToHomeScreen {
clickCancelShortcutButton() clickCancelShortcutButton()
} }
browserScreen { browserScreen {
}.openThreeDotMenu { }.openThreeDotMenu {
expandMenu()
}.openAddToHomeScreen { }.openAddToHomeScreen {
verifyShortcutNameField("Test_Page_1") verifyShortcutNameField("Test_Page_1")
addShortcutName("Test Page") addShortcutName("Test Page")
@ -310,6 +313,7 @@ class SmokeTest {
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) { }.enterURLAndEnterToBrowser(defaultWebPage.url) {
}.openThreeDotMenu { }.openThreeDotMenu {
expandMenu()
}.openSaveToCollection { }.openSaveToCollection {
verifyCollectionNameTextField() verifyCollectionNameTextField()
} }

@ -69,6 +69,10 @@ class ThreeDotMenuMainRobot {
fun verifyShareButton() = assertShareButton() fun verifyShareButton() = assertShareButton()
fun verifyReaderViewAppearance(visible: Boolean) = assertReaderViewAppearanceButton(visible) fun verifyReaderViewAppearance(visible: Boolean) = assertReaderViewAppearanceButton(visible)
fun expandMenu() {
onView(withId(R.id.mozac_browser_menu_menuView)).perform(swipeUp())
}
fun clickShareButton() { fun clickShareButton() {
shareButton().click() shareButton().click()
mDevice.waitNotNull(Until.findObject(By.text("ALL ACTIONS")), waitingTime) mDevice.waitNotNull(Until.findObject(By.text("ALL ACTIONS")), waitingTime)

@ -456,7 +456,8 @@ open class DefaultToolbarMenu(
val addToHomeScreenItem = BrowserMenuImageText( val addToHomeScreenItem = BrowserMenuImageText(
label = context.getString(R.string.browser_menu_add_to_homescreen), label = context.getString(R.string.browser_menu_add_to_homescreen),
imageResource = R.drawable.ic_add_to_homescreen, imageResource = R.drawable.ic_add_to_homescreen,
iconTintColorResource = primaryTextColor() iconTintColorResource = primaryTextColor(),
isCollapsingMenuLimit = true
) { ) {
onItemTapped.invoke(ToolbarMenu.Item.AddToHomeScreen) onItemTapped.invoke(ToolbarMenu.Item.AddToHomeScreen)
} }

Loading…
Cancel
Save