Release notes 1.57 (#283)

* Add 8290 course target (#281) * Add EGE 8290 * Fix configs * Enable Appsee only for main target * Add IQKeyboardManager * Add placeholders for text views in quizzes * Fix paddings * Fix onboarding encoding bug * Fix git-crypt * Added release notes
StepicOrg · Apr 24, 2018 · e2f254c · e2f254c
1 parent 67b8305
commit e2f254c
Show file tree

Hide file tree

Showing 51 changed files with 1,957 additions and 42 deletions.
diff --git a/Podfile b/Podfile
@@ -69,8 +69,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
@@ -81,6 +84,7 @@ target 'Stepic' do
     target 'StepicTests' do
         inherit! :search_paths
         all_pods
+        main_pods
         testing_pods
     end
 end
@@ -125,6 +129,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

diff --git a/Stepic.xcodeproj/project.pbxproj b/Stepic.xcodeproj/project.pbxproj
diff --git a/Stepic.xcodeproj/xcshareddata/xcschemes/Adaptive 8290.xcscheme b/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>
diff --git a/Stepic/AnalyticsHelper.swift b/Stepic/AnalyticsHelper.swift
@@ -12,14 +12,22 @@ import FirebaseCore
 import Mixpanel
 import YandexMobileMetrica
 import Crashlytics
-import Appsee
+
+#if ENABLE_APPSEE
+    import Appsee
+#endif
 
 class AnalyticsHelper: NSObject {
     static var sharedHelper = AnalyticsHelper()
     fileprivate override init() {super.init()}
 
     func setupAnalytics() {
-        Fabric.with([Crashlytics.self, Appsee.self])
+        #if ENABLE_APPSEE
+            Fabric.with([Crashlytics.self, Appsee.self])
+        #else
+            Fabric.with([Crashlytics.self])
+        #endif
+
         FirebaseApp.configure()
 
         Mixpanel.initialize(token: Tokens.shared.mixpanelToken)

diff --git a/Stepic/CardStepPresenter.swift b/Stepic/CardStepPresenter.swift
@@ -50,9 +50,18 @@ class CardStepPresenter {
 
         // Set up quiz view controller
         switch step.block.name {
-        case "choice": quizViewController = ChoiceQuizViewController(nibName: "QuizViewController", bundle: nil)
-        case "string": quizViewController = StringQuizViewController(nibName: "QuizViewController", bundle: nil)
-        case "number": quizViewController = NumberQuizViewController(nibName: "QuizViewController", bundle: nil)
+        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
         }
 

diff --git a/Stepic/CardStepViewController.swift b/Stepic/CardStepViewController.swift
@@ -137,7 +137,7 @@ class CardStepViewController: UIViewController, CardStepView {
         }
     }
 
-    private func refreshWebView() {
+    func refreshWebView() {
         resetWebViewHeight(5.0)
 
         func reloadContent() -> Promise<Void> {

diff --git a/Stepic/NumberQuizViewController.swift b/Stepic/NumberQuizViewController.swift
@@ -18,6 +18,9 @@ class NumberQuizViewController: QuizViewController {
     var dataset: String?
     var reply: NumberReply?
 
+    // Hack for adaptive mode (ugly layout when child quiz has padding)
+    var useSmallPadding: Bool = false
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -27,11 +30,11 @@ class NumberQuizViewController: QuizViewController {
 
         if #available(iOS 11.0, *) {
             NSLayoutConstraint.activate([
-                textField.leadingAnchor.constraint(equalTo: containerView.safeAreaLayoutGuide.leadingAnchor, constant: 16),
-                textField.trailingAnchor.constraint(equalTo: containerView.safeAreaLayoutGuide.trailingAnchor, constant: -16)
+                textField.leadingAnchor.constraint(equalTo: containerView.safeAreaLayoutGuide.leadingAnchor, constant: useSmallPadding ? 8 : 16),
+                textField.trailingAnchor.constraint(equalTo: containerView.safeAreaLayoutGuide.trailingAnchor, constant: useSmallPadding ? -8 : -16)
             ])
         } else {
-            textField.alignLeading("16", trailing: "-16", toView: containerView)
+            textField.alignLeading(useSmallPadding ? "8" : "16", trailing: useSmallPadding ? "-8" : "-16", toView: containerView)
         }
 
         textField.borderStyle = UITextBorderStyle.roundedRect

diff --git a/Stepic/OnboardingCardStepViewController.swift b/Stepic/OnboardingCardStepViewController.swift
@@ -28,6 +28,19 @@ class OnboardingCardStepViewController: CardStepViewController {
         stepWebView.loadHTMLString(html, baseURL: step.baseURL)
     }
 
+    override func refreshWebView() {
+        // Workaround for strange encoding bug
+        // Skip refreshing for onboarding
+        alignImages(in: self.stepWebView).then {
+            self.getContentHeight(self.stepWebView)
+        }.then { height -> Void in
+            self.resetWebViewHeight(Float(height))
+            self.scrollView.layoutIfNeeded()
+        }.catch { _ in
+            print("onboarding card step: error while refreshing")
+        }
+    }
+
     override func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         super.webView(webView, didFinish: navigation)
         delegate?.contentLoadingDidComplete()

diff --git a/Stepic/StringQuizViewController.swift b/Stepic/StringQuizViewController.swift
@@ -7,16 +7,20 @@
 //
 
 import UIKit
+import IQKeyboardManagerSwift
 
 class StringQuizViewController: QuizViewController {
 
-    var textView = UITextView()
+    var textView = IQTextView()
 
     var dataset: String?
     var reply: TextReply?
 
     let textViewHeight = 64
 
+    // Hack for adaptive mode (ugly layout when child quiz has padding)
+    var useSmallPadding: Bool = false
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -26,12 +30,13 @@ class StringQuizViewController: QuizViewController {
 
         if #available(iOS 11.0, *) {
             NSLayoutConstraint.activate([
-                textView.leadingAnchor.constraint(equalTo: containerView.safeAreaLayoutGuide.leadingAnchor, constant: 16),
-                textView.trailingAnchor.constraint(equalTo: containerView.safeAreaLayoutGuide.trailingAnchor, constant: -16)
+                textView.leadingAnchor.constraint(equalTo: containerView.safeAreaLayoutGuide.leadingAnchor, constant: useSmallPadding ? 8 : 16),
+                textView.trailingAnchor.constraint(equalTo: containerView.safeAreaLayoutGuide.trailingAnchor, constant: useSmallPadding ? -8 : -16)
             ])
         } else {
-            textView.alignLeading("16", trailing: "-16", toView: containerView)
+            textView.alignLeading(useSmallPadding ? "8" : "16", trailing: useSmallPadding ? "-8" : "-16", toView: containerView)
         }
+
         textView.setRoundedCorners(cornerRadius: 8.0, borderWidth: 0.5, borderColor: UIColor.lightGray)
 
         textView.font = UIFont.systemFont(ofSize: 16)

diff --git a/Stepic/en.lproj/Localizable.strings b/Stepic/en.lproj/Localizable.strings
@@ -170,6 +170,8 @@ StreakNotificationsAlertMessage = "Seems like you've disabled notifications in s
 PassedPercent = "Passed";
 AuthorDidntUploadVideo = "Author didn't upload any video yet.";
 NoVideo = "No video";
+StringInputTextFieldPlaceholder = "Enter your answer";
+NumberInputTextFieldPlaceholder = "Enter your answer";
 FillBlankOptionTitle = "Select option";
 FillBlankInputTextFieldPlaceholder = "Enter your answer";
 FillBlanksSelectAnswerString = "Select your answer";
@@ -486,4 +488,4 @@ CodeEditorLanguage = "Language";
 CodeEditorFont = "Font";
 CodeEditorColor = "Colors";
 CodeEditorCurrentTheme = "Current: %@";
-CodeEditorCurrentFontSize = "Current: %@pt";
+CodeEditorCurrentFontSize = "Current: %@pt";
diff --git a/Stepic/ru.lproj/Localizable.strings b/Stepic/ru.lproj/Localizable.strings
@@ -170,6 +170,8 @@ StreakNotificationsAlertMessage = "Похоже, вы запретили при
 PassedPercent = "Пройдено";
 AuthorDidntUploadVideo = "Автор еще не загрузил видео.";
 NoVideo = "Нет видео";
+StringInputTextFieldPlaceholder = "Введите ответ";
+NumberInputTextFieldPlaceholder = "Введите ответ";
 FillBlankOptionTitle = "Выберите вариант";
 FillBlankInputTextFieldPlaceholder = "Введите ответ";
 FillBlanksSelectAnswerString = "Выберите ответ";
@@ -486,4 +488,4 @@ CodeEditorLanguage = "Язык";
 CodeEditorFont = "Шрифт";
 CodeEditorColor = "Цвет";
 CodeEditorCurrentTheme = "Используется: %@";
-CodeEditorCurrentFontSize = "Используется: %@pt";
+CodeEditorCurrentFontSize = "Используется: %@pt";
diff --git a/StepicAdaptiveCourse/AdaptiveAppDelegate.swift b/StepicAdaptiveCourse/AdaptiveAppDelegate.swift
@@ -11,6 +11,7 @@ import Mixpanel
 import Fabric
 import Crashlytics
 import PromiseKit
+import IQKeyboardManagerSwift
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -29,6 +30,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             DefaultsContainer.launch.didLaunch = true
         }
 
+        IQKeyboardManager.sharedManager().enable = true
+        IQKeyboardManager.sharedManager().shouldResignOnTouchOutside = true
+        IQKeyboardManager.sharedManager().keyboardDistanceFromTextField = 16
+        IQKeyboardManager.sharedManager().enableAutoToolbar = false
+
         LocalNotificationsHelper.registerNotifications()
 
         if let launchNotification = launchOptions?[UIApplicationLaunchOptionsKey.localNotification] as? UILocalNotification {

diff --git a/StepicAdaptiveCourse/Content/3149/Icons.xcassets/AppIcon3149.appiconset/Contents.json b/StepicAdaptiveCourse/Content/3149/Icons.xcassets/AppIcon3149.appiconset/Contents.json
@@ -143,6 +143,11 @@
       "idiom" : "ipad",
       "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {