Skip to content

Update filters and add buttons colors #14872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 31, 2025
Merged

Update filters and add buttons colors #14872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07bfe80
Use Purple 40 for Filters buttons
irfano Oct 31, 2025
9a8feb4
Update AddButton background tint
irfano Oct 31, 2025
1644f37
Reformat styles_base.xml
irfano Oct 31, 2025
fd0febf
Update RELEASE-NOTES.txt
irfano Oct 31, 2025
f87d2ed
Merge branch 'trunk' into update-filters-and-add-buttons-colors
irfano Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- [*] Fixed an issue when images for the card reader flows were not shown on tablets [https://github.com/woocommerce/woocommerce-android/pull/14849]
- [*] Fixed an issue where the count of the filters applied to the orders was not updated correctly [https://github.com/woocommerce/woocommerce-android/pull/14844]
- [**] POS: Allow merchants to view, search, and manage POS orders directly within the POS interface. [https://github.com/woocommerce/woocommerce-android/pull/14866]
- [*] Improved the Filters and Add button colors [https://github.com/woocommerce/woocommerce-android/pull/14872]

23.5
-----
Expand Down
2 changes: 1 addition & 1 deletion WooCommerce/src/main/res/color/button_outlined_bg_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_selected="true"
android:color="@color/product_filer_bg_selected"/>
android:color="@color/primary_colored_button_background"/>
<item
android:state_selected="false"
android:color="@android:color/transparent"/>
Expand Down
1 change: 0 additions & 1 deletion WooCommerce/src/main/res/values/colors_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@
-->
<color name="product_status_fg_other">@color/woo_blue_50</color>
<color name="product_status_fg_pending">@color/woo_orange_50</color>
<color name="product_filer_bg_selected">@color/color_primary</color>
<!--
Product Status Badge
-->
Expand Down
53 changes: 32 additions & 21 deletions WooCommerce/src/main/res/values/styles_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Base Woo Styles. Use these styles as a base for custom component styles and override only the
properties necessary. The goal is to make as few modifications as possible to keep a consistent
theme across the entire app. Overridden versions should be added to the styles.xml file.
-->
<resources
xmlns:tools="http://schemas.android.com/tools">
<style name="Woo"/>
<style name="Widget"/>
<style name="Widget.Woo"/>
<resources xmlns:tools="http://schemas.android.com/tools">

<style name="Woo" />

<style name="Widget" />

<style name="Widget.Woo" />

<!--
Toolbar Styles
Expand All @@ -21,18 +22,22 @@
<item name="android:paddingStart">0dp</item>
<item name="android:paddingLeft">0dp</item>
</style>

<style name="Widget.Woo.Toolbar.Surface" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
<item name="actionMenuTextColor">@color/color_primary_selector</item>
</style>

<style name="TextAppearance.Woo.CollapsingToolbar.Expanded" parent="TextAppearance.MaterialComponents.Headline4">
<item name="android:textColor">@color/color_on_surface</item>
<item name="android:textStyle">bold</item>
<item name="android:layout_height">@dimen/expanded_toolbar_height</item>
</style>

<style name="TextAppearance.Woo.CollapsingToolbar.Collapsed" parent="TextAppearance.MaterialComponents.Headline6">
<item name="android:textColor">@color/color_on_surface</item>
<item name="android:layout_height">@dimen/toolbar_height</item>
</style>

<style name="Woo.CollapsedToolbarLayout" parent="@style/Widget.Design.CollapsingToolbar">
<item name="layout_scrollFlags">scroll|exitUntilCollapsed</item>
<item name="android:background">@color/color_toolbar</item>
Expand All @@ -47,10 +52,12 @@
<item name="expandedTitleMarginEnd">16dp</item>
<item name="android:paddingEnd">4dp</item>
</style>

<style name="Woo.ActionMode.OverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
<item name="tint">@color/color_primary</item>
<item name="android:paddingEnd">16dp</item>
</style>

<style name="Woo.TextView.Subtitle1.ToolbarSubtitle">
<item name="android:layout_gravity">bottom</item>
<item name="android:layout_marginStart">16dp</item>
Expand Down Expand Up @@ -189,7 +196,7 @@
<item name="android:textColor">@color/color_on_surface_high</item>
</style>

<style name="Woo.Card.StatusMessage" parent="Woo.TextView.Subtitle1"/>
<style name="Woo.Card.StatusMessage" parent="Woo.TextView.Subtitle1" />

<style name="Woo.Card.ListHeader" parent="Woo.TextView.Body2">
<item name="android:layout_marginBottom">@dimen/major_75</item>
Expand Down Expand Up @@ -363,17 +370,15 @@
<!--
TextInputLayout styles
-->
<style name="Woo.TextInputLayout"
parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
<style name="Woo.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
<item name="android:layout_marginStart">@dimen/major_100</item>
<item name="android:layout_marginEnd">@dimen/major_100</item>
<item name="android:layout_marginTop">@dimen/minor_00</item>
<item name="android:layout_marginBottom">@dimen/minor_75</item>
<item name="helperTextTextAppearance">@style/TextAppearance.Woo.Caption</item>
</style>

<style name="Woo.TextInputEditText"
parent="Widget.MaterialComponents.TextInputEditText.OutlinedBox">
<style name="Woo.TextInputEditText" parent="Widget.MaterialComponents.TextInputEditText.OutlinedBox">
<item name="android:textAppearance">?attr/textAppearanceSubtitle1</item>
<item name="android:textColor">@color/color_on_surface_high</item>
<item name="android:gravity">center_vertical|start</item>
Expand Down Expand Up @@ -534,7 +539,7 @@
<style name="Woo.AddButton">
<item name="android:src">@drawable/ic_add</item>
<item name="tint">@color/woo_white</item>
<item name="backgroundTint">?colorPrimary</item>
<item name="backgroundTint">@color/primary_colored_button_background</item>
</style>

<!-- Set at the theme level so no need to set directly on the component -->
Expand Down Expand Up @@ -608,7 +613,7 @@
<!--
List Styles
-->
<style name="Woo.ListHeader" parent="Woo.TextView.Subtitle2"/>
<style name="Woo.ListHeader" parent="Woo.TextView.Subtitle2" />

<!-- Use with a list item container -->
<style name="Woo.ListItem">
Expand All @@ -616,14 +621,19 @@
<item name="android:background">?attr/selectableItemBackground</item>
<item name="android:paddingStart">@dimen/major_100</item>
<item name="android:paddingEnd">@dimen/major_100</item>
<item name="android:paddingTop">@dimen/minor_100</item>

Check warning

Code scanning / Android Lint

Unused resources Warning

The resource R.style.Woo_ListItem_Overline appears to be unused
<item name="android:paddingBottom">@dimen/minor_100</item>
</style>
<style name="Woo.ListItem.Title" parent="Woo.TextView.Subtitle1"/>
<style name="Woo.ListItem.Subtitle" parent="Woo.TextView.Subtitle2"/>
<style name="Woo.ListItem.Overline" parent="Woo.TextView.Overline"/>
<style name="Woo.ListItem.Caption" parent="Woo.TextView.Caption"/>
<style name="Woo.ListItem.Body" parent="Woo.TextView.Body2"/>

<style name="Woo.ListItem.Title" parent="Woo.TextView.Subtitle1" />

<style name="Woo.ListItem.Subtitle" parent="Woo.TextView.Subtitle2" />

<style name="Woo.ListItem.Overline" parent="Woo.TextView.Overline" />

<style name="Woo.ListItem.Caption" parent="Woo.TextView.Caption" />

<style name="Woo.ListItem.Body" parent="Woo.TextView.Body2" />

<!--
FlowLayout Style
Expand Down Expand Up @@ -695,7 +705,7 @@
<item name="android:paddingEnd">@dimen/major_100</item>
</style>

<style name="Widget.Woo.Settings.OptionValue"/>
<style name="Widget.Woo.Settings.OptionValue" />

<style name="Widget.Woo.Settings.OptionToggle">
<item name="android:paddingStart">@dimen/major_100</item>
Expand Down Expand Up @@ -726,7 +736,8 @@
<item name="android:layout_marginBottom">@dimen/major_75</item>
</style>

<style name="Woo.Skeleton.ListItem"/>
<style name="Woo.Skeleton.ListItem" />

<style name="Woo.Skeleton.ListItem.Single">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">@dimen/skeleton_text_height_200</item>
Expand Down