Merge pull request #42 in IL/yandex-checkout-payments-swift from ~TVE…

…RDOKHLEB/yandex-checkout-payments-swift:task/b2b/BIOS-825 to release/2.0.0

* commit 'a3ac733c1121e57c2bd307ba76a65b2f78cb2c97':
  [BIOS-825] Fix height for ContractTemplate with fast rendering

YandexCheckoutPayments/Modules/PaymentMethods/PaymentMethodsViewIO.swift

@@ -49,6 +49,7 @@ protocol PaymentMethodsViewInput: ActivityIndicatorFullViewPresenting {
 
 protocol PaymentMethodsViewOutput: ActionTextDialogDelegate {
     func setupView()
+    func viewDidAppear()
     func didSelectViewModel(_ viewModel: PaymentMethodViewModel, at indexPath: IndexPath)
     func logoutDidPress(at indexPath: IndexPath)
 }

YandexCheckoutPayments/Modules/PaymentMethods/Presenter/PaymentMethodsPresenter.swift

@@ -27,7 +27,9 @@ extension PaymentMethodsPresenter: PaymentMethodsViewOutput {
         view.showActivity()
         view.setLogoVisible(isLogoVisible)
         view.setPlaceholderViewButtonTitle(§Localized.PlaceholderView.buttonTitle)
+    }
 
+    func viewDidAppear() {
         DispatchQueue.global().async { [weak self] in
             self?.interactor.fetchPaymentMethods()
         }

YandexCheckoutPayments/Modules/PaymentMethods/View/PaymentMethodsViewController.swift

@@ -94,6 +94,11 @@ final class PaymentMethodsViewController: UIViewController, PlaceholderProvider
         output.setupView()
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        output.viewDidAppear()
+    }
+
     private func loadSubviews() {
         titleView.contentView.addSubview(headerView)
 

YandexCheckoutPayments/Modules/Tokenization/Assembly/TokenizationAssembly.swift

@@ -33,17 +33,6 @@ public enum TokenizationAssembly {
                                                 clientApplicationKey: inputData.clientApplicationKey,
                                                 amount: inputData.amount)
 
-        let paymentMethodsModuleInputData
-            = PaymentMethodsModuleInputData(clientApplicationKey: inputData.clientApplicationKey,
-                                            gatewayId: inputData.gatewayId,
-                                            amount: inputData.amount,
-                                            tokenizationSettings: inputData.tokenizationSettings,
-                                            testModeSettings: inputData.testModeSettings,
-                                            isLoggingEnabled: inputData.isLoggingEnabled)
-
-        let paymentMethods = PaymentMethodsAssembly.makeModule(inputData: paymentMethodsModuleInputData,
-                                                               moduleOutput: presenter)
-
         viewController.output = presenter
         viewController.transitioningDelegate = router
         viewController.modalPresentationStyle = .custom
@@ -56,8 +45,6 @@ public enum TokenizationAssembly {
 
         router.transitionHandler = viewController
 
-        viewController.show(paymentMethods, sender: nil)
-
         return viewController
     }
 }

YandexCheckoutPayments/Modules/Tokenization/Presenter/TokenizationPresenter.swift

@@ -270,6 +270,7 @@ extension TokenizationPresenter: TokenizationViewOutput {
 
     func setupView() {
         interactor.startAnalyticsService()
+        presentPaymentMethodsModule()
     }
 }
 

YandexCheckoutPayments/Modules/Tokenization/View/TokenizationViewController.swift

@@ -33,12 +33,6 @@ class TokenizationViewController: UIViewController {
 
     private var containerConstraints: [NSLayoutConstraint] = []
 
-    // MARK: - Managing Child View Controllers in a Custom Container
-
-    override var shouldAutomaticallyForwardAppearanceMethods: Bool {
-        return false
-    }
-
     // MARK: - Configuring the View Rotation Settings
 
     override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
@@ -257,8 +251,6 @@ class TokenizationViewController: UIViewController {
         view.addSubview(actionSheetTemplate.view)
         actionSheetTemplate.dummyView.addSubview(vc.view)
 
-        actionSheetTemplate.beginAppearanceTransition(true, animated: false)
-
         actionSheetTemplate.view.translatesAutoresizingMaskIntoConstraints = false
         vc.view.translatesAutoresizingMaskIntoConstraints = false
 
@@ -283,8 +275,6 @@ class TokenizationViewController: UIViewController {
         actionSheetTemplate.didMove(toParent: self)
         vc.didMove(toParent: actionSheetTemplate)
 
-        actionSheetTemplate.endAppearanceTransition()
-
         appendIfNeeded(vc)
         self.actionSheetTemplate = actionSheetTemplate
     }
@@ -301,8 +291,6 @@ class TokenizationViewController: UIViewController {
         vc.view.translatesAutoresizingMaskIntoConstraints = false
         modalTemplate.setContentView(vc.view)
 
-        modalTemplate.beginAppearanceTransition(true, animated: true)
-
         let modalTemplateConstraints = [
             view.leading.constraint(equalTo: modalTemplate.view.leading),
             view.trailing.constraint(equalTo: modalTemplate.view.trailing),
@@ -318,8 +306,6 @@ class TokenizationViewController: UIViewController {
         modalTemplate.didMove(toParent: self)
         vc.didMove(toParent: modalTemplate)
 
-        modalTemplate.endAppearanceTransition()
-
         let hasNavigationBar = (vc as? Presentable)?.hasNavigationBar ?? true
         modalTemplate.setNavigationBarHidden(hasNavigationBar == false, animated: false)
         modalTemplate.setNavigationItems(modules.map { $0.navigationItem }, animated: false)
@@ -382,20 +368,15 @@ class TokenizationViewController: UIViewController {
     private func hideContainer(_ vc: UIViewController) {
         vc.willMove(toParent: nil)
 
-        vc.beginAppearanceTransition(false, animated: false)
-
         containerConstraints = []
 
         vc.view.removeFromSuperview()
         vc.removeFromParent()
-
-        vc.endAppearanceTransition()
     }
 
     // MARK: - Hide view controller animated
 
     private func hideAnimated(actionSheet: ActionSheetTemplate, completion: (() -> Void)? = nil) {
-        actionSheet.beginAppearanceTransition(false, animated: true)
         actionSheet.willMove(toParent: nil)
 
         NSLayoutConstraint.deactivate(containerConstraints)
@@ -413,7 +394,6 @@ class TokenizationViewController: UIViewController {
                            self.view.layoutIfNeeded()
                        },
                        completion: { _ in
-                           actionSheet.endAppearanceTransition()
                            actionSheet.view.removeFromSuperview()
                            actionSheet.removeFromParent()
                            self.actionSheetTemplate = nil
@@ -422,7 +402,6 @@ class TokenizationViewController: UIViewController {
     }
 
     private func hideAnimated(pageSheet: PageSheetTemplate, completion: (() -> Void)? = nil) {
-        pageSheet.beginAppearanceTransition(false, animated: true)
         pageSheet.willMove(toParent: nil)
         NSLayoutConstraint.deactivate(containerConstraints)
 
@@ -439,7 +418,6 @@ class TokenizationViewController: UIViewController {
                            self.view.layoutIfNeeded()
                        },
                        completion: { _ in
-                           pageSheet.endAppearanceTransition()
                            pageSheet.view.removeFromSuperview()
                            pageSheet.removeFromParent()
                            self.pageSheetTemplate = nil
@@ -448,7 +426,6 @@ class TokenizationViewController: UIViewController {
     }
 
     private func hideAnimated(modalTemplate: ModalTemplate, completion: (() -> Void)? = nil) {
-        modalTemplate.beginAppearanceTransition(false, animated: true)
         modalTemplate.willMove(toParent: nil)
         NSLayoutConstraint.deactivate(containerConstraints)
 
@@ -465,7 +442,6 @@ class TokenizationViewController: UIViewController {
                            self.view.layoutIfNeeded()
                        },
                        completion: { _ in
-                           modalTemplate.endAppearanceTransition()
                            modalTemplate.view.removeFromSuperview()
                            modalTemplate.removeFromParent()
                            self.modalTemplate = nil
@@ -489,8 +465,6 @@ class TokenizationViewController: UIViewController {
         modalTemplate.addChild(vc)
         modalTemplate.setContentView(vc.view)
 
-        modalTemplate.beginAppearanceTransition(true, animated: true)
-
         let startConstraints = [
             modalTemplate.view.leading.constraint(equalTo: view.leading),
             modalTemplate.view.top.constraint(equalTo: view.bottom),
@@ -523,8 +497,6 @@ class TokenizationViewController: UIViewController {
                            modalTemplate.didMove(toParent: self)
                            vc.didMove(toParent: modalTemplate)
 
-                           modalTemplate.endAppearanceTransition()
-
                            self.modalTemplate = modalTemplate
                            completion?()
                        })
@@ -542,8 +514,6 @@ class TokenizationViewController: UIViewController {
         vc.view.translatesAutoresizingMaskIntoConstraints = false
         pageSheet.setContentView(vc.view)
 
-        pageSheet.beginAppearanceTransition(true, animated: true)
-
         let startConstraints = [
             pageSheet.view.leading.constraint(equalTo: view.leading),
             pageSheet.view.top.constraint(equalTo: view.bottom),
@@ -576,8 +546,6 @@ class TokenizationViewController: UIViewController {
                            pageSheet.didMove(toParent: self)
                            vc.didMove(toParent: pageSheet)
 
-                           pageSheet.endAppearanceTransition()
-
                            vc.removeKeyboardObservers()
 
                            self.pageSheetTemplate = pageSheet
@@ -595,8 +563,6 @@ class TokenizationViewController: UIViewController {
         actionSheetTemplate.addChild(vc)
         vc.didMove(toParent: actionSheetTemplate)
 
-        actionSheetTemplate.beginAppearanceTransition(true, animated: true)
-
         view.addSubview(actionSheetTemplate.view)
         actionSheetTemplate.dummyView.addSubview(vc.view)
 
@@ -638,9 +604,6 @@ class TokenizationViewController: UIViewController {
                        },
                        completion: { _ in
                            actionSheetTemplate.didMove(toParent: self)
-
-                           actionSheetTemplate.endAppearanceTransition()
-
                            completion?()
                        })
 

YandexCheckoutPayments/Modules/YandexAuth/Presenter/YandexAuthPresenter.swift

@@ -31,6 +31,7 @@ extension YandexAuthPresenter: PaymentMethodsViewOutput {
         }
     }
 
+    func viewDidAppear() {}
     func didSelectViewModel(_ viewModel: PaymentMethodViewModel, at indexPath: IndexPath) {}
     func logoutDidPress(at indexPath: IndexPath) {}
 }