Merge pull request #37 from StepicOrg/release/1.32

Release/1.32

.gitattributes

@@ -1,4 +1,5 @@
 Sb/** filter=git-crypt diff=git-crypt
 cert/** filter=git-crypt diff=git-crypt
 fastlane/** filter=git-crypt diff=git-crypt
+StepicTests/TestInfo.plist filter=git-crypt diff=git-crypt
 .gitattributes !filter !diff

.gitignore

@@ -26,10 +26,13 @@ DerivedData
 Pods/
 artefacts/
 fastlane/screenshots/
+fastlane/report.xml
 *.lock
 # Carthage
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 # Carthage/Checkouts
 
 Carthage/Build
+
+.DS_Store

DefaultsContainer.swift

@@ -0,0 +1,17 @@
+//
+//  DefaultsContainer.swift
+//  Stepic
+//
+//  Created by Alexander Karpov on 07.04.17.
+//  Copyright © 2017 Alex Karpov. All rights reserved.
+//
+
+import Foundation
+
+/*
+ Used to store application data, generated by an app
+ */
+class DefaultsContainer {
+    private init() {}
+    static let launch = LaunchDefaultsContainer()
+}

JSQWebViewController.swift

@@ -123,7 +123,7 @@ class WebViewController: UIViewController {
     /// :nodoc:
     required init?(coder aDecoder: NSCoder) {
         self.configuration = WKWebViewConfiguration()
-        self.urlRequest = URLRequest(url: NSURL(string: "") as! URL)
+        self.urlRequest = URLRequest(url: NSURL(string: "")! as URL)
         self.activities = nil
         super.init(coder: aDecoder)
     }

LaunchDefaultsContainer.swift

@@ -0,0 +1,30 @@
+//
+//  LaunchDefaultsContainer.swift
+//  Stepic
+//
+//  Created by Alexander Karpov on 07.04.17.
+//  Copyright © 2017 Alex Karpov. All rights reserved.
+//
+
+import Foundation
+
+class LaunchDefaultsContainer {
+    fileprivate let defaults = UserDefaults.standard
+
+    fileprivate let didLaunchKey = "didLaunchKey"
+
+    var didLaunch : Bool {
+        get {
+            if let did = defaults.value(forKey: didLaunchKey) as? Bool {
+                return did
+            } else {
+                return false
+            }
+        }
+
+        set(value) {
+            defaults.set(value, forKey: didLaunchKey)
+            defaults.synchronize()
+        }
+    }
+}

Podfile

@@ -40,13 +40,21 @@ def all_pods
     pod 'FBSDKLoginKit'
 
     pod 'SVGKit', :git => 'https://github.com/SVGKit/SVGKit.git', :branch => '2.x'
+
+    pod 'Presentr'
+end
+
+def testing_pods
+    pod 'Quick'
+    pod 'Nimble'
 end
 
 target 'Stepic' do
     all_pods
     target 'StepicTests' do
         inherit! :search_paths
         all_pods
+        testing_pods
     end
 end
 

Stepic.xcodeproj/xcuserdata/Ostrenkiy.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -16,6 +16,13 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>StepicTests.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>31</integer>
+		</dict>
 		<key>StepicWatch (Complication).xcscheme</key>
 		<dict>
 			<key>orderHint</key>

Stepic/APIEndpoint.swift

@@ -11,6 +11,10 @@ import Alamofire
 import SwiftyJSON
 import CoreData
 
+enum RetrieveError : Error {
+    case connectionError, badStatus
+}
+
 class APIEndpoint {
 
     func constructIdsString<TID>(array arr: [TID]) -> String {
@@ -53,16 +57,15 @@ class APIEndpoint {
                 print(json)
             }
 
-            print(json)
 
-            if let e = error as? NSError {
+            if let e = error as NSError? {
                 print("RETRIEVE \(requestString)?\(ids): error \(e.domain) \(e.code): \(e.localizedDescription)")
                 failure(.connectionError)
                 return
             }
 
             if response?.statusCode != 200 {
-                print("RETRIEVE \(requestString)?\(ids)): bad response status code \(response?.statusCode)")
+                print("RETRIEVE \(requestString)?\(ids)): bad response status code \(String(describing: response?.statusCode))")
                 failure(.badStatus)
                 return
             }

Stepic/Alerts.swift

@@ -13,4 +13,5 @@ import Foundation
  */
 class Alerts {
     static let streaks = StreaksStepikAlertManager()
+    static let rate = RateAppAlertManager()
 }

Stepic/AnalyticsEvents.swift

@@ -16,14 +16,26 @@ struct AnalyticsEvents {
 
     struct SignIn {
         static let onLaunchScreen = "clicked_SignIn_on_launch_screen"
-        static let onSignInScreen = "clicked_SignIn_on_sign_in_screen"
+        static let onSignInScreen = "click_sign_in_with_interaction_type"
         static let nextButton = "click_sign_in_next_sign_in_screen"
+        struct Fields {
+            static let tap = "tap_on_fields_login"
+            static let typing = "typing_text_fields_login"
+        }
+        struct Social {
+            static let clicked = "social_login"
+            static let codeReceived = "Api:auth with social account"
+        }
     }
 
     struct SignUp {
         static let onLaunchScreen = "clicked_SignUp_on_launch_screen"
-        static let onSignUpScreen = "clicked_SignUp_on_sign_up_screen"
+        static let onSignUpScreen = "click_registration_with_interaction_type"
         static let nextButton = "click_registration_send_ime"
+        struct Fields {
+            static let tap = "tap_on_fields_registration"
+            static let typing = "typing_text_fields_registration"
+        }
     }
 
     struct Login {
@@ -96,6 +108,7 @@ struct AnalyticsEvents {
         static let myCoursesClicked = "main_choice_my_courses"
         static let findCoursesClicked = "main_choice_find_courses"
         static let downloadsClicked = "main_choice_downloads"
+        static let certificatesClicked = "main_choice_certificates"
     }
 
     struct Token {
@@ -114,10 +127,21 @@ struct AnalyticsEvents {
             }
         }
         static let notificationOpened = "streak_notification_opened"
+
+        struct LocalNotification {
+            static let shown = "streak_local_notification_shown"
+            static let clicked = "streak_local_notification_clicked"
+        }
+        struct ImproveAlert {
+            static let notificationOffered = "streak_improve_alert_notifications_offered"
+            static let timeSelected = "streak_improve_alert_time_selected"
+            static let timeCancelled = "streak_improve_alert_time_cancelled"
+        }
     }
 
     struct App {
         static let opened = "app_opened"
+        static let firstLaunch = "first_launch_after_install"
     }
 
     struct Errors {
@@ -128,4 +152,25 @@ struct AnalyticsEvents {
         static let sectionsOpened = "continue_section_opened"
         static let stepOpened = "continue_step_opened"
     }
+
+    struct Rate {
+        static let rated = "app_rate"
+        struct Positive {
+            static let later = "app_rate_positive_later"
+            static let appstore = "app_rate_positive_appstore"
+        }
+        struct Negative {
+            static let later = "app_rate_negative_later"
+            static let email = "app_rate_negative_email"
+            struct Email {
+                static let cancelled = "app_rate_negative_email_cancelled"
+                static let success = "app_rate_negative_email_success"
+            }
+        }
+    }
+
+    struct Certificates {
+        static let opened = "certificates_opened_certificate"
+        static let shared = "certificates_pressed_share_certificate"
+    }
 }

Stepic/AnalyticsReporter.swift

@@ -12,10 +12,15 @@ import Mixpanel
 import YandexMobileMetrica
 
 class AnalyticsReporter {
-    static func reportEvent(_ event: String, parameters: [String: NSObject]?) {
-        reportFirebaseEvent(event, parameters: parameters)
-        reportAppMetricaEvent(event, parameters: parameters)
-        reportMixpanelEvent(event, parameters: parameters)
+    static func reportEvent(_ event: String, parameters: [String: Any]? = nil) {
+
+        guard let params = parameters as? [String: NSObject] else {
+            return
+        }
+
+        reportFirebaseEvent(event, parameters: params)
+        reportAppMetricaEvent(event, parameters: params)
+        reportMixpanelEvent(event, parameters: params)
     }
 
     private static func reportFirebaseEvent(_ event: String, parameters: [String: NSObject]?) {