Skip to content

Commit

Permalink
For mozilla-mobile#21646: Update section titles and customize button …
Browse files Browse the repository at this point in the history
…name on home
  • Loading branch information
eliserichards authored and mergify[bot] committed Oct 1, 2021
1 parent 4863b56 commit c7067a5
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ fun PocketStories(

Column(modifier = Modifier.padding(vertical = 48.dp)) {
SectionHeader(
text = stringResource(R.string.pocket_stories_header),
text = stringResource(R.string.pocket_stories_header_1),
modifier = Modifier
.fillMaxWidth()
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/customize_home_list_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
android:background="@drawable/rounded_button_background"
android:clickable="false"
android:focusable="false"
android:text="@string/browser_menu_customize_home"
android:text="@string/browser_menu_customize_home_1"
android:gravity="center"
android:maxLines="1"
app:layout_constraintBottom_toBottomOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/history_metadata_header.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
style="@style/Header16TextStyle"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:text="@string/history_metadata_header_2"
android:text="@string/history_metadata_header_3"
android:maxLines="2"
android:gravity="center_vertical"
app:layout_constraintStart_toStartOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/recent_bookmarks_header.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
android:layout_height="0dp"
android:contentDescription="@string/recently_saved_bookmarks_content_description"
android:maxLines="2"
android:text="@string/recently_bookmarked"
android:text="@string/recent_bookmarks_title"
android:gravity="center_vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
Expand Down
27 changes: 21 additions & 6 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
<!-- Title for the home screen section with recently saved bookmarks. -->
<string name="recently_saved_bookmarks" moz:removedIn="94" tools:ignore="UnusedResources">Recently saved</string>
<!-- Title for the home screen section with recently saved bookmarks. -->
<string name="recently_bookmarked">Recently bookmarked</string>
<string name="recently_bookmarked" moz:removedIn="94" tools:ignore="UnusedResources">Recently bookmarked</string>
<!-- Title for the home screen section with recently saved bookmarks. -->
<string name="recent_bookmarks_title">Recent bookmarks</string>
<!-- Content description for the recently saved bookmarks section on the home screen. -->
<string name="recently_saved_bookmarks_content_description">Recently saved bookmarks</string>
<!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
Expand Down Expand Up @@ -137,7 +139,10 @@
<string name="history_metadata_header" moz:removedIn="94" tools:ignore="UnusedResources">Past explorations</string>
<!-- Header text for a section on the home screen that displays grouped highlights from the
user's browsing history, such as topics they have researched or explored on the web -->
<string name="history_metadata_header_2">Recently visited</string>
<string name="history_metadata_header_2" moz:removedIn="94" tools:ignore="UnusedResources">Recently visited</string>
<!-- Header text for a section on the home screen that displays grouped highlights from the
user's browsing history, such as topics they have researched or explored on the web -->
<string name="history_metadata_header_3">Recent searches</string>
<!-- Text for the menu button to remove a grouped highlight from the user's browsing history
in the Recently visited section -->
<string name="recently_visited_menu_item_remove">Remove</string>
Expand Down Expand Up @@ -218,6 +223,8 @@
<string name="browser_menu_edit">Edit</string>
<!-- Browser menu button that opens the Customize menu -->
<string name="browser_menu_customize_home">Customize home</string>
<!-- Button shown on the home page that opens the Customize home settings -->
<string name="browser_menu_customize_home_1">Customize homepage</string>
<!-- Browser Toolbar -->
<!-- Content description for the Home screen button on the browser toolbar -->
<string name="browser_toolbar_home">Home screen</string>
Expand Down Expand Up @@ -432,9 +439,15 @@
<!-- Title for the customize home screen section with recently saved bookmarks. -->
<string name="customize_toggle_recently_saved_bookmarks" moz:removedIn="94" tools:ignore="UnusedResources">Recently saved</string>
<!-- Title for the customize home screen section with recently saved bookmarks. -->
<string name="customize_toggle_recently_bookmarked">Recently bookmarked</string>
<!-- Title for the customize home screen section with recently visited. Recently visited is a section where users see a list of tabs that they have visited in the past few days -->
<string name="customize_toggle_recently_visited">Recently visited</string>
<string name="customize_toggle_recently_bookmarked" moz:removedIn="94" tools:ignore="UnusedResources">Recently bookmarked</string>
<!-- Title for the customize home screen section with recently saved bookmarks. -->
<string name="customize_toggle_recent_bookmarks">Recent bookmarks</string>
<!-- Title for the customize home screen section with recently visited. Recently visited is
a section where users see a list of tabs that they have visited in the past few days -->
<string name="customize_toggle_recently_visited" moz:removedIn="94" tools:ignore="UnusedResources">Recently visited</string>
<!-- Title for the customize home screen settings section for recent searches. Recent searches
is a section where users see a list of groups of tabs that they have visited in the past few days -->
<string name="customize_toggle_recent_searches">Recent searches</string>
<!-- Title for the customize home screen section with Pocket. -->
<string name="customize_toggle_pocket">Pocket</string>

Expand Down Expand Up @@ -1956,7 +1969,9 @@

<!-- Pocket recommended stories -->
<!-- Header text for a section on the home screen. -->
<string name="pocket_stories_header">Thought provoking stories</string>
<string name="pocket_stories_header" moz:removedIn="94" tools:ignore="UnusedResources">Thought provoking stories</string>
<!-- Header text for a section on the home screen. -->
<string name="pocket_stories_header_1">Thought-provoking stories</string>
<!-- Header text for a section on the home screen. -->
<string name="pocket_stories_categories_header">Stories by topic</string>
<!-- Text of a button allowing users to access an external url for more Pocket recommendations. -->
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/xml/customization_preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@

<androidx.preference.SwitchPreference
android:key="@string/pref_key_recent_bookmarks"
android:title="@string/customize_toggle_recently_bookmarked"
android:title="@string/customize_toggle_recent_bookmarks"
app:isPreferenceVisible="false" />

<androidx.preference.SwitchPreference
android:key="@string/pref_key_history_metadata_feature"
android:title="@string/customize_toggle_recently_visited"
android:title="@string/customize_toggle_recent_searches"
app:isPreferenceVisible="false" />

<androidx.preference.SwitchPreference
Expand Down

0 comments on commit c7067a5

Please sign in to comment.