More SwiftUI sample app improvements

Shopify · Oct 16, 2024 · 2bceb1e · 2bceb1e
1 parent 02d796b
commit 2bceb1e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/.../SimpleAppIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/.../SimpleAppIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,14 +1,5 @@
 {
   "pins" : [
-    {
-      "identity" : "mobile-buy-sdk-ios",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Shopify/mobile-buy-sdk-ios",
-      "state" : {
-        "revision" : "e6e85dcf8f9eb95baaa8336ad3d7967ea8c36ade",
-        "version" : "11.3.0"
-      }
-    },
     {
       "identity" : "swiftlintplugin",
       "kind" : "remoteSourceControl",

diff --git a/Samples/SwiftUIExample/SwiftUIExample/App.swift b/Samples/SwiftUIExample/SwiftUIExample/App.swift
@@ -29,6 +29,7 @@ struct SwiftUIExampleApp: App {
 	init() {
 		ShopifyCheckoutSheetKit.configure {
 			$0.preloading.enabled = true
+			$0.logLevel = .all
 		}
 	}
 
@@ -55,7 +56,7 @@ struct RootTabView: View {
 				CartView(cartManager: cartManager, checkoutURL: $checkoutURL, isShowingCheckout: $isShowingCheckout)
 					.navigationTitle("Cart")
 					.navigationBarTitleDisplayMode(.inline)
-					.padding(20)
+					.padding(10)
 					.toolbar {
 						if cartManager.cart?.lines != nil {
 							ToolbarItem(placement: .navigationBarTrailing) {

diff --git a/Samples/SwiftUIExample/SwiftUIExample/CartView.swift b/Samples/SwiftUIExample/SwiftUIExample/CartView.swift
@@ -150,9 +150,12 @@ struct CartLines: View {
 			HStack {
 				if let imageUrl = variant?.product.featuredImage?.url {
 					AsyncImage(url: imageUrl) { image in
-						image.image?.resizable().aspectRatio(contentMode: .fit)
+						image.image?
+							.resizable()
+							.aspectRatio(contentMode: .fill)
+							.frame(width: 80, height: 105)
+							.clipped()
 					}
-					.frame(width: 60, height: 120)
 				}
 
 				VStack(alignment: .leading, spacing: 8
@@ -170,6 +173,8 @@ struct CartLines: View {
 					if let price = variant?.price.formattedString() {
 						HStack(spacing: 80) {
 							Text("\(price)")
+								.lineLimit(1)
+								.minimumScaleFactor(0.5)
 								.foregroundColor(.gray)
 
 						HStack(spacing: 20) {
@@ -262,5 +267,6 @@ struct CartViewPreviewContent: View {
 
 	var body: some View {
 		CartView(cartManager: CartManager.shared, checkoutURL: $checkoutURL, isShowingCheckout: $isShowingCheckout)
+			.padding(10)
 	}
 }
diff --git a/Samples/SwiftUIExample/SwiftUIExample/CatalogView.swift b/Samples/SwiftUIExample/SwiftUIExample/CatalogView.swift
@@ -45,7 +45,10 @@ struct CatalogView: View {
 	var body: some View {
 		NavigationView {
 			VStack {
-				if let product = product, let price = product.variants.nodes.first?.price.formattedString() {
+				if
+				let product = product,
+				let first = product.variants.nodes.first,
+				let price = first.price.formattedString() {
 					VStack {
 						VStack(alignment: .leading) {
 							AsyncImage(url: product.featuredImage?.url) { image in
@@ -81,6 +84,7 @@ struct CatalogView: View {
 							Text(product.description)
 								.padding(2)
 								.bold()
+								.lineLimit(3)
 								.foregroundColor(.gray)
 						}.padding(.horizontal, 15)
 
@@ -103,15 +107,16 @@ struct CatalogView: View {
 										.foregroundColor(.white)
 										.cornerRadius(10)
 								} else {
-									Text("Add to cart - \(price)")
+									Text(product.availableForSale ? (first.price.amount == 0 ? "Add to cart - Free" : "Add to cart - \(price)") : "Out of stock")
 										.font(.headline)
 										.padding()
 										.frame(maxWidth: 400)
-										.background(Color.blue)
+										.background(product.availableForSale ? Color.blue : Color.gray)
 										.foregroundColor(.white)
 										.cornerRadius(10)
 								}
 							})
+							.disabled(!product.availableForSale)
 							.accessibilityIdentifier("addToCartButton")
 							.sheet(isPresented: $isShowingCart) {
 								NavigationView {

diff --git a/Samples/SwiftUIExample/SwiftUIExample/ProductViewModel.swift b/Samples/SwiftUIExample/SwiftUIExample/ProductViewModel.swift
@@ -179,8 +179,11 @@ extension Storefront.ProductQuery {
 			.title()
 			.description()
 			.vendor()
+			.availableForSale()
 			.featuredImage { $0
-				.url()
+				.url(
+					transform: Storefront.ImageTransformInput(maxWidth: 932)
+				)
 			}
 			.variants(first: 1) { $0
 				.nodes { $0
@@ -216,8 +219,11 @@ extension Storefront.CartQuery {
 							.product { $0
 								.title()
 								.vendor()
+								.availableForSale()
 								.featuredImage { $0
-									.url()
+									.url(
+										transform: Storefront.ImageTransformInput(maxWidth: 120)
+									)
 								}
 							}
 						}