blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Issue #11112 - Update empty collections string + tests. (#11538)

master
liuche 2020-06-12 15:01:38 -07:00 committed by GitHub
parent a36ec7279e
commit 35fa445165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
View File

@ -514,13 +514,13 @@ private fun assertCollectionsHeader() =
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
private fun assertNoCollectionsHeader() =
onView(allOf(withText("No collections")))
onView(allOf(withText("Collect the things that matter to you")))
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
private fun assertNoCollectionsText() =
onView(
allOf(
withText("Collect the things that matter to you. To start, save open tabs to a new collection.")
withText("Group together similar searches, sites, and tabs for quick access later.")
)
)
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))

4
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
View File

@ -21,8 +21,8 @@ import org.mozilla.fenix.home.OnboardingState
import org.mozilla.fenix.components.tips.Tip
val noCollectionMessage = AdapterItem.NoContentMessage(
R.string.no_collections_header,
R.string.collections_description
R.string.no_collections_header1,
R.string.no_collections_description1
)
// This method got a little complex with the addition of the tab tray feature flag

12
app/src/main/res/values/strings.xml
View File

@ -15,8 +15,6 @@
<string name="content_description_disable_private_browsing_button">Disable private browsing</string>
<!-- Placeholder text shown in the search bar before a user enters text -->
<string name="search_hint">Search or enter address</string>
<!-- No Open Tabs Message Header -->
<string name="no_open_tabs_header_2">No open tabs</string>
<!-- No Open Tabs Message Description -->
<string name="no_open_tabs_description">Your open tabs will be shown here.</string>
<!-- No Private Tabs Message Description -->
@ -477,7 +475,7 @@
<!-- Open tabs menu item to share all tabs -->
<string name="tabs_menu_share_tabs">Share tabs</string>
<!-- Open tabs menu item to save tabs to collection -->
<string name="tabs_menu_save_to_collection">Save to collection</string>
<string name="tabs_menu_save_to_collection1">Save tabs to collection</string>
<!-- Content description (not visible, for screen readers etc.): Opens the tab menu when pressed -->
<string name="tab_menu">Tab menu</string>
<!-- Tab menu item to share the tab -->
@ -686,16 +684,14 @@
<string name="delete_browsing_data_quit_off">Off</string>
<!-- Collections -->
<!-- Label to describe what collections are to a new user without any collections -->
<string name="collections_description">Collect the things that matter to you. To start, save open tabs to a new collection.</string>
<!-- Collections header on home fragment -->
<string name="collections_header">Collections</string>
<!-- Content description (not visible, for screen readers etc.): Opens the collection menu when pressed -->
<string name="collection_menu_button_content_description">Collection menu</string>
<!-- No Open Tabs Message Header -->
<string name="no_collections_header">No collections</string>
<!-- No Open Tabs Message Description -->
<string name="no_collections_description">Your collections will be shown here.</string>
<string name="no_collections_header1">Collect the things that matter to you</string>
<!-- Label to describe what collections are to a new user without any collections -->
<string name="no_collections_description1">Group together similar searches, sites, and tabs for quick access later.</string>
<!-- Title for the "select tabs" step of the collection creator -->
<string name="create_collection_select_tabs">Select Tabs</string>
<!-- Title for the "select collection" step of the collection creator -->