Skip to content

Commit a469a1f

Browse files
authored
Merge pull request #14832 from woocommerce/issue/WOOMOB-1548-filters-chip-dark-mode-color
Improve the Filters button color in dark mode
2 parents ebd5b97 + d035e13 commit a469a1f

File tree

5 files changed

+35
-33
lines changed

5 files changed

+35
-33
lines changed

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
-----
66
- [Internal] Improve WebView experience by using Authenticated WebView for more scenarios [https://github.com/woocommerce/woocommerce-android/pull/14826]
77
- [Internal] Update In-Person Payments setup flow to use Authenticated WebView [https://github.com/woocommerce/woocommerce-android/pull/14827]
8+
- [*] Improved the Filters button colors on the Orders and Products screens [https://github.com/woocommerce/woocommerce-android/pull/14832]
89

910
23.5
1011
-----

WooCommerce/src/main/res/color/button_outlined_text_selector.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

WooCommerce/src/main/res/values-night/colors_base.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
-->
9494
<color name="product_status_fg_other">@color/woo_blue_30</color>
9595
<color name="product_status_fg_pending">@color/woo_orange_30</color>
96-
<color name="product_filer_bg_selected">@color/color_secondary</color>
9796

9897
<!--
9998
Aztec Editor

WooCommerce/src/main/res/values/colors_base.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
-->
152152
<color name="product_status_fg_other">@color/woo_blue_50</color>
153153
<color name="product_status_fg_pending">@color/woo_orange_50</color>
154-
<color name="product_filer_bg_selected">@color/color_primary_surface</color>
154+
<color name="product_filer_bg_selected">@color/color_primary</color>
155155
<!--
156156
Product Status Badge
157157
-->
@@ -215,6 +215,7 @@
215215
<color name="light_colored_button_text_secondary">@color/color_primary</color>
216216
<color name="primary_colored_button_background">@color/woo_purple_40</color>
217217
<color name="text_button_over_bottom_sheet">@color/color_primary</color>
218+
<color name="button_outlined_text">@color/white</color>
218219

219220
<!--
220221
Analytics

WooCommerce/src/main/res/values/styles_base.xml

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
Base Woo Styles. Use these styles as a base for custom component styles and override only the
43
properties necessary. The goal is to make as few modifications as possible to keep a consistent
54
theme across the entire app. Overridden versions should be added to the styles.xml file.
65
-->
7-
<resources
8-
xmlns:tools="http://schemas.android.com/tools">
9-
<style name="Woo"/>
10-
<style name="Widget"/>
11-
<style name="Widget.Woo"/>
6+
<resources xmlns:tools="http://schemas.android.com/tools">
7+
8+
<style name="Woo" />
9+
10+
<style name="Widget" />
11+
12+
<style name="Widget.Woo" />
1213

1314
<!--
1415
Toolbar Styles
@@ -21,18 +22,22 @@ theme across the entire app. Overridden versions should be added to the styles.x
2122
<item name="android:paddingStart">0dp</item>
2223
<item name="android:paddingLeft">0dp</item>
2324
</style>
25+
2426
<style name="Widget.Woo.Toolbar.Surface" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
2527
<item name="actionMenuTextColor">@color/color_primary_selector</item>
2628
</style>
29+
2730
<style name="TextAppearance.Woo.CollapsingToolbar.Expanded" parent="TextAppearance.MaterialComponents.Headline4">
2831
<item name="android:textColor">@color/color_on_surface</item>
2932
<item name="android:textStyle">bold</item>
3033
<item name="android:layout_height">@dimen/expanded_toolbar_height</item>
3134
</style>
35+
3236
<style name="TextAppearance.Woo.CollapsingToolbar.Collapsed" parent="TextAppearance.MaterialComponents.Headline6">
3337
<item name="android:textColor">@color/color_on_surface</item>
3438
<item name="android:layout_height">@dimen/toolbar_height</item>
3539
</style>
40+
3641
<style name="Woo.CollapsedToolbarLayout" parent="@style/Widget.Design.CollapsingToolbar">
3742
<item name="layout_scrollFlags">scroll|exitUntilCollapsed</item>
3843
<item name="android:background">@color/color_toolbar</item>
@@ -47,10 +52,12 @@ theme across the entire app. Overridden versions should be added to the styles.x
4752
<item name="expandedTitleMarginEnd">16dp</item>
4853
<item name="android:paddingEnd">4dp</item>
4954
</style>
55+
5056
<style name="Woo.ActionMode.OverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
5157
<item name="tint">@color/color_primary</item>
5258
<item name="android:paddingEnd">16dp</item>
5359
</style>
60+
5461
<style name="Woo.TextView.Subtitle1.ToolbarSubtitle">
5562
<item name="android:layout_gravity">bottom</item>
5663
<item name="android:layout_marginStart">16dp</item>
@@ -189,7 +196,7 @@ theme across the entire app. Overridden versions should be added to the styles.x
189196
<item name="android:textColor">@color/color_on_surface_high</item>
190197
</style>
191198

192-
<style name="Woo.Card.StatusMessage" parent="Woo.TextView.Subtitle1"/>
199+
<style name="Woo.Card.StatusMessage" parent="Woo.TextView.Subtitle1" />
193200

194201
<style name="Woo.Card.ListHeader" parent="Woo.TextView.Body2">
195202
<item name="android:layout_marginBottom">@dimen/major_75</item>
@@ -363,17 +370,15 @@ theme across the entire app. Overridden versions should be added to the styles.x
363370
<!--
364371
TextInputLayout styles
365372
-->
366-
<style name="Woo.TextInputLayout"
367-
parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
373+
<style name="Woo.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
368374
<item name="android:layout_marginStart">@dimen/major_100</item>
369375
<item name="android:layout_marginEnd">@dimen/major_100</item>
370376
<item name="android:layout_marginTop">@dimen/minor_00</item>
371377
<item name="android:layout_marginBottom">@dimen/minor_75</item>
372378
<item name="helperTextTextAppearance">@style/TextAppearance.Woo.Caption</item>
373379
</style>
374380

375-
<style name="Woo.TextInputEditText"
376-
parent="Widget.MaterialComponents.TextInputEditText.OutlinedBox">
381+
<style name="Woo.TextInputEditText" parent="Widget.MaterialComponents.TextInputEditText.OutlinedBox">
377382
<item name="android:textAppearance">?attr/textAppearanceSubtitle1</item>
378383
<item name="android:textColor">@color/color_on_surface_high</item>
379384
<item name="android:gravity">center_vertical|start</item>
@@ -549,7 +554,7 @@ theme across the entire app. Overridden versions should be added to the styles.x
549554
<item name="android:textSize">@dimen/text_minor_100</item>
550555
<item name="android:textStyle">normal</item>
551556
<item name="lineHeight">@dimen/line_height_minor_80</item>
552-
<item name="android:textColor">@color/button_outlined_text_selector</item>
557+
<item name="android:textColor">@color/button_outlined_text</item>
553558
</style>
554559

555560
<!-- Set at the theme level so no need to set directly on the component -->
@@ -608,7 +613,7 @@ theme across the entire app. Overridden versions should be added to the styles.x
608613
<!--
609614
List Styles
610615
-->
611-
<style name="Woo.ListHeader" parent="Woo.TextView.Subtitle2"/>
616+
<style name="Woo.ListHeader" parent="Woo.TextView.Subtitle2" />
612617

613618
<!-- Use with a list item container -->
614619
<style name="Woo.ListItem">
@@ -619,11 +624,16 @@ theme across the entire app. Overridden versions should be added to the styles.x
619624
<item name="android:paddingTop">@dimen/minor_100</item>
620625
<item name="android:paddingBottom">@dimen/minor_100</item>
621626
</style>
622-
<style name="Woo.ListItem.Title" parent="Woo.TextView.Subtitle1"/>
623-
<style name="Woo.ListItem.Subtitle" parent="Woo.TextView.Subtitle2"/>
624-
<style name="Woo.ListItem.Overline" parent="Woo.TextView.Overline"/>
625-
<style name="Woo.ListItem.Caption" parent="Woo.TextView.Caption"/>
626-
<style name="Woo.ListItem.Body" parent="Woo.TextView.Body2"/>
627+
628+
<style name="Woo.ListItem.Title" parent="Woo.TextView.Subtitle1" />
629+
630+
<style name="Woo.ListItem.Subtitle" parent="Woo.TextView.Subtitle2" />
631+
632+
<style name="Woo.ListItem.Overline" parent="Woo.TextView.Overline" />
633+
634+
<style name="Woo.ListItem.Caption" parent="Woo.TextView.Caption" />
635+
636+
<style name="Woo.ListItem.Body" parent="Woo.TextView.Body2" />
627637

628638
<!--
629639
FlowLayout Style
@@ -695,7 +705,7 @@ theme across the entire app. Overridden versions should be added to the styles.x
695705
<item name="android:paddingEnd">@dimen/major_100</item>
696706
</style>
697707

698-
<style name="Widget.Woo.Settings.OptionValue"/>
708+
<style name="Widget.Woo.Settings.OptionValue" />
699709

700710
<style name="Widget.Woo.Settings.OptionToggle">
701711
<item name="android:paddingStart">@dimen/major_100</item>
@@ -726,7 +736,8 @@ theme across the entire app. Overridden versions should be added to the styles.x
726736
<item name="android:layout_marginBottom">@dimen/major_75</item>
727737
</style>
728738

729-
<style name="Woo.Skeleton.ListItem"/>
739+
<style name="Woo.Skeleton.ListItem" />
740+
730741
<style name="Woo.Skeleton.ListItem.Single">
731742
<item name="android:layout_width">0dp</item>
732743
<item name="android:layout_height">@dimen/skeleton_text_height_200</item>

0 commit comments

Comments
 (0)