blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #1231: Changes all use of favorites to bookmarks

master
Sawyer Blatz 2019-03-27 14:29:38 -07:00 committed by Jeff Boek
parent c2d0a6e265
commit 6249b9eb89
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt
View File

@ -53,7 +53,7 @@ class LibraryFragment : Fragment() {
libraryScreenshots.setOnClickListener {
ItsNotBrokenSnack(context!!).showSnackbar(issueNumber = "89")
}
libraryFavorites.setOnClickListener {
libraryBookmarks.setOnClickListener {
ItsNotBrokenSnack(context!!).showSnackbar(issueNumber = "90")
}
libraryReadingList.setOnClickListener {

4
app/src/main/res/drawable/library_icon_favorites_circle_background.xml → app/src/main/res/drawable/library_icon_bookmarks_circle_background.xml
View File

File diff suppressed because one or more lines are too long

4
app/src/main/res/layout/fragment_library.xml
View File

@ -44,14 +44,14 @@
app:listItemTitle="@string/library_downloads" />
<org.mozilla.fenix.library.LibraryListItem
android:id="@+id/libraryFavorites"
android:id="@+id/libraryBookmarks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:contentDescription="@string/library_bookmarks"
android:focusable="true"
app:listItemIcon="@drawable/library_icon_favorites_circle_background"
app:listItemIcon="@drawable/library_icon_bookmarks_circle_background"
app:listItemTitle="@string/library_bookmarks" />
<org.mozilla.fenix.library.LibraryListItem

4
app/src/main/res/layout/layout_quick_action_sheet.xml
View File

@ -55,12 +55,12 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_width="0dp"
android:drawableTop="@drawable/library_icon_favorites_circle_background"
android:drawableTop="@drawable/library_icon_bookmarks_circle_background"
android:drawablePadding="5dp"
android:textAlignment="center"
android:textSize="12sp"
android:textColor="?attr/toolbarTextColor"
android:text="@string/quick_action_favorite"/>
android:text="@string/quick_action_bookmark"/>
<androidx.appcompat.widget.AppCompatTextView
android:layout_height="wrap_content"

4
app/src/main/res/values/colors.xml
View File

@ -60,8 +60,8 @@
<color name="library_downloads_icon_background">#D4C1FA</color>
<color name="library_downloads_icon">#2E2060</color>
<color name="library_favorites_icon_background">#F4B8D9</color>
<color name="library_favorites_icon">#491949</color>
<color name="library_bookmarks_icon_background">#F4B8D9</color>
<color name="library_bookmarks_icon">#491949</color>
<color name="library_history_icon_background">#F5C0C6</color>
<color name="library_history_icon">#3E0909</color>

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

@ -208,8 +208,8 @@
<string name="quick_action_share">Share</string>
<!-- Option in Quick Action Sheet in the browser to download the current page -->
<string name="quick_action_download">Download</string>
<!-- Option in Quick Action Sheet in the browser to favorite the current page -->
<string name="quick_action_favorite">Favorite</string>
<!-- Option in Quick Action Sheet in the browser to bookmark the current page -->
<string name="quick_action_bookmark">Bookmark</string>
<!-- Option in Quick Action Sheet in the browser to put the the current page in reader mode -->
<string name="quick_action_read">Read</string>
<!-- Content description (not visible, for screen readers etc.): Quick action sheet-->
@ -224,7 +224,7 @@
<string name="library_screenshots">Screenshots</string>
<!-- Option in Library to open Downloads page -->
<string name="library_downloads">Downloads</string>
<!-- Option in Library to open Favorites page -->
<!-- Option in Library to open Bookmarks page -->
<string name="library_bookmarks">Bookmarks</string>
<!-- Option in Library to open History page -->
<string name="library_history">History</string>