diff --git a/app/src/main/res/color/tab_icon.xml b/app/src/main/res/color/tab_icon.xml index e7f94f10c..ba08eca7f 100644 --- a/app/src/main/res/color/tab_icon.xml +++ b/app/src/main/res/color/tab_icon.xml @@ -4,5 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_tab_tray.xml b/app/src/main/res/drawable/ic_menu_tab_tray.xml new file mode 100644 index 000000000..a15096873 --- /dev/null +++ b/app/src/main/res/drawable/ic_menu_tab_tray.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/layout/component_tabstray.xml b/app/src/main/res/layout/component_tabstray.xml index 88ee4b2a0..190ca2b39 100644 --- a/app/src/main/res/layout/component_tabstray.xml +++ b/app/src/main/res/layout/component_tabstray.xml @@ -45,8 +45,6 @@ android:id="@+id/tab_layout" android:layout_width="0dp" android:layout_height="80dp" - app:tabSelectedTextColor="@color/accent_normal_theme" - app:tabTextColor="@color/secondary_text_normal_theme" app:tabIndicatorColor="@color/accent_normal_theme" app:tabIconTint="@color/tab_icon" app:tabRippleColor="@android:color/transparent" @@ -76,7 +74,7 @@ android:layout_height="48dp" android:background="?android:attr/selectableItemBackgroundBorderless" android:contentDescription="@string/open_tabs_menu" - app:srcCompat="@drawable/ic_menu" + app:srcCompat="@drawable/ic_menu_tab_tray" android:layout_marginEnd="0dp" android:visibility="visible" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index bab591fcf..20081b942 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -53,6 +53,7 @@ @color/tab_tray_toolbar_background_dark_theme @color/tab_tray_item_divider_dark_theme @color/tab_tray_item_media_background_dark_theme + @color/tab_tray_heading_icon_dark_theme @color/collection_icon_color_violet_dark_theme diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index b994943af..fa8d508db 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -56,6 +56,7 @@ + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b98801607..e13fc0e2a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,6 +8,7 @@ #52525E #32313C #1C1B22 + #312A65 #291D4F #20123A #1D1133 @@ -15,6 +16,7 @@ #F9F9FB #E0E0E6 #AFAFBB + #9059FF #529059FF #1F592ACB @@ -68,6 +70,7 @@ @color/light_grey_30 #ffffff #312A65 + @color/ink_20 #FBFBFE @@ -118,6 +121,7 @@ @color/dark_grey_50 @color/dark_grey_10 #9059FF + @color/violet_50 #FBFBFE @@ -167,6 +171,7 @@ @color/ink_50 @color/dark_grey_10 #9059FF + @color/violet_50 @color/primary_text_light_theme @@ -215,6 +220,7 @@ @color/tab_tray_toolbar_background_light_theme @color/tab_tray_item_divider_light_theme @color/tab_tray_item_media_background_light_theme + @color/tab_tray_heading_icon_light_theme #DFDFE3 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 76808ea7c..82f985d28 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -78,6 +78,7 @@ @color/tab_tray_toolbar_background_normal_theme @color/tab_tray_item_divider_normal_theme @color/tab_tray_item_media_background_normal_theme + @color/tab_tray_heading_icon_normal_theme @drawable/ic_logo_wordmark_normal @@ -201,6 +202,7 @@ @color/tab_tray_toolbar_background_private_theme @color/tab_tray_item_divider_private_theme @color/tab_tray_item_media_background_private_theme + @color/tab_tray_heading_icon_dark_theme @drawable/ic_logo_wordmark_private