diff --git a/WooCommerce/WooCommerceScreenshots/WooCommerceScreenshots.swift b/WooCommerce/WooCommerceScreenshots/WooCommerceScreenshots.swift index a10f482f3bf..6723cd8b915 100644 --- a/WooCommerce/WooCommerceScreenshots/WooCommerceScreenshots.swift +++ b/WooCommerce/WooCommerceScreenshots/WooCommerceScreenshots.swift @@ -24,6 +24,7 @@ class WooCommerceScreenshots: XCTestCase { let app = XCUIApplication() setupSnapshot(app) app.launchArguments.append("mocked-network-layer") + app.launchArguments.append("use-mocked-card-present-payment") app.launchArguments.append("-simulate-stripe-card-reader") app.launchArguments.append("disable-animations") app.launchArguments.append("-mocks-push-notification") @@ -74,25 +75,27 @@ class WooCommerceScreenshots: XCTestCase { .goBackToOrderScreen() .goBackToOrdersScreen() - // POS - try TabNavComponent() - .goToPOSScreen() - .tapAddProduct(productID: 1) - .tapAddProduct(productID: 2) - .thenTakeScreenshot(named: "pos-dashboard", orientation: .landscapeLeft) - .tapConnectReader() - .waitForReaderConnected() - .tapCheckout() - .waitForTotalsLoaded() - .waitForCardPaymentReady() - .thenTakeScreenshot(named: "pos-payment", orientation: .landscapeLeft) - .tapCashPayment() - .tapMarkPaymentComplete() - .waitForPaymentSuccess() - .thenTakeScreenshot(named: "pos-success", orientation: .landscapeLeft) - .tapMenuButton() - .tapExitMenuItem() - .confirmExitPOS() + // POS - iPad only + if UIDevice.current.userInterfaceIdiom == .pad { + try TabNavComponent() + .goToPOSScreen() + .tapAddProduct(productID: 1) + .tapAddProduct(productID: 2) + .thenTakeScreenshot(named: "pos-dashboard", orientation: .landscapeLeft) + .tapConnectReader() + .waitForReaderConnected() + .tapCheckout() + .waitForTotalsLoaded() + .waitForCardPaymentReady() + .thenTakeScreenshot(named: "pos-payment", orientation: .landscapeLeft) + .tapCashPayment() + .tapMarkPaymentComplete() + .waitForPaymentSuccess() + .thenTakeScreenshot(named: "pos-success", orientation: .landscapeLeft) + .tapMenuButton() + .tapExitMenuItem() + .confirmExitPOS() + } // Products try TabNavComponent() diff --git a/fastlane/Fastfile b/fastlane/Fastfile index f77b4391920..b384bc53209 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -341,7 +341,10 @@ platform :ios do 'app_store_screenshot-2' => File.join(source_metadata_folder, 'promo_screenshot_2.txt'), 'app_store_screenshot-3' => File.join(source_metadata_folder, 'promo_screenshot_3.txt'), 'app_store_screenshot-4' => File.join(source_metadata_folder, 'promo_screenshot_4.txt'), - 'app_store_screenshot-5' => File.join(source_metadata_folder, 'promo_screenshot_5.txt') + 'app_store_screenshot-5' => File.join(source_metadata_folder, 'promo_screenshot_5.txt'), + 'app_store_screenshot-6' => File.join(source_metadata_folder, 'promo_screenshot_6.txt'), + 'app_store_screenshot-7' => File.join(source_metadata_folder, 'promo_screenshot_7.txt'), + 'app_store_screenshot-8' => File.join(source_metadata_folder, 'promo_screenshot_8.txt') } ios_update_metadata_source( @@ -1119,7 +1122,10 @@ platform :ios do 'app_store_screenshot-2' => { desc: 'app_store_screenshot_2.txt' }, 'app_store_screenshot-3' => { desc: 'app_store_screenshot_3.txt' }, 'app_store_screenshot-4' => { desc: 'app_store_screenshot_4.txt' }, - 'app_store_screenshot-5' => { desc: 'app_store_screenshot_5.txt' } + 'app_store_screenshot-5' => { desc: 'app_store_screenshot_5.txt' }, + 'app_store_screenshot-6' => { desc: 'app_store_screenshot_6.txt' }, + 'app_store_screenshot-7' => { desc: 'app_store_screenshot_7.txt' }, + 'app_store_screenshot-8' => { desc: 'app_store_screenshot_8.txt' } } metadata_locales = GLOTPRESS_TO_ASC_METADATA_LOCALE_CODES diff --git a/fastlane/appstoreres/assets/ipad-background-1-landscape.png b/fastlane/appstoreres/assets/ipad-background-1-landscape.png new file mode 100644 index 00000000000..278cb872a10 --- /dev/null +++ b/fastlane/appstoreres/assets/ipad-background-1-landscape.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c594f2af9b74404c4e64413422bafad1febceb6e737d41779cc0b390fb3f059 +size 138623 diff --git a/fastlane/appstoreres/assets/ipad-background-2-landscape.png b/fastlane/appstoreres/assets/ipad-background-2-landscape.png new file mode 100644 index 00000000000..21f2fc0ca94 --- /dev/null +++ b/fastlane/appstoreres/assets/ipad-background-2-landscape.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3660fb0272b243a8ba753ec54d40a85188e39875195a8987c201710ce3d4f1f3 +size 138486 diff --git a/fastlane/appstoreres/assets/ipad-x-landscape.png b/fastlane/appstoreres/assets/ipad-x-landscape.png new file mode 100644 index 00000000000..bcc95c8e3df --- /dev/null +++ b/fastlane/appstoreres/assets/ipad-x-landscape.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9102106c9fc4459ef0cb9cbddb9e98843d56db65067875068ba1a3d88d67bf5f +size 68022 diff --git a/fastlane/appstoreres/assets/ipad-x-mask-landscape.png b/fastlane/appstoreres/assets/ipad-x-mask-landscape.png new file mode 100644 index 00000000000..8fd7994fc87 --- /dev/null +++ b/fastlane/appstoreres/assets/ipad-x-mask-landscape.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:147b29aeb5dbc5b4fa108e229f3c443a459c4e6e1c544f2a9c59f2bee133a445 +size 105245 diff --git a/fastlane/appstoreres/metadata/source/promo_screenshot_4.txt b/fastlane/appstoreres/metadata/source/promo_screenshot_4.txt index c5a817c0626..8eac971071d 100644 --- a/fastlane/appstoreres/metadata/source/promo_screenshot_4.txt +++ b/fastlane/appstoreres/metadata/source/promo_screenshot_4.txt @@ -1,2 +1 @@ -Add and edit products -with a touch +Sell online and in person \ No newline at end of file diff --git a/fastlane/appstoreres/metadata/source/promo_screenshot_5.txt b/fastlane/appstoreres/metadata/source/promo_screenshot_5.txt index f1d3dcbf79b..d9066b261f6 100644 --- a/fastlane/appstoreres/metadata/source/promo_screenshot_5.txt +++ b/fastlane/appstoreres/metadata/source/promo_screenshot_5.txt @@ -1,2 +1 @@ -Get notified of -every sale \ No newline at end of file +Track orders and view totals in real time \ No newline at end of file diff --git a/fastlane/appstoreres/metadata/source/promo_screenshot_6.txt b/fastlane/appstoreres/metadata/source/promo_screenshot_6.txt new file mode 100644 index 00000000000..2267c51b4a2 --- /dev/null +++ b/fastlane/appstoreres/metadata/source/promo_screenshot_6.txt @@ -0,0 +1 @@ +Complete payments quickly and efficiently \ No newline at end of file diff --git a/fastlane/metadata/en-US/app_store_screenshot_4.txt b/fastlane/appstoreres/metadata/source/promo_screenshot_7.txt similarity index 63% rename from fastlane/metadata/en-US/app_store_screenshot_4.txt rename to fastlane/appstoreres/metadata/source/promo_screenshot_7.txt index c5a817c0626..2545cb607f9 100644 --- a/fastlane/metadata/en-US/app_store_screenshot_4.txt +++ b/fastlane/appstoreres/metadata/source/promo_screenshot_7.txt @@ -1,2 +1,2 @@ Add and edit products -with a touch +with a touch \ No newline at end of file diff --git a/fastlane/metadata/en-US/app_store_screenshot_5.txt b/fastlane/appstoreres/metadata/source/promo_screenshot_8.txt similarity index 100% rename from fastlane/metadata/en-US/app_store_screenshot_5.txt rename to fastlane/appstoreres/metadata/source/promo_screenshot_8.txt diff --git a/fastlane/metadata/default/app_store_screenshot_1.txt b/fastlane/metadata/default/app_store_screenshot_1.txt new file mode 100644 index 00000000000..934799e221b --- /dev/null +++ b/fastlane/metadata/default/app_store_screenshot_1.txt @@ -0,0 +1,2 @@ +Track sales and +bestselling products \ No newline at end of file diff --git a/fastlane/metadata/default/app_store_screenshot_2.txt b/fastlane/metadata/default/app_store_screenshot_2.txt new file mode 100644 index 00000000000..23e9c67d7c4 --- /dev/null +++ b/fastlane/metadata/default/app_store_screenshot_2.txt @@ -0,0 +1,2 @@ +Create orders +on the fly \ No newline at end of file diff --git a/fastlane/metadata/default/app_store_screenshot_3.txt b/fastlane/metadata/default/app_store_screenshot_3.txt new file mode 100644 index 00000000000..e9af8c48041 --- /dev/null +++ b/fastlane/metadata/default/app_store_screenshot_3.txt @@ -0,0 +1,2 @@ +Take payments +in person \ No newline at end of file diff --git a/fastlane/metadata/default/app_store_screenshot_4.txt b/fastlane/metadata/default/app_store_screenshot_4.txt new file mode 100644 index 00000000000..8eac971071d --- /dev/null +++ b/fastlane/metadata/default/app_store_screenshot_4.txt @@ -0,0 +1 @@ +Sell online and in person \ No newline at end of file diff --git a/fastlane/metadata/default/app_store_screenshot_5.txt b/fastlane/metadata/default/app_store_screenshot_5.txt new file mode 100644 index 00000000000..d9066b261f6 --- /dev/null +++ b/fastlane/metadata/default/app_store_screenshot_5.txt @@ -0,0 +1 @@ +Track orders and view totals in real time \ No newline at end of file diff --git a/fastlane/metadata/default/app_store_screenshot_6.txt b/fastlane/metadata/default/app_store_screenshot_6.txt new file mode 100644 index 00000000000..2267c51b4a2 --- /dev/null +++ b/fastlane/metadata/default/app_store_screenshot_6.txt @@ -0,0 +1 @@ +Complete payments quickly and efficiently \ No newline at end of file diff --git a/fastlane/metadata/default/app_store_screenshot_7.txt b/fastlane/metadata/default/app_store_screenshot_7.txt new file mode 100644 index 00000000000..2545cb607f9 --- /dev/null +++ b/fastlane/metadata/default/app_store_screenshot_7.txt @@ -0,0 +1,2 @@ +Add and edit products +with a touch \ No newline at end of file diff --git a/fastlane/metadata/default/app_store_screenshot_8.txt b/fastlane/metadata/default/app_store_screenshot_8.txt new file mode 100644 index 00000000000..f1d3dcbf79b --- /dev/null +++ b/fastlane/metadata/default/app_store_screenshot_8.txt @@ -0,0 +1,2 @@ +Get notified of +every sale \ No newline at end of file diff --git a/fastlane/screenshots.json b/fastlane/screenshots.json index 6a88d38d027..24241366798 100644 --- a/fastlane/screenshots.json +++ b/fastlane/screenshots.json @@ -28,6 +28,19 @@ "device_frame": "appstoreres/assets/ipad-x.png", "device_frame_size": [1531, 1998], "device_frame_offset": [259, 559] + }, + { + "name": "iPad Pro 13-inch (M4) - landscape", + "canvas_size": [2732, 2048], + "text_size": [1848, 559], + "text_offset": [442, 0], + "font_size": "100px", + "screenshot_size": [1868, 1401], + "screenshot_offset": [432, 512], + "screenshot_mask": "appstoreres/assets/ipad-x-mask-landscape.png", + "device_frame": "appstoreres/assets/ipad-x-landscape.png", + "device_frame_size": [1998, 1531], + "device_frame_offset": [367, 447] } ], "entries": [ @@ -62,7 +75,7 @@ "filename": "iPhone 16 Plus-04.png", "background": "appstoreres/assets/iphone-background-2.png", "screenshot": "iPhone 16 Plus-4-light-product-add.png", - "text": "metadata/{locale}/app_store_screenshot_4.txt" + "text": "metadata/{locale}/app_store_screenshot_7.txt" }, // Get notified of every sale { @@ -70,7 +83,7 @@ "filename": "iPhone 16 Plus-05.png", "background": "appstoreres/assets/iphone-background-1.png", "screenshot": "iPhone 16 Plus-5-dark-order-notification.png", - "text": "metadata/{locale}/app_store_screenshot_5.txt" + "text": "metadata/{locale}/app_store_screenshot_8.txt" }, @@ -99,21 +112,45 @@ "screenshot": "iPad Pro 13-inch (M4)-3-dark-order-payment.png", "text": "metadata/{locale}/app_store_screenshot_3.txt" }, - // Add and edit products with a touch + // Sell online and in person { - "device": "iPad Pro 13-inch (M4)", + "device": "iPad Pro 13-inch (M4) - landscape", "filename": "iPad Pro 13-inch (M4)-04.png", - "background": "appstoreres/assets/ipad-background-2.png", - "screenshot": "iPad Pro 13-inch (M4)-4-light-product-add.png", + "background": "appstoreres/assets/ipad-background-2-landscape.png", + "screenshot": "iPad Pro 13-inch (M4)-4-light-pos-dashboard.png", "text": "metadata/{locale}/app_store_screenshot_4.txt" }, - // Get notified of every sale + // Track orders and view totals in real time { - "device": "iPad Pro 13-inch (M4)", + "device": "iPad Pro 13-inch (M4) - landscape", "filename": "iPad Pro 13-inch (M4)-05.png", - "background": "appstoreres/assets/ipad-background-1.png", - "screenshot": "iPad Pro 13-inch (M4)-5-dark-order-notification.png", + "background": "appstoreres/assets/ipad-background-1-landscape.png", + "screenshot": "iPad Pro 13-inch (M4)-5-dark-pos-payment.png", "text": "metadata/{locale}/app_store_screenshot_5.txt" + }, + // Complete payments quickly and efficiently + { + "device": "iPad Pro 13-inch (M4) - landscape", + "filename": "iPad Pro 13-inch (M4)-06.png", + "background": "appstoreres/assets/ipad-background-2-landscape.png", + "screenshot": "iPad Pro 13-inch (M4)-6-light-pos-success.png", + "text": "metadata/{locale}/app_store_screenshot_6.txt" + }, + // Add and edit products with a touch + { + "device": "iPad Pro 13-inch (M4)", + "filename": "iPad Pro 13-inch (M4)-07.png", + "background": "appstoreres/assets/ipad-background-1.png", + "screenshot": "iPad Pro 13-inch (M4)-7-dark-product-add.png", + "text": "metadata/{locale}/app_store_screenshot_7.txt" + }, + // Get notified of every sale + { + "device": "iPad Pro 13-inch (M4)", + "filename": "iPad Pro 13-inch (M4)-08.png", + "background": "appstoreres/assets/ipad-background-2.png", + "screenshot": "iPad Pro 13-inch (M4)-8-light-order-notification.png", + "text": "metadata/{locale}/app_store_screenshot_8.txt" } ] }