Merge branch 'trunk' into issue/12439-countries-support

.buildkite/commands/lint.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -u
 
-.buildkite/commands/restore-cache.sh
+"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
 
 echo "--- 🧹 Linting"
 ./gradlew :WooCommerce:lintJalapenoDebug

.buildkite/commands/prototype-build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-.buildkite/commands/restore-cache.sh
+"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
 
 APP_TO_BUILD="${1?You need to specify the app to build, WooCommerce or WooCommerce-Wear}"
 

.buildkite/commands/restore-cache.sh

@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 echo "--- 💾 Restore Cache"
 restore_gradle_dependency_cache || true

.buildkite/commands/run-instrumented-tests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-.buildkite/commands/restore-cache.sh
+"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
 
 echo "--- :rubygems: Setting up Gems"
 install_gems

.buildkite/commands/run-unit-tests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-.buildkite/commands/restore-cache.sh
+"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
 
 echo "--- 🧪 Testing"
 set +e

.buildkite/commands/save-cache.sh

@@ -2,40 +2,8 @@
 
 set -euo pipefail
 
-echo "--- :rubygems: Setting up Gems"
-install_gems
-
-echo "--- :closed_lock_with_key: Installing Secrets"
-bundle exec fastlane run configure_apply
-
-# .buildkite/commands/prototype-build.sh -> build_and_upload_prototype_build
-# -> prototype_flavor = 'Jalapeno'
-# -> prototype_build_type = 'Debug'
-echo "--- 🛠 Download Mobile App Dependencies [Assemble Mobile App]"
-./gradlew :WooCommerce:assembleJalapenoDebug
-echo ""
-
-# .buildkite/commands/prototype-build.sh -> build_and_upload_prototype_build
-# -> prototype_flavor = 'Jalapeno'
-# -> prototype_build_type = 'Debug'
-echo "--- 🛠 Download Wear App Dependencies [Assemble Wear App]"
-./gradlew :WooCommerce-Wear:assembleJalapenoDebug
-echo ""
-
-# .buildkite/commands/lint.sh -> ./gradlew :WooCommerce:lintJalapenoDebug
-echo "--- 🧹 Download Lint Dependencies [Lint Mobile App]"
-./gradlew :WooCommerce:lintJalapenoDebug
-echo ""
-
-# .buildkite/commands/run-unit-tests.sh -> ./gradlew testJalapenoDebugUnitTest testDebugUnitTest
-echo "--- 🧪 Download Unit Test Dependencies [Assemble Unit Tests]"
-./gradlew assembleJalapenoDebugUnitTest assembleDebugUnitTest
-echo ""
-
-# .buildkite/commands/run-instrumented-tests.sh -> build_and_instrumented_test
-#  -> gradle(tasks: %w[assembleVanillaDebug assembleVanillaDebugAndroidTest])
-echo "--- 🧪 Download Android Test Dependencies [Assemble Android Tests]"
-./gradlew assembleJalapenoDebugAndroidTest
+echo "--- 📦 Download Dependencies"
+./gradlew downloadDependencies
 echo ""
 
 echo "--- 💾 Save Cache"

.buildkite/schedules/dependency-cache.yml

@@ -5,10 +5,8 @@ agents:
   queue: "android"
 
 steps:
-  - label: "dependency cache"
-    command: |
-      echo "--- 💾 Download and Cache Dependencies"
-      .buildkite/commands/save-cache.sh
+  - label: "💾 Download and Cache Dependencies"
+    command: .buildkite/commands/save-cache.sh
     plugins: [$CI_TOOLKIT]
 
 notify:

RELEASE-NOTES.txt

@@ -3,8 +3,11 @@
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
 21.6
 -----
+- [*] Updated tablet detection logic to consider both width and height dimensions, enhancing compatibility with larger phones and tablets, particularly in landscape mode [https://github.com/woocommerce/woocommerce-android/pull/13228]
 - [**] 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
 -----

WooCommerce-Wear/src/jalapeno/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">WooCommerce (Pre-Alpha)</string>
+    <string name="app_name">Woo (Pre-Alpha)</string>
 </resources>

WooCommerce-Wear/src/main/AndroidManifest.xml

@@ -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>
@@ -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>
@@ -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>
@@ -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>

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/complications/ComplicationUtils.kt

@@ -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()

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/compose/theme/WooColors.kt

@@ -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)
@@ -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(

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/login/LoginScreen.kt

@@ -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
         )

WooCommerce-Wear/src/main/res/drawable/img_woo.xml

@@ -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>