For #8653 - changed menu strings
parent
14338a3b13
commit
ab04155222
|
@ -97,7 +97,7 @@ class ThreeDotMenuMainRobot {
|
|||
}
|
||||
|
||||
fun openLibrary(interact: LibraryRobot.() -> Unit): LibraryRobot.Transition {
|
||||
mDevice.waitNotNull(Until.findObject(By.text("Your Library")), waitingTime)
|
||||
mDevice.waitNotNull(Until.findObject(By.text("Library")), waitingTime)
|
||||
libraryButton().click()
|
||||
|
||||
LibraryRobot().interact()
|
||||
|
@ -253,7 +253,7 @@ private fun assertSettingsButton() = settingsButton()
|
|||
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
|
||||
.check(matches(isCompletelyDisplayed()))
|
||||
|
||||
private fun libraryButton() = onView(allOf(withText(R.string.browser_menu_your_library)))
|
||||
private fun libraryButton() = onView(allOf(withText(R.string.browser_menu_library)))
|
||||
private fun assertLibraryButton() = libraryButton()
|
||||
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
|
||||
|
||||
|
@ -299,7 +299,7 @@ private fun assertShareButton() = shareButton()
|
|||
|
||||
private fun browserViewSaveCollectionButton() = onView(
|
||||
allOf(
|
||||
withText("Save to Collection"),
|
||||
withText("Save to collection"),
|
||||
withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
|
||||
)
|
||||
)
|
||||
|
|
|
@ -194,7 +194,7 @@ class DefaultToolbarMenu(
|
|||
}
|
||||
|
||||
private val addons = BrowserMenuImageText(
|
||||
label = context.getString(R.string.browser_menu_addon_manager),
|
||||
label = context.getString(R.string.browser_menu_add_ons),
|
||||
imageResource = R.drawable.mozac_ic_extensions,
|
||||
iconTintColorResource = primaryTextColor()
|
||||
) {
|
||||
|
@ -220,7 +220,7 @@ class DefaultToolbarMenu(
|
|||
}
|
||||
|
||||
private val library = BrowserMenuImageText(
|
||||
label = context.getString(R.string.browser_menu_your_library),
|
||||
label = context.getString(R.string.browser_menu_library),
|
||||
imageResource = R.drawable.ic_library,
|
||||
iconTintColorResource = primaryTextColor()
|
||||
) {
|
||||
|
@ -280,7 +280,7 @@ class DefaultToolbarMenu(
|
|||
}
|
||||
|
||||
private val saveToCollection = BrowserMenuImageText(
|
||||
label = context.getString(R.string.browser_menu_save_to_collection),
|
||||
label = context.getString(R.string.browser_menu_save_to_collection_2),
|
||||
imageResource = R.drawable.ic_tab_collection,
|
||||
iconTintColorResource = primaryTextColor()
|
||||
) {
|
||||
|
|
|
@ -116,7 +116,7 @@ class HomeMenu(
|
|||
whatsNewItem,
|
||||
BrowserMenuDivider(),
|
||||
BrowserMenuCategory(
|
||||
context.getString(R.string.browser_menu_your_library),
|
||||
context.getString(R.string.browser_menu_library),
|
||||
textColorResource = menuCategoryTextColor
|
||||
),
|
||||
bookmarksItem,
|
||||
|
|
|
@ -9,7 +9,8 @@ import android.util.AttributeSet
|
|||
import android.view.LayoutInflater
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import androidx.core.content.withStyledAttributes
|
||||
import kotlinx.android.synthetic.main.library_list_item.view.*
|
||||
import kotlinx.android.synthetic.main.library_list_item.view.libraryIcon
|
||||
import kotlinx.android.synthetic.main.library_list_item.view.libraryItemTitle
|
||||
import org.mozilla.fenix.R
|
||||
|
||||
class LibraryListItem @JvmOverloads constructor(
|
||||
|
@ -29,7 +30,7 @@ class LibraryListItem @JvmOverloads constructor(
|
|||
libraryItemTitle?.text = resources.getString(
|
||||
getResourceId(
|
||||
R.styleable.LibraryListItem_listItemTitle,
|
||||
R.string.browser_menu_your_library
|
||||
R.string.browser_menu_library
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
|
@ -11,7 +11,9 @@ import android.view.View
|
|||
import android.widget.TextView
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import androidx.core.content.withStyledAttributes
|
||||
import kotlinx.android.synthetic.main.delete_browsing_data_item.view.*
|
||||
import kotlinx.android.synthetic.main.delete_browsing_data_item.view.checkbox
|
||||
import kotlinx.android.synthetic.main.delete_browsing_data_item.view.subtitle
|
||||
import kotlinx.android.synthetic.main.delete_browsing_data_item.view.title
|
||||
import org.mozilla.fenix.R
|
||||
|
||||
class DeleteBrowsingDataItem @JvmOverloads constructor(
|
||||
|
@ -51,7 +53,7 @@ class DeleteBrowsingDataItem @JvmOverloads constructor(
|
|||
context.withStyledAttributes(attrs, R.styleable.DeleteBrowsingDataItem, defStyleAttr, 0) {
|
||||
val titleId = getResourceId(
|
||||
R.styleable.DeleteBrowsingDataItem_deleteBrowsingDataItemTitle,
|
||||
R.string.browser_menu_your_library
|
||||
R.string.browser_menu_library
|
||||
)
|
||||
val subtitleId = getResourceId(
|
||||
R.styleable.DeleteBrowsingDataItem_deleteBrowsingDataItemSubtitle,
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
<!-- Content description (not visible, for screen readers etc.): Un-bookmark the current page -->
|
||||
<string name="browser_menu_edit_bookmark">Edit bookmark</string>
|
||||
<!-- Browser menu button that opens the addon manager -->
|
||||
<string name="browser_menu_addon_manager">Add-ons Manager</string>
|
||||
<string name="browser_menu_add_ons">Add-ons</string>
|
||||
<!-- Text displayed when there are no add-ons to be shown -->
|
||||
<string name="no_add_ons">No add-ons here</string>
|
||||
<!-- Browser menu button that sends a user to help articles -->
|
||||
|
@ -75,7 +75,7 @@
|
|||
<!-- Browser menu button that opens the settings menu -->
|
||||
<string name="browser_menu_settings">Settings</string>
|
||||
<!-- Browser menu button that opens a user's library -->
|
||||
<string name="browser_menu_your_library">Your Library</string>
|
||||
<string name="browser_menu_library">Library</string>
|
||||
<!-- Browser menu toggle that requests a desktop site -->
|
||||
<string name="browser_menu_desktop_site">Desktop site</string>
|
||||
<!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
|
||||
|
@ -89,7 +89,7 @@
|
|||
<!-- Browser menu button that creates a new tab -->
|
||||
<string name="browser_menu_new_tab">New tab</string>
|
||||
<!-- Browser menu button that saves the current tab to a collection -->
|
||||
<string name="browser_menu_save_to_collection">Save to Collection</string>
|
||||
<string name="browser_menu_save_to_collection_2">Save to collection</string>
|
||||
<!-- Browser menu button that opens a dialog to report issues with the current site -->
|
||||
<string name="browser_menu_report_issue">Report site issue</string>
|
||||
<!-- Browser menu button that open a share menu to share the current site -->
|
||||
|
|
Loading…
Reference in New Issue