Merge pull request #667 from qonversion/release/6.11.0

Release 6.11.0

Author: suriksarkisyan

Framework/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.10.0</string>
+	<string>6.11.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Podfile.lock

@@ -1,8 +1,8 @@
 PODS:
   - OCMock (3.9.4)
-  - Qonversion (6.8.0):
-    - Qonversion/Main (= 6.8.0)
-  - Qonversion/Main (6.8.0)
+  - Qonversion (6.9.0):
+    - Qonversion/Main (= 6.9.0)
+  - Qonversion/Main (6.9.0)
 
 DEPENDENCIES:
   - OCMock
@@ -18,7 +18,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
-  Qonversion: dc8d5a02ec83a4bfe1f2a73f08d9c00ebb254063
+  Qonversion: bcd154ecd6c0f323971dbddbb71d2e9257b171d1
 
 PODFILE CHECKSUM: 039889b49d515621e653ab1d97888c4c2744c482
 

Qonversion.podspec

@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
   idfa_exclude_files = ['Sources/Qonversion/IDFA']
   s.name         = 'Qonversion'
   s.swift_version = '5.5'
-  s.version      = '6.10.0'
+  s.version      = '6.11.0'
   s.summary      = 'qonversion.io'
   s.description  = <<-DESC
   Deep Analytics for iOS Subscriptions

Sample/Views/EntitlementsView.swift

@@ -22,8 +22,8 @@ struct EntitlementsView: View {
                             Task { await appState.loadEntitlements() }
                         }
 
-                        ActionButton(title: "Set Entitlements Listener", color: .purple) {
-                            setEntitlementsListener()
+                        ActionButton(title: "Set Deferred Purchases Listener", color: .purple) {
+                            setDeferredPurchasesListener()
                         }
 
                         ActionButton(title: "Restore Purchases", color: .green) {
@@ -45,7 +45,7 @@ struct EntitlementsView: View {
                         HStack {
                             Image(systemName: "checkmark.circle.fill")
                                 .foregroundColor(.green)
-                            Text("Entitlements listener is active")
+                            Text("Deferred purchases listener is active")
                                 .font(.caption)
                                 .foregroundColor(.secondary)
                         }
@@ -108,22 +108,29 @@ struct EntitlementsView: View {
         }
     }
 
-    private func setEntitlementsListener() {
-        Qonversion.shared().setEntitlementsUpdateListener(EntitlementsListenerHandler.shared)
-        EntitlementsListenerHandler.shared.appState = appState
+    private func setDeferredPurchasesListener() {
+        Qonversion.shared().setDeferredPurchasesListener(DeferredPurchasesListenerHandler.shared)
+        DeferredPurchasesListenerHandler.shared.appState = appState
         listenerSet = true
-        appState.successMessage = "Entitlements listener set successfully!"
+        appState.successMessage = "Deferred purchases listener set successfully!"
     }
 }
 
-// MARK: - Entitlements Listener Handler
-class EntitlementsListenerHandler: NSObject, Qonversion.EntitlementsUpdateListener {
-    static let shared = EntitlementsListenerHandler()
+// MARK: - Deferred Purchases Listener Handler
+class DeferredPurchasesListenerHandler: NSObject, Qonversion.DeferredPurchasesListener {
+    static let shared = DeferredPurchasesListenerHandler()
     weak var appState: AppState?
-    
-    func didReceiveUpdatedEntitlements(_ entitlements: [String: Qonversion.Entitlement]) {
+
+    func deferredPurchaseCompleted(_ purchaseResult: Qonversion.PurchaseResult) {
         Task { @MainActor in
-            appState?.entitlements = entitlements
+            if purchaseResult.isSuccessful, let entitlements = purchaseResult.entitlements {
+                for (key, value) in entitlements {
+                    appState?.entitlements[key] = value
+                }
+                appState?.successMessage = "Deferred purchase completed successfully!"
+            } else if purchaseResult.isError {
+                appState?.errorMessage = purchaseResult.error?.localizedDescription ?? "Deferred purchase failed"
+            }
         }
     }
 }

Sample/Views/NoCodesView.swift

@@ -16,6 +16,9 @@ struct NoCodesView: View {
     @State private var animated = true
     @State private var listenerSet = false
     @State private var customizationDelegateSet = false
+    @State private var customVariableName = ""
+    @State private var customVariableValue = ""
+    @State private var customVariablesDelegateSet = false
 
     var body: some View {
         ScrollView {
@@ -92,6 +95,54 @@ struct NoCodesView: View {
                 .background(Color(.systemGray6))
                 .cornerRadius(12)
 
+                // Custom Variables Section
+                VStack(alignment: .leading, spacing: 12) {
+                    Text("Custom Variables")
+                        .font(.headline)
+
+                    TextField("Variable Name", text: $customVariableName)
+                        .textFieldStyle(.roundedBorder)
+                    TextField("Variable Value", text: $customVariableValue)
+                        .textFieldStyle(.roundedBorder)
+
+                    ActionButton(title: "Add Variable", color: .orange) {
+                        guard !customVariableName.isEmpty else { return }
+                        NoCodesCustomVariablesHandler.shared.variables[customVariableName] = customVariableValue
+                        appState.successMessage = "Variable '\(customVariableName)' = '\(customVariableValue)' added"
+                        customVariableName = ""
+                        customVariableValue = ""
+                    }
+
+                    ActionButton(title: "Set Custom Variables Delegate", color: .orange) {
+                        NoCodes.shared.set(customVariablesDelegate: NoCodesCustomVariablesHandler.shared)
+                        customVariablesDelegateSet = true
+                        appState.successMessage = "Custom variables delegate set!"
+                    }
+
+                    if customVariablesDelegateSet {
+                        HStack {
+                            Image(systemName: "checkmark.circle.fill")
+                                .foregroundColor(.green)
+                            Text("Custom variables delegate active (\(NoCodesCustomVariablesHandler.shared.variables.count) vars)")
+                                .font(.caption)
+                                .foregroundColor(.secondary)
+                        }
+                    }
+
+                    if !NoCodesCustomVariablesHandler.shared.variables.isEmpty {
+                        ForEach(Array(NoCodesCustomVariablesHandler.shared.variables.keys.sorted()), id: \.self) { key in
+                            HStack {
+                                Text("\(key) = \(NoCodesCustomVariablesHandler.shared.variables[key] ?? "")")
+                                    .font(.caption)
+                                Spacer()
+                            }
+                        }
+                    }
+                }
+                .padding()
+                .background(Color(.systemGray6))
+                .cornerRadius(12)
+
                 // Close Button
                 ActionButton(title: "Close No-Code Screen", color: .red) {
                     NoCodes.shared.close()
@@ -290,6 +341,17 @@ class NoCodesListenerHandler: NoCodesDelegate {
     }
 }
 
+// MARK: - NoCodes Custom Variables Handler
+class NoCodesCustomVariablesHandler: NoCodesCustomVariablesDelegate {
+    static let shared = NoCodesCustomVariablesHandler()
+    var variables: [String: String] = [:]
+
+    func customVariables(for contextKey: String) -> [String: String] {
+        print("Custom variables requested for context key: \(contextKey), returning: \(variables)")
+        return variables
+    }
+}
+
 #Preview {
     NavigationView {
         NoCodesView()

Sources/NoCodes/Assemblies/NoCodesAssembly.swift

@@ -31,7 +31,7 @@ final class NoCodesAssembly {
 
     let noCodesService: NoCodesServiceInterface = servicesAssembly.noCodesService()
     let screenEventsService: ScreenEventsServiceInterface = servicesAssembly.screenEventsService()
-    let coordinator = NoCodesFlowCoordinator(delegate: configuration.delegate, screenCustomizationDelegate: configuration.screenCustomizationDelegate, purchaseDelegate: configuration.purchaseDelegate, noCodesService: noCodesService, screenEventsService: screenEventsService, viewsAssembly: viewsAssembly(), logger: miscAssembly.loggerWrapper(), customLocale: configuration.locale, theme: configuration.theme)
+    let coordinator = NoCodesFlowCoordinator(delegate: configuration.delegate, screenCustomizationDelegate: configuration.screenCustomizationDelegate, purchaseDelegate: configuration.purchaseDelegate, customVariablesDelegate: configuration.customVariablesDelegate, noCodesService: noCodesService, screenEventsService: screenEventsService, viewsAssembly: viewsAssembly(), logger: miscAssembly.loggerWrapper(), customLocale: configuration.locale, theme: configuration.theme)
     flowCoordinatorInstance = coordinator
 
     return coordinator

Sources/NoCodes/Assemblies/NoCodesViewsAssembly.swift

@@ -20,12 +20,12 @@ final class ViewsAssembly {
     self.servicesAssembly = servicesAssembly
   }
 
-  func viewController(with screenId: String, delegate: NoCodesViewControllerDelegate, purchaseDelegate: NoCodesPurchaseDelegate?, screenCustomizationDelegate: NoCodesScreenCustomizationDelegate?, presentationConfiguration: NoCodesPresentationConfiguration, customLocale: String? = nil, theme: NoCodesTheme = .auto) -> NoCodesViewController {
-      return NoCodesViewController(screenId: screenId, contextKey: nil, delegate: delegate, purchaseDelegate: purchaseDelegate, screenCustomizationDelegate: screenCustomizationDelegate, noCodesMapper: miscAssembly.noCodesMapper(), noCodesService: servicesAssembly.noCodesService(), screenEventsService: servicesAssembly.screenEventsService(), viewsAssembly: self, logger: miscAssembly.loggerWrapper(), presentationConfiguration: presentationConfiguration, contextBuilder: miscAssembly.contextBuilder(), htmlInjector: miscAssembly.htmlInjector(), customLocale: customLocale, theme: theme)
+  func viewController(with screenId: String, delegate: NoCodesViewControllerDelegate, purchaseDelegate: NoCodesPurchaseDelegate?, screenCustomizationDelegate: NoCodesScreenCustomizationDelegate?, customVariablesDelegate: NoCodesCustomVariablesDelegate?, presentationConfiguration: NoCodesPresentationConfiguration, customLocale: String? = nil, theme: NoCodesTheme = .auto) -> NoCodesViewController {
+      return NoCodesViewController(screenId: screenId, contextKey: nil, delegate: delegate, purchaseDelegate: purchaseDelegate, screenCustomizationDelegate: screenCustomizationDelegate, customVariablesDelegate: customVariablesDelegate, noCodesMapper: miscAssembly.noCodesMapper(), noCodesService: servicesAssembly.noCodesService(), screenEventsService: servicesAssembly.screenEventsService(), viewsAssembly: self, logger: miscAssembly.loggerWrapper(), presentationConfiguration: presentationConfiguration, contextBuilder: miscAssembly.contextBuilder(), htmlInjector: miscAssembly.htmlInjector(), customLocale: customLocale, theme: theme)
   }
 
-  func viewController(withContextKey contextKey: String, delegate: NoCodesViewControllerDelegate, purchaseDelegate: NoCodesPurchaseDelegate?, screenCustomizationDelegate: NoCodesScreenCustomizationDelegate?, presentationConfiguration: NoCodesPresentationConfiguration, customLocale: String? = nil, theme: NoCodesTheme = .auto) -> NoCodesViewController {
-      return NoCodesViewController(screenId: nil, contextKey: contextKey, delegate: delegate, purchaseDelegate: purchaseDelegate, screenCustomizationDelegate: screenCustomizationDelegate, noCodesMapper: miscAssembly.noCodesMapper(), noCodesService: servicesAssembly.noCodesService(), screenEventsService: servicesAssembly.screenEventsService(), viewsAssembly: self, logger: miscAssembly.loggerWrapper(), presentationConfiguration: presentationConfiguration, contextBuilder: miscAssembly.contextBuilder(), htmlInjector: miscAssembly.htmlInjector(), customLocale: customLocale, theme: theme)
+  func viewController(withContextKey contextKey: String, delegate: NoCodesViewControllerDelegate, purchaseDelegate: NoCodesPurchaseDelegate?, screenCustomizationDelegate: NoCodesScreenCustomizationDelegate?, customVariablesDelegate: NoCodesCustomVariablesDelegate?, presentationConfiguration: NoCodesPresentationConfiguration, customLocale: String? = nil, theme: NoCodesTheme = .auto) -> NoCodesViewController {
+      return NoCodesViewController(screenId: nil, contextKey: contextKey, delegate: delegate, purchaseDelegate: purchaseDelegate, screenCustomizationDelegate: screenCustomizationDelegate, customVariablesDelegate: customVariablesDelegate, noCodesMapper: miscAssembly.noCodesMapper(), noCodesService: servicesAssembly.noCodesService(), screenEventsService: servicesAssembly.screenEventsService(), viewsAssembly: self, logger: miscAssembly.loggerWrapper(), presentationConfiguration: presentationConfiguration, contextBuilder: miscAssembly.contextBuilder(), htmlInjector: miscAssembly.htmlInjector(), customLocale: customLocale, theme: theme)
   }
 }
 

Sources/NoCodes/Delegate.swift

@@ -70,6 +70,17 @@ public protocol NoCodesScreenCustomizationDelegate {
   func noCodesCustomLoadingView() -> NoCodesLoadingView?
 }
 
+/// Delegate responsible for providing custom variables for No-Codes screens.
+/// Custom variables are injected into the screen's JavaScript context
+/// and can be used to influence content displayed on the screen.
+public protocol NoCodesCustomVariablesDelegate: AnyObject {
+  /// Provide custom variables for a specific screen identified by context key.
+  /// Called each time a screen is about to be displayed.
+  /// - Parameter contextKey: the context key of the screen being loaded.
+  /// - Returns: a dictionary of custom variables to inject into the screen.
+  func customVariables(for contextKey: String) -> [String: String]
+}
+
 /// Delegate responsible for custom purchase and restore handling.
 /// When this delegate is provided, it replaces the default Qonversion SDK purchase flow.
 public protocol NoCodesPurchaseDelegate {

Sources/NoCodes/NoCodes.swift

@@ -48,6 +48,15 @@ public final class NoCodes {
     flowCoordinator?.set(screenCustomizationDelegate: screenCustomizationDelegate)
   }
 
+  /// Use this function to set the custom variables delegate.
+  /// This delegate will be called each time a screen is about to be displayed
+  /// to get custom variables that will be injected into the screen's JavaScript context.
+  /// - Parameters:
+  ///   - delegate: ``NoCodesCustomVariablesDelegate`` object.
+  public func set(customVariablesDelegate: NoCodesCustomVariablesDelegate) {
+    flowCoordinator?.set(customVariablesDelegate: customVariablesDelegate)
+  }
+
   /// Use this function to set the purchase delegate.
   /// This delegate should be used if you want to handle purchases and restore operations on your end.
   /// If this delegate is provided, it will be used instead of the default Qonversion SDK purchase flow.

Sources/NoCodes/NoCodesConfiguration.swift

@@ -23,6 +23,10 @@ public struct NoCodesConfiguration {
 
   /// Purchase delegate. If provided, it will be used instead of the default Qonversion SDK purchase flow.
   public var purchaseDelegate: NoCodesPurchaseDelegate?
+
+  /// Custom variables delegate. If provided, it will be called each time a screen is about to be displayed
+  /// to get custom variables for the screen.
+  public weak var customVariablesDelegate: NoCodesCustomVariablesDelegate?
 
   /// Optional custom fallback file name. If not provided, defaults to "nocodes_fallbacks.json"
   public var fallbackFileName: String?
@@ -51,11 +55,12 @@ public struct NoCodesConfiguration {
   ///   - proxyURL: Optional proxy URL for API requests. If not provided, uses default API endpoint
   ///   - locale: Optional custom locale for No-Code screens localization. If not provided, uses system default
   ///   - theme: Theme mode for No-Code screens. Defaults to `.auto` which follows device settings
-  public init(projectKey: String, delegate: NoCodesDelegate? = nil, screenCustomizationDelegate: NoCodesScreenCustomizationDelegate? = nil, purchaseDelegate: NoCodesPurchaseDelegate? = nil, fallbackFileName: String? = nil, proxyURL: String? = nil, locale: String? = nil, theme: NoCodesTheme = .auto) {
+  public init(projectKey: String, delegate: NoCodesDelegate? = nil, screenCustomizationDelegate: NoCodesScreenCustomizationDelegate? = nil, purchaseDelegate: NoCodesPurchaseDelegate? = nil, customVariablesDelegate: NoCodesCustomVariablesDelegate? = nil, fallbackFileName: String? = nil, proxyURL: String? = nil, locale: String? = nil, theme: NoCodesTheme = .auto) {
     self.projectKey = projectKey
     self.delegate = delegate
     self.screenCustomizationDelegate = screenCustomizationDelegate
     self.purchaseDelegate = purchaseDelegate
+    self.customVariablesDelegate = customVariablesDelegate
     self.fallbackFileName = fallbackFileName
     self.proxyURL = proxyURL
     self.locale = locale