Moved the priceFormattingRuleSets from new Config struct to the existing UIConfig

Author: rickvdl

RevenueCatUI/Templates/V2/Previews/PreviewMock.swift

@@ -64,7 +64,8 @@ enum PreviewUIConfig {
             variableConfig: .init(
                 variableCompatibilityMap: [:],
                 functionCompatibilityMap: [:]
-            )
+            ),
+            priceFormattingRuleSets: [:]
         )
     }
 
@@ -239,7 +240,8 @@ enum PreviewMock {
         variableConfig: .init(
             variableCompatibilityMap: [:],
             functionCompatibilityMap: [:]
-        )
+        ),
+        priceFormattingRuleSets: [:]
     )
 
 }

RevenueCatUI/Templates/V2/Previews/TemplateComponentsViewPreviews/ButtonWithFooterPreview.swift

@@ -423,7 +423,8 @@ private enum ButtonWithSheetPreview {
             variableConfig: .init(
                 variableCompatibilityMap: [:],
                 functionCompatibilityMap: [:]
-            )
+            ),
+            priceFormattingRuleSets: [:]
         ),
         data: data
     )

RevenueCatUI/Templates/V2/Previews/TemplateComponentsViewPreviews/Template1Preview.swift

@@ -164,7 +164,8 @@ private enum Template1Preview {
             variableConfig: .init(
                 variableCompatibilityMap: [:],
                 functionCompatibilityMap: [:]
-            )
+            ),
+            priceFormattingRuleSets: [:]
         ),
         data: data
     )

Sources/Networking/Responses/OfferingsResponse.swift

@@ -54,70 +54,6 @@ struct OfferingsResponse {
     let placements: Placements?
     let targeting: Targeting?
     let uiConfig: UIConfig?
-    let config: Config?
-
-    public struct Config {
-        
-        @DefaultDecodable.EmptyDictionary
-        var priceFormattingRuleSets: [
-            // storefront country code -> ruleset
-            String: PriceFormattingRuleSet
-        ]
-        
-    }
-}
-
-/*
- Contains a set of rules that will be used when formatting a price
- Currrently only supports overriding the currencySymbol per currency
- */
-struct PriceFormattingRuleSet: Sendable {
-    
-    // currencyCode: CurrencySymbolOverride
-    private var currencySymbolOverrides: [String: CurrencySymbolOverride]
-    
-    public init(currencySymbolOverrides: [String : CurrencySymbolOverride]) {
-        self.currencySymbolOverrides = currencySymbolOverrides
-    }
-    
-    public func currencySymbolOverride(
-        currencyCode: String
-    ) -> CurrencySymbolOverride? {
-        return self.currencySymbolOverrides[currencyCode]
-    }
-    
-    /*
-     Contains a set of currencySymbol overrides for different pluralization rules
-     */
-    public struct CurrencySymbolOverride: Sendable {
-        let zero: String
-        let one: String
-        let two: String
-        let few: String
-        let many: String
-        let other: String
-        
-        func value(for rule: PluralRule) -> String {
-            switch rule {
-            case .zero:
-                return self.zero
-            case .one:
-                return self.one
-            case .two:
-                return self.two
-            case .few:
-                return self.few
-            case .many:
-                return self.many
-            case .other:
-                return self.other
-            }
-        }
-        
-        public enum PluralRule {
-            case zero, one, two, few, many, other
-        }
-    }
 }
 
 extension OfferingsResponse {
@@ -147,8 +83,5 @@ extension OfferingsResponse.Offering: Codable, Equatable {}
 extension OfferingsResponse.Placements: Codable, Equatable {}
 extension OfferingsResponse.Targeting: Codable, Equatable {}
 extension OfferingsResponse: Codable, Equatable {}
-extension OfferingsResponse.Config: Codable, Equatable {}
-extension PriceFormattingRuleSet: Codable, Equatable {}
-extension PriceFormattingRuleSet.CurrencySymbolOverride: Codable, Equatable {}
 
 extension OfferingsResponse: HTTPResponseBody {}

Sources/Networking/Responses/RevenueCatUI/UIConfig.swift

@@ -115,21 +115,93 @@ public struct UIConfig: Codable, Equatable, Sendable {
     public var app: AppConfig
     public var localizations: [String: [String: String]]
     public var variableConfig: VariableConfig
+    
+    @DefaultDecodable.EmptyDictionary
+    var priceFormattingRuleSets: [
+        // storefront country code -> ruleset
+        String: PriceFormattingRuleSet
+    ]
 
     public init(app: AppConfig,
                 localizations: [String: [String: String]],
-                variableConfig: VariableConfig) {
+                variableConfig: VariableConfig,
+                priceFormattingRuleSets: [String: PriceFormattingRuleSet]) {
         self.app = app
         self.localizations = localizations
         self.variableConfig = variableConfig
+        self.priceFormattingRuleSets = priceFormattingRuleSets
     }
 
 }
 
 #else
 
 public struct UIConfig: Codable, Equatable, Sendable {
-
+    @DefaultDecodable.EmptyDictionary
+    var priceFormattingRuleSets: [
+        // storefront country code -> ruleset
+        String: PriceFormattingRuleSet
+    ]
+    
+    public init(priceFormattingRuleSets: [String: PriceFormattingRuleSet]) {
+        self.priceFormattingRuleSets = priceFormattingRuleSets
+    }
 }
 
 #endif
+
+/*
+ Contains a set of rules that will be used when formatting a price
+ Currrently only supports overriding the currencySymbol per currency
+ */
+public struct PriceFormattingRuleSet: Sendable {
+    
+    // currencyCode: CurrencySymbolOverride
+    private var currencySymbolOverrides: [String: CurrencySymbolOverride]
+    
+    init(currencySymbolOverrides: [String : CurrencySymbolOverride]) {
+        self.currencySymbolOverrides = currencySymbolOverrides
+    }
+    
+    func currencySymbolOverride(
+        currencyCode: String
+    ) -> CurrencySymbolOverride? {
+        return self.currencySymbolOverrides[currencyCode]
+    }
+    
+    /*
+     Contains a set of currencySymbol overrides for different pluralization rules
+     */
+    struct CurrencySymbolOverride: Sendable {
+        let zero: String
+        let one: String
+        let two: String
+        let few: String
+        let many: String
+        let other: String
+        
+        func value(for rule: PluralRule) -> String {
+            switch rule {
+            case .zero:
+                return self.zero
+            case .one:
+                return self.one
+            case .two:
+                return self.two
+            case .few:
+                return self.few
+            case .many:
+                return self.many
+            case .other:
+                return self.other
+            }
+        }
+        
+        public enum PluralRule {
+            case zero, one, two, few, many, other
+        }
+    }
+}
+
+extension PriceFormattingRuleSet: Codable, Equatable {}
+extension PriceFormattingRuleSet.CurrencySymbolOverride: Codable, Equatable {}

Sources/Purchasing/Purchases/Purchases.swift

@@ -399,7 +399,7 @@ public typealias StartPurchaseBlock = (@escaping PurchaseCompletedBlock) -> Void
             if Self.isConfigured, let offeringsResponse = Self.shared.cachedOfferings?.response,
                 let storeFrontCountryCode = systemInfo.storefront?.countryCode
             {
-                priceFormattingRuleSet = offeringsResponse.config?.priceFormattingRuleSets[storeFrontCountryCode]
+                priceFormattingRuleSet = offeringsResponse.uiConfig?.priceFormattingRuleSets[storeFrontCountryCode]
             }
 
             return priceFormattingRuleSet

Tests/StoreKitUnitTests/OfferingsManagerStoreKitTests.swift

@@ -109,8 +109,7 @@ private extension OfferingsManagerStoreKitTests {
             ],
             placements: nil,
             targeting: nil,
-            uiConfig: nil,
-            config: nil
+            uiConfig: nil
         )
     }
 

Tests/UnitTests/Caching/DeviceCacheTests.swift

@@ -853,7 +853,7 @@ private extension DeviceCacheTests {
                             offerings: [offeringsData],
                             placements: nil,
                             targeting: nil,
-                            uiConfig: nil, config: nil)
+                            uiConfig: nil)
         )
     }
 
@@ -871,8 +871,7 @@ private extension Offerings {
             offerings: [],
             placements: nil,
             targeting: nil,
-            uiConfig: nil,
-            config: nil
+            uiConfig: nil
         )
     )
 

Tests/UnitTests/Misc/PurchasesDiagnosticsTests.swift

@@ -43,7 +43,7 @@ class PurchasesDiagnosticsTests: TestCase {
                                   offerings: [],
                                   placements: nil,
                                   targeting: nil,
-                                  uiConfig: nil, config: nil))
+                                  uiConfig: nil))
         )
     }
 

Tests/UnitTests/Mocks/MockOfferingsFactory.swift

@@ -23,7 +23,7 @@ class MockOfferingsFactory: OfferingsFactory {
                                              offerings: [],
                                              placements: nil,
                                              targeting: nil,
-                                             uiConfig: nil, config: nil))
+                                             uiConfig: nil))
         }
         if nilOfferings {
             return nil
@@ -55,7 +55,7 @@ class MockOfferingsFactory: OfferingsFactory {
                       packages: [
                         .init(identifier: "", platformProductIdentifier: "$rc_monthly", webCheckoutUrl: nil)
                       ], webCheckoutUrl: nil)
-            ], placements: nil, targeting: nil, uiConfig: nil, config: nil)
+            ], placements: nil, targeting: nil, uiConfig: nil)
 
         )
     }
@@ -78,8 +78,7 @@ extension OfferingsResponse {
         ],
         placements: nil,
         targeting: nil,
-        uiConfig: nil,
-        config: nil
+        uiConfig: nil
     )
 
 }