Code quiz & fullscreen

Podfile.lock

@@ -348,4 +348,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 0c6f3046cd7795142e613d85d7621ac20ce19346
 
-COCOAPODS: 1.7.4
+COCOAPODS: 1.7.5

Stepic/AlamofireRequestsLogger.swift

@@ -50,7 +50,7 @@ final class AlamofireRequestsLogger {
 
         if let httpBody = request.httpBody,
            let httpBodyString = String(data: httpBody, encoding: .utf8) {
-            print(httpBodyString)
+            print("Body: \(httpBodyString)")
         }
     }
 }

Stepic/CodeEditorPreferencesContainer.swift

@@ -19,8 +19,8 @@ class CodeEditorPreferencesContainer {
             if let value = defaults.value(forKey: themeKey) as? String {
                 return value
             } else {
-                self.theme = "androidstudio"
-                return "androidstudio"
+                self.theme = "xcode"
+                return "xcode"
             }
         }
 

Stepic/CodeEditorSettingsPresenter.swift

@@ -17,7 +17,7 @@ protocol CodeEditorSettingsView: class {
     func updatePreview(fontSize: Int)
 }
 
-class CodeEditorSettingsPresenter {
+final class CodeEditorSettingsPresenter {
     weak var view: CodeEditorSettingsView?
 
     var themeBlock: TransitionMenuBlock?
@@ -34,12 +34,16 @@ class CodeEditorSettingsPresenter {
         PreferencesContainer.codeEditor.theme = newTheme
         themeBlock?.subtitle = String(format: NSLocalizedString("CodeEditorCurrentTheme", comment: ""), newTheme)
         view?.updatePreview(theme: newTheme)
+
+        NotificationCenter.default.post(name: .codeEditorThemeDidChange, object: nil)
     }
 
     func updateFontSize(with newSize: Int) {
         PreferencesContainer.codeEditor.fontSize = newSize
         fontSizeBlock?.subtitle = String(format: NSLocalizedString("CodeEditorCurrentFontSize", comment: ""), "\(newSize)")
         view?.updatePreview(fontSize: newSize)
+
+        NotificationCenter.default.post(name: .codeEditorThemeDidChange, object: nil)
     }
 
     private func buildSettingsMenu() -> Menu {
@@ -87,3 +91,7 @@ class CodeEditorSettingsPresenter {
         return fontSizeBlock!
     }
 }
+
+extension NSNotification.Name {
+    static let codeEditorThemeDidChange = NSNotification.Name("codeEditorThemeDidChange")
+}

Stepic/CodeEditorSettingsViewController.swift

@@ -5,48 +5,116 @@
 //  Created by Vladislav Kiryukhin on 11.04.18.
 //  Copyright © 2018 Alex Karpov. All rights reserved.
 //
-import UIKit
+
 import ActionSheetPicker_3_0
+import UIKit
+
+@available(*, deprecated, message: "Class to initialize code editor settings w/o storyboards logic")
+final class CodeEditorSettingsLegacyAssembly: Assembly {
+    private let previewLanguage: CodeLanguage
+
+    init(previewLanguage: CodeLanguage = .python) {
+        self.previewLanguage = previewLanguage
+    }
+
+    func makeModule() -> UIViewController {
+        guard let viewController = ControllerHelper.instantiateViewController(
+            identifier: "CodeEditorSettings",
+            storyboardName: "Profile"
+        ) as? CodeEditorSettingsViewController else {
+            fatalError("Failed to initialize CodeEditorSettingsViewController")
+        }
+
+        let presenter = CodeEditorSettingsPresenter(view: viewController)
+        viewController.presenter = presenter
+        viewController.previewLanguage = self.previewLanguage
 
-class CodeEditorSettingsViewController: MenuViewController, CodeEditorSettingsView {
+        return viewController
+    }
+}
+
+final class CodeEditorSettingsViewController: MenuViewController {
     var presenter: CodeEditorSettingsPresenter?
-    var previewView: CodeEditorPreviewView!
     var previewLanguage = CodeLanguage.python
 
+    private lazy var previewView: CodeEditorPreviewView = {
+        let previewView = CodeEditorPreviewView()
+        previewView.delegate = self
+        return previewView
+    }()
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        edgesForExtendedLayout = []
-
-        previewView = CodeEditorPreviewView()
-        previewView.delegate = self
-        tableView.tableHeaderView = previewView
-        layoutTableHeaderView()
+        self.edgesForExtendedLayout = []
+        self.tableView.tableHeaderView = self.previewView
 
-        presenter = CodeEditorSettingsPresenter(view: self)
+        self.layoutTableHeaderView()
     }
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        previewView.setupPreview(with: PreferencesContainer.codeEditor.theme, fontSize: PreferencesContainer.codeEditor.fontSize, language: previewLanguage)
+
+        // TODO: Add injection for theme.
+        self.previewView.setupPreview(
+            with: PreferencesContainer.codeEditor.theme,
+            fontSize: PreferencesContainer.codeEditor.fontSize,
+            language: self.previewLanguage
+        )
+    }
+
+    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+        super.viewWillTransition(to: size, with: coordinator)
+        self.layoutTableHeaderView()
+    }
+
+    private func layoutTableHeaderView() {
+        guard let tableHeaderView = self.tableView.tableHeaderView else {
+            return
+        }
+
+        tableHeaderView.translatesAutoresizingMaskIntoConstraints = false
+
+        let headerWidth = tableHeaderView.bounds.size.width
+        let widthConstraint = tableHeaderView.widthAnchor.constraint(equalToConstant: headerWidth)
+        widthConstraint.isActive = true
+
+        tableHeaderView.setNeedsLayout()
+        tableHeaderView.layoutIfNeeded()
+
+        var frame = tableHeaderView.frame
+        frame.size.height = tableHeaderView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize).height
+        tableHeaderView.frame = frame
+
+        tableHeaderView.removeConstraint(widthConstraint)
+        tableHeaderView.translatesAutoresizingMaskIntoConstraints = true
+        self.tableView.tableHeaderView = tableHeaderView
+    }
+}
+
+extension CodeEditorSettingsViewController: CodeEditorSettingsView {
+    func setMenu(menu: Menu) {
+        self.menu = menu
     }
 
     func chooseEditorTheme(current: String) {
-        guard let hl = previewView.highlightr,
-              let currentThemeIndex = hl.availableThemes().index(of: current) else {
+        guard let highlightr = self.previewView.highlightr,
+              let currentThemeIndex = highlightr.availableThemes().index(of: current) else {
             return
         }
 
-        ActionSheetStringPicker.show(withTitle: NSLocalizedString("CodeEditorTheme", comment: ""),
-            rows: hl.availableThemes(),
+        ActionSheetStringPicker.show(
+            withTitle: NSLocalizedString("CodeEditorTheme", comment: ""),
+            rows: highlightr.availableThemes(),
             initialSelection: currentThemeIndex,
-            doneBlock: { _, _, value in
+            doneBlock: { [weak self]  _, _, value in
                 if let value = value as? String {
-                    self.presenter?.updateTheme(with: value)
+                    self?.presenter?.updateTheme(with: value)
                 }
             },
             cancel: { _ in },
-            origin: previewView)
+            origin: self.previewView
+        )
     }
 
     func chooseFontSize(current: Int) {
@@ -56,72 +124,54 @@ class CodeEditorSettingsViewController: MenuViewController, CodeEditorSettingsVi
             return
         }
 
-        ActionSheetStringPicker.show(withTitle: NSLocalizedString("CodeEditorFontSize", comment: ""),
+        ActionSheetStringPicker.show(
+            withTitle: NSLocalizedString("CodeEditorFontSize", comment: ""),
             rows: availableSizes.map { "\($0)" },
             initialSelection: currentSizeIndex,
-            doneBlock: { _, _, value in
+            doneBlock: { [weak self] _, _, value in
                 if let value = value as? String, let intValue = Int(value) {
-                    self.presenter?.updateFontSize(with: intValue)
+                    self?.presenter?.updateFontSize(with: intValue)
                 }
             },
             cancel: { _ in },
-            origin: previewView)
+            origin: self.previewView
+        )
     }
 
     func updatePreview(theme: String) {
-        previewView?.updateTheme(with: theme)
+        self.previewView.updateTheme(with: theme)
     }
 
     func updatePreview(fontSize: Int) {
-        previewView?.updateFontSize(with: fontSize)
-    }
-
-    func setMenu(menu: Menu) {
-        self.menu = menu
-    }
-
-    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
-        super.viewWillTransition(to: size, with: coordinator)
-        layoutTableHeaderView()
-    }
-
-    func layoutTableHeaderView() {
-        guard let headerView = tableView.tableHeaderView else {
-            return
-        }
-        headerView.translatesAutoresizingMaskIntoConstraints = false
-
-        let headerWidth = headerView.bounds.size.width
-        let widthConstraint = headerView.widthAnchor.constraint(equalToConstant: headerWidth)
-        widthConstraint.isActive = true
-
-        headerView.setNeedsLayout()
-        headerView.layoutIfNeeded()
-
-        var frame = headerView.frame
-        frame.size.height = headerView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize).height
-        headerView.frame = frame
-
-        headerView.removeConstraint(widthConstraint)
-        headerView.translatesAutoresizingMaskIntoConstraints = true
-        tableView.tableHeaderView = headerView
+        self.previewView.updateFontSize(with: fontSize)
     }
 }
 
 extension CodeEditorSettingsViewController: CodeEditorPreviewViewDelegate {
     func languageButtonDidClick() {
-        let availableLanguages = Array(Set(CodeLanguage.allLanguages.map { $0.humanReadableName }))
+        let availableLanguages = Array(Set(CodeLanguage.allCases.map { $0.humanReadableName }))
 
-        ActionSheetStringPicker.show(withTitle: NSLocalizedString("CodeEditorLanguage", comment: ""),
+        guard let currentLanguageIndex = availableLanguages.index(of: self.previewLanguage.humanReadableName) else {
+            return
+        }
+
+        ActionSheetStringPicker.show(
+            withTitle: NSLocalizedString("CodeEditorLanguage", comment: ""),
             rows: availableLanguages,
-            initialSelection: availableLanguages.index(of: previewLanguage.humanReadableName)!,
-            doneBlock: { _, _, value in
+            initialSelection: currentLanguageIndex,
+            doneBlock: { [weak self] _, _, value in
+                guard let strongSelf = self else {
+                    return
+                }
+
                 if let value = value as? String {
-                    self.previewLanguage = CodeLanguage.allLanguages.first(where: { $0.humanReadableName == value }) ?? self.previewLanguage
-                    self.previewView.updateLanguage(with: self.previewLanguage)
+                    let newPreviewLanguage = CodeLanguage.allCases.first(where: { $0.humanReadableName == value })
+                    strongSelf.previewLanguage = newPreviewLanguage ?? strongSelf.previewLanguage
+                    strongSelf.previewView.updateLanguage(with: strongSelf.previewLanguage)
                 }
             },
             cancel: { _ in },
-            origin: previewView.languageButton)
+            origin: self.previewView.languageButton
+        )
     }
 }

Stepic/CodeLanguagePickerViewController.swift

@@ -28,20 +28,4 @@ class CodeLanguagePickerViewController: PickerViewController {
             picker.selectRow(start, inComponent: 0, animated: false)
         }
     }
-
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-
-    /*
-     // MARK: - Navigation
-
-     // In a storyboard-based application, you will often want to do a little preparation before navigation
-     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-     // Get the new view controller using segue.destinationViewController.
-     // Pass the selected object to the new view controller.
-     }
-     */
-
 }

Stepic/CodeLanguages.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-enum CodeLanguage: String {
+enum CodeLanguage: String, CaseIterable {
     case python = "python3"
     case cpp11 = "c++11"
     case cpp = "c++"
@@ -36,11 +36,7 @@ enum CodeLanguage: String {
     case pascal = "pascalabc"
     case perl = "perl"
     case sql = "sql"
-
-    static let allLanguages: [CodeLanguage] = [.python, .cpp11, .cpp, .c, .haskell, .haskell7,
-                               .haskell8, .java, .java8, .java9, .java11, .octave, .asm32, .asm64,
-                               .shell, .rust, .r, .ruby, .clojure, .cs, .javascript,
-                               .scala, .kotlin, .go, .pascal, .perl, .sql]
+    case swift = "swift"
 
     var highlightr: String {
         switch self {
@@ -82,6 +78,8 @@ enum CodeLanguage: String {
             return "perl"
         case .sql:
             return "sql"
+        case .swift:
+            return "swift"
         }
     }
 
@@ -125,6 +123,8 @@ enum CodeLanguage: String {
             return "Perl"
         case .sql:
             return "SQL"
+        case .swift:
+            return "Swift"
         }
     }
 
@@ -172,6 +172,8 @@ enum CodeLanguage: String {
             return "# comment\nprint \"Hello World!\\n\";"
         case .sql:
             return "# comment\n\nSELECT 'Hello World';"
+        case .swift:
+            return "// comment\nprint(\"Hello World!\")"
         }
     }
 }

Stepic/CodeLimit.swift

@@ -11,11 +11,14 @@ import CoreData
 import SwiftyJSON
 
 class CodeLimit: NSManagedObject {
-
     var language: CodeLanguage? {
         return CodeLanguage(rawValue: languageString)
     }
 
+    override var description: String {
+        return "CodeLimit(languageString: \(self.languageString), time: \(self.time), memory: \(self.memory)"
+    }
+
     convenience required init(language: String, json: JSON) {
         self.init()
         initialize(language: language, json: json)

Stepic/CodeLimitPlainObject.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+struct CodeLimitPlainObject {
+    let language: String?
+    let memory: Double
+    let time: TimeInterval
+}
+
+extension CodeLimitPlainObject {
+    init(codeLimit: CodeLimit) {
+        self.language = codeLimit.languageString
+        self.memory = codeLimit.memory
+        self.time = codeLimit.time
+    }
+}