Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ let package = Package(
path: "RevenueCatUI",
resources: [
// Note: these have to match the values in RevenueCatUI.podspec
.copy("Resources/background.jpg"),
.process("Resources/icons.xcassets"),
.process("Resources/Media.xcassets")
],
Expand Down
1 change: 0 additions & 1 deletion Package@swift-5.8.swift
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ let package = Package(
dependencies: ["RevenueCat"],
path: "RevenueCatUI",
resources: [
.copy("Resources/background.jpg"),
.process("Resources/icons.xcassets")
]),
.testTarget(name: "RevenueCatUITests",
Expand Down
4 changes: 0 additions & 4 deletions RevenueCat.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,6 @@
887A60892C1D037000E1A461 /* PaywallPurchasesType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 887A5FEE2C1D037000E1A461 /* PaywallPurchasesType.swift */; };
887A608A2C1D037000E1A461 /* PurchaseHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 887A5FEF2C1D037000E1A461 /* PurchaseHandler.swift */; };
887A608B2C1D037000E1A461 /* PurchaseHandler+TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 887A5FF02C1D037000E1A461 /* PurchaseHandler+TestData.swift */; };
887A608C2C1D037000E1A461 /* background.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 887A5FF22C1D037000E1A461 /* background.jpg */; };
887A608D2C1D037000E1A461 /* icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 887A5FF32C1D037000E1A461 /* icons.xcassets */; };
887A608E2C1D037000E1A461 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 887A5FF52C1D037000E1A461 /* Localizable.strings */; };
887A608F2C1D037000E1A461 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 887A5FF72C1D037000E1A461 /* Localizable.strings */; };
Expand Down Expand Up @@ -2826,7 +2825,6 @@
887A5FEE2C1D037000E1A461 /* PaywallPurchasesType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaywallPurchasesType.swift; sourceTree = "<group>"; };
887A5FEF2C1D037000E1A461 /* PurchaseHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PurchaseHandler.swift; sourceTree = "<group>"; };
887A5FF02C1D037000E1A461 /* PurchaseHandler+TestData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PurchaseHandler+TestData.swift"; sourceTree = "<group>"; };
887A5FF22C1D037000E1A461 /* background.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = background.jpg; sourceTree = "<group>"; };
887A5FF32C1D037000E1A461 /* icons.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = icons.xcassets; sourceTree = "<group>"; };
887A5FF42C1D037000E1A461 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
887A5FF62C1D037000E1A461 /* zh_Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_Hans; path = zh_Hans.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -6107,7 +6105,6 @@
isa = PBXGroup;
children = (
161627FD2F50987800DEEDEB /* Media.xcassets */,
887A5FF22C1D037000E1A461 /* background.jpg */,
887A5FF32C1D037000E1A461 /* icons.xcassets */,
887A5FF52C1D037000E1A461 /* Localizable.strings */,
887A5FF72C1D037000E1A461 /* Localizable.strings */,
Expand Down Expand Up @@ -7426,7 +7423,6 @@
887A609A2C1D037000E1A461 /* Localizable.strings in Resources */,
887A609D2C1D037000E1A461 /* Localizable.strings in Resources */,
887A60B02C1D037000E1A461 /* Localizable.strings in Resources */,
887A608C2C1D037000E1A461 /* background.jpg in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
1 change: 0 additions & 1 deletion RevenueCatUI.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Pod::Spec.new do |s|
# This is done automatically by SPM but must be added manually here:
'RevenueCatUI/Resources/*.lproj/*.strings',
# Note: these have to match the values in Package.swift
'RevenueCatUI/Resources/background.jpg',
'RevenueCatUI/Resources/icons.xcassets',
'RevenueCatUI/Resources/Media.xcassets'
]
Expand Down
2 changes: 0 additions & 2 deletions RevenueCatUI/Helpers/PaywallData+Default.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ extension PaywallData {
config: .init(
packages: packageIdentifiers,
images: .init(
background: Self.backgroundImage,
icon: Self.appIconPlaceholder
),
colors: Self.colors,
Expand Down Expand Up @@ -116,7 +115,6 @@ private extension PaywallData {

internal extension PaywallData {

static let backgroundImage = "background.jpg"
static let defaultTemplateBaseURL = Bundle.revenueCatUI.resourceURL ?? Bundle.revenueCatUI.bundleURL
static let revisionID: Int = -1

Expand Down
Binary file removed RevenueCatUI/Resources/background.jpg
Binary file not shown.
18 changes: 1 addition & 17 deletions RevenueCatUI/Views/LoadingPaywallView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct LoadingPaywallView: View {
identifier: Self.offeringIdentifier,
serverDescription: "",
metadata: [:],
paywall: Self.paywall,
paywall: Self.defaultPaywall,
availablePackages: Self.packages,
webCheckoutUrl: nil
),
Expand All @@ -51,27 +51,11 @@ struct LoadingPaywallView: View {
.allowsHitTesting(false)
.redacted(reason: .placeholder)
.shimmering(enable: self.mode.shouldDisplayBackground && self.shimmer)
.background {
TemplateBackgroundImageView(
url: Self.defaultPaywall.backgroundImageURL,
lowResUrl: Self.defaultPaywall.backgroundLowResImageURL,
blurred: true,
ignoreSafeArea: self.mode.shouldDisplayBackground
)
}
}

private static let template: PaywallTemplate = PaywallData.defaultTemplate
private static let defaultPaywall: PaywallData = .createDefault(with: Self.packages, locale: .current)

private static let paywall: PaywallData = {
var paywall: PaywallData = Self.defaultPaywall
// Hide background so it doesn't get shimmer
paywall.config.images.background = nil

return paywall
}()

private static let packages: [Package] = [
Self.monthlyPackage,
Self.weeklyPackage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

},
"images_heic" : {
"background" : "background.jpg",
"background" : null,
"header" : null,
"icon" : "revenuecatui_default_paywall_app_icon"
},
Expand Down
Loading