Revert "Resolve UI module warnings"

This reverts commit b3b9587.
processout · Sep 25, 2024 · 72159c4 · 72159c4
1 parent 811d6dc
commit 72159c4
Show file tree

Hide file tree

Showing 20 changed files with 6 additions and 52 deletions.
diff --git a/Sources/ProcessOutUI/Sources/Core/Interactor/BaseInteractor.swift b/Sources/ProcessOutUI/Sources/Core/Interactor/BaseInteractor.swift
@@ -23,6 +23,7 @@ class BaseInteractor<State>: Interactor {
     var didChange: (() -> Void)?
     var willChange: ((State) -> Void)?
 
+    @MainActor
     func start() {
         // Does nothing
     }

diff --git a/Sources/ProcessOutUI/Sources/Core/Interactor/Interactor.swift b/Sources/ProcessOutUI/Sources/Core/Interactor/Interactor.swift
@@ -5,7 +5,6 @@
 //  Created by Andrii Vysotskyi on 19.10.2023.
 //
 
-@MainActor
 protocol Interactor<State>: AnyObject {
 
     associatedtype State

diff --git a/Sources/ProcessOutUI/Sources/Core/ViewModel/AnyViewModel.swift b/Sources/ProcessOutUI/Sources/Core/ViewModel/AnyViewModel.swift
@@ -27,10 +27,6 @@ final class AnyViewModel<State>: ViewModel {
         base.start()
     }
 
-    func stop() {
-        base.stop()
-    }
-
     var state: State {
         get { base.state }
         set { base.state = newValue }
@@ -54,10 +50,6 @@ private class ViewModelBox<T>: AnyViewModelBase<T.State> where T: ViewModel {
         base.start()
     }
 
-    override func stop() {
-        base.stop()
-    }
-
     override var state: T.State {
         get { base.state }
         set { base.state = newValue }
@@ -72,10 +64,6 @@ private class AnyViewModelBase<State>: ViewModel {
         fatalError("Not implemented")
     }
 
-    func stop() {
-        fatalError("Not implemented")
-    }
-
     var state: State {
         get { fatalError("Not implemented") }
         set { fatalError("Not implemented") }

diff --git a/Sources/ProcessOutUI/Sources/Core/ViewModel/ViewModel.swift b/Sources/ProcessOutUI/Sources/Core/ViewModel/ViewModel.swift
@@ -7,7 +7,6 @@
 
 import Combine
 
-@MainActor
 protocol ViewModel<State>: ObservableObject {
 
     associatedtype State
@@ -17,7 +16,4 @@ protocol ViewModel<State>: ObservableObject {
 
     /// Starts view model.
     func start()
-
-    /// Stops view model.
-    func stop()
 }
diff --git a/...ProcessOutUI/Sources/Modules/CardTokenization/Interactor/CardTokenizationInteractor.swift b/...ProcessOutUI/Sources/Modules/CardTokenization/Interactor/CardTokenizationInteractor.swift
@@ -7,7 +7,6 @@
 
 import ProcessOut
 
-@MainActor
 protocol CardTokenizationInteractor: Interactor<CardTokenizationInteractorState> {
 
     /// Delegate.

diff --git a/Sources/ProcessOutUI/Sources/Modules/CardTokenization/View/POCardTokenizationView.swift b/Sources/ProcessOutUI/Sources/Modules/CardTokenization/View/POCardTokenizationView.swift
@@ -31,7 +31,6 @@ public struct POCardTokenizationView: View {
             style.backgroundColor.ignoresSafeArea()
         }
         .onAppear(perform: viewModel.start)
-        .onDisappear(perform: viewModel.stop)
     }
 
     // MARK: - Private Properties

diff --git a/...ssOutUI/Sources/Modules/CardTokenization/ViewModel/DefaultCardTokenizationViewModel.swift b/...ssOutUI/Sources/Modules/CardTokenization/ViewModel/DefaultCardTokenizationViewModel.swift
@@ -28,10 +28,6 @@ final class DefaultCardTokenizationViewModel: ViewModel {
         $state.performWithoutAnimation(interactor.start)
     }
 
-    func stop() {
-        interactor.cancel()
-    }
-
     // MARK: - Private Nested Types
 
     private typealias InteractorState = CardTokenizationInteractorState

diff --git a/Sources/ProcessOutUI/Sources/Modules/CardUpdate/Interactor/CardUpdateInteractor.swift b/Sources/ProcessOutUI/Sources/Modules/CardUpdate/Interactor/CardUpdateInteractor.swift
@@ -7,7 +7,6 @@
 
 import ProcessOut
 
-@MainActor
 protocol CardUpdateInteractor: Interactor<CardUpdateInteractorState> {
 
     /// Updates CVC value.

diff --git a/Sources/ProcessOutUI/Sources/Modules/CardUpdate/View/POCardUpdateView.swift b/Sources/ProcessOutUI/Sources/Modules/CardUpdate/View/POCardUpdateView.swift
@@ -47,7 +47,6 @@ public struct POCardUpdateView: View {
             style.backgroundColor.ignoresSafeArea()
         }
         .onAppear(perform: viewModel.start)
-        .onDisappear(perform: viewModel.stop)
     }
 
     // MARK: - Private Properties

diff --git a/Sources/ProcessOutUI/Sources/Modules/CardUpdate/ViewModel/AnyCardUpdateViewModel.swift b/Sources/ProcessOutUI/Sources/Modules/CardUpdate/ViewModel/AnyCardUpdateViewModel.swift
@@ -42,10 +42,6 @@ final class AnyCardUpdateViewModel: CardUpdateViewModel {
         base.start()
     }
 
-    func stop() {
-        base.stop()
-    }
-
     // MARK: - Private Properties
 
     private var cancellable: AnyCancellable?

diff --git a/Sources/ProcessOutUI/Sources/Modules/CardUpdate/ViewModel/CardUpdateViewModel.swift b/Sources/ProcessOutUI/Sources/Modules/CardUpdate/ViewModel/CardUpdateViewModel.swift
@@ -8,7 +8,6 @@
 import Combine
 @_spi(PO) import ProcessOutCoreUI
 
-@MainActor
 protocol CardUpdateViewModel: ObservableObject {
 
     /// Screen title.
@@ -25,7 +24,4 @@ protocol CardUpdateViewModel: ObservableObject {
 
     /// Starts view model.
     func start()
-
-    /// Stops view model.
-    func stop()
 }
diff --git a/Sources/ProcessOutUI/Sources/Modules/CardUpdate/ViewModel/DefaultCardUpdateViewModel.swift b/Sources/ProcessOutUI/Sources/Modules/CardUpdate/ViewModel/DefaultCardUpdateViewModel.swift
@@ -39,10 +39,6 @@ final class DefaultCardUpdateViewModel: CardUpdateViewModel {
         interactor.start()
     }
 
-    func stop() {
-        interactor.cancel()
-    }
-
     // MARK: - Private Nested Types
 
     private typealias InteractorState = CardUpdateInteractorState

diff --git a/...s/ProcessOutUI/Sources/Modules/DynamicCheckout/Interactor/DynamicCheckoutInteractor.swift b/...s/ProcessOutUI/Sources/Modules/DynamicCheckout/Interactor/DynamicCheckoutInteractor.swift
@@ -5,7 +5,6 @@
 //  Created by Andrii Vysotskyi on 05.03.2024.
 //
 
-@MainActor
 protocol DynamicCheckoutInteractor: Interactor<DynamicCheckoutInteractorState> {
 
     /// Configuration.

diff --git a/.../Modules/DynamicCheckout/Utils/ChildProvider/DynamicCheckoutInteractorChildProvider.swift b/.../Modules/DynamicCheckout/Utils/ChildProvider/DynamicCheckoutInteractorChildProvider.swift
@@ -9,7 +9,6 @@
 
 /// - NOTE: Your implementation should expect that instances created
 /// by provider are going to be different every time you call a method.
-@MainActor
 protocol DynamicCheckoutInteractorChildProvider {
 
     /// Creates and returns card tokenization interactor.

diff --git a/Sources/ProcessOutUI/Sources/Modules/DynamicCheckout/View/PODynamicCheckoutView.swift b/Sources/ProcessOutUI/Sources/Modules/DynamicCheckout/View/PODynamicCheckoutView.swift
@@ -48,7 +48,6 @@ public struct PODynamicCheckoutView: View {
         }
         .backport.geometryGroup()
         .onAppear(perform: viewModel.start)
-        .onDisappear(perform: viewModel.stop)
         .poConfirmationDialog(item: $viewModel.state.confirmationDialog)
     }
 

diff --git a/...cessOutUI/Sources/Modules/DynamicCheckout/ViewModel/DefaultDynamicCheckoutViewModel.swift b/...cessOutUI/Sources/Modules/DynamicCheckout/ViewModel/DefaultDynamicCheckoutViewModel.swift
@@ -28,10 +28,6 @@ final class DefaultDynamicCheckoutViewModel: ViewModel {
         $state.performWithoutAnimation(interactor.start)
     }
 
-    func stop() {
-        interactor.cancel()
-    }
-
     // MARK: - Private Nested Types
 
     private enum ButtonId {

diff --git a/...dules/NativeAlternativePayment/Interactor/NativeAlternativePaymentDefaultInteractor.swift b/...dules/NativeAlternativePayment/Interactor/NativeAlternativePaymentDefaultInteractor.swift
@@ -278,8 +278,7 @@ final class NativeAlternativePaymentDefaultInteractor:
         guard let timeInterval = configuration.paymentConfirmation.showProgressIndicatorAfter else {
             return
         }
-        Task { [weak self] in
-            try? await Task.sleep(seconds: timeInterval)
+        Timer.scheduledTimer(withTimeInterval: timeInterval, repeats: false) { [weak self] _ in
             guard let self, case .awaitingCapture(var awaitingCaptureState) = self.state else {
                 return
             }

diff --git a/...rces/Modules/NativeAlternativePayment/Interactor/NativeAlternativePaymentInteractor.swift b/...rces/Modules/NativeAlternativePayment/Interactor/NativeAlternativePaymentInteractor.swift
@@ -5,7 +5,6 @@
 //  Created by Andrii Vysotskyi on 29.02.2024.
 //
 
-@MainActor
 protocol NativeAlternativePaymentInteractor: Interactor<NativeAlternativePaymentInteractorState> {
 
     /// Configuration.

diff --git a/...sOutUI/Sources/Modules/NativeAlternativePayment/View/PONativeAlternativePaymentView.swift b/...sOutUI/Sources/Modules/NativeAlternativePayment/View/PONativeAlternativePaymentView.swift
@@ -37,7 +37,6 @@ public struct PONativeAlternativePaymentView: View {
                 .animation(.default, value: viewModel.state.isCaptured)
         }
         .onAppear(perform: viewModel.start)
-        .onDisappear(perform: viewModel.stop)
         .poConfirmationDialog(item: $viewModel.state.confirmationDialog)
     }
 

diff --git a/...Modules/NativeAlternativePayment/ViewModel/DefaultNativeAlternativePaymentViewModel.swift b/...Modules/NativeAlternativePayment/ViewModel/DefaultNativeAlternativePaymentViewModel.swift
@@ -18,6 +18,10 @@ final class DefaultNativeAlternativePaymentViewModel: ViewModel {
         observeChanges(interactor: interactor)
     }
 
+    deinit {
+        interactor.cancel()
+    }
+
     // MARK: - NativeAlternativePaymentViewModel
 
     @AnimatablePublished
@@ -27,10 +31,6 @@ final class DefaultNativeAlternativePaymentViewModel: ViewModel {
         $state.performWithoutAnimation(interactor.start)
     }
 
-    func stop() {
-        interactor.cancel()
-    }
-
     // MARK: - Private Nested Types
 
     private typealias InteractorState = NativeAlternativePaymentInteractorState