blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #10159 - Tab tray bottom toolbar colors (#10326)

master
David Walsh 2020-05-05 13:16:09 -05:00 committed by GitHub
parent 5106134786
commit 249e0cd4e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/layout/fragment_tab_tray.xml
View File

@ -6,7 +6,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:mozac="http://schemas.android.com/apk/res-auto" xmlns:mozac="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="?tabTrayItemBackground">
<TextView <TextView
android:id="@+id/tab_tray_empty_view" android:id="@+id/tab_tray_empty_view"
@ -60,7 +61,7 @@
android:id="@+id/tab_tray_controls" android:id="@+id/tab_tray_controls"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/browser_toolbar_height" android:layout_height="@dimen/browser_toolbar_height"
android:background="?bottomBarBackground" android:background="?tabTrayToolbarBackground"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />

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

@ -41,6 +41,7 @@
<color name="tab_tray_item_url_normal_theme">@color/tab_tray_item_url_dark_theme</color> <color name="tab_tray_item_url_normal_theme">@color/tab_tray_item_url_dark_theme</color>
<color name="tab_tray_item_background_normal_theme">@color/tab_tray_item_background_dark_theme</color> <color name="tab_tray_item_background_normal_theme">@color/tab_tray_item_background_dark_theme</color>
<color name="tab_tray_item_selected_background_normal_theme">@color/tab_tray_item_selected_background_dark_theme</color> <color name="tab_tray_item_selected_background_normal_theme">@color/tab_tray_item_selected_background_dark_theme</color>
<color name="tab_tray_toolbar_background_normal_theme">@color/tab_tray_toolbar_background_dark_theme</color>
<!-- Collection icons--> <!-- Collection icons-->
<color name="collection_icon_color_violet">@color/collection_icon_color_violet_dark_theme</color> <color name="collection_icon_color_violet">@color/collection_icon_color_violet_dark_theme</color>

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

@ -49,6 +49,7 @@
<attr name="tabTrayItemUrl" format="reference" /> <attr name="tabTrayItemUrl" format="reference" />
<attr name="tabTrayItemBackground" format="reference" /> <attr name="tabTrayItemBackground" format="reference" />
<attr name="tabTrayItemSelectedBackground" format="reference" /> <attr name="tabTrayItemSelectedBackground" format="reference" />
<attr name="tabTrayToolbarBackground" format="reference" />
<declare-styleable name="LibraryListItem"> <declare-styleable name="LibraryListItem">
<attr name="listItemTitle" format="reference" /> <attr name="listItemTitle" format="reference" />

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

@ -58,6 +58,7 @@
<color name="tab_tray_item_url_light_theme">@color/dark_grey_05</color> <color name="tab_tray_item_url_light_theme">@color/dark_grey_05</color>
<color name="tab_tray_item_background_light_theme">@color/light_grey_10</color> <color name="tab_tray_item_background_light_theme">@color/light_grey_10</color>
<color name="tab_tray_item_selected_background_light_theme">@color/violet_70_12a</color> <color name="tab_tray_item_selected_background_light_theme">@color/violet_70_12a</color>
<color name="tab_tray_toolbar_background_light_theme">@color/light_grey_10</color>
<!-- Dark theme color palette --> <!-- Dark theme color palette -->
<color name="primary_text_dark_theme">#FBFBFE</color> <color name="primary_text_dark_theme">#FBFBFE</color>
@ -97,6 +98,7 @@
<color name="tab_tray_item_url_dark_theme">@color/light_grey_60</color> <color name="tab_tray_item_url_dark_theme">@color/light_grey_60</color>
<color name="tab_tray_item_background_dark_theme">@color/dark_grey_80</color> <color name="tab_tray_item_background_dark_theme">@color/dark_grey_80</color>
<color name="tab_tray_item_selected_background_dark_theme">@color/violet_50_32a</color> <color name="tab_tray_item_selected_background_dark_theme">@color/violet_50_32a</color>
<color name="tab_tray_toolbar_background_dark_theme">@color/dark_grey_50</color>
<!-- Private theme color palette --> <!-- Private theme color palette -->
<color name="primary_text_private_theme">#FBFBFE</color> <color name="primary_text_private_theme">#FBFBFE</color>
@ -134,6 +136,7 @@
<color name="tab_tray_item_url_private_theme">@color/light_grey_60</color> <color name="tab_tray_item_url_private_theme">@color/light_grey_60</color>
<color name="tab_tray_item_background_private_theme">@color/ink_90</color> <color name="tab_tray_item_background_private_theme">@color/ink_90</color>
<color name="tab_tray_item_selected_background_private_theme">@color/violet_50_32a</color> <color name="tab_tray_item_selected_background_private_theme">@color/violet_50_32a</color>
<color name="tab_tray_toolbar_background_private_theme">@color/ink_50</color>
<!-- Normal theme colors for light mode --> <!-- Normal theme colors for light mode -->
<color name="primary_text_normal_theme">@color/primary_text_light_theme</color> <color name="primary_text_normal_theme">@color/primary_text_light_theme</color>
@ -170,6 +173,7 @@
<color name="tab_tray_item_url_normal_theme">@color/tab_tray_item_url_light_theme</color> <color name="tab_tray_item_url_normal_theme">@color/tab_tray_item_url_light_theme</color>
<color name="tab_tray_item_background_normal_theme">@color/tab_tray_item_background_light_theme</color> <color name="tab_tray_item_background_normal_theme">@color/tab_tray_item_background_light_theme</color>
<color name="tab_tray_item_selected_background_normal_theme">@color/tab_tray_item_selected_background_light_theme</color> <color name="tab_tray_item_selected_background_normal_theme">@color/tab_tray_item_selected_background_light_theme</color>
<color name="tab_tray_toolbar_background_normal_theme">@color/tab_tray_toolbar_background_light_theme</color>
<!-- Bookmark buttons --> <!-- Bookmark buttons -->
<color name="bookmark_favicon_background">#DFDFE3</color> <color name="bookmark_favicon_background">#DFDFE3</color>

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

@ -69,8 +69,9 @@
<item name="tabTrayItemText">@color/tab_tray_item_text_normal_theme</item> <item name="tabTrayItemText">@color/tab_tray_item_text_normal_theme</item>
<item name="tabTrayItemUrl">@color/tab_tray_item_url_normal_theme</item> <item name="tabTrayItemUrl">@color/tab_tray_item_url_normal_theme</item>
<item name="tabTrayItemBackground">@color/foundation_normal_theme</item> <item name="tabTrayItemBackground">@color/tab_tray_item_background_normal_theme</item>
<item name="tabTrayItemSelectedBackground">@color/tab_tray_item_selected_background_normal_theme</item> <item name="tabTrayItemSelectedBackground">@color/tab_tray_item_selected_background_normal_theme</item>
<item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_normal_theme</item>
<!-- Drawables --> <!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item> <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
@ -180,8 +181,9 @@
<!-- Tab Tray --> <!-- Tab Tray -->
<item name="tabTrayItemText">@color/tab_tray_item_text_private_theme</item> <item name="tabTrayItemText">@color/tab_tray_item_text_private_theme</item>
<item name="tabTrayItemUrl">@color/tab_tray_item_url_private_theme</item> <item name="tabTrayItemUrl">@color/tab_tray_item_url_private_theme</item>
<item name="tabTrayItemBackground">@color/foundation_private_theme</item> <item name="tabTrayItemBackground">@color/tab_tray_item_background_private_theme</item>
<item name="tabTrayItemSelectedBackground">@color/tab_tray_item_selected_background_private_theme</item> <item name="tabTrayItemSelectedBackground">@color/tab_tray_item_selected_background_private_theme</item>
<item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_private_theme</item>
<!-- Drawables --> <!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_private</item> <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>