From 8e7e472c8985e8cdc26ef50c2bb9795f6cef66c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boz=CC=8Cidar=20S=CC=8Cevo?= Date: Fri, 12 Jan 2024 10:09:19 +0100 Subject: [PATCH 1/3] Use exact commit reference for SwiftUI Shimmer package --- WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- WooCommerce/WooCommerce.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved index 066be35192b..d32f22bda52 100644 --- a/WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -96,8 +96,8 @@ "repositoryURL": "https://github.com/markiv/SwiftUI-Shimmer", "state": { "branch": null, - "revision": "1f3a620e4abe890d00008cb2af7023d810b433a7", - "version": "1.4.0" + "revision": "394183720a2579a07cba7d1e52cb21570a3b4fa0", + "version": null } }, { diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj index 1c2e0f975bd..728b303dafa 100644 --- a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj +++ b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj @@ -16043,8 +16043,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/markiv/SwiftUI-Shimmer"; requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.0.0; + kind = revision; + revision = 394183720a2579a07cba7d1e52cb21570a3b4fa0; }; }; 4598297F28574688003A9AFE /* XCRemoteSwiftPackageReference "Inject" */ = { From 33e436ea72b1f80c4e9ad6e708f7404efaeabc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boz=CC=8Cidar=20S=CC=8Cevo?= Date: Tue, 16 Jan 2024 10:41:03 +0100 Subject: [PATCH 2/3] Revert SwiftUI-Shimmer version --- WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- WooCommerce/WooCommerce.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved index d32f22bda52..066be35192b 100644 --- a/WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -96,8 +96,8 @@ "repositoryURL": "https://github.com/markiv/SwiftUI-Shimmer", "state": { "branch": null, - "revision": "394183720a2579a07cba7d1e52cb21570a3b4fa0", - "version": null + "revision": "1f3a620e4abe890d00008cb2af7023d810b433a7", + "version": "1.4.0" } }, { diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj index 728b303dafa..1c2e0f975bd 100644 --- a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj +++ b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj @@ -16043,8 +16043,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/markiv/SwiftUI-Shimmer"; requirement = { - kind = revision; - revision = 394183720a2579a07cba7d1e52cb21570a3b4fa0; + kind = upToNextMajorVersion; + minimumVersion = 1.0.0; }; }; 4598297F28574688003A9AFE /* XCRemoteSwiftPackageReference "Inject" */ = { From e1c1d81ab4a4053ce3fc9816a236c813087b7d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boz=CC=8Cidar=20S=CC=8Cevo?= Date: Tue, 16 Jan 2024 10:41:20 +0100 Subject: [PATCH 3/3] Remove shimmering from OwnerUpgradesView --- .../Classes/ViewRelated/Upgrades/OwnerUpgradesView.swift | 6 ------ 1 file changed, 6 deletions(-) diff --git a/WooCommerce/Classes/ViewRelated/Upgrades/OwnerUpgradesView.swift b/WooCommerce/Classes/ViewRelated/Upgrades/OwnerUpgradesView.swift index e565fefe9c8..669dd157abb 100644 --- a/WooCommerce/Classes/ViewRelated/Upgrades/OwnerUpgradesView.swift +++ b/WooCommerce/Classes/ViewRelated/Upgrades/OwnerUpgradesView.swift @@ -42,7 +42,6 @@ struct OwnerUpgradesView: View { .cornerRadius(Layout.cornerRadius) .background(Color(.systemGroupedBackground)) .redacted(reason: isLoading ? .placeholder : []) - .shimmering(active: isLoading) Picker(selection: $paymentFrequency, label: EmptyView()) { ForEach(paymentFrequencies) { @@ -54,7 +53,6 @@ struct OwnerUpgradesView: View { .padding() .background(Color(.systemGroupedBackground)) .redacted(reason: isLoading ? .placeholder : []) - .shimmering(active: isLoading) ScrollView { VStack { @@ -63,7 +61,6 @@ struct OwnerUpgradesView: View { .disabled(isPurchasing) .listRowSeparator(.hidden) .redacted(reason: isLoading ? .placeholder : []) - .shimmering(active: isLoading) .padding(.bottom, 8) } Button(Localization.allFeaturesListText) { @@ -72,7 +69,6 @@ struct OwnerUpgradesView: View { .buttonStyle(SecondaryButtonStyle()) .disabled(isPurchasing || isLoading) .redacted(reason: isLoading ? .placeholder : []) - .shimmering(active: isLoading) .sheet(isPresented: $showingFullFeatureList) { NavigationView { FullFeatureListView() @@ -92,7 +88,6 @@ struct OwnerUpgradesView: View { .buttonStyle(PrimaryLoadingButtonStyle(isLoading: isPurchasing)) .disabled(isLoading) .redacted(reason: isLoading ? .placeholder : []) - .shimmering(active: isLoading) } else { Button(Localization.selectPlanButtonText) { // no-op @@ -100,7 +95,6 @@ struct OwnerUpgradesView: View { .buttonStyle(PrimaryLoadingButtonStyle(isLoading: isPurchasing)) .disabled(true) .redacted(reason: isLoading ? .placeholder : []) - .shimmering(active: isLoading) } } .padding()