From 69379f65ce834fa2b6b76fb7bd1517b99c960551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Sat, 4 Jan 2025 13:57:28 +0300 Subject: [PATCH 1/3] Remove unused icons --- .../src/main/res/drawable/ic_chart.xml | 15 ------------ .../src/main/res/drawable/ic_cloud.xml | 14 ----------- .../main/res/drawable/ic_configuration.xml | 8 ------- .../res/drawable/ic_free_trial_item_check.xml | 10 -------- WooCommerce/src/main/res/drawable/ic_gift.xml | 14 ----------- .../src/main/res/drawable/ic_globe_2.xml | 14 ----------- .../src/main/res/drawable/ic_letter.xml | 14 ----------- .../src/main/res/drawable/ic_two_persons.xml | 24 ------------------- .../src/main/res/drawable/ic_update_clock.xml | 14 ----------- 9 files changed, 127 deletions(-) delete mode 100644 WooCommerce/src/main/res/drawable/ic_chart.xml delete mode 100644 WooCommerce/src/main/res/drawable/ic_cloud.xml delete mode 100644 WooCommerce/src/main/res/drawable/ic_configuration.xml delete mode 100644 WooCommerce/src/main/res/drawable/ic_free_trial_item_check.xml delete mode 100644 WooCommerce/src/main/res/drawable/ic_gift.xml delete mode 100644 WooCommerce/src/main/res/drawable/ic_globe_2.xml delete mode 100644 WooCommerce/src/main/res/drawable/ic_letter.xml delete mode 100644 WooCommerce/src/main/res/drawable/ic_two_persons.xml delete mode 100644 WooCommerce/src/main/res/drawable/ic_update_clock.xml diff --git a/WooCommerce/src/main/res/drawable/ic_chart.xml b/WooCommerce/src/main/res/drawable/ic_chart.xml deleted file mode 100644 index 8752dc282eb..00000000000 --- a/WooCommerce/src/main/res/drawable/ic_chart.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/WooCommerce/src/main/res/drawable/ic_cloud.xml b/WooCommerce/src/main/res/drawable/ic_cloud.xml deleted file mode 100644 index 85dbc9923f1..00000000000 --- a/WooCommerce/src/main/res/drawable/ic_cloud.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/WooCommerce/src/main/res/drawable/ic_configuration.xml b/WooCommerce/src/main/res/drawable/ic_configuration.xml deleted file mode 100644 index f32d5b0798f..00000000000 --- a/WooCommerce/src/main/res/drawable/ic_configuration.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - 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 deleted file mode 100644 index f93328cf361..00000000000 --- a/WooCommerce/src/main/res/drawable/ic_free_trial_item_check.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/WooCommerce/src/main/res/drawable/ic_gift.xml b/WooCommerce/src/main/res/drawable/ic_gift.xml deleted file mode 100644 index 3db06227ddc..00000000000 --- a/WooCommerce/src/main/res/drawable/ic_gift.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/WooCommerce/src/main/res/drawable/ic_globe_2.xml b/WooCommerce/src/main/res/drawable/ic_globe_2.xml deleted file mode 100644 index bb83ee776cc..00000000000 --- a/WooCommerce/src/main/res/drawable/ic_globe_2.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/WooCommerce/src/main/res/drawable/ic_letter.xml b/WooCommerce/src/main/res/drawable/ic_letter.xml deleted file mode 100644 index 8a557799a7d..00000000000 --- a/WooCommerce/src/main/res/drawable/ic_letter.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/WooCommerce/src/main/res/drawable/ic_two_persons.xml b/WooCommerce/src/main/res/drawable/ic_two_persons.xml deleted file mode 100644 index bc8092682ea..00000000000 --- a/WooCommerce/src/main/res/drawable/ic_two_persons.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - diff --git a/WooCommerce/src/main/res/drawable/ic_update_clock.xml b/WooCommerce/src/main/res/drawable/ic_update_clock.xml deleted file mode 100644 index 12ad5a24174..00000000000 --- a/WooCommerce/src/main/res/drawable/ic_update_clock.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - From e95cd5a933c1154f6e3f72b831101671a9128189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Sat, 4 Jan 2025 14:07:37 +0300 Subject: [PATCH 2/3] Update purple colors in icons t --- .../main/res/drawable/ic_ai_share_button.xml | 18 ++--- .../main/res/drawable/ic_arrow_down_26.xml | 6 +- .../res/drawable/ic_arrow_forward_rounded.xml | 14 ++-- .../src/main/res/drawable/ic_arrow_up_26.xml | 6 +- .../src/main/res/drawable/ic_badge_new.xml | 12 ++-- .../main/res/drawable/ic_credit_card_give.xml | 70 +++++++++---------- .../res/drawable/ic_gridicons_megaphone.xml | 18 ++--- .../ic_rounded_chcekbox_partially_checked.xml | 6 +- WooCommerce/src/main/res/drawable/info.xml | 13 ++-- .../src/main/res/values/wc_colors_base.xml | 1 + 10 files changed, 85 insertions(+), 79 deletions(-) diff --git a/WooCommerce/src/main/res/drawable/ic_ai_share_button.xml b/WooCommerce/src/main/res/drawable/ic_ai_share_button.xml index dcd73ee1b7a..21cf076bc6a 100644 --- 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"> - - - + + + diff --git a/WooCommerce/src/main/res/drawable/ic_arrow_down_26.xml b/WooCommerce/src/main/res/drawable/ic_arrow_down_26.xml index 9e562c586e7..610d9196713 100644 --- 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"> - + diff --git a/WooCommerce/src/main/res/drawable/ic_arrow_forward_rounded.xml b/WooCommerce/src/main/res/drawable/ic_arrow_forward_rounded.xml index bee0bbe143d..618aed03270 100644 --- 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 @@ - - + + android:strokeWidth="10" + android:strokeColor="@color/color_primary" + android:strokeLineCap="round" /> diff --git a/WooCommerce/src/main/res/drawable/ic_arrow_up_26.xml b/WooCommerce/src/main/res/drawable/ic_arrow_up_26.xml index e7751f7ef84..2919b4e7348 100644 --- 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"> - + diff --git a/WooCommerce/src/main/res/drawable/ic_badge_new.xml b/WooCommerce/src/main/res/drawable/ic_badge_new.xml index 477b91124c0..f6effc37b8d 100644 --- 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"> - - + + diff --git a/WooCommerce/src/main/res/drawable/ic_credit_card_give.xml b/WooCommerce/src/main/res/drawable/ic_credit_card_give.xml index 0392fca6720..68b0dd4c5c7 100644 --- 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"> - - - - - + + + + + diff --git a/WooCommerce/src/main/res/drawable/ic_gridicons_megaphone.xml b/WooCommerce/src/main/res/drawable/ic_gridicons_megaphone.xml index 87e16bd1049..d4883ea2a03 100644 --- a/WooCommerce/src/main/res/drawable/ic_gridicons_megaphone.xml +++ b/WooCommerce/src/main/res/drawable/ic_gridicons_megaphone.xml @@ -3,13 +3,13 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - - + + diff --git a/WooCommerce/src/main/res/drawable/ic_rounded_chcekbox_partially_checked.xml b/WooCommerce/src/main/res/drawable/ic_rounded_chcekbox_partially_checked.xml index eb7a55157b4..d15d8027e28 100644 --- a/WooCommerce/src/main/res/drawable/ic_rounded_chcekbox_partially_checked.xml +++ b/WooCommerce/src/main/res/drawable/ic_rounded_chcekbox_partially_checked.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/WooCommerce/src/main/res/drawable/info.xml b/WooCommerce/src/main/res/drawable/info.xml index 25c96d08758..a05ee8efd1f 100644 --- a/WooCommerce/src/main/res/drawable/info.xml +++ b/WooCommerce/src/main/res/drawable/info.xml @@ -3,11 +3,10 @@ android:height="48dp" android:viewportWidth="48" android:viewportHeight="48"> - - - - + + + + diff --git a/WooCommerce/src/main/res/values/wc_colors_base.xml b/WooCommerce/src/main/res/values/wc_colors_base.xml index dc9c0c6006d..baad6df4fbd 100644 --- a/WooCommerce/src/main/res/values/wc_colors_base.xml +++ b/WooCommerce/src/main/res/values/wc_colors_base.xml @@ -1,6 +1,7 @@ #F2EDFF + #E1D7FF #D1C1FF #B999FF #A77EFF From c1cde941d1920a083b5f24b501a1a9719fc4b199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Sat, 4 Jan 2025 14:25:58 +0300 Subject: [PATCH 3/3] Fix the typo in checkbox drawable name --- .../creation/objective/BlazeCampaignObjectiveScreen.kt | 4 ++-- .../android/ui/compose/component/SelectionCheck.kt | 4 ++-- .../ui/products/selector/components/SelectorListItem.kt | 6 +++--- ...chcekbox_checked.xml => ic_rounded_checkbox_checked.xml} | 0 ...hecked.xml => ic_rounded_checkbox_partially_checked.xml} | 0 ...kbox_unchecked.xml => ic_rounded_checkbox_unchecked.xml} | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename WooCommerce/src/main/res/drawable/{ic_rounded_chcekbox_checked.xml => ic_rounded_checkbox_checked.xml} (100%) rename WooCommerce/src/main/res/drawable/{ic_rounded_chcekbox_partially_checked.xml => ic_rounded_checkbox_partially_checked.xml} (100%) rename WooCommerce/src/main/res/drawable/{ic_rounded_chcekbox_unchecked.xml => ic_rounded_checkbox_unchecked.xml} (100%) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/creation/objective/BlazeCampaignObjectiveScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/creation/objective/BlazeCampaignObjectiveScreen.kt index 07aacef8e0f..9015f9dfde1 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/creation/objective/BlazeCampaignObjectiveScreen.kt +++ b/WooCommerce/src/main/kotlin/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 index b326b39f2c4..7d4d96209c8 100644 --- 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/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/components/SelectorListItem.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/components/SelectorListItem.kt index bbc1cdc2e5b..5455de049c8 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/components/SelectorListItem.kt +++ b/WooCommerce/src/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_rounded_chcekbox_checked.xml b/WooCommerce/src/main/res/drawable/ic_rounded_checkbox_checked.xml similarity index 100% rename from WooCommerce/src/main/res/drawable/ic_rounded_chcekbox_checked.xml rename to WooCommerce/src/main/res/drawable/ic_rounded_checkbox_checked.xml diff --git a/WooCommerce/src/main/res/drawable/ic_rounded_chcekbox_partially_checked.xml b/WooCommerce/src/main/res/drawable/ic_rounded_checkbox_partially_checked.xml similarity index 100% rename from WooCommerce/src/main/res/drawable/ic_rounded_chcekbox_partially_checked.xml rename to WooCommerce/src/main/res/drawable/ic_rounded_checkbox_partially_checked.xml diff --git a/WooCommerce/src/main/res/drawable/ic_rounded_chcekbox_unchecked.xml b/WooCommerce/src/main/res/drawable/ic_rounded_checkbox_unchecked.xml similarity index 100% rename from WooCommerce/src/main/res/drawable/ic_rounded_chcekbox_unchecked.xml rename to WooCommerce/src/main/res/drawable/ic_rounded_checkbox_unchecked.xml