For #1072: Fixes theming

nightly-build-test
Sawyer Blatz 5 years ago committed by Colin Lee
parent 0a449dc12c
commit 05353ee2e1

@ -1,32 +0,0 @@
<?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/. -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="oval">
<size
android:width="40dp"
android:height="40dp" />
<solid android:color="@color/library_screenshots_icon_background" />
</shape>
</item>
<item
android:bottom="8dp"
android:left="8dp"
android:right="8dp"
android:top="8dp">
<vector
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/library_screenshots_icon"
android:fillType="evenOdd"
android:pathData="M6,7.1707C7.1652,7.5825 8,8.6938 8,10C8,10.2312 7.9738,10.4563 7.9243,10.6725L10.4097,12.5843L14.9445,9.4447C16.0797,8.6588 17.6371,8.942 18.423,10.0772L7.9279,17.3431C7.9751,17.5545 8,17.7743 8,18C8,19.6569 6.6569,21 5,21C3.3431,21 2,19.6569 2,18C2,16.3431 3.3431,15 5,15C5.5103,15 5.9909,15.1274 6.4116,15.3522L8.2516,14.0783L6.4,12.654C5.9821,12.8749 5.5056,13 5,13C3.3431,13 2,11.6569 2,10C2,8.6938 2.8348,7.5825 4,7.1707L4,6L6,6L6,7.1707ZM6,2L6,4L4,4C4,2.8954 4.8954,2 6,2ZM8,2L10,2L10,4L8,4L8,2ZM12,2L14,2L14,4L12,4L12,2ZM16,2L18,2L18,4L16,4L16,2ZM20,2C21.1046,2 22,2.8954 22,4L20,4L20,2ZM20,6L22,6L22,8L20,8L20,6ZM20,10L22,10L22,12L20,12L20,10ZM20,14L22,14C22,15.1046 21.1046,16 20,16L20,14ZM13.648,15.0753L18.7621,19.0092C17.9203,20.1036 16.3507,20.3083 15.2563,19.4665L11.49,16.5693L13.648,15.0753ZM5,11C5.5523,11 6,10.5523 6,10C6,9.4477 5.5523,9 5,9C4.4477,9 4,9.4477 4,10C4,10.5523 4.4477,11 5,11ZM5,19C5.5523,19 6,18.5523 6,18C6,17.4477 5.5523,17 5,17C4.4477,17 4,17.4477 4,18C4,18.5523 4.4477,19 5,19Z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
</item>
</layer-list>

@ -20,7 +20,7 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="@color/off_white"
android:background="?attr/toolbarColor"
android:clipToPadding="true"
app:behavior_hideable="true"
app:behavior_peekHeight="15dp"

@ -9,16 +9,16 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/off_white">
android:background="?attr/toolbarColor">
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/quick_action_sheet_handle"
android:layout_marginTop="3dp"
android:layout_marginBottom="10dp"
android:layout_width="24dp"
android:layout_height="2dp"
android:layout_gravity="center_horizontal"
android:background="@drawable/ic_drawer_pull_tab"/>
android:background="?attr/quickActionPullTabColor"
android:src="@drawable/ic_drawer_pull_tab"/>
<LinearLayout
android:orientation="horizontal"
@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_marginBottom="3dp"
android:layout_height="wrap_content"
android:background="@color/off_white">
android:background="?attr/toolbarColor">
<androidx.appcompat.widget.AppCompatImageButton
android:layout_weight="1"
@ -37,7 +37,7 @@
android:layout_gravity="center_vertical"
android:contentDescription="@string/quick_action_share"
android:src="@drawable/quick_action_icon_share"
android:background="@color/off_white"/>
android:background="?attr/toolbarColor"/>
<androidx.appcompat.widget.AppCompatImageButton
android:layout_weight="1"
@ -48,7 +48,7 @@
android:layout_gravity="center_vertical"
android:contentDescription="@string/quick_action_screenshot"
android:src="@drawable/library_icon_screenshots_circle_background"
android:background="@color/off_white"/>
android:background="?attr/toolbarColor"/>
<androidx.appcompat.widget.AppCompatImageButton
android:layout_weight="1"
@ -59,7 +59,7 @@
android:layout_gravity="center_vertical"
android:contentDescription="@string/quick_action_download"
android:src="@drawable/library_icon_downloads_circle_background"
android:background="@color/off_white"/>
android:background="?attr/toolbarColor"/>
<androidx.appcompat.widget.AppCompatImageButton
android:layout_weight="1"
@ -70,7 +70,7 @@
android:layout_gravity="center_vertical"
android:contentDescription="@string/quick_action_favorite"
android:src="@drawable/library_icon_favorites_circle_background"
android:background="@color/off_white"/>
android:background="?attr/toolbarColor"/>
<androidx.appcompat.widget.AppCompatImageButton
android:layout_weight="1"
@ -81,7 +81,7 @@
android:layout_gravity="center_vertical"
android:contentDescription="@string/quick_action_read"
android:src="@drawable/quick_action_icon_read"
android:background="@color/off_white"/>
android:background="?attr/toolbarColor"/>
</LinearLayout>
<LinearLayout
@ -89,7 +89,7 @@
android:layout_gravity="bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/off_white">
android:background="?attr/toolbarColor">
<androidx.appcompat.widget.AppCompatTextView
android:layout_height="wrap_content"
@ -97,6 +97,7 @@
android:layout_width="0dp"
android:textAlignment="center"
android:textSize="12sp"
android:textColor="?attr/toolbarTextColor"
android:text="@string/quick_action_share"/>
<androidx.appcompat.widget.AppCompatTextView
@ -105,6 +106,7 @@
android:layout_width="0dp"
android:textAlignment="center"
android:textSize="12sp"
android:textColor="?attr/toolbarTextColor"
android:text="@string/quick_action_screenshot"/>
<androidx.appcompat.widget.AppCompatTextView
@ -113,6 +115,7 @@
android:layout_width="0dp"
android:textAlignment="center"
android:textSize="12sp"
android:textColor="?attr/toolbarTextColor"
android:text="@string/quick_action_download"/>
<androidx.appcompat.widget.AppCompatTextView
@ -121,6 +124,7 @@
android:layout_width="0dp"
android:textAlignment="center"
android:textSize="12sp"
android:textColor="?attr/toolbarTextColor"
android:text="@string/quick_action_favorite"/>
<androidx.appcompat.widget.AppCompatTextView
@ -129,8 +133,8 @@
android:layout_width="0dp"
android:textAlignment="center"
android:textSize="12sp"
android:textColor="?attr/toolbarTextColor"
android:text="@string/quick_action_read"/>
</LinearLayout>
</LinearLayout>

@ -41,6 +41,7 @@
<attr name="browserToolbarIcons" format="reference" />
<attr name="browserToolbarMenuIcons" format="reference" />
<attr name="navigationBarColorBrowser" format="reference" />
<attr name="quickActionPullTabColor" format="reference" />
<!-- History Fragment -->
<attr name="historyURLColor" format="reference" />

@ -85,4 +85,6 @@
<color name="quick_action_read_icon">#8a201f</color>
<color name="quick_action_read_icon_background">#fce98f</color>
<color name="quick_action_pull_tab">#2915141A</color>
</resources>

@ -53,6 +53,7 @@
<item name="browserToolbarBackground">@color/off_white</item>
<item name="browserToolbarIcons">@color/icons_light_mode</item>
<item name="browserToolbarMenuIcons">@color/icons_light_mode</item>
<item name="quickActionPullTabColor">@color/quick_action_pull_tab</item>
<!-- History fragment colors -->
<item name="historyTitleColor">@color/history_title_light_theme</item>
@ -93,6 +94,7 @@
<item name="homeDividerColor">@color/search_private_background</item>
<item name="sessionBackgroundColor">@color/session_list_private_header</item>
<item name="sessionBorderColor">@color/private_browsing_primary</item>
<item name="quickActionPullTabColor">@color/off_white</item>
<!-- Search fragment colors -->
<item name="searchBackground">@color/private_browsing_bottom_gradient</item>

Loading…
Cancel
Save