Skip to content

Commit

Permalink
Merge pull request #13516 from woocommerce/update-notificaiton-icon-to-w
Browse files Browse the repository at this point in the history
Update notification icon to W logo
  • Loading branch information
irfano authored Feb 11, 2025
2 parents 81619ae + a5067ed commit 4e001ed
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 19 deletions.
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
21.8
-----
- [**] Improved accessibility support (handling of increased text size) in in-person payment flows [https://github.com/woocommerce/woocommerce-android/pull/13414]
- [*] Updated the notification icon for better readability [https://github.com/woocommerce/woocommerce-android/pull/13516]
- [*] Automatically select the first available order when filtering is active in the two-pane layout.[https://github.com/woocommerce/woocommerce-android/pull/13491]
- [*] [Internal] Removal animation of the items from the cart [https://github.com/woocommerce/woocommerce-android/pull/13442]

Expand Down
3 changes: 0 additions & 3 deletions WooCommerce-Wear/lint.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
<ignore path="**/sentry*.jar"/>
</issue>

<issue id="IconDuplicates" severity="error">
<ignore path="**/login_notification_icon.webp" />
</issue>
<!-- Ignore the IconLocation for the Tile preview images -->
<issue id="IconLocation">
<ignore path="res/drawable/tile_preview.png" />
Expand Down
4 changes: 0 additions & 4 deletions WooCommerce/lint.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,4 @@
<ignore regexp="java-common-1.13.jar" />
<ignore path="**/sentry*.jar"/>
</issue>

<issue id="IconDuplicates" severity="error">
<ignore path="**/login_notification_icon.webp" />
</issue>
</lint>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15 changes: 9 additions & 6 deletions WooCommerce/src/main/res/drawable/ic_woo_w_notification.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="7dp"
android:viewportWidth="24"
android:viewportHeight="7">
<path
android:pathData="M20.55,0.223c-1.708,0 -3.015,1.277 -3.015,3s1.307,3 3.015,3c1.708,0 3.01,-1.277 3.01,-3s-1.312,-3 -3.01,-3ZM20.55,4.38c-0.64,0 -1.082,-0.491 -1.082,-1.157s0.436,-1.157 1.082,-1.157c0.646,0 1.082,0.49 1.082,1.157 0,0.666 -0.44,1.157 -1.082,1.157ZM14.171,0.223c-1.708,0 -3.015,1.277 -3.015,3s1.312,3 3.015,3 3.01,-1.277 3.01,-3 -1.312,-3 -3.01,-3ZM14.171,4.38c-0.64,0 -1.082,-0.491 -1.082,-1.157s0.436,-1.157 1.082,-1.157c0.646,0 1.082,0.49 1.082,1.157 0,0.666 -0.436,1.157 -1.082,1.157ZM3.578,6.223c0.676,0 1.217,-0.336 1.627,-1.107l0.907,-1.698L6.112,4.86c0,0.847 0.55,1.363 1.407,1.363 0.661,0 1.147,-0.3 1.628,-1.107l2.098,-3.531c0.461,-0.771 0.136,-1.362 -0.876,-1.362 -0.54,0 -0.891,0.18 -1.207,0.77l-1.447,2.71L7.715,1.294c0,-0.72 -0.34,-1.071 -0.977,-1.071 -0.496,0 -0.892,0.215 -1.202,0.816l-1.362,2.66v-2.38c0,-0.77 -0.316,-1.096 -1.087,-1.096L1.524,0.223c-0.59,0 -0.891,0.275 -0.891,0.786 0,0.51 0.31,0.796 0.891,0.796h0.641v3.05c0.005,0.852 0.571,1.368 1.413,1.368Z"
android:fillColor="#fff"/>
android:height="13.299185dp"
android:viewportWidth="85.9"
android:viewportHeight="47.6">

<path
android:fillColor="#fff"
android:fillType="evenOdd"
android:pathData="M77.4,0.1c-4.3,0 -7.1,1.4 -9.6,6.1L56.4,27.7V8.6c0,-5.7 -2.7,-8.5 -7.7,-8.5s-7.1,1.7 -9.6,6.5L28.3,27.7V8.8c0,-6.1 -2.5,-8.7 -8.6,-8.7H7.3C2.6,0.1 0,2.3 0,6.3s2.5,6.4 7.1,6.4h5.1v24.1c0,6.8 4.6,10.8 11.2,10.8S33,45 36.3,38.9l7.2,-13.5v11.4c0,6.7 4.4,10.8 11.1,10.8s9.2,-2.3 13,-8.7l16.6,-28C87.8,4.8 85.3,0.1 77.3,0.1h0.1z" />

</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static Notification progress(Context context, int progress) {
progress,
R.string.notification_login_title_in_progress,
R.string.notification_logging_in,
R.drawable.login_notification_icon,
R.drawable.ic_woo_w_notification,
R.color.login_notification_accent_color);
}

Expand All @@ -138,7 +138,7 @@ static Notification success(Context context) {
context.getString(R.string.login_notification_channel_id),
R.string.notification_login_title_success,
R.string.notification_logged_in,
R.drawable.login_notification_icon,
R.drawable.ic_woo_w_notification,
R.color.login_notification_accent_color);
}

Expand All @@ -147,13 +147,14 @@ static Notification failure(Context context, @StringRes int content) {
context.getString(R.string.login_notification_channel_id),
R.string.notification_login_title_stopped,
content,
R.drawable.login_notification_icon,
R.drawable.ic_woo_w_notification,
R.color.login_notification_accent_color);
}
}

static class OnCredentialsOK {
OnCredentialsOK() {}
OnCredentialsOK() {
}
}

static class TwoFactorRequested {
Expand All @@ -176,9 +177,11 @@ static class TwoFactorRequested {
}
}

@Inject Dispatcher mDispatcher;
@Inject
Dispatcher mDispatcher;

@Inject LoginAnalyticsListener mAnalyticsListener;
@Inject
LoginAnalyticsListener mAnalyticsListener;

private String mIdToken;
private String mService;
Expand Down
Binary file not shown.
Binary file not shown.
12 changes: 12 additions & 0 deletions libs/login/src/main/res/drawable/ic_woo_w_notification.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="13.299185dp"
android:viewportWidth="85.9"
android:viewportHeight="47.6">

<path
android:fillColor="#fff"
android:fillType="evenOdd"
android:pathData="M77.4,0.1c-4.3,0 -7.1,1.4 -9.6,6.1L56.4,27.7V8.6c0,-5.7 -2.7,-8.5 -7.7,-8.5s-7.1,1.7 -9.6,6.5L28.3,27.7V8.8c0,-6.1 -2.5,-8.7 -8.6,-8.7H7.3C2.6,0.1 0,2.3 0,6.3s2.5,6.4 7.1,6.4h5.1v24.1c0,6.8 4.6,10.8 11.2,10.8S33,45 36.3,38.9l7.2,-13.5v11.4c0,6.7 4.4,10.8 11.1,10.8s9.2,-2.3 13,-8.7l16.6,-28C87.8,4.8 85.3,0.1 77.3,0.1h0.1z" />

</vector>

0 comments on commit 4e001ed

Please sign in to comment.