Merge pull request #282 from StepicOrg/release/1.57

Release 1.57

.gitignore

@@ -40,3 +40,6 @@ Preview.html
 Carthage/Build
 
 .DS_Store
+
+# AppCode
+.idea/

Podfile

@@ -24,7 +24,7 @@ def all_pods
     pod 'SVProgressHUD'
     pod 'FLKAutoLayout', '1.0.1'
     pod 'TSMessages', :git => 'https://github.com/KrauseFx/TSMessages.git'
-    pod 'YandexMobileMetrica/Dynamic'
+    pod 'YandexMobileMetrica/Dynamic', '~> 3.0.0'
 
     pod 'FirebaseCore'
     pod 'FirebaseAppIndexing'
@@ -35,7 +35,10 @@ def all_pods
     pod 'Mixpanel-swift', '2.3.0'
 
     pod 'BEMCheckBox'
-    pod 'IQKeyboardManagerSwift'
+
+    # actual version - 6.x, we should test it before update
+    pod 'IQKeyboardManagerSwift', '~> 5.0'
+
     pod 'Kanna', '~> 4.0.0'
     pod 'CRToast', :git => 'https://github.com/cruffenach/CRToast.git', :branch => 'master'
     pod 'TUSafariActivity', '~> 1.0'
@@ -65,8 +68,11 @@ def testing_pods
     pod 'Nimble'
 end
 
+def main_pods
+    pod 'Appsee'
+end
+
 def adaptive_pods
-    pod 'Koloda', '4.3.1'
     pod 'SDWebImage/GIF'
     pod 'NotificationBannerSwift', '1.5.2' 
 end
@@ -77,6 +83,7 @@ target 'Stepic' do
     target 'StepicTests' do
         inherit! :search_paths
         all_pods
+        main_pods
         testing_pods
     end
 end
@@ -91,11 +98,6 @@ target 'StepikTV' do
     end
 end
 
-target 'SberbankUniversity' do 
-    platform :ios, '9.0'
-    all_pods
-end
-
 target 'Adaptive 1838' do
     platform :ios, '9.0'
     all_pods
@@ -126,6 +128,12 @@ target 'Adaptive 3124' do
     adaptive_pods
 end
 
+target 'Adaptive 8290' do
+    platform :ios, '9.0'
+    all_pods
+    adaptive_pods
+end
+
 target 'Adaptive 1838 Screenshots' do
     pod 'SimulatorStatusMagic', :configurations => ['Debug']
 end

Stepic.xcodeproj/xcshareddata/xcschemes/Adaptive 8290.xcscheme

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0920"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2CA8D1392088D9C000E105E9"
+               BuildableName = "Adaptive 8290.app"
+               BlueprintName = "Adaptive 8290"
+               ReferencedContainer = "container:Stepic.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2CA8D1392088D9C000E105E9"
+            BuildableName = "Adaptive 8290.app"
+            BlueprintName = "Adaptive 8290"
+            ReferencedContainer = "container:Stepic.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2CA8D1392088D9C000E105E9"
+            BuildableName = "Adaptive 8290.app"
+            BlueprintName = "Adaptive 8290"
+            ReferencedContainer = "container:Stepic.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2CA8D1392088D9C000E105E9"
+            BuildableName = "Adaptive 8290.app"
+            BlueprintName = "Adaptive 8290"
+            ReferencedContainer = "container:Stepic.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Stepic.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Stepic/APIEndpoint.swift

@@ -42,9 +42,7 @@ class APIEndpoint {
     var retrieve: RetrieveRequestMaker
 
     init() {
-        let configuration = URLSessionConfiguration.default
-        configuration.timeoutIntervalForRequest = 15
-        manager = Alamofire.SessionManager(configuration: configuration)
+        manager = Alamofire.SessionManager(configuration: StepikURLSessionConfiguration.default)
         let retrier = ApiRequestRetrier()
         manager.retrier = retrier
         manager.adapter = retrier

Stepic/AlamofireDefaultSessionManager.swift

@@ -0,0 +1,13 @@
+//
+//  AlamofireDefaultSessionManager.swift
+//  Stepic
+//
+//  Created by Vladislav Kiryukhin on 16.04.2018.
+//  Copyright © 2018 Alex Karpov. All rights reserved.
+//
+
+import Alamofire
+
+class AlamofireDefaultSessionManager: Alamofire.SessionManager {
+    static let shared = Alamofire.SessionManager(configuration: StepikURLSessionConfiguration.default)
+}

Stepic/AnalyticsHelper.swift

@@ -19,10 +19,13 @@ class AnalyticsHelper: NSObject {
 
     func setupAnalytics() {
         Fabric.with([Crashlytics.self])
+
         FirebaseApp.configure()
 
         Mixpanel.initialize(token: Tokens.shared.mixpanelToken)
 
-        YMMYandexMetrica.activate(withApiKey: Tokens.shared.appMetricaToken)
+        if let config = YMMYandexMetricaConfiguration(apiKey: Tokens.shared.appMetricaToken) {
+            YMMYandexMetrica.activate(with: config)
+        }
     }
 }

Stepic/ApiRequestRetrier.swift

@@ -13,6 +13,7 @@ class ApiRequestRetrier: RequestRetrier, RequestAdapter {
 
     func adapt(_ urlRequest: URLRequest) throws -> URLRequest {
         var urlRequest = urlRequest
+
         for (headerField, value) in AuthInfo.shared.initialHTTPHeaders {
             urlRequest.setValue(value, forHTTPHeaderField: headerField)
         }

Stepic/AttemptsAPI.swift

@@ -44,7 +44,7 @@ class AttemptsAPI: APIEndpoint {
             print("no user id!")
         }
 
-        return Alamofire.request("\(StepicApplicationsInfo.apiURL)/attempts", method: .get, parameters: params, encoding: URLEncoding.default, headers: headers).responseSwiftyJSON({
+        return manager.request("\(StepicApplicationsInfo.apiURL)/attempts", method: .get, parameters: params, encoding: URLEncoding.default, headers: headers).responseSwiftyJSON({
             response in
 
             var error = response.result.error

Stepic/AvatarImageView.swift

@@ -49,7 +49,7 @@ class AvatarImageView: UIImageView {
         if url.pathExtension != "svg" {
             self.sd_setImage(with: url, placeholderImage: self.image)
         } else {
-            Alamofire.request(url).responseData(completionHandler: { response in
+            AlamofireDefaultSessionManager.shared.request(url).responseData(completionHandler: { response in
                 if response.result.error != nil {
                     return
                 }

Stepic/BaseCardsStepsViewController.swift

@@ -25,6 +25,20 @@ class BaseCardsStepsViewController: CardsStepsViewController {
     var course: Course!
     var didJustSubscribe: Bool = false
 
+    override var state: CardsStepsViewState {
+        set {
+            super.state = newValue
+            if newValue != .normal {
+                bringElementsToFront()
+            } else {
+                sendElementsToBack()
+            }
+        }
+        get {
+            return super.state
+        }
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -38,12 +52,7 @@ class BaseCardsStepsViewController: CardsStepsViewController {
             view.insertSubview(padView, at: 0)
         }
 
-        trophyButton.layer.zPosition = kolodaView.layer.zPosition - 1
-        backButton.layer.zPosition = kolodaView.layer.zPosition - 1
-        statusBarPad?.layer.zPosition = kolodaView.layer.zPosition - 1
-        progressBar.layer.zPosition = kolodaView.layer.zPosition - 1
-        labelsStackView.layer.zPosition = kolodaView.layer.zPosition - 1
-        shadowView.layer.zPosition = kolodaView.layer.zPosition - 1
+        sendElementsToBack()
 
         progressBar.progress = 0
 
@@ -170,4 +179,25 @@ class BaseCardsStepsViewController: CardsStepsViewController {
         shouldToggleNavigationBar = true
         super.presentDiscussions(stepId: stepId, discussionProxyId: discussionProxyId)
     }
+
+    private func changeZPositionForElements(change: CGFloat, relativeTo layer: CALayer) {
+        trophyButton.layer.zPosition = layer.zPosition + change
+        backButton.layer.zPosition = layer.zPosition + change
+        statusBarPad?.layer.zPosition = layer.zPosition + change
+        progressBar.layer.zPosition = layer.zPosition + change
+        labelsStackView.layer.zPosition = layer.zPosition + change
+        shadowView.layer.zPosition = layer.zPosition + change
+    }
+
+    private func bringElementsToFront() {
+        backButton.superview?.bringSubview(toFront: backButton)
+        trophyButton.superview?.bringSubview(toFront: trophyButton)
+
+        changeZPositionForElements(change: 1.0, relativeTo: placeholderContainer.placeholderView.layer)
+    }
+
+    private func sendElementsToBack() {
+        changeZPositionForElements(change: -1.0, relativeTo: kolodaView.layer)
+    }
+
 }

Stepic/CardStepPresenter.swift

@@ -33,7 +33,7 @@ class CardStepPresenter {
         return step.lesson
     }
 
-    var quizViewController: ChoiceQuizViewController?
+    var quizViewController: QuizViewController?
 
     init(view: CardStepView, step: Step) {
         self.step = step
@@ -49,7 +49,22 @@ class CardStepPresenter {
         view?.updateProblem(with: step.block.text ?? "")
 
         // Set up quiz view controller
-        quizViewController = ChoiceQuizViewController(nibName: "QuizViewController", bundle: nil)
+        switch step.block.name {
+        case "choice":
+            quizViewController = ChoiceQuizViewController(nibName: "QuizViewController", bundle: nil)
+        case "string":
+            let vc = StringQuizViewController(nibName: "QuizViewController", bundle: nil)
+            vc.useSmallPadding = true
+            vc.textView.placeholder = NSLocalizedString("StringInputTextFieldPlaceholder", comment: "")
+            quizViewController = vc
+        case "number":
+            let vc = NumberQuizViewController(nibName: "QuizViewController", bundle: nil)
+            vc.useSmallPadding = true
+            vc.textField.placeholder = NSLocalizedString("NumberInputTextFieldPlaceholder", comment: "")
+            quizViewController = vc
+        default: break
+        }
+
         guard let quizViewController = quizViewController else {
             print("card step: quiz vc init failed")
             delegate?.contentLoadingDidFail()
@@ -69,9 +84,15 @@ class CardStepPresenter {
     }
 
     func submit() {
-        // TODO: this check only for choices
         var isSelected = false
-        quizViewController?.choices.forEach { isSelected = isSelected || $0 }
+
+        switch step.block.name {
+        case "choice":
+            (quizViewController as? ChoiceQuizViewController)?.choices.forEach { isSelected = isSelected || $0 }
+        case "string", "number":
+            isSelected = true
+        default: break
+        }
 
         if isSelected {
             quizViewController?.submitPressed()

Stepic/CardStepViewController.swift

@@ -137,7 +137,7 @@ class CardStepViewController: UIViewController, CardStepView {
         }
     }
 
-    private func refreshWebView() {
+    func refreshWebView() {
         resetWebViewHeight(5.0)
 
         func reloadContent() -> Promise<Void> {

Stepic/CardsStepsViewController.swift

@@ -45,7 +45,7 @@ class CardsStepsViewController: UIViewController, CardsStepsView, ControllerWith
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        registerPlaceholder(placeholder: StepikPlaceholder(.noConnection, action: { [weak self] in
+        registerPlaceholder(placeholder: StepikPlaceholder(.noConnectionQuiz, action: { [weak self] in
             self?.presenter?.tryAgain()
         }), for: .connectionError)