Merge pull request #13242 from woocommerce/feature/update-icon-colors

Update icon colors
woocommerce · Jan 6, 2025 · 320cc86 · 320cc86
2 parents 8a84edc + c1cde94
commit 320cc86
Show file tree

Hide file tree

Showing 25 changed files with 98 additions and 219 deletions.
diff --git a/...otlin/com/woocommerce/android/ui/blaze/creation/objective/BlazeCampaignObjectiveScreen.kt b/...otlin/com/woocommerce/android/ui/blaze/creation/objective/BlazeCampaignObjectiveScreen.kt
@@ -153,9 +153,9 @@ fun ObjectiveListItem(
         horizontalArrangement = Arrangement.spacedBy(16.dp)
     ) {
         val selectionDrawable = if (isSelected) {
-            R.drawable.ic_rounded_chcekbox_checked
+            R.drawable.ic_rounded_checkbox_checked
         } else {
-            R.drawable.ic_rounded_chcekbox_unchecked
+            R.drawable.ic_rounded_checkbox_unchecked
         }
         Crossfade(
             targetState = selectionDrawable,

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/SelectionCheck.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/SelectionCheck.kt
@@ -25,9 +25,9 @@ fun SelectionCheck(
     isEnabled: Boolean = true
 ) {
     val selectionDrawable = if (isSelected) {
-        R.drawable.ic_rounded_chcekbox_checked
+        R.drawable.ic_rounded_checkbox_checked
     } else {
-        R.drawable.ic_rounded_chcekbox_unchecked
+        R.drawable.ic_rounded_checkbox_unchecked
     }
 
     val colorFilter = if (isEnabled) null else ColorFilter.tint(Color.Gray)

diff --git a/...c/main/kotlin/com/woocommerce/android/ui/products/selector/components/SelectorListItem.kt b/...c/main/kotlin/com/woocommerce/android/ui/products/selector/components/SelectorListItem.kt
@@ -76,9 +76,9 @@ fun SelectorListItem(
         horizontalArrangement = Arrangement.spacedBy(dimensionResource(id = dimen.major_100))
     ) {
         val selectionDrawable = when (selectionState) {
-            SELECTED -> drawable.ic_rounded_chcekbox_checked
-            UNSELECTED -> drawable.ic_rounded_chcekbox_unchecked
-            PARTIALLY_SELECTED -> drawable.ic_rounded_chcekbox_partially_checked
+            SELECTED -> drawable.ic_rounded_checkbox_checked
+            UNSELECTED -> drawable.ic_rounded_checkbox_unchecked
+            PARTIALLY_SELECTED -> drawable.ic_rounded_checkbox_partially_checked
         }
         Crossfade(
             targetState = selectionDrawable,

diff --git a/WooCommerce/src/main/res/drawable/ic_ai_share_button.xml b/WooCommerce/src/main/res/drawable/ic_ai_share_button.xml
@@ -3,13 +3,13 @@
     android:height="18dp"
     android:viewportWidth="17"
     android:viewportHeight="18">
-  <path
-      android:pathData="M10,2L11.891,7.109L17,9L11.891,10.891L10,16L8.109,10.891L3,9L8.109,7.109L10,2Z"
-      android:fillColor="#674399"/>
-  <path
-      android:pathData="M3,0.5L3.81,2.69L6,3.5L3.81,4.31L3,6.5L2.19,4.31L0,3.5L2.19,2.69L3,0.5Z"
-      android:fillColor="#674399"/>
-  <path
-      android:pathData="M3,11.5L3.81,13.69L6,14.5L3.81,15.31L3,17.5L2.19,15.31L0,14.5L2.19,13.69L3,11.5Z"
-      android:fillColor="#674399"/>
+    <path
+        android:fillColor="@color/tag_icon"
+        android:pathData="M10,2L11.891,7.109L17,9L11.891,10.891L10,16L8.109,10.891L3,9L8.109,7.109L10,2Z" />
+    <path
+        android:fillColor="@color/tag_icon"
+        android:pathData="M3,0.5L3.81,2.69L6,3.5L3.81,4.31L3,6.5L2.19,4.31L0,3.5L2.19,2.69L3,0.5Z" />
+    <path
+        android:fillColor="@color/tag_icon"
+        android:pathData="M3,11.5L3.81,13.69L6,14.5L3.81,15.31L3,17.5L2.19,15.31L0,14.5L2.19,13.69L3,11.5Z" />
 </vector>
diff --git a/WooCommerce/src/main/res/drawable/ic_arrow_down_26.xml b/WooCommerce/src/main/res/drawable/ic_arrow_down_26.xml
@@ -3,7 +3,7 @@
     android:height="8dp"
     android:viewportWidth="26"
     android:viewportHeight="8">
-  <path
-      android:pathData="M1.848,3.32C1.583,3.211 1.374,3.051 1.219,2.842C1.064,2.632 0.986,2.4 0.986,2.145C0.986,1.743 1.118,1.411 1.383,1.146C1.647,0.873 1.975,0.736 2.367,0.736C2.577,0.736 2.8,0.782 3.037,0.873C3.283,0.955 3.493,1.028 3.666,1.092L14.139,5.207H12.211L22.684,1.092C22.857,1.028 23.066,0.955 23.313,0.873C23.559,0.782 23.782,0.736 23.982,0.736C24.374,0.736 24.702,0.873 24.967,1.146C25.231,1.411 25.363,1.743 25.363,2.145C25.363,2.4 25.286,2.632 25.131,2.842C24.976,3.051 24.766,3.211 24.502,3.32L15.178,6.971C14.859,7.089 14.521,7.212 14.166,7.34C13.811,7.458 13.482,7.518 13.182,7.518C12.872,7.518 12.539,7.458 12.184,7.34C11.828,7.212 11.495,7.089 11.186,6.971L1.848,3.32Z"
-      android:fillColor="#966CCF"/>
+    <path
+        android:fillColor="@color/color_primary"
+        android:pathData="M1.848,3.32C1.583,3.211 1.374,3.051 1.219,2.842C1.064,2.632 0.986,2.4 0.986,2.145C0.986,1.743 1.118,1.411 1.383,1.146C1.647,0.873 1.975,0.736 2.367,0.736C2.577,0.736 2.8,0.782 3.037,0.873C3.283,0.955 3.493,1.028 3.666,1.092L14.139,5.207H12.211L22.684,1.092C22.857,1.028 23.066,0.955 23.313,0.873C23.559,0.782 23.782,0.736 23.982,0.736C24.374,0.736 24.702,0.873 24.967,1.146C25.231,1.411 25.363,1.743 25.363,2.145C25.363,2.4 25.286,2.632 25.131,2.842C24.976,3.051 24.766,3.211 24.502,3.32L15.178,6.971C14.859,7.089 14.521,7.212 14.166,7.34C13.811,7.458 13.482,7.518 13.182,7.518C12.872,7.518 12.539,7.458 12.184,7.34C11.828,7.212 11.495,7.089 11.186,6.971L1.848,3.32Z" />
 </vector>
diff --git a/WooCommerce/src/main/res/drawable/ic_arrow_forward_rounded.xml b/WooCommerce/src/main/res/drawable/ic_arrow_forward_rounded.xml
@@ -1,6 +1,12 @@
-<vector android:height="20.676924dp" android:viewportHeight="56"
-    android:viewportWidth="65" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="20.676924dp"
+    android:viewportWidth="65"
+    android:viewportHeight="56">
+    <path
+        android:fillColor="#00000000"
         android:pathData="M5,28H57M57,28L34,5M57,28L34,51"
-        android:strokeColor="#7F54B3" android:strokeLineCap="round" android:strokeWidth="10"/>
+        android:strokeWidth="10"
+        android:strokeColor="@color/color_primary"
+        android:strokeLineCap="round" />
 </vector>
diff --git a/WooCommerce/src/main/res/drawable/ic_arrow_up_26.xml b/WooCommerce/src/main/res/drawable/ic_arrow_up_26.xml
@@ -3,7 +3,7 @@
     android:height="8dp"
     android:viewportWidth="26"
     android:viewportHeight="8">
-  <path
-      android:pathData="M1.848,4.537L11.186,0.887C11.495,0.768 11.828,0.65 12.184,0.531C12.539,0.404 12.872,0.34 13.182,0.34C13.482,0.34 13.811,0.404 14.166,0.531C14.521,0.65 14.859,0.768 15.178,0.887L24.502,4.537C24.766,4.637 24.976,4.797 25.131,5.016C25.286,5.225 25.363,5.453 25.363,5.699C25.363,6.109 25.231,6.451 24.967,6.725C24.702,6.989 24.374,7.121 23.982,7.121C23.782,7.121 23.559,7.08 23.313,6.998C23.066,6.907 22.857,6.825 22.684,6.752L12.211,2.65H14.139L3.666,6.752C3.493,6.825 3.283,6.907 3.037,6.998C2.8,7.08 2.577,7.121 2.367,7.121C1.975,7.121 1.647,6.989 1.383,6.725C1.118,6.451 0.986,6.109 0.986,5.699C0.986,5.453 1.064,5.225 1.219,5.016C1.374,4.797 1.583,4.637 1.848,4.537Z"
-      android:fillColor="#966CCF"/>
+    <path
+        android:fillColor="@color/color_primary"
+        android:pathData="M1.848,4.537L11.186,0.887C11.495,0.768 11.828,0.65 12.184,0.531C12.539,0.404 12.872,0.34 13.182,0.34C13.482,0.34 13.811,0.404 14.166,0.531C14.521,0.65 14.859,0.768 15.178,0.887L24.502,4.537C24.766,4.637 24.976,4.797 25.131,5.016C25.286,5.225 25.363,5.453 25.363,5.699C25.363,6.109 25.231,6.451 24.967,6.725C24.702,6.989 24.374,7.121 23.982,7.121C23.782,7.121 23.559,7.08 23.313,6.998C23.066,6.907 22.857,6.825 22.684,6.752L12.211,2.65H14.139L3.666,6.752C3.493,6.825 3.283,6.907 3.037,6.998C2.8,7.08 2.577,7.121 2.367,7.121C1.975,7.121 1.647,6.989 1.383,6.725C1.118,6.451 0.986,6.109 0.986,5.699C0.986,5.453 1.064,5.225 1.219,5.016C1.374,4.797 1.583,4.637 1.848,4.537Z" />
 </vector>
diff --git a/WooCommerce/src/main/res/drawable/ic_badge_new.xml b/WooCommerce/src/main/res/drawable/ic_badge_new.xml
@@ -3,10 +3,10 @@
     android:height="16dp"
     android:viewportWidth="42"
     android:viewportHeight="24">
-  <path
-      android:pathData="M8,0L34,0A8,8 0,0 1,42 8L42,16A8,8 0,0 1,34 24L8,24A8,8 0,0 1,0 16L0,8A8,8 0,0 1,8 0z"
-      android:fillColor="#F7EDF7"/>
-  <path
-      android:pathData="M7.025,16H8.719V10.592H8.813L12.727,16H14.191V7.545H12.498V12.93H12.404L8.502,7.545H7.025V16ZM16.648,16H22.25V14.541H18.418V12.402H22.033V11.043H18.418V9.004H22.25V7.545H16.648V16ZM26.241,16H27.911L29.493,10.305H29.587L31.187,16H32.845L35.089,7.545H33.261L31.954,13.586H31.861L30.29,7.545H28.796L27.255,13.586H27.161L25.843,7.545H24.003L26.241,16Z"
-      android:fillColor="#674399"/>
+    <path
+        android:fillColor="@color/woo_purple_0"
+        android:pathData="M8,0L34,0A8,8 0,0 1,42 8L42,16A8,8 0,0 1,34 24L8,24A8,8 0,0 1,0 16L0,8A8,8 0,0 1,8 0z" />
+    <path
+        android:fillColor="@color/woo_purple_60"
+        android:pathData="M7.025,16H8.719V10.592H8.813L12.727,16H14.191V7.545H12.498V12.93H12.404L8.502,7.545H7.025V16ZM16.648,16H22.25V14.541H18.418V12.402H22.033V11.043H18.418V9.004H22.25V7.545H16.648V16ZM26.241,16H27.911L29.493,10.305H29.587L31.187,16H32.845L35.089,7.545H33.261L31.954,13.586H31.861L30.29,7.545H28.796L27.255,13.586H27.161L25.843,7.545H24.003L26.241,16Z" />
 </vector>
diff --git a/WooCommerce/src/main/res/drawable/ic_chart.xml b/WooCommerce/src/main/res/drawable/ic_chart.xml
diff --git a/WooCommerce/src/main/res/drawable/ic_cloud.xml b/WooCommerce/src/main/res/drawable/ic_cloud.xml
diff --git a/WooCommerce/src/main/res/drawable/ic_configuration.xml b/WooCommerce/src/main/res/drawable/ic_configuration.xml
diff --git a/WooCommerce/src/main/res/drawable/ic_credit_card_give.xml b/WooCommerce/src/main/res/drawable/ic_credit_card_give.xml
@@ -3,39 +3,39 @@
     android:height="40dp"
     android:viewportWidth="56"
     android:viewportHeight="40">
-  <path
-      android:pathData="M1.75,35.75C10.5,35.75 7,37.5 29.75,37.5C36.75,37.5 43.75,35.75 45.5,28.75"
-      android:strokeLineJoin="round"
-      android:strokeWidth="3.49999"
-      android:fillColor="#00000000"
-      android:strokeColor="#7F54B3"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M1.75,17.993H7.303C7.957,17.993 8.61,17.69 9.03,17.153L18.48,7.843L27.393,9.631C28.653,9.864 29.493,10.891 28.933,13.131C28.7,14.017 27.953,14.671 27.067,14.811L22.68,15.441C21.583,15.534 20.79,16.491 20.907,17.587C20.907,17.611 20.907,17.634 20.907,17.657V23.607C20.743,24.284 20.393,24.891 19.88,25.357L15.027,29.161"
-      android:strokeLineJoin="round"
-      android:strokeWidth="3.49999"
-      android:fillColor="#00000000"
-      android:strokeColor="#7F54B3"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M28,28.75H50.75C52.663,28.75 54.25,27.163 54.25,25.25V6C54.25,4.063 52.663,2.5 50.75,2.5H24.5C22.563,2.5 21,4.063 21,6V8.357"
-      android:strokeLineJoin="round"
-      android:strokeWidth="3.49999"
-      android:fillColor="#00000000"
-      android:strokeColor="#7F54B3"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M29.143,11.25H54.25"
-      android:strokeLineJoin="round"
-      android:strokeWidth="3.49999"
-      android:fillColor="#00000000"
-      android:strokeColor="#7F54B3"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M47.25,18.25H43.75"
-      android:strokeLineJoin="round"
-      android:strokeWidth="3.49999"
-      android:fillColor="#00000000"
-      android:strokeColor="#7F54B3"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M1.75,35.75C10.5,35.75 7,37.5 29.75,37.5C36.75,37.5 43.75,35.75 45.5,28.75"
+        android:strokeWidth="3.49999"
+        android:strokeColor="@color/color_primary"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M1.75,17.993H7.303C7.957,17.993 8.61,17.69 9.03,17.153L18.48,7.843L27.393,9.631C28.653,9.864 29.493,10.891 28.933,13.131C28.7,14.017 27.953,14.671 27.067,14.811L22.68,15.441C21.583,15.534 20.79,16.491 20.907,17.587C20.907,17.611 20.907,17.634 20.907,17.657V23.607C20.743,24.284 20.393,24.891 19.88,25.357L15.027,29.161"
+        android:strokeWidth="3.49999"
+        android:strokeColor="@color/color_primary"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M28,28.75H50.75C52.663,28.75 54.25,27.163 54.25,25.25V6C54.25,4.063 52.663,2.5 50.75,2.5H24.5C22.563,2.5 21,4.063 21,6V8.357"
+        android:strokeWidth="3.49999"
+        android:strokeColor="@color/color_primary"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29.143,11.25H54.25"
+        android:strokeWidth="3.49999"
+        android:strokeColor="@color/color_primary"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M47.25,18.25H43.75"
+        android:strokeWidth="3.49999"
+        android:strokeColor="@color/color_primary"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/WooCommerce/src/main/res/drawable/ic_free_trial_item_check.xml b/WooCommerce/src/main/res/drawable/ic_free_trial_item_check.xml
diff --git a/WooCommerce/src/main/res/drawable/ic_gift.xml b/WooCommerce/src/main/res/drawable/ic_gift.xml
diff --git a/WooCommerce/src/main/res/drawable/ic_globe_2.xml b/WooCommerce/src/main/res/drawable/ic_globe_2.xml