Skip to content

Commit

Permalink
Merge pull request #13254 from woocommerce/feature/woo-2.0-brand-updates
Browse files Browse the repository at this point in the history
Woo 2.0 Brand Updates
  • Loading branch information
irfano authored Jan 30, 2025
2 parents fe7f276 + 5f8b670 commit 975c78d
Show file tree
Hide file tree
Showing 423 changed files with 3,943 additions and 6,373 deletions.
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- [**] The UK customers have access to the POS now [https://github.com/woocommerce/woocommerce-android/pull/13386]
- [Internal] [*] Fixed a bug that could lead to a crash when formatting dates and times [https://github.com/woocommerce/woocommerce-android/pull/13393]
- [Internal] [*] Removed order creation survey from the order's list [https://github.com/woocommerce/woocommerce-android/pull/13423]
- [***] Updated the app look and feel to match the new WooCommerce branding [https://github.com/woocommerce/woocommerce-android/pull/13254]

21.5
-----
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion WooCommerce-Wear/src/jalapeno/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">WooCommerce (Pre-Alpha)</string>
<string name="app_name">Woo (Pre-Alpha)</string>
</resources>
8 changes: 4 additions & 4 deletions WooCommerce-Wear/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<service
android:name=".wear.complications.ordertotals.OrderTotalsComplicationService"
android:exported="true"
android:icon="@drawable/img_woo_bubble_monochrome"
android:icon="@drawable/img_woo_monochrome"
android:label="@string/order_totals_complication_label"
android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
<intent-filter>
Expand All @@ -51,7 +51,7 @@
<service
android:name=".wear.complications.ordercount.OrderCountComplicationService"
android:exported="true"
android:icon="@drawable/img_woo_bubble_monochrome"
android:icon="@drawable/img_woo_monochrome"
android:label="@string/order_count_complication_label"
android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
<intent-filter>
Expand All @@ -69,7 +69,7 @@
<service
android:name=".wear.complications.visitorscount.VisitorsCountComplicationService"
android:exported="true"
android:icon="@drawable/img_woo_bubble_monochrome"
android:icon="@drawable/img_woo_monochrome"
android:label="@string/visitors_count_complication_label"
android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
<intent-filter>
Expand All @@ -87,7 +87,7 @@
<service
android:name=".wear.complications.shortcut.AppShortcutComplicationService"
android:exported="true"
android:icon="@drawable/img_woo_bubble_monochrome"
android:icon="@drawable/img_woo_monochrome"
android:label="@string/shortcut_complication_label"
android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
<intent-filter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ private fun createAppPendingIntent(context: Context): PendingIntent {
}

private fun createIcon(context: Context) = MonochromaticImage.Builder(
Icon.createWithResource(context, R.drawable.img_woo_bubble_monochrome),
Icon.createWithResource(context, R.drawable.img_woo_monochrome),
).build()

private fun String.toComplicationText() = PlainComplicationText.Builder(this).build()
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import androidx.wear.compose.material.Colors

@Suppress("MagicNumber")
object WooColors {
val md_theme_dark_primary = Color(0xFFB17FD4)
val md_theme_dark_primary = Color(0xFFA77EFF)
val md_theme_dark_onPrimary = Color(0xFF000000)
val md_theme_dark_primary_variant = Color(0xFF7F54B3)
val md_theme_dark_secondary = Color(0xFFEB6594)
Expand All @@ -17,13 +17,11 @@ object WooColors {
val md_theme_dark_onBackground = Color(0xFFFFFFFF)
val md_theme_dark_surface = Color(0xFF000000)
val md_theme_dark_onSurface = Color(0xFFFFFFFF)
val woo_purple_surface = Color(0xBB533582)
val woo_purple_5 = Color(0xFFDFD1FB)
val woo_purple_10 = Color(0xFFCFB9F6)
val woo_purple_20 = Color(0xFFBEA0F2)
val woo_purple_alpha = Color(0x66674399)
val woo_purple_5 = Color(0xFFE1D7FF)
val woo_purple_10 = Color(0xFFD1C1FF)
val woo_purple_20 = Color(0xFFB999FF)
val woo_purple_alpha = Color(0x666108CE)
val woo_gray_alpha = Color(0x80FFFFFF)
val woo_amber_40 = Color(0xFFFFA60E)
}

val WooWearColors = Colors(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ private fun LoginLoadingScreen(
horizontalAlignment = Alignment.CenterHorizontally
) {
Image(
painter = painterResource(id = R.drawable.img_woo_bubble_white_background),
painter = painterResource(id = R.drawable.img_woo),
contentDescription = null,
contentScale = ContentScale.FillWidth
)
Expand Down
12 changes: 12 additions & 0 deletions WooCommerce-Wear/src/main/res/drawable/img_woo.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="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">
<group>
<clip-path android:pathData="M0,0h92v92H0z" />
<path
android:fillColor="#873EFF"
android:pathData="M79.922,34c-6.853,0 -12.098,5.124 -12.098,12.038 0,6.913 5.245,12.037 12.098,12.037C86.775,58.075 92,52.951 92,46.038 92,39.125 86.735,34 79.922,34ZM79.922,50.68c-2.572,0 -4.34,-1.97 -4.34,-4.642 0,-2.673 1.748,-4.643 4.34,-4.643 2.593,0 4.34,1.97 4.34,4.643 0,2.672 -1.767,4.642 -4.34,4.642ZM54.325,34c-6.853,0 -12.098,5.124 -12.098,12.038 0,6.913 5.265,12.037 12.098,12.037 6.832,0 12.077,-5.124 12.077,-12.037C66.402,39.125 61.137,34 54.324,34ZM54.325,50.68c-2.573,0 -4.341,-1.97 -4.341,-4.642 0,-2.673 1.748,-4.643 4.34,-4.643 2.593,0 4.341,1.97 4.341,4.643 0,2.672 -1.748,4.642 -4.34,4.642ZM11.817,58.075c2.713,0 4.883,-1.346 6.53,-4.441l3.638,-6.813v5.788c0,3.396 2.21,5.466 5.647,5.466 2.653,0 4.602,-1.206 6.532,-4.441l8.42,-14.168c1.849,-3.095 0.542,-5.466 -3.517,-5.466 -2.17,0 -3.577,0.724 -4.843,3.095l-5.808,10.872L28.416,38.3c0,-2.894 -1.367,-4.301 -3.919,-4.301 -1.99,0 -3.577,0.864 -4.823,3.276l-5.466,10.67v-9.545c0,-3.095 -1.266,-4.401 -4.36,-4.401h-6.27C1.205,34 0,35.105 0,37.155s1.246,3.195 3.577,3.195L6.15,40.35L6.15,52.59c0.02,3.416 2.291,5.486 5.668,5.486Z" />
</group>
</vector>

This file was deleted.

14 changes: 0 additions & 14 deletions WooCommerce-Wear/src/main/res/drawable/img_woo_bubble_white.xml

This file was deleted.

This file was deleted.

13 changes: 13 additions & 0 deletions WooCommerce-Wear/src/main/res/drawable/img_woo_monochrome.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="200dp"
android:height="200dp"
android:viewportWidth="200"
android:viewportHeight="200">
<group>
<clip-path
android:pathData="M0,0h200v200H0z"/>
<path
android:pathData="M173.74,73.91c-14.9,0 -26.3,11.14 -26.3,26.17 0,15.03 11.4,26.17 26.3,26.17 14.9,0 26.26,-11.14 26.26,-26.17 0,-15.03 -11.45,-26.17 -26.26,-26.17ZM173.74,110.17c-5.59,0 -9.44,-4.28 -9.44,-10.09 0,-5.81 3.8,-10.09 9.44,-10.09s9.44,4.28 9.44,10.09c0,5.81 -3.85,10.09 -9.44,10.09ZM118.09,73.91c-14.9,0 -26.3,11.14 -26.3,26.17 0,15.03 11.45,26.17 26.3,26.17 14.85,0 26.26,-11.14 26.26,-26.17 0,-15.03 -11.45,-26.17 -26.26,-26.17ZM118.09,110.17c-5.59,0 -9.44,-4.28 -9.44,-10.09 0,-5.81 3.8,-10.09 9.44,-10.09 5.64,0 9.44,4.28 9.44,10.09 0,5.81 -3.8,10.09 -9.44,10.09ZM25.69,126.25c5.9,0 10.62,-2.93 14.2,-9.65l7.91,-14.81v12.58c0,7.38 4.81,11.88 12.28,11.88 5.77,0 10.01,-2.62 14.2,-9.65l18.31,-30.8c4.02,-6.73 1.18,-11.88 -7.65,-11.88 -4.72,0 -7.78,1.57 -10.53,6.73l-12.63,23.64L61.77,83.26c0,-6.29 -2.97,-9.35 -8.52,-9.35 -4.32,0 -7.78,1.88 -10.48,7.12l-11.88,23.2L30.89,83.48c0,-6.73 -2.75,-9.57 -9.48,-9.57L7.78,73.91C2.62,73.91 0,76.32 0,80.77c0,4.46 2.71,6.95 7.78,6.95h5.59v26.61c0.04,7.43 4.98,11.93 12.32,11.93Z"
android:fillColor="#FFFFFF"/>
</group>
</vector>
Binary file modified WooCommerce-Wear/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified WooCommerce-Wear/src/main/res/mipmap-hdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified WooCommerce-Wear/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified WooCommerce-Wear/src/main/res/mipmap-mdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified WooCommerce-Wear/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified WooCommerce-Wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified WooCommerce-Wear/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Binary file modified WooCommerce-Wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Diff not rendered.
Loading

0 comments on commit 975c78d

Please sign in to comment.