Skip to content

Commit 27e82b4

Browse files
committed
Rename for clarity
1 parent 6c2e9f5 commit 27e82b4

17 files changed

+78
-77
lines changed

RevenueCatUI/Templates/V2/Components/Carousel/CarouselComponentViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class CarouselComponentViewModel {
6363
anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
6464
anyPackageHasPromoOffer: anyPackageHasPromoOffer,
6565
selectedPackage: packageContext.package,
66-
conditionalVisibilityFallback: component.conditionalVisibilityFallback,
66+
isVisibleByDefaultOnUnknownConditions: component.isVisibleByDefaultOnUnknownConditions,
6767
with: self.presentedOverrides
6868
)
6969

RevenueCatUI/Templates/V2/Components/Icon/IconComponentViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class IconComponentViewModel {
105105
anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
106106
anyPackageHasPromoOffer: anyPackageHasPromoOffer,
107107
selectedPackage: packageContext.package,
108-
conditionalVisibilityFallback: component.conditionalVisibilityFallback,
108+
isVisibleByDefaultOnUnknownConditions: component.isVisibleByDefaultOnUnknownConditions,
109109
with: self.presentedOverrides
110110
)
111111

RevenueCatUI/Templates/V2/Components/Image/ImageComponentViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class ImageComponentViewModel {
6767
anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
6868
anyPackageHasPromoOffer: anyPackageHasPromoOffer,
6969
selectedPackage: packageContext.package,
70-
conditionalVisibilityFallback: component.conditionalVisibilityFallback,
70+
isVisibleByDefaultOnUnknownConditions: component.isVisibleByDefaultOnUnknownConditions,
7171
with: self.presentedOverrides
7272
)
7373
let partial = localizedPartial?.partial

RevenueCatUI/Templates/V2/Components/Stack/StackComponentViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class StackComponentViewModel {
7474
anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
7575
anyPackageHasPromoOffer: anyPackageHasPromoOffer,
7676
selectedPackage: packageContext.package,
77-
conditionalVisibilityFallback: component.conditionalVisibilityFallback,
77+
isVisibleByDefaultOnUnknownConditions: component.isVisibleByDefaultOnUnknownConditions,
7878
with: self.presentedOverrides
7979
)
8080

RevenueCatUI/Templates/V2/Components/Text/TextComponentViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class TextComponentViewModel {
6363
anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
6464
anyPackageHasPromoOffer: anyPackageHasPromoOffer,
6565
selectedPackage: packageContext.package,
66-
conditionalVisibilityFallback: component.conditionalVisibilityFallback,
66+
isVisibleByDefaultOnUnknownConditions: component.isVisibleByDefaultOnUnknownConditions,
6767
with: self.presentedOverrides
6868
)
6969
let partial = localizedPartial?.partial

RevenueCatUI/Templates/V2/Components/Timeline/TimelineComponentView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ struct ContentView_Previews: PreviewProvider {
366366
padding: .init(top: 5, bottom: 5, leading: 5, trailing: 5),
367367
margin: .init(top: 5, bottom: 5, leading: 5, trailing: 5),
368368
items: items,
369-
conditionalVisibilityFallback: nil,
369+
isVisibleByDefaultOnUnknownConditions: nil,
370370
overrides: nil
371371
), localizationProvider: LocalizationProvider(
372372
locale: Locale.current,

RevenueCatUI/Templates/V2/Components/Timeline/TimelineComponentViewModel.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class TimelineComponentViewModel {
6262
anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
6363
anyPackageHasPromoOffer: anyPackageHasPromoOffer,
6464
selectedPackage: packageContext.package,
65-
conditionalVisibilityFallback: component.conditionalVisibilityFallback,
65+
isVisibleByDefaultOnUnknownConditions: component.isVisibleByDefaultOnUnknownConditions,
6666
with: self.presentedOverrides
6767
)
6868

@@ -124,7 +124,7 @@ class TimelineItemViewModel {
124124
anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
125125
anyPackageHasPromoOffer: anyPackageHasPromoOffer,
126126
selectedPackage: packageContext.package,
127-
conditionalVisibilityFallback: nil,
127+
isVisibleByDefaultOnUnknownConditions: nil,
128128
with: self.presentedOverrides
129129
)
130130

RevenueCatUI/Templates/V2/Components/Video/VideoComponentViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class VideoComponentViewModel {
6262
anyPackageHasIntroOffer: packageContext.variableContext.hasAnyIntroOffer,
6363
anyPackageHasPromoOffer: anyPackageHasPromoOffer,
6464
selectedPackage: packageContext.package,
65-
conditionalVisibilityFallback: component.conditionalVisibilityFallback,
65+
isVisibleByDefaultOnUnknownConditions: component.isVisibleByDefaultOnUnknownConditions,
6666
with: self.presentedOverrides
6767
)
6868
let partial = localizedPartial?.partial

RevenueCatUI/Templates/V2/ViewModelHelpers/PresentedPartials.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ extension PresentedPartial {
6161
anyPackageHasIntroOffer: Bool = false,
6262
anyPackageHasPromoOffer: Bool = false,
6363
selectedPackage: Package?,
64-
conditionalVisibilityFallback: Bool?,
64+
isVisibleByDefaultOnUnknownConditions: Bool?,
6565
with presentedOverrides: PresentedOverrides<Self>?
6666
) -> Self? {
6767
guard let presentedOverrides else {
@@ -78,7 +78,7 @@ extension PresentedPartial {
7878
isEligibleForPromoOffer: isEligibleForPromoOffer,
7979
anyPackageHasIntroOffer: anyPackageHasIntroOffer,
8080
anyPackageHasPromoOffer: anyPackageHasPromoOffer,
81-
conditionalVisibilityFallback: conditionalVisibilityFallback,
81+
isVisibleByDefaultOnUnknownConditions: isVisibleByDefaultOnUnknownConditions,
8282
selectedPackage: selectedPackage
8383
) {
8484
presentedPartial = Self.combine(presentedPartial, with: presentedOverride.properties)
@@ -96,7 +96,7 @@ extension PresentedPartial {
9696
isEligibleForPromoOffer: Bool,
9797
anyPackageHasIntroOffer: Bool,
9898
anyPackageHasPromoOffer: Bool,
99-
conditionalVisibilityFallback: Bool?,
99+
isVisibleByDefaultOnUnknownConditions: Bool?,
100100
selectedPackage: Package?
101101
) -> Bool {
102102
// Early return when any condition evaluates to false
@@ -180,7 +180,7 @@ extension PresentedPartial {
180180
}
181181
case .unsupported:
182182
// if a fallback is specified, use it, otherwise ignore the unsupported condition entirely
183-
return conditionalVisibilityFallback ?? true
183+
return isVisibleByDefaultOnUnknownConditions ?? true
184184
@unknown default:
185185
return false
186186
}

Sources/Paywalls/Components/PaywallCarouselComponent.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public extension PaywallComponent {
134134
public let pageControl: PageControl?
135135

136136
public let overrides: ComponentOverrides<PartialCarouselComponent>?
137-
public let conditionalVisibilityFallback: Bool?
137+
public let isVisibleByDefaultOnUnknownConditions: Bool?
138138

139139
public init(
140140
visible: Bool? = nil,
@@ -154,7 +154,7 @@ public extension PaywallComponent {
154154
autoAdvance: PaywallComponent.CarouselComponent.AutoAdvanceSlides? = nil,
155155
pageControl: PageControl? = nil,
156156
overrides: ComponentOverrides<PartialCarouselComponent>? = nil,
157-
conditionalVisibilityFallback: Bool? = nil
157+
isVisibleByDefaultOnUnknownConditions: Bool? = nil
158158
) {
159159
self.type = .carousel
160160

@@ -175,7 +175,7 @@ public extension PaywallComponent {
175175
self.autoAdvance = autoAdvance
176176
self.pageControl = pageControl
177177
self.overrides = overrides
178-
self.conditionalVisibilityFallback = conditionalVisibilityFallback
178+
self.isVisibleByDefaultOnUnknownConditions = isVisibleByDefaultOnUnknownConditions
179179
}
180180

181181
public static func == (lhs: CarouselComponent, rhs: CarouselComponent) -> Bool {
@@ -197,7 +197,7 @@ public extension PaywallComponent {
197197
lhs.autoAdvance == rhs.autoAdvance &&
198198
lhs.pageControl == rhs.pageControl &&
199199
lhs.overrides == rhs.overrides &&
200-
lhs.conditionalVisibilityFallback == rhs.conditionalVisibilityFallback
200+
lhs.isVisibleByDefaultOnUnknownConditions == rhs.isVisibleByDefaultOnUnknownConditions
201201
}
202202

203203
// MARK: - Hashable
@@ -220,7 +220,7 @@ public extension PaywallComponent {
220220
hasher.combine(autoAdvance)
221221
hasher.combine(pageControl)
222222
hasher.combine(overrides)
223-
hasher.combine(conditionalVisibilityFallback)
223+
hasher.combine(isVisibleByDefaultOnUnknownConditions)
224224
}
225225

226226
}

0 commit comments

Comments
 (0)