ServiceTermsModal: Setup all the plumbery for the "Decline" button

Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenCoordinator.swift

@@ -66,7 +66,11 @@ extension ServiceTermsModalScreenCoordinator: ServiceTermsModalScreenViewModelCo
     func serviceTermsModalScreenViewModel(_ coordinator: ServiceTermsModalScreenViewModelType, displayPolicy policy: MXLoginPolicyData) {
         self.delegate?.serviceTermsModalScreenCoordinator(self, displayPolicy: policy)
     }
-    
+
+    func serviceTermsModalScreenViewModelDidDecline(_ viewModel: ServiceTermsModalScreenViewModelType) {
+        self.delegate?.serviceTermsModalScreenCoordinatorDidDecline(self)
+    }
+
     func serviceTermsModalScreenViewModelDidCancel(_ viewModel: ServiceTermsModalScreenViewModelType) {
         self.delegate?.serviceTermsModalScreenCoordinatorDidCancel(self)
     }

Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenCoordinatorType.swift

@@ -21,6 +21,7 @@ import Foundation
 protocol ServiceTermsModalScreenCoordinatorDelegate: class {
     func serviceTermsModalScreenCoordinatorDidAccept(_ coordinator: ServiceTermsModalScreenCoordinatorType)
     func serviceTermsModalScreenCoordinator(_ coordinator: ServiceTermsModalScreenCoordinatorType, displayPolicy policy: MXLoginPolicyData)
+    func serviceTermsModalScreenCoordinatorDidDecline(_ coordinator: ServiceTermsModalScreenCoordinatorType)
     func serviceTermsModalScreenCoordinatorDidCancel(_ coordinator: ServiceTermsModalScreenCoordinatorType)
 }
 

Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewAction.swift

@@ -23,5 +23,6 @@ enum ServiceTermsModalScreenViewAction {
     case load
     case display(MXLoginPolicyData)
     case accept
+    case decline
     case cancel
 }

Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.storyboard

@@ -61,6 +61,9 @@
                                                                 <state key="normal" title="Decline">
                                                                     <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                                 </state>
+                                                                <connections>
+                                                                    <action selector="declineButtonAction:" destination="V8j-Lb-PgC" eventType="touchUpInside" id="MTU-9k-8yo"/>
+                                                                </connections>
                                                             </button>
                                                         </subviews>
                                                     </stackView>

Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.swift

@@ -211,6 +211,10 @@ final class ServiceTermsModalScreenViewController: UIViewController {
         self.viewModel.process(viewAction: .accept)
     }
 
+    @IBAction private func declineButtonAction(_ sender: Any) {
+        self.viewModel.process(viewAction: .decline)
+    }
+    
     private func cancelButtonAction() {
         self.viewModel.process(viewAction: .cancel)
     }

Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewModel.swift

@@ -61,6 +61,8 @@ final class ServiceTermsModalScreenViewModel: ServiceTermsModalScreenViewModelTy
             self.coordinatorDelegate?.serviceTermsModalScreenViewModel(self, displayPolicy: policy)
         case .accept:
             self.acceptTerms()
+        case .decline:
+            self.coordinatorDelegate?.serviceTermsModalScreenViewModelDidDecline(self)
         case .cancel:
             self.coordinatorDelegate?.serviceTermsModalScreenViewModelDidCancel(self)
         }

Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewModelType.swift

@@ -25,6 +25,7 @@ protocol ServiceTermsModalScreenViewModelViewDelegate: class {
 protocol ServiceTermsModalScreenViewModelCoordinatorDelegate: class {
     func serviceTermsModalScreenViewModel(_ coordinator: ServiceTermsModalScreenViewModelType, displayPolicy policy: MXLoginPolicyData)
     func serviceTermsModalScreenViewModelDidAccept(_ viewModel: ServiceTermsModalScreenViewModelType)
+    func serviceTermsModalScreenViewModelDidDecline(_ viewModel: ServiceTermsModalScreenViewModelType)
     func serviceTermsModalScreenViewModelDidCancel(_ viewModel: ServiceTermsModalScreenViewModelType)
 }
 

Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinator.swift

@@ -100,6 +100,10 @@ extension ServiceTermsModalCoordinator: ServiceTermsModalScreenCoordinatorDelega
         self.showPolicy(policy: policy)
     }
 
+    func serviceTermsModalScreenCoordinatorDidDecline(_ coordinator: ServiceTermsModalScreenCoordinatorType) {
+        self.delegate?.serviceTermsModalCoordinatorDidDecline(self)
+    }
+
     func serviceTermsModalScreenCoordinatorDidCancel(_ coordinator: ServiceTermsModalScreenCoordinatorType) {
         self.delegate?.serviceTermsModalCoordinatorDidCancel(self)
     }

Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift

@@ -20,6 +20,7 @@ import Foundation
 
 @objc protocol ServiceTermsModalCoordinatorBridgePresenterDelegate {
     func serviceTermsModalCoordinatorBridgePresenterDelegateDidAccept(_ coordinatorBridgePresenter: ServiceTermsModalCoordinatorBridgePresenter)
+    func serviceTermsModalCoordinatorBridgePresenterDelegateDidDecline(_ coordinatorBridgePresenter: ServiceTermsModalCoordinatorBridgePresenter, session: MXSession)
     func serviceTermsModalCoordinatorBridgePresenterDelegateDidCancel(_ coordinatorBridgePresenter: ServiceTermsModalCoordinatorBridgePresenter)
 }
 
@@ -99,6 +100,10 @@ extension ServiceTermsModalCoordinatorBridgePresenter: ServiceTermsModalCoordina
         self.delegate?.serviceTermsModalCoordinatorBridgePresenterDelegateDidAccept(self)
     }
 
+    func serviceTermsModalCoordinatorDidDecline(_ coordinator: ServiceTermsModalCoordinatorType) {
+        self.delegate?.serviceTermsModalCoordinatorBridgePresenterDelegateDidDecline(self, session: self.session)
+    }
+
     func serviceTermsModalCoordinatorDidCancel(_ coordinator: ServiceTermsModalCoordinatorType) {
         self.delegate?.serviceTermsModalCoordinatorBridgePresenterDelegateDidCancel(self)
     }

Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorType.swift

@@ -20,6 +20,7 @@ import Foundation
 
 protocol ServiceTermsModalCoordinatorDelegate: class {
     func serviceTermsModalCoordinatorDidAccept(_ coordinator: ServiceTermsModalCoordinatorType)
+    func serviceTermsModalCoordinatorDidDecline(_ coordinator: ServiceTermsModalCoordinatorType)
     func serviceTermsModalCoordinatorDidCancel(_ coordinator: ServiceTermsModalCoordinatorType)
 }