From 0a86676563924467b42092160b5a5859b063c5c3 Mon Sep 17 00:00:00 2001 From: Tiger Oakes Date: Mon, 18 Nov 2019 23:23:55 -0800 Subject: [PATCH] For #6523 - Remove close button in library --- .../java/org/mozilla/fenix/ui/HistoryTest.kt | 11 ----------- .../java/org/mozilla/fenix/ui/LibraryMenuTest.kt | 11 ----------- .../java/org/mozilla/fenix/ui/robots/HistoryRobot.kt | 9 --------- .../java/org/mozilla/fenix/ui/robots/LibraryRobot.kt | 10 +--------- .../org/mozilla/fenix/library/LibraryFragment.kt | 12 ------------ .../org/mozilla/fenix/library/LibraryPageFragment.kt | 10 +--------- .../fenix/library/bookmarks/BookmarkFragment.kt | 5 ----- .../mozilla/fenix/library/history/HistoryFragment.kt | 8 +------- app/src/main/res/menu/bookmarks_menu.xml | 6 ------ app/src/main/res/menu/library_menu.xml | 10 +--------- 10 files changed, 4 insertions(+), 88 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt index 8bb57f93d..4e04a3fe9 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt @@ -236,15 +236,4 @@ class HistoryTest { verifyHomeScreen() } } - - @Test - @Ignore("Test will be included after back navigation from History Fragment is sorted") - fun verifyCloseMenu() { - homeScreen { - }.openThreeDotMenu { - }.openHistory { - }.closeMenu { - verifyHomeScreen() - } - } } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/LibraryMenuTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/LibraryMenuTest.kt index ca1ca72b9..935e7f530 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/LibraryMenuTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/LibraryMenuTest.kt @@ -47,17 +47,6 @@ class LibraryMenuTest { } } - @Test - fun closeMenuButtonTest() { - navigationToolbar { - }.enterURLAndEnterToBrowser(defaultWebPage.url) { - }.openThreeDotMenu { - }.openLibrary { - }.closeMenu { - verifyBrowserScreen() - } - } - @Test fun backButtonTest() { navigationToolbar { diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt index 1636b5057..e0f62e109 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt @@ -92,13 +92,6 @@ class HistoryRobot { HistoryRobot().interact() return Transition() } - - fun closeMenu(interact: HistoryRobot.() -> Unit): Transition { - closeButton().click() - - HistoryRobot().interact() - return Transition() - } } } @@ -145,5 +138,3 @@ private fun assertDeleteConfirmationMessage() = onView(withText("This will delete all of your browsing data.")) .inRoot(isDialog()) .check(matches(isDisplayed())) - -private fun closeButton() = onView(withId(R.id.libraryClose)) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibraryRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibraryRobot.kt index ff5a298bb..4d9aa5b36 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibraryRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibraryRobot.kt @@ -13,9 +13,9 @@ import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.withContentDescription import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText -import androidx.test.uiautomator.UiDevice import androidx.test.platform.app.InstrumentationRegistry import androidx.test.uiautomator.By +import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.Until import org.hamcrest.CoreMatchers.allOf import org.mozilla.fenix.R @@ -44,13 +44,6 @@ class LibraryRobot { return BrowserRobot.Transition() } - fun closeMenu(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition { - closeButton().click() - - BrowserRobot().interact() - return BrowserRobot.Transition() - } - fun openBookmarks(interact: BookmarksRobot.() -> Unit): BookmarksRobot.Transition { mDevice.waitNotNull(Until.findObject(By.text("Bookmarks")), TestAssetHelper.waitingTime) bookmarksButton().click() @@ -70,7 +63,6 @@ class LibraryRobot { } private fun goBackButton() = onView(allOf(withContentDescription("Navigate up"))) -private fun closeButton() = onView(withId(R.id.libraryClose)) private fun bookmarksButton() = onView(allOf(withText("Bookmarks"))) private fun historyButton() = onView(allOf(withText("History"))) diff --git a/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt index 95e4dc670..d5ded0872 100644 --- a/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt @@ -7,12 +7,10 @@ package org.mozilla.fenix.library import android.os.Bundle import android.view.Menu import android.view.MenuInflater -import android.view.MenuItem import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.fragment.app.Fragment -import androidx.navigation.Navigation import kotlinx.android.synthetic.main.fragment_library.* import mozilla.appservices.places.BookmarkRoot import mozilla.components.support.ktx.android.content.getColorFromAttr @@ -65,16 +63,6 @@ class LibraryFragment : Fragment(R.layout.fragment_library) { inflater.inflate(R.menu.library_menu, menu) } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - return when (item.itemId) { - R.id.libraryClose -> { - Navigation.findNavController(requireActivity(), R.id.container).navigateUp() - true - } - else -> super.onOptionsItemSelected(item) - } - } - override fun onDestroy() { super.onDestroy() requireComponents.analytics.metrics.track(Event.LibraryClosed) diff --git a/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt b/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt index 092259688..1c1c638e1 100644 --- a/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt @@ -5,22 +5,14 @@ package org.mozilla.fenix.library import androidx.fragment.app.Fragment -import androidx.navigation.fragment.findNavController -import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.R +import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.ext.components abstract class LibraryPageFragment : Fragment() { abstract val selectedItems: Set - protected fun close() { - if (!findNavController().popBackStack(R.id.libraryFragment, true)) { - findNavController().popBackStack(R.id.homeFragment, false) - } - } - protected fun openItemsInNewTab(private: Boolean = false, toUrl: (T) -> String?) { context?.components?.useCases?.tabsUseCases?.let { tabsUseCases -> val addTab = if (private) tabsUseCases.addPrivateTab else tabsUseCases.addTab diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt index 5b964a642..32de4a9ed 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt @@ -171,11 +171,6 @@ class BookmarkFragment : LibraryPageFragment(), BackHandler { override fun onOptionsItemSelected(item: MenuItem): Boolean { return when (item.itemId) { - R.id.libraryClose -> { - invokePendingDeletion() - close() - true - } R.id.add_bookmark_folder -> { navigate( BookmarkFragmentDirections diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt index 4068cc806..90304f76a 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt @@ -157,15 +157,9 @@ class HistoryFragment : LibraryPageFragment(), BackHandler { } true } - R.id.libraryClose -> { - close() - true - } R.id.delete_history_multi_select -> { - val components = context?.components!! - lifecycleScope.launch(Main) { - deleteSelectedHistory(historyStore.state.mode.selectedItems, components) + deleteSelectedHistory(historyStore.state.mode.selectedItems, requireComponents) viewModel.invalidate() historyStore.dispatch(HistoryFragmentAction.ExitDeletionMode) } diff --git a/app/src/main/res/menu/bookmarks_menu.xml b/app/src/main/res/menu/bookmarks_menu.xml index 20a914232..6b4104a0d 100644 --- a/app/src/main/res/menu/bookmarks_menu.xml +++ b/app/src/main/res/menu/bookmarks_menu.xml @@ -10,10 +10,4 @@ app:iconTint="?primaryText" android:title="@string/bookmark_add_folder" app:showAsAction="ifRoom" /> - diff --git a/app/src/main/res/menu/library_menu.xml b/app/src/main/res/menu/library_menu.xml index 489921eec..4e581c561 100644 --- a/app/src/main/res/menu/library_menu.xml +++ b/app/src/main/res/menu/library_menu.xml @@ -2,12 +2,4 @@ - - - +