blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Update multi-task, private, 3-dot icon and hairline in light mode to ink_20 (#312A65) and in dark mode to violet_50 (#9059FF)

master
David Walsh 2020-05-29 11:17:01 -05:00 committed by Jeff Boek
parent 51ea68f4bd
commit b9370640a2
7 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/color/tab_icon.xml
View File

@ -4,5 +4,5 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?accent" android:state_selected="true" />
<item android:color="?secondaryText"/>
<item android:color="?tabTrayHeadingIcon" />
</selector>

13
app/src/main/res/drawable/ic_menu_tab_tray.xml 100644
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?tabTrayHeadingIcon"
android:pathData="M14,6a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM14,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM12,20a2,2 0,1 0,0 -4,2 2,0 0,0 0,4z" />
</vector>

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

@ -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"

1
app/src/main/res/values-night/colors.xml
View File

@ -53,6 +53,7 @@
<color name="tab_tray_toolbar_background_normal_theme">@color/tab_tray_toolbar_background_dark_theme</color>
<color name="tab_tray_item_divider_normal_theme">@color/tab_tray_item_divider_dark_theme</color>
<color name="tab_tray_item_media_background_normal_theme">@color/tab_tray_item_media_background_dark_theme</color>
<color name="tab_tray_heading_icon_normal_theme">@color/tab_tray_heading_icon_dark_theme</color>
<!-- Collection icons-->
<color name="collection_icon_color_violet">@color/collection_icon_color_violet_dark_theme</color>

1
app/src/main/res/values/attrs.xml
View File

@ -56,6 +56,7 @@
<attr name="tabTrayToolbarBackground" format="reference" />
<attr name="tabTrayItemDivider" format="reference" />
<attr name="tabTrayItemMediaBackground" format="reference" />
<attr name="tabTrayHeadingIcon" format="reference" />
<declare-styleable name="TrackingProtectionCategory">
<attr name="categoryItemTitle" format="reference" />

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

@ -8,6 +8,7 @@
<color name="dark_grey_10">#52525E</color>
<color name="dark_grey_50">#32313C</color>
<color name="dark_grey_80">#1C1B22</color>
<color name="ink_20">#312A65</color>
<color name="ink_50">#291D4F</color>
<color name="ink_80">#20123A</color>
<color name="ink_90">#1D1133</color>
@ -15,6 +16,7 @@
<color name="light_grey_10">#F9F9FB</color>
<color name="light_grey_30">#E0E0E6</color>
<color name="light_grey_60">#AFAFBB</color>
<color name="violet_50">#9059FF</color>
<color name="violet_50_32a">#529059FF</color>
<color name="violet_70_12a">#1F592ACB</color>
@ -68,6 +70,7 @@
<color name="tab_tray_item_divider_light_theme">@color/light_grey_30</color>
<color name="tab_tray_item_media_stroke">#ffffff</color>
<color name="tab_tray_item_media_background_light_theme">#312A65</color>
<color name="tab_tray_heading_icon_light_theme">@color/ink_20</color>
<!-- Dark theme color palette -->
<color name="primary_text_dark_theme">#FBFBFE</color>
@ -118,6 +121,7 @@
<color name="tab_tray_toolbar_background_dark_theme">@color/dark_grey_50</color>
<color name="tab_tray_item_divider_dark_theme">@color/dark_grey_10</color>
<color name="tab_tray_item_media_background_dark_theme">#9059FF</color>
<color name="tab_tray_heading_icon_dark_theme">@color/violet_50</color>
<!-- Private theme color palette -->
<color name="primary_text_private_theme">#FBFBFE</color>
@ -167,6 +171,7 @@
<color name="tab_tray_toolbar_background_private_theme">@color/ink_50</color>
<color name="tab_tray_item_divider_private_theme">@color/dark_grey_10</color>
<color name="tab_tray_item_media_background_private_theme">#9059FF</color>
<color name="tab_tray_heading_icon_private_theme">@color/violet_50</color>
<!-- Normal theme colors for light mode -->
<color name="primary_text_normal_theme">@color/primary_text_light_theme</color>
@ -215,6 +220,7 @@
<color name="tab_tray_toolbar_background_normal_theme">@color/tab_tray_toolbar_background_light_theme</color>
<color name="tab_tray_item_divider_normal_theme">@color/tab_tray_item_divider_light_theme</color>
<color name="tab_tray_item_media_background_normal_theme">@color/tab_tray_item_media_background_light_theme</color>
<color name="tab_tray_heading_icon_normal_theme">@color/tab_tray_heading_icon_light_theme</color>
<!-- Bookmark buttons -->
<color name="bookmark_favicon_background">#DFDFE3</color>

2
app/src/main/res/values/styles.xml
View File

@ -78,6 +78,7 @@
<item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_normal_theme</item>
<item name="tabTrayItemDivider">@color/tab_tray_item_divider_normal_theme</item>
<item name="tabTrayItemMediaBackground">@color/tab_tray_item_media_background_normal_theme</item>
<item name="tabTrayHeadingIcon">@color/tab_tray_heading_icon_normal_theme</item>
<!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
@ -201,6 +202,7 @@
<item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_private_theme</item>
<item name="tabTrayItemDivider">@color/tab_tray_item_divider_private_theme</item>
<item name="tabTrayItemMediaBackground">@color/tab_tray_item_media_background_private_theme</item>
<item name="tabTrayHeadingIcon">@color/tab_tray_heading_icon_dark_theme</item>
<!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>