diff --git a/app/src/main/java/org/mozilla/fenix/library/LibraryListItem.kt b/app/src/main/java/org/mozilla/fenix/library/LibraryListItem.kt
index e4eb57fd84..73abfd723f 100644
--- a/app/src/main/java/org/mozilla/fenix/library/LibraryListItem.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/LibraryListItem.kt
@@ -28,7 +28,7 @@ class LibraryListItem @JvmOverloads constructor(
try {
val id = getResourceId(
R.styleable.LibraryListItem_listItemIcon,
- R.drawable.library_icon_logins_circle_background
+ R.drawable.library_icon_reading_list_circle_background
)
libraryIcon?.background = resources.getDrawable(id, context.theme)
libraryItemTitle?.text = resources.getString(
diff --git a/app/src/main/res/drawable/ic_readermode.xml b/app/src/main/res/drawable/ic_readermode.xml
new file mode 100644
index 0000000000..86a199a332
--- /dev/null
+++ b/app/src/main/res/drawable/ic_readermode.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/library_icon_logins_circle_background.xml b/app/src/main/res/drawable/library_icon_logins_circle_background.xml
deleted file mode 100644
index 99cb335e1c..0000000000
--- a/app/src/main/res/drawable/library_icon_logins_circle_background.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/library_icon_reading_list_circle_background.xml b/app/src/main/res/drawable/library_icon_reading_list_circle_background.xml
new file mode 100644
index 0000000000..bdfeac5586
--- /dev/null
+++ b/app/src/main/res/drawable/library_icon_reading_list_circle_background.xml
@@ -0,0 +1,30 @@
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 6d3151dc76..fb8f694bea 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -13,6 +13,9 @@
android:id="@+id/navigationToolbar"
android:layout_width="match_parent"
android:layout_height="56dp"
+ app:titleMarginStart="16dp"
+ app:titleMarginEnd="16dp"
+ app:titleTextAppearance="@style/ToolbarTitleTextStyle"
android:background="?attr/toolbarColor"
android:elevation="8dp"/>
diff --git a/app/src/main/res/layout/component_tabs.xml b/app/src/main/res/layout/component_tabs.xml
index 3807331407..ba7488c2d7 100644
--- a/app/src/main/res/layout/component_tabs.xml
+++ b/app/src/main/res/layout/component_tabs.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tabs_header_title"
- android:textAppearance="@style/headerText"
+ android:textAppearance="@style/HeaderTextStyle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 76c11bb74d..dad8985bef 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -49,30 +49,29 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
- android:contentDescription="@string/library_favorites"
+ android:contentDescription="@string/library_bookmarks"
android:focusable="true"
app:listItemIcon="@drawable/library_icon_favorites_circle_background"
- app:listItemTitle="@string/library_favorites" />
+ app:listItemTitle="@string/library_bookmarks" />
+ app:listItemIcon="@drawable/library_icon_reading_list_circle_background"
+ app:listItemTitle="@string/library_reading_list" />
-
+ app:listItemIcon="@drawable/library_icon_history_circle_background"
+ app:listItemTitle="@string/library_history" />
diff --git a/app/src/main/res/layout/library_list_item.xml b/app/src/main/res/layout/library_list_item.xml
index ca939d915c..861d518470 100644
--- a/app/src/main/res/layout/library_list_item.xml
+++ b/app/src/main/res/layout/library_list_item.xml
@@ -17,7 +17,7 @@
android:layout_marginTop="@dimen/library_item_icon_margin_vertical"
android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
android:layout_marginBottom="@dimen/library_item_icon_margin_vertical"
- android:background="@drawable/library_icon_logins_circle_background"
+ android:background="@drawable/library_icon_reading_list_circle_background"
android:clickable="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -30,7 +30,7 @@
android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
android:clickable="false"
android:gravity="center_vertical"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+ android:textAppearance="@style/ListItemTextStyle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/libraryIcon"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/session_bottom_sheet.xml b/app/src/main/res/layout/session_bottom_sheet.xml
index 1165d6667b..a563d27b1d 100644
--- a/app/src/main/res/layout/session_bottom_sheet.xml
+++ b/app/src/main/res/layout/session_bottom_sheet.xml
@@ -44,7 +44,7 @@
android:layout_marginEnd="12dp"
android:layout_marginBottom="8dp"
android:text="@string/tabs_header_title"
- android:textAppearance="@style/headerText"
+ android:textAppearance="@style/HeaderTextStyle"
app:layout_constraintStart_toEndOf="@id/current_session_image"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/session_item.xml b/app/src/main/res/layout/session_item.xml
index 11cfb73f96..7fe8d50b8b 100644
--- a/app/src/main/res/layout/session_item.xml
+++ b/app/src/main/res/layout/session_item.xml
@@ -5,7 +5,7 @@
@@ -54,8 +54,7 @@
android:id="@+id/session_card_extras"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/photonGrey50"
- android:textSize="12sp"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
app:layout_constraintStart_toStartOf="@id/session_card_titles"
app:layout_constraintTop_toBottomOf="@+id/session_card_titles" />
@@ -71,10 +70,21 @@
android:layout_width="@dimen/glyph_button_width"
android:layout_height="@dimen/glyph_button_height"
android:background="?android:attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/content_description_session_menu"
android:src="@drawable/ic_menu"
android:tint="?attr/toolbarTextColor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/session_list_header.xml b/app/src/main/res/layout/session_list_header.xml
index 5a120a0fbd..d607ba493f 100644
--- a/app/src/main/res/layout/session_list_header.xml
+++ b/app/src/main/res/layout/session_list_header.xml
@@ -5,7 +5,7 @@
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d6b94de372..c7c977c26e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -47,4 +47,7 @@
+
+
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 23b4e203fb..a0db02b604 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -51,23 +51,23 @@
#FAFAFC
#202340
- #C0EBFF
- #094490
+ #B9F0FD
+ #0E214A
- #A3FFFF
- #09616A
+ #A5FCD4
+ #1B3F36
- #D6CEFF
- #1E1562
+ #D4C1FA
+ #2E2060
- #FDD4FF
- #6E006E
+ #F4B8D9
+ #491949
- #FFDAEC
- #720028
+ #F5C0C6
+ #3E0909
- #FFF4C3
- #C13905
+ #FCE98F
+ #8A201F
#696A6A
@color/light_mode_text_color
@@ -87,4 +87,6 @@
#fce98f
#2915141A
+
+ #202340
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 132915b25a..ed4eab1f6e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -14,7 +14,7 @@
16dp
8dp
40dp
- 16dp
+ 14dp
2dp
8dp
24dp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5992e1f47f..48ab4468e9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -186,11 +186,11 @@
Downloads
- Favorites
+ Bookmarks
History
-
- Logins
+
+ Reading List
Search
@@ -259,4 +259,10 @@
Close tab
Restore tab
+
+
+ Session Options
+
+
+ Share Session
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1ca02540bc..144a965bbc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -59,6 +59,9 @@
- @color/history_title_light_theme
- @color/history_url_light_theme
- @color/history_header_light_theme
+
+
+ - @color/library_list_item_text_color_light_mode
-
+
+
+
+
+
+