1
0
Fork 0

For #1072: Fixes theming

master
Sawyer Blatz 2019-03-21 08:39:01 -07:00 committed by Colin Lee
parent 0a449dc12c
commit 05353ee2e1
6 changed files with 21 additions and 44 deletions

File diff suppressed because one or more lines are too long

View File

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

View File

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

View File

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

View File

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

View File

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