Adaptive reactions for exam application

ExamEGERussian/Sources/CoreLayer/Graph/Base/Vertex.swift

@@ -21,7 +21,7 @@ extension Vertex: Hashable {
         return "\(id)".hashValue
     }
 
-    static public func == (lhs: Vertex, rhs: Vertex) -> Bool {
+    public static func == (lhs: Vertex, rhs: Vertex) -> Bool {
         return lhs.id == rhs.id
     }
 }

ExamEGERussian/Sources/Model/Builders/Controllers/QuizViewControllerBuilder.swift

@@ -12,6 +12,7 @@ final class QuizViewControllerBuilder {
     private(set) weak var logoutable: Logoutable?
     private(set) var stepType: StepPlainObject.StepType?
     private(set) var needNewAttempt = false
+    private(set) var isSubmitButtonHidden = false
 
     func setStepType(_ stepType: StepPlainObject.StepType) -> QuizViewControllerBuilder {
         self.stepType = stepType
@@ -28,6 +29,11 @@ final class QuizViewControllerBuilder {
         return self
     }
 
+    func setSubmitButtonHidden(_ isSubmitButtonHidden: Bool) -> QuizViewControllerBuilder {
+        self.isSubmitButtonHidden = isSubmitButtonHidden
+        return self
+    }
+
     func build() -> QuizViewController? {
         guard let stepType = stepType else {
             return nil

ExamEGERussian/Sources/Model/PlainObjects/StepPlainObject.swift

@@ -16,7 +16,11 @@ struct StepPlainObject {
     let text: String
     let type: StepType
     let progressId: String?
-    var isPassed = false
+    var state: Progress = .default
+
+    var isPassed: Bool {
+        return state == .successful
+    }
 
     var image: UIImage {
         switch type {
@@ -31,6 +35,10 @@ struct StepPlainObject {
         }
     }
 
+    mutating func setPassed(_ passed: Bool) {
+        state = passed ? .successful : .unsolved
+    }
+
     // MARK: Types
 
     enum StepType: String {
@@ -50,4 +58,33 @@ struct StepPlainObject {
         case dataset
         case admin
     }
+
+    enum Progress {
+        case successful
+        case unsolved
+        case wrong
+
+        static var `default`: Progress {
+            return .unsolved
+        }
+    }
+}
+
+extension StepPlainObject {
+    init(id: Int,
+         lessonId: Int,
+         position: Int,
+         text: String,
+         type: StepType,
+         progressId: String?,
+         isPassed: Bool = false
+    ) {
+        self.id = id
+        self.lessonId = lessonId
+        self.position = position
+        self.text = text
+        self.type = type
+        self.progressId = progressId
+        setPassed(isPassed)
+    }
 }

ExamEGERussian/Sources/PresentationLayer/Steps/Adaptive/Presenter/AdaptiveStepsPresenter.swift

@@ -21,8 +21,12 @@ final class AdaptiveStepsPresenter: AdaptiveStepsPresenterProtocol {
     private let courseService: CourseService
     private let viewsService: ViewsServiceProtocol
 
-    private var stepViewController: UIViewController?
+    private var currentStepViewController: UIViewController?
+    private var currentStepPresenter: StepPresenter?
     private var currentStep: StepPlainObject?
+    private var currentStepProgress: StepPlainObject.Progress {
+        return currentStep?.state ?? .default
+    }
 
     private var cachedRecommendedLessons = [LessonPlainObject]()
     private static let recommendationsBatchSize = 6
@@ -47,17 +51,73 @@ final class AdaptiveStepsPresenter: AdaptiveStepsPresenterProtocol {
         self.viewsService = viewsService
     }
 
+    // MARK: - Public API
+
     func refresh() {
+        currentStep = nil
+
+        updateView()
         startRecommendationsPipeline()
     }
 
-    private func sendReaction(_ reaction: Reaction) -> Promise<Void> {
+    func submit() {
+        view?.state = .fetching
+
+        switch currentStepProgress {
+        case .unsolved:
+            currentStepPresenter?.submit()
+        case .wrong:
+            currentStepPresenter?.retry()
+        case .successful:
+            showNextTask()
+        }
+    }
+
+    func sendHardReaction() {
+        sendReaction(.maybeLater)
+    }
+
+    func sendEasyReaction() {
+        sendReaction(.neverAgain)
+    }
+
+    // MARK: - Private API
+
+    private func updateView() {
+        view?.state = .idle
+
+        switch currentStepProgress {
+        case .unsolved:
+            view?.updateSubmitButtonTitle(NSLocalizedString("AdaptiveControlButtonSubmit", comment: ""))
+        case .wrong:
+            view?.updateSubmitButtonTitle(NSLocalizedString("AdaptiveControlButtonTryAgain", comment: ""))
+        case .successful:
+            view?.updateSubmitButtonTitle(NSLocalizedString("AdaptiveControlButtonNextTask", comment: ""))
+        }
+    }
+
+    private func showNextTask() {
+        refresh()
+    }
+
+    private func sendReaction(_ reaction: Reaction) {
         guard let lessonId = currentStep?.lessonId,
               let user = AuthInfo.shared.user else {
-            return Promise(error: AdaptiveStepsError.reactionNotSent)
+            return
         }
 
-        return reactionService.sendReaction(reaction, forLesson: lessonId, byUser: user.id)
+        view?.state = .fetching
+
+        reactionService.sendReaction(reaction, forLesson: lessonId, byUser: user.id).done {
+            if reaction == .solved {
+                self.view?.state = .idle
+            } else {
+                self.showNextTask()
+            }
+        }.catch { error in
+            print("\(#function): error: \(error)")
+            self.view?.state = .connectionError
+        }
     }
 
     // MARK: - Types
@@ -184,19 +244,28 @@ extension AdaptiveStepsPresenter {
 
 extension AdaptiveStepsPresenter {
     private func showStepViewController(for step: StepPlainObject, lesson: LessonPlainObject) {
-        let newStepViewController = buildStepViewController(for: step, lesson: lesson)
-        if let stepViewController = stepViewController {
-            view?.removeContentController(stepViewController)
+        if self.currentStepViewController != nil {
+            view?.removeContentController(self.currentStepViewController!)
         }
 
-        stepViewController = newStepViewController
-        view?.addContentController(newStepViewController)
+        let stepViewController = buildStepViewController(for: step, lesson: lesson)
+        self.currentStepViewController = stepViewController
+        self.currentStepPresenter = stepViewController.presenter
+
+        view?.addContentController(stepViewController)
         view?.updateTitle(lesson.title)
     }
 
-    private func buildStepViewController(for step: StepPlainObject, lesson: LessonPlainObject) -> UIViewController {
-        let builder = QuizViewControllerBuilder().setNeedNewAttempt(true)
-        let seed = StepModuleSeed(lesson: lesson, step: step, quizViewControllerBuilder: builder, stepPresenterDelegate: self)
+    private func buildStepViewController(for step: StepPlainObject, lesson: LessonPlainObject) -> StepViewController {
+        let builder = QuizViewControllerBuilder()
+            .setNeedNewAttempt(true)
+            .setSubmitButtonHidden(true)
+        let seed = StepModuleSeed(
+            lesson: lesson,
+            step: step,
+            quizViewControllerBuilder: builder,
+            stepPresenterDelegate: self
+        )
 
         return stepAssembly.module(seed: seed)
     }
@@ -206,12 +275,18 @@ extension AdaptiveStepsPresenter {
 
 extension AdaptiveStepsPresenter: StepPresenterDelegate {
     func stepPresenterSubmissionDidCorrect(_ stepPresenter: StepPresenter) {
-        currentStep?.isPassed = true
+        currentStep?.state = .successful
+        updateView()
+        sendReaction(.solved)
+    }
 
-        sendReaction(.solved).done {
-            self.refresh()
-        }.catch { error in
-            print("\(#function): error: \(error)")
-        }
+    func stepPresenterSubmissionDidWrong(_ stepPresenter: StepPresenter) {
+        currentStep?.state = .wrong
+        updateView()
+    }
+
+    func stepPresenterSubmissionDidRetry(_ stepPresenter: StepPresenter) {
+        currentStep?.state = .unsolved
+        updateView()
     }
 }

ExamEGERussian/Sources/PresentationLayer/Steps/Adaptive/Presenter/AdaptiveStepsPresenterProtocol.swift

@@ -10,4 +10,7 @@ import Foundation
 
 protocol AdaptiveStepsPresenterProtocol: class {
     func refresh()
+    func submit()
+    func sendHardReaction()
+    func sendEasyReaction()
 }

ExamEGERussian/Sources/PresentationLayer/Steps/Adaptive/View/AdaptiveStepsView.swift

@@ -22,4 +22,5 @@ protocol AdaptiveStepsView: class {
     func removeContentController(_ controller: UIViewController)
 
     func updateTitle(_ title: String)
+    func updateSubmitButtonTitle(_ title: String)
 }

ExamEGERussian/Sources/PresentationLayer/Steps/Adaptive/View/AdaptiveStepsViewController.swift

@@ -19,15 +19,19 @@ final class AdaptiveStepsViewController: UIViewController, ControllerWithStepikP
             case .idle:
                 SVProgressHUD.dismiss()
                 isPlaceholderShown = false
+                setToolbarItemsEnabled(true)
             case .fetching:
                 SVProgressHUD.show()
                 isPlaceholderShown = false
+                setToolbarItemsEnabled(false)
             case .coursePassed:
                 SVProgressHUD.dismiss()
                 showPlaceholder(for: .adaptiveCoursePassed)
+                setToolbarItemsEnabled(false)
             case .connectionError:
                 SVProgressHUD.dismiss()
                 showPlaceholder(for: .connectionError)
+                setToolbarItemsEnabled(false)
             }
         }
     }
@@ -36,21 +40,73 @@ final class AdaptiveStepsViewController: UIViewController, ControllerWithStepikP
 
     private weak var stepView: UIView?
 
+    private lazy var hardBarButtonItem: UIBarButtonItem = {
+        UIBarButtonItem(title: NSLocalizedString("AdaptiveHardReaction", comment: ""), style: .plain,
+                        target: self, action: #selector(onHardClick(_:)))
+    }()
+    private lazy var easyBarButtonItem: UIBarButtonItem = {
+        UIBarButtonItem(title: NSLocalizedString("AdaptiveEasyReaction", comment: ""), style: .plain,
+                        target: self, action: #selector(onEasyClick(_:)))
+    }()
+
+    private lazy var submitBarButtonItem: UIBarButtonItem = {
+        UIBarButtonItem(title: NSLocalizedString("Submit", comment: ""), style: .plain,
+                        target: self, action: #selector(onSubmitClick(_:)))
+    }()
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
         setup()
         presenter?.refresh()
     }
 
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        navigationController?.setToolbarHidden(false, animated: animated)
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        navigationController?.setToolbarHidden(true, animated: animated)
+    }
+
+    // MARK: - Private API
+
     private func setup() {
         view.backgroundColor = .white
 
+        let spacer = UIBarButtonItem(barButtonSystemItem: .flexibleSpace,
+                                     target: self, action: nil)
+        toolbarItems = [hardBarButtonItem, spacer, submitBarButtonItem, spacer,
+                        easyBarButtonItem]
+
         registerPlaceholder(placeholder: StepikPlaceholder(.noConnectionQuiz, action: { [weak self] in
             self?.presenter?.refresh()
         }), for: .connectionError)
         registerPlaceholder(placeholder: StepikPlaceholder(.adaptiveCoursePassed), for: .adaptiveCoursePassed)
     }
+
+    private func setToolbarItemsEnabled(_ enabled: Bool) {
+        toolbarItems?.forEach {
+            $0.isEnabled = enabled
+        }
+    }
+
+    @objc
+    private func onHardClick(_ sender: Any) {
+        presenter?.sendHardReaction()
+    }
+
+    @objc
+    private func onSubmitClick(_ sender: Any) {
+        presenter?.submit()
+    }
+
+    @objc
+    private func onEasyClick(_ sender: Any) {
+        presenter?.sendEasyReaction()
+    }
 }
 
 // MARK: - AdaptiveStepViewController: AdaptiveStepView -
@@ -77,4 +133,8 @@ extension AdaptiveStepsViewController: AdaptiveStepsView {
     func updateTitle(_ title: String) {
         self.title = title
     }
+
+    func updateSubmitButtonTitle(_ title: String) {
+        submitBarButtonItem.title = title
+    }
 }

ExamEGERussian/Sources/PresentationLayer/Steps/Standart/Pager/Presenter/StepsPagerPresenterImpl.swift

@@ -137,7 +137,7 @@ extension StepsPagerPresenterImpl: StepPresenterDelegate {
     // MARK: Private Helpers
 
     private func updateStepProgress(at index: Int, passed: Bool) {
-        steps[index].isPassed = passed
+        steps[index].setPassed(passed)
         view?.setTabSelected(passed, at: index)
     }
 }

ExamEGERussian/Sources/PresentationLayer/Steps/Standart/Step/Assembly/StepAssembly.swift

@@ -6,7 +6,7 @@
 import Foundation
 
 protocol StepAssembly: class {
-    func module(seed: StepModuleSeed) -> UIViewController
+    func module(seed: StepModuleSeed) -> StepViewController
 }
 
 class StepModuleSeed {

ExamEGERussian/Sources/PresentationLayer/Steps/Standart/Step/Assembly/StepAssemblyImpl.swift

@@ -6,7 +6,7 @@
 import Foundation
 
 final class StepAssemblyImpl: BaseAssembly, StepAssembly {
-    func module(seed: StepModuleSeed) -> UIViewController {
+    func module(seed: StepModuleSeed) -> StepViewController {
         let controller = StepViewController()
         let router = StepRouter(viewController: controller, authAssembly: assemblyFactory.authAssembly)