Moving to unified store (#30)

* moving to unified store

* readding tests

* Update swift.yml

* removing github files

Author: ay42

.github/FUNDING.yml

@@ -1,16 +1,16 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(
-    name: "StoreKitPlus",
+    name: "Storefront",
     platforms: [
-        .iOS(.v15), .macOS(.v12), .tvOS(.v15), .watchOS(.v8)
+        .iOS(.v17), .macOS(.v14), .tvOS(.v17), .watchOS(.v10)
     ],
     products: [
-        .library(name: "StoreKitPlus", targets: ["StoreKitPlus"])
+        .library(name: "Storefront", targets: ["Storefront"])
     ],
     targets: [
-        .target(name: "StoreKitPlus"),
-        .testTarget(name: "StoreKitPlusTests", dependencies: ["StoreKitPlus"])
+        .target(name: "Storefront"),
+        .testTarget(name: "StorefrontTests", dependencies: ["Storefront"])
     ]
 )

.github/workflows/swift.yml

@@ -1 +1 @@
-## StoreKitPlus
+## Storefront

LICENSE

@@ -0,0 +1,60 @@
+import StoreKit
+import SwiftUI
+
+/// A manager class that handles app review prompts based on user engagement points
+@Observable public class ReviewManager {
+    /// The current engagement points accumulated by the user
+    private(set) var engagementPoints: Int
+    
+    /// The thresholds at which review prompts will be triggered
+    private let thresholds: [Int]
+    
+    /// UserDefaults keys
+    private enum Keys {
+        static let highestThresholdReached = "highestThresholdReached"
+        static let currentPoints = "currentPoints"
+    }
+    
+    /// UserDefaults instance
+    private let defaults: UserDefaults
+    
+    /// Initialize the ReviewManager with custom thresholds
+    init(thresholds: [Int] = [10, 50, 100], defaults: UserDefaults = .standard) {
+        self.thresholds = thresholds.sorted()
+        self.defaults = defaults
+        self.engagementPoints = defaults.integer(forKey: Keys.currentPoints)
+    }
+    
+    /// Add engagement points and check if a review should be requested
+    /// - Parameter points: The number of points to add
+    /// - Returns: True if a review prompt should be shown
+    @MainActor
+    public func add(engagementPoints points: Int) -> Bool {
+        engagementPoints += points
+        defaults.set(engagementPoints, forKey: Keys.currentPoints)
+        
+        let highestThresholdReached = defaults.integer(forKey: Keys.highestThresholdReached)
+        
+        // Check if we should show a review prompt
+        if let nextThreshold = thresholds.first(where: { $0 > highestThresholdReached }),
+           engagementPoints >= nextThreshold {
+            
+            defaults.set(nextThreshold, forKey: Keys.highestThresholdReached)
+            return true
+        }
+        
+        return false
+    }
+    
+    /// Reset the engagement points and review history
+    public func reset() {
+        engagementPoints = 0
+        defaults.set(0, forKey: Keys.currentPoints)
+        defaults.set(0, forKey: Keys.highestThresholdReached)
+    }
+}
+
+
+extension EnvironmentValues {
+    @Entry public var reviewManager = ReviewManager(thresholds: [1, 10, 30], defaults: .standard)
+}

Package.swift

@@ -9,7 +9,8 @@ public enum StoreError: Error {
     case failedVerification
 }
 
-@MainActor public final class Store: ObservableObject {
+@MainActor @Observable
+public final class Store {
     public enum PurchaseFinishedAction {
         case dismissStore
         case noAction
@@ -18,19 +19,19 @@ public enum StoreError: Error {
 
     private let productIdentifiers: Set<String>
 
-    @Published public private(set) var nonConsumables: [Product]
-    @Published public private(set) var subscriptions: [Product]
+    public private(set) var nonConsumables: [Product]
+    public private(set) var subscriptions: [Product]
 
-    @Published public private(set) var purchasedNonConsumables: [Product] = []
-    @Published public private(set) var purchasedSubscriptions: [Product] = []
+    public private(set) var purchasedNonConsumables: [Product] = []
+    public private(set) var purchasedSubscriptions: [Product] = []
 
-    @Published public private(set) var purchasedProductIdentifiers: Set<String>
+    public private(set) var purchasedProductIdentifiers: Set<String>
 
-    @Published public private(set) var purchaseError: (any LocalizedError)?
+    public private(set) var purchaseError: (any LocalizedError)?
 
-    ///
-    private var lastLoadError: Error?
+    public private(set) var purchaseInProgress: Bool
 
+    private var lastLoadError: Error?
     private var productLoadingTask: Task<Void, Never>?
     private var transactionUpdatesTask: Task<Void, Never>?
     private var statusUpdatesTask: Task<Void, Never>?
@@ -44,6 +45,8 @@ public enum StoreError: Error {
         self.purchasedProductIdentifiers = Set(purchasedProductsArray ?? [])
         print("Persisted Purchased Products:", Set(purchasedProductsArray ?? []))
 
+        self.purchaseInProgress = false
+        
         nonConsumables = []
         subscriptions = []
 
@@ -59,10 +62,12 @@ public enum StoreError: Error {
     }
 
     deinit {
-        productLoadingTask?.cancel()
-        transactionUpdatesTask?.cancel()
-        statusUpdatesTask?.cancel()
-        storefrontUpdatesTask?.cancel()
+        Task { @MainActor [weak self] in
+            self?.productLoadingTask?.cancel()
+            self?.transactionUpdatesTask?.cancel()
+            self?.statusUpdatesTask?.cancel()
+            self?.storefrontUpdatesTask?.cancel()
+        }
     }
 
     @MainActor
@@ -112,6 +117,7 @@ public enum StoreError: Error {
     }
 
     public func purchase(option product: Product) async -> PurchaseFinishedAction {
+        purchaseInProgress = true
         let action: PurchaseFinishedAction
         do {
             let result = try await product.purchase()
@@ -144,6 +150,7 @@ public enum StoreError: Error {
             print("Purchase failed: \(error)")
             action = .noAction
         }
+        purchaseInProgress = false
         return action
     }
 

README.md

@@ -19,7 +19,7 @@ public struct SubscriptionSavings {
     @available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
     public func formattedPrice(for subscription: Product) -> String {
         let currency = granularPrice.formatted(subscription.priceFormatStyle)
-        let period = granularPricePeriod.formatted(subscription.subscriptionPeriodUnitFormatStyle)
+        let period = granularPricePeriod.formatted(subscription.subscriptionPeriodUnitFormatStyle).lowercased()
         return "\(currency)/\(period)"
     }
 }