Fix StoreKit

oversizedev · Oct 3, 2023 · fa9f521 · fa9f521
1 parent 7630469
commit fa9f521
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 40 deletions.
diff --git a/Sources/OversizeKit/LauncherKit/Launcher.swift b/Sources/OversizeKit/LauncherKit/Launcher.swift
@@ -138,16 +138,6 @@ public extension View {
     }
 }
 
-extension View {
-    func withoutAnimation(action: @escaping () -> Void) {
-        var transaction = Transaction()
-        transaction.disablesAnimations = true
-        withTransaction(transaction) {
-            action()
-        }
-    }
-}
-
 struct LockscreenView_Previews: PreviewProvider {
     static var previews: some View {
         Launcher {

diff --git a/Sources/OversizeKit/StoreKit/StoreScreen/StoreInstuctinsView.swift b/Sources/OversizeKit/StoreKit/StoreScreen/StoreInstuctinsView.swift
@@ -29,16 +29,7 @@ public struct StoreInstuctinsView: View {
                 PageView { offset = $0 } content: {
                     Group {
                         switch viewModel.state {
-                        case .initial:
-                            contentPlaceholder()
-                                .task {
-                                    await viewModel.fetchData()
-                                    if case let .result(products) = viewModel.state {
-                                        await viewModel.updateState(products: products)
-                                    }
-                                }
-
-                        case .loading:
+                        case .initial, .loading:
                             contentPlaceholder()
                         case let .result(data):
                             content(data: data)
@@ -73,6 +64,9 @@ public struct StoreInstuctinsView: View {
                         dismiss()
                     }
                 }
+                .task {
+                    await viewModel.fetchData()
+                }
             #else
                 EmptyView()
             #endif

diff --git a/Sources/OversizeKit/StoreKit/StoreScreen/StoreSpecialOfferView.swift b/Sources/OversizeKit/StoreKit/StoreScreen/StoreSpecialOfferView.swift
@@ -40,12 +40,6 @@ public struct StoreSpecialOfferView: View {
                             HStack {
                                 Spacer()
                                 ProgressView()
-                                    .task {
-                                        await viewModel.fetchData()
-                                        if case let .result(products) = viewModel.state {
-                                            await viewModel.updateState(products: products)
-                                        }
-                                    }
                                 Spacer()
                             }
                             Spacer()
@@ -82,6 +76,9 @@ public struct StoreSpecialOfferView: View {
                     dismiss()
                 }
             }
+            .task {
+                await viewModel.fetchData()
+            }
         #else
             EmptyView()
         #endif

diff --git a/Sources/OversizeKit/StoreKit/StoreScreen/StoreView.swift b/Sources/OversizeKit/StoreKit/StoreScreen/StoreView.swift
@@ -29,16 +29,7 @@ import SwiftUI
             PageView {
                 Group {
                     switch viewModel.state {
-                    case .initial:
-                        contentPlaceholder()
-                            .task {
-                                await viewModel.fetchData()
-                                if case let .result(products) = viewModel.state {
-                                    await viewModel.updateState(products: products)
-                                }
-                            }
-
-                    case .loading:
+                    case .initial, .loading:
                         contentPlaceholder()
                     case let .result(data):
                         content(data: data)
@@ -75,6 +66,9 @@ import SwiftUI
                     Fireworks()
                 }
             }
+            .task {
+                await viewModel.fetchData()
+            }
         }
 
         var titleText: String {

diff --git a/Sources/OversizeKit/StoreKit/StoreScreen/ViewModel/StoreViewModel.swift b/Sources/OversizeKit/StoreKit/StoreScreen/ViewModel/StoreViewModel.swift
@@ -342,7 +342,11 @@ extension StoreViewModel {
                 }
                 state = .result(finalProducts)
                 log("✅ StoeKit fetched")
-            // log(finalProducts)
+                if finalProducts.autoRenewable.isEmpty {
+                    log("❌ NO autoRenewable products")
+                } else {
+                    log("📦 \(finalProducts.autoRenewable.count) autoRenewable products")
+                }
             case let .failure(error):
                 state = .error(error)
                 log("❌ Product not fetched (\(error.title))")

diff --git a/Sources/OversizeKit/StoreKit/Views/PrmiumBannerRow.swift b/Sources/OversizeKit/StoreKit/Views/PrmiumBannerRow.swift
@@ -37,9 +37,6 @@ public struct PrmiumBannerRow: View {
         }
         .task {
             await viewModel.fetchData()
-            if case let .result(products) = viewModel.state {
-                await viewModel.updateState(products: products)
-            }
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,9 +37,6 @@ public struct PrmiumBannerRow: View { @@
             }
             .task {
                 await viewModel.fetchData()
-                if case let .result(products) = viewModel.state {
-                    await viewModel.updateState(products: products)
-                }
             }
         }
@@ Expand Down @@