From 5854e468fa5407f9517b44373b10d0cc688b7aab Mon Sep 17 00:00:00 2001
From: Ivan Magda <ivan.magda@stepik.org>
Date: Sun, 16 Feb 2020 12:20:17 +0300
Subject: [PATCH 1/9] Download images in foreground

---
 .../DownloadingService/DownloadingServiceFactory.swift          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Stepic/Sources/Frameworks/Downloader/DownloadingService/DownloadingServiceFactory.swift b/Stepic/Sources/Frameworks/Downloader/DownloadingService/DownloadingServiceFactory.swift
index b069a22529..0c817b6e02 100644
--- a/Stepic/Sources/Frameworks/Downloader/DownloadingService/DownloadingServiceFactory.swift
+++ b/Stepic/Sources/Frameworks/Downloader/DownloadingService/DownloadingServiceFactory.swift
@@ -2,7 +2,7 @@ import Foundation
 
 enum DownloadingServiceFactory {
     private static let sharedImageDownloadingService = DownloadingService(
-        downloader: Downloader(session: .background(id: "image.main")),
+        downloader: Downloader(session: .foreground),
         fileManager: StoredFileManagerFactory.makeStoredFileManager(type: .image)
     )
 

From dc105fbc47473ebaa9966cf78f8f8e30fced85ba Mon Sep 17 00:00:00 2001
From: Ivan Magda <ivan.magda@stepik.org>
Date: Sun, 16 Feb 2020 12:52:20 +0300
Subject: [PATCH 2/9] Register placeholder for empty submissions

---
 .../Modules/Submissions/SubmissionsViewController.swift     | 2 +-
 Stepic/StepikPlaceholderStyle+Placeholders.swift            | 6 ++++++
 Stepic/en.lproj/Localizable.strings                         | 1 +
 Stepic/ru.lproj/Localizable.strings                         | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Stepic/Sources/Modules/Submissions/SubmissionsViewController.swift b/Stepic/Sources/Modules/Submissions/SubmissionsViewController.swift
index 20fe00ab49..ce8ab05aea 100644
--- a/Stepic/Sources/Modules/Submissions/SubmissionsViewController.swift
+++ b/Stepic/Sources/Modules/Submissions/SubmissionsViewController.swift
@@ -100,7 +100,7 @@ final class SubmissionsViewController: UIViewController, ControllerWithStepikPla
             ),
             for: .connectionError
         )
-        self.registerPlaceholder(placeholder: StepikPlaceholder(.emptySolutions, action: nil), for: .empty)
+        self.registerPlaceholder(placeholder: StepikPlaceholder(.emptySubmissions, action: nil), for: .empty)
     }
 
     private func updateState(newState: Submissions.ViewControllerState) {
diff --git a/Stepic/StepikPlaceholderStyle+Placeholders.swift b/Stepic/StepikPlaceholderStyle+Placeholders.swift
index 31d9418649..2890fc34c7 100644
--- a/Stepic/StepikPlaceholderStyle+Placeholders.swift
+++ b/Stepic/StepikPlaceholderStyle+Placeholders.swift
@@ -108,6 +108,12 @@ extension StepikPlaceholder.Style {
         text: NSLocalizedString("DiscussionsPlaceholderEmptySolutionsTitle", comment: ""),
         buttonTitle: NSLocalizedString("DiscussionsPlaceholderEmptySolutionsButtonTitle", comment: "")
     )
+    static let emptySubmissions = StepikPlaceholderStyle(
+        id: "emptySubmissions",
+        image: PlaceholderImage(image: #imageLiteral(resourceName: "new-empty-empty"), scale: 0.99),
+        text: NSLocalizedString("SubmissionsPlaceholderEmptyTitle", comment: ""),
+        buttonTitle: nil
+    )
     static let emptyProfileLoading = StepikPlaceholderStyle(
         id: "emptyProfileLoading",
         image: PlaceholderImage(image: #imageLiteral(resourceName: "new-empty-empty"), scale: 0.99),
diff --git a/Stepic/en.lproj/Localizable.strings b/Stepic/en.lproj/Localizable.strings
index 9bb22997f4..0b7182b8cf 100644
--- a/Stepic/en.lproj/Localizable.strings
+++ b/Stepic/en.lproj/Localizable.strings
@@ -859,6 +859,7 @@ CodeQuizFullscreenTabRunTitle = "Run";
 
 /* Submissions */
 SubmissionsTitle = "Submissions";
+SubmissionsPlaceholderEmptyTitle = "No Submissions";
 
 /* Solution */
 SolutionTitle = "Solution %@";
diff --git a/Stepic/ru.lproj/Localizable.strings b/Stepic/ru.lproj/Localizable.strings
index 02bac5f3d0..198a98aa44 100644
--- a/Stepic/ru.lproj/Localizable.strings
+++ b/Stepic/ru.lproj/Localizable.strings
@@ -860,6 +860,7 @@ CodeQuizFullscreenTabRunTitle = "Запуск";
 
 /* Submissions */
 SubmissionsTitle = "Решения";
+SubmissionsPlaceholderEmptyTitle = "Решений нет";
 
 /* Solution */
 SolutionTitle = "Решение %@";

From e3a64b9c9bc24752f3eef213659c7bfd1f13028d Mon Sep 17 00:00:00 2001
From: Ivan Magda <ivan.magda@stepik.org>
Date: Sun, 16 Feb 2020 18:40:39 +0300
Subject: [PATCH 3/9] Cosmetics video player & lesson (#654)

* Increase horizontal spacing between video player bottom controls

* Override prefersHomeIndicatorAutoHidden

* Reset to aspect video fill mode only on transition to portrait

* Update Tabman

* Step view respects safe area

* CodeInputAccessoryView leading to safe area
---
 Podfile                                      |  2 +-
 Podfile.lock                                 | 12 ++++--------
 Stepic.xcodeproj/project.pbxproj             |  4 ----
 Stepic/CodeInputAccessoryView.xib            | 16 +++++++---------
 Stepic/Sources/Modules/Step/StepView.swift   |  6 +++---
 Stepic/StepikVideoPlayerViewController.swift | 17 ++++++++++++++---
 Stepic/StepikVideoPlayerViewController.xib   | 12 ++++++------
 7 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/Podfile b/Podfile
index f51b0c47b9..fe09a304a2 100644
--- a/Podfile
+++ b/Podfile
@@ -64,7 +64,7 @@ def all_pods
     pod 'ActionSheetPicker-3.0', '2.4.0'
     pod 'Nuke', '8.3.1'
     pod 'STRegex', '2.1.0'
-    pod 'Tabman', '2.6.3'
+    pod 'Tabman', '2.8.0'
     pod 'SwiftDate', '6.1.0'
 end
 
diff --git a/Podfile.lock b/Podfile.lock
index 6eed5555f5..4669729df3 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -5,7 +5,6 @@ PODS:
   - Alamofire (4.9.1)
   - Amplitude-iOS (4.9.3)
   - Atributika (4.9.4)
-  - AutoInsetter (1.8.0)
   - BEMCheckBox (1.4.1)
   - Branch (0.31.0):
     - Branch/Core (= 0.31.0)
@@ -170,8 +169,7 @@ PODS:
   - SwiftLint (0.38.2)
   - SwiftyGif (5.2.0)
   - SwiftyJSON (5.0.0)
-  - Tabman (2.6.3):
-    - AutoInsetter (~> 1.8.0)
+  - Tabman (2.8.0):
     - Pageboy (~> 3.5.0)
   - TSMessages (0.9.13):
     - HexColors (~> 2.3.0)
@@ -228,7 +226,7 @@ DEPENDENCIES:
   - SwiftDate (= 6.1.0)
   - SwiftLint (= 0.38.2)
   - SwiftyJSON (= 5.0.0)
-  - Tabman (= 2.6.3)
+  - Tabman (= 2.8.0)
   - TSMessages (from `https://github.com/KrauseFx/TSMessages.git`)
   - TTTAttributedLabel (= 2.0.0)
   - TUSafariActivity (= 1.0.4)
@@ -242,7 +240,6 @@ SPEC REPOS:
     - Alamofire
     - Amplitude-iOS
     - Atributika
-    - AutoInsetter
     - BEMCheckBox
     - Branch
     - Charts
@@ -323,7 +320,6 @@ SPEC CHECKSUMS:
   Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
   Amplitude-iOS: 122e026c44db8460e5efcf84859aa290a0ae9786
   Atributika: 643a248e2dd8b4d74b23b53ea31393cab0a01d94
-  AutoInsetter: 0b90ca74e36561c340129045a3722c51a0b15c58
   BEMCheckBox: 5ba6e37ade3d3657b36caecc35c8b75c6c2b1a4e
   Branch: d2e1611afa9ea9aa36fa1996df7f38ca2c3eb03e
   Charts: 74c9f256eaf0460c0c416522d1cf8c634ea6b286
@@ -377,7 +373,7 @@ SPEC CHECKSUMS:
   SwiftLint: 8f5d2f903e1c9bcbc832fd16771e80a263ac6cbb
   SwiftyGif: b85c6b33a9411859d9e1db998b6a8214aea942df
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
-  Tabman: 63eae331ae7a9388ae389b1808f1939269fcdece
+  Tabman: f62ad94ee54a7d96e3fbab34f677d9ea4d38ece6
   TSMessages: eb3cf27b6900684a21bad4fe9ea426e287b8c839
   TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
   TUSafariActivity: afc55a00965377939107ce4fdc7f951f62454546
@@ -385,6 +381,6 @@ SPEC CHECKSUMS:
   VK-ios-sdk: 62a10b6571fbcda0657f455fedce7fedf55b4cd0
   YandexMobileMetrica: 1030df2959c886a7be3bc3d274eb54c8e86afd6f
 
-PODFILE CHECKSUM: ba390ba6c2c2242b85e6dd46f53cc8dad466e12e
+PODFILE CHECKSUM: b9360478efa119ccbcb0ae9fc4da864d52d5251e
 
 COCOAPODS: 1.8.4
diff --git a/Stepic.xcodeproj/project.pbxproj b/Stepic.xcodeproj/project.pbxproj
index 3f5c00a146..7f941be13e 100644
--- a/Stepic.xcodeproj/project.pbxproj
+++ b/Stepic.xcodeproj/project.pbxproj
@@ -6258,7 +6258,6 @@
 				"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
 				"${BUILT_PRODUCTS_DIR}/Amplitude-iOS/Amplitude_iOS.framework",
 				"${BUILT_PRODUCTS_DIR}/Atributika/Atributika.framework",
-				"${BUILT_PRODUCTS_DIR}/AutoInsetter/AutoInsetter.framework",
 				"${BUILT_PRODUCTS_DIR}/BEMCheckBox/BEMCheckBox.framework",
 				"${BUILT_PRODUCTS_DIR}/Branch/Branch.framework",
 				"${BUILT_PRODUCTS_DIR}/CRToast/CRToast.framework",
@@ -6312,7 +6311,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Amplitude_iOS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Atributika.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AutoInsetter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BEMCheckBox.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Branch.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CRToast.framework",
@@ -6376,7 +6374,6 @@
 				"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
 				"${BUILT_PRODUCTS_DIR}/Amplitude-iOS/Amplitude_iOS.framework",
 				"${BUILT_PRODUCTS_DIR}/Atributika/Atributika.framework",
-				"${BUILT_PRODUCTS_DIR}/AutoInsetter/AutoInsetter.framework",
 				"${BUILT_PRODUCTS_DIR}/BEMCheckBox/BEMCheckBox.framework",
 				"${BUILT_PRODUCTS_DIR}/Branch/Branch.framework",
 				"${BUILT_PRODUCTS_DIR}/CRToast/CRToast.framework",
@@ -6426,7 +6423,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Amplitude_iOS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Atributika.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AutoInsetter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BEMCheckBox.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Branch.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CRToast.framework",
diff --git a/Stepic/CodeInputAccessoryView.xib b/Stepic/CodeInputAccessoryView.xib
index ee2027b76b..92ec504630 100644
--- a/Stepic/CodeInputAccessoryView.xib
+++ b/Stepic/CodeInputAccessoryView.xib
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CodeInputAccessoryView" customModule="Adaptive_1838" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CodeInputAccessoryView" customModule="Stepic" customModuleProvider="target">
             <connections>
                 <outlet property="collectionView" destination="deC-Qf-rIK" id="ILh-vj-n7N"/>
                 <outlet property="hideKeyboardImageView" destination="Mgs-a5-wfF" id="lwm-tS-Pjh"/>
@@ -44,13 +42,13 @@
                 <constraint firstAttribute="bottom" secondItem="deC-Qf-rIK" secondAttribute="bottom" constant="4" id="Lyg-81-IfB"/>
                 <constraint firstItem="Mgs-a5-wfF" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="4" id="MT5-y9-OKk"/>
                 <constraint firstAttribute="trailing" secondItem="deC-Qf-rIK" secondAttribute="trailing" id="VCQ-0i-M93"/>
-                <constraint firstItem="Mgs-a5-wfF" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="4" id="acR-nX-ArL"/>
-                <constraint firstItem="Mgs-a5-wfF" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="4" id="dVo-uX-Z0r"/>
                 <constraint firstAttribute="bottom" secondItem="Mgs-a5-wfF" secondAttribute="bottom" constant="4" id="hPQ-mG-JRJ"/>
                 <constraint firstItem="deC-Qf-rIK" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="4" id="ser-rR-KTA"/>
+                <constraint firstItem="Mgs-a5-wfF" firstAttribute="leading" secondItem="j0p-Qp-9MR" secondAttribute="leading" constant="4" id="wET-y9-hWO"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <viewLayoutGuide key="safeArea" id="j0p-Qp-9MR"/>
             <point key="canvasLocation" x="-341" y="-45"/>
         </view>
     </objects>
diff --git a/Stepic/Sources/Modules/Step/StepView.swift b/Stepic/Sources/Modules/Step/StepView.swift
index 62a1da6972..e417e08588 100644
--- a/Stepic/Sources/Modules/Step/StepView.swift
+++ b/Stepic/Sources/Modules/Step/StepView.swift
@@ -200,8 +200,8 @@ final class StepView: UIView {
     private func positionVideoPreview() {
         let fullHeight = self.bounds.height
         let previewHeight = self.stepVideoPreviewView.bounds.height
-        let topInset = self.scrollableStackView.contentInsets.top
-        let bottomInset = self.scrollableStackView.contentInsets.bottom
+        let topInset = self.safeAreaInsets.top
+        let bottomInset = self.safeAreaInsets.bottom
 
         let controlsRealHeight = self.stepControlsView.bounds.height
         let controlsHeight = self.stepControlsView.sizeWithAllControls.height
@@ -238,7 +238,7 @@ extension StepView: ProgrammaticallyInitializableViewProtocol {
 
         self.scrollableStackView.translatesAutoresizingMaskIntoConstraints = false
         self.scrollableStackView.snp.makeConstraints { make in
-            make.edges.equalToSuperview()
+            make.edges.equalTo(self.safeAreaLayoutGuide)
         }
 
         self.loadingIndicatorView.translatesAutoresizingMaskIntoConstraints = false
diff --git a/Stepic/StepikVideoPlayerViewController.swift b/Stepic/StepikVideoPlayerViewController.swift
index ba4f10af31..69778d3145 100644
--- a/Stepic/StepikVideoPlayerViewController.swift
+++ b/Stepic/StepikVideoPlayerViewController.swift
@@ -78,7 +78,7 @@ final class StepikVideoPlayerViewController: UIViewController {
     private static let seekBackTimeOffset: TimeInterval = 10
     private static let seekPreferredTimescale: CMTimeScale = 1000
 
-    private static let hidePlayerControlsTimeInterval = 4.5
+    private static let hidePlayerControlsTimeInterval: TimeInterval = 4.5
 
     @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
 
@@ -204,7 +204,11 @@ final class StepikVideoPlayerViewController: UIViewController {
 
     private var wasPlayingBeforeSeeking = false
 
-    private var isPlayerControlsVisible = true
+    private var isPlayerControlsVisible = true {
+        didSet {
+            self.setNeedsUpdateOfHomeIndicatorAutoHidden()
+        }
+    }
     private var hidePlayerControlsTimer: Timer?
 
     /// This property will be set to `true` when player playback did end and device, not in the foreground state.
@@ -214,6 +218,11 @@ final class StepikVideoPlayerViewController: UIViewController {
 
     override var prefersStatusBarHidden: Bool { true }
 
+    override var prefersHomeIndicatorAutoHidden: Bool {
+        let anyAutoplayControlVisible = self.allAutoplayViews.first(where: { $0.isHidden }) == nil
+        return self.isPlayerControlsVisible || anyAutoplayControlVisible ? false : true
+    }
+
     // MARK: UIViewController life cycle
 
     override func viewDidLoad() {
@@ -254,7 +263,9 @@ final class StepikVideoPlayerViewController: UIViewController {
 
         coordinator.animate(
             alongsideTransition: { _ in
-                self.currentVideoFillMode = .aspect
+                if DeviceInfo.current.orientation.interface.isPortrait {
+                    self.currentVideoFillMode = .aspect
+                }
             },
             completion: { _ in
                 self.updateVideoFillModeIcon()
diff --git a/Stepic/StepikVideoPlayerViewController.xib b/Stepic/StepikVideoPlayerViewController.xib
index 72f7647f4e..34ad7012e5 100644
--- a/Stepic/StepikVideoPlayerViewController.xib
+++ b/Stepic/StepikVideoPlayerViewController.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -48,7 +48,7 @@
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MoB-ve-4BS">
-                            <rect key="frame" x="312" y="10" width="30" height="30"/>
+                            <rect key="frame" x="320" y="10" width="30" height="30"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="30" id="tVL-Dp-TN2"/>
                                 <constraint firstAttribute="height" constant="30" id="wZk-Yo-OEn"/>
@@ -59,7 +59,7 @@
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="knc-c5-olR">
-                            <rect key="frame" x="218" y="10" width="30" height="30"/>
+                            <rect key="frame" x="210" y="10" width="30" height="30"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="30" id="DMK-n1-UpU"/>
                                 <constraint firstAttribute="width" constant="30" id="n5t-wt-pm2"/>
@@ -93,11 +93,11 @@
                         <constraint firstItem="knc-c5-olR" firstAttribute="centerY" secondItem="fyR-gR-ToD" secondAttribute="centerY" id="7ZO-ur-Sfh"/>
                         <constraint firstItem="MoB-ve-4BS" firstAttribute="centerY" secondItem="fyR-gR-ToD" secondAttribute="centerY" id="I1e-2N-aae"/>
                         <constraint firstItem="gts-J5-a5Y" firstAttribute="trailing" secondItem="toN-Q6-jzn" secondAttribute="trailing" constant="8" id="SWq-FR-Q39"/>
-                        <constraint firstItem="MoB-ve-4BS" firstAttribute="leading" secondItem="um1-Jr-FFH" secondAttribute="trailing" constant="8" id="VvC-b6-Uyy"/>
+                        <constraint firstItem="MoB-ve-4BS" firstAttribute="leading" secondItem="um1-Jr-FFH" secondAttribute="trailing" constant="16" id="VvC-b6-Uyy"/>
                         <constraint firstItem="jpo-wy-Esq" firstAttribute="centerY" secondItem="fyR-gR-ToD" secondAttribute="centerY" id="e96-UG-koQ"/>
                         <constraint firstAttribute="height" constant="50" id="igX-Zj-N0W"/>
                         <constraint firstItem="um1-Jr-FFH" firstAttribute="centerX" secondItem="fyR-gR-ToD" secondAttribute="centerX" id="j2a-8M-cBZ"/>
-                        <constraint firstItem="um1-Jr-FFH" firstAttribute="leading" secondItem="knc-c5-olR" secondAttribute="trailing" constant="8" id="pMg-pD-6wl"/>
+                        <constraint firstItem="um1-Jr-FFH" firstAttribute="leading" secondItem="knc-c5-olR" secondAttribute="trailing" constant="16" id="pMg-pD-6wl"/>
                         <constraint firstItem="um1-Jr-FFH" firstAttribute="centerY" secondItem="fyR-gR-ToD" secondAttribute="centerY" id="sus-vd-Mx6"/>
                         <constraint firstItem="jpo-wy-Esq" firstAttribute="leading" secondItem="gts-J5-a5Y" secondAttribute="leading" constant="8" id="tvt-q5-fQw"/>
                         <constraint firstItem="toN-Q6-jzn" firstAttribute="centerY" secondItem="fyR-gR-ToD" secondAttribute="centerY" id="w29-8I-pJO"/>

From 59e442cdebb916650fc353929e7c619b6d1cb346 Mon Sep 17 00:00:00 2001
From: Ivan Magda <ivan.magda@stepik.org>
Date: Sun, 16 Feb 2020 22:00:10 +0300
Subject: [PATCH 4/9] Update dependencies 1.113 (#655)

* Bump Firebase from 6.14.0 to 6.17.0

Bumps [Firebase](https://github.com/firebase/firebase-ios-sdk) from from 6.14.0 to 6.17.0.
- [Release notes](https://github.com/firebase/firebase-ios-sdk/releases/tag/6.17.0)
- [Commits](https://github.com/firebase/firebase-ios-sdk/compare/6.14.0...6.17.0)

* Bump SwiftLint from 0.38.2 to 0.39.1

Bumps [SwiftLint](https://github.com/realm/SwiftLint) from 0.38.2 to 0.39.1
- [Release notes](https://github.com/realm/SwiftLint/releases/tag/0.39.1)
- [Commits](https://github.com/realm/SwiftLint/compare/0.38.2...0.39.1)

* Add tuple_pattern opt-in rule

* Add return_value_from_void_function opt-in rule

* Add void_function_in_ternary opt-in rule

* Add prohibited_nan_comparison opt-in rule

* Update gems
---
 .swiftlint.yml                   |   7 ++
 Gemfile.lock                     |   4 +-
 Podfile                          |  10 +-
 Podfile.lock                     | 156 ++++++++++++++++---------------
 Stepic.xcodeproj/project.pbxproj |   4 +
 5 files changed, 101 insertions(+), 80 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index 97f93694b1..757d8cacb6 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -103,6 +103,7 @@ whitelist_rules:
   - optional_enum_case_matching
   - overridden_super_call
   - override_in_extension
+  - prohibited_nan_comparison
   - prefer_self_type_over_type_of_self
   - prefixed_toplevel_constant
   - private_over_fileprivate
@@ -123,6 +124,7 @@ whitelist_rules:
   - redundant_string_enum_value
   - redundant_type_annotation
   - redundant_void_return
+  - return_value_from_void_function
   - return_arrow_whitespace
   - shorthand_operator
   - single_test_class
@@ -140,6 +142,7 @@ whitelist_rules:
   - trailing_newline
   - trailing_semicolon
   - trailing_whitespace
+  - tuple_pattern
   - type_name
   - unavailable_function
   - unneeded_break_in_switch
@@ -151,6 +154,7 @@ whitelist_rules:
   - unused_optional_binding
   - vertical_whitespace_closing_braces
   - vertical_whitespace_opening_braces
+  - void_function_in_ternary
   - void_return
   - weak_delegate
   - yoda_condition
@@ -443,6 +447,9 @@ trailing_newline:
 trailing_semicolon:
   severity: error
 
+tuple_pattern:
+  severity: error
+
 type_name:
   severity: error
   max_length: 64
diff --git a/Gemfile.lock b/Gemfile.lock
index fd3e914d39..84ab5c6f1b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ GEM
     colored2 (3.1.2)
     commander-fastlane (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     declarative (0.0.10)
     declarative-option (0.1.0)
     digest-crc (0.4.1)
@@ -177,7 +177,7 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.7)
+    simctl (1.6.8)
       CFPropertyList
       naturally
     slack-notifier (2.3.2)
diff --git a/Podfile b/Podfile
index fe09a304a2..9f56c8df04 100644
--- a/Podfile
+++ b/Podfile
@@ -15,7 +15,7 @@ def shared_pods
     pod 'Crashlytics', '3.14.0'
     pod 'DeviceKit', '3.0.0'
     pod 'PromiseKit', '6.13.0'
-    pod 'SwiftLint', '0.38.2'
+    pod 'SwiftLint', '0.39.1'
     pod 'Reveal-SDK', :configurations => ['Debug']
 end
 
@@ -30,10 +30,10 @@ def all_pods
     pod 'SnapKit', '5.0.1'
 
     # Firebase
-    pod 'Firebase/Core', '6.14.0'
-    pod 'Firebase/Messaging' , '6.14.0'
-    pod 'Firebase/Analytics' , '6.14.0'
-    pod 'Firebase/RemoteConfig', '6.14.0'
+    pod 'Firebase/Core', '6.17.0'
+    pod 'Firebase/Messaging' , '6.17.0'
+    pod 'Firebase/Analytics' , '6.17.0'
+    pod 'Firebase/RemoteConfig', '6.17.0'
 
     pod 'YandexMobileMetrica/Dynamic', '3.9.4'
     pod 'Amplitude-iOS', '4.9.3'
diff --git a/Podfile.lock b/Podfile.lock
index 4669729df3..7679a07866 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -32,59 +32,64 @@ PODS:
     - FBSDKLoginKit/Login (= 5.13.0)
   - FBSDKLoginKit/Login (5.13.0):
     - FBSDKCoreKit (~> 5.0)
-  - Firebase/Analytics (6.14.0):
+  - Firebase/Analytics (6.17.0):
     - Firebase/Core
-  - Firebase/Core (6.14.0):
+  - Firebase/Core (6.17.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (= 6.1.7)
-  - Firebase/CoreOnly (6.14.0):
-    - FirebaseCore (= 6.5.0)
-  - Firebase/Messaging (6.14.0):
+    - FirebaseAnalytics (= 6.2.2)
+  - Firebase/CoreOnly (6.17.0):
+    - FirebaseCore (= 6.6.2)
+  - Firebase/Messaging (6.17.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 4.1.10)
-  - Firebase/RemoteConfig (6.14.0):
+    - FirebaseMessaging (~> 4.2.1)
+  - Firebase/RemoteConfig (6.17.0):
     - Firebase/CoreOnly
-    - FirebaseRemoteConfig (~> 4.4.6)
+    - FirebaseRemoteConfig (~> 4.4.7)
   - FirebaseABTesting (3.1.2):
     - FirebaseAnalyticsInterop (~> 1.3)
     - FirebaseCore (~> 6.1)
     - Protobuf (>= 3.9.2, ~> 3.9)
-  - FirebaseAnalytics (6.1.7):
-    - FirebaseCore (~> 6.5)
-    - FirebaseInstanceID (~> 4.2)
-    - GoogleAppMeasurement (= 6.1.7)
+  - FirebaseAnalytics (6.2.2):
+    - FirebaseCore (~> 6.6)
+    - FirebaseInstanceID (~> 4.3)
+    - GoogleAppMeasurement (= 6.2.2)
     - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
     - GoogleUtilities/MethodSwizzler (~> 6.0)
     - GoogleUtilities/Network (~> 6.0)
     - "GoogleUtilities/NSData+zlib (~> 6.0)"
     - nanopb (= 0.3.9011)
-  - FirebaseAnalyticsInterop (1.4.0)
-  - FirebaseCore (6.5.0):
-    - FirebaseCoreDiagnostics (~> 1.0)
-    - FirebaseCoreDiagnosticsInterop (~> 1.0)
-    - GoogleUtilities/Environment (~> 6.4)
-    - GoogleUtilities/Logger (~> 6.4)
-  - FirebaseCoreDiagnostics (1.1.2):
-    - FirebaseCoreDiagnosticsInterop (~> 1.0)
-    - GoogleDataTransportCCTSupport (~> 1.0)
-    - GoogleUtilities/Environment (~> 6.2)
-    - GoogleUtilities/Logger (~> 6.2)
+  - FirebaseAnalyticsInterop (1.5.0)
+  - FirebaseCore (6.6.2):
+    - FirebaseCoreDiagnostics (~> 1.2)
+    - FirebaseCoreDiagnosticsInterop (~> 1.2)
+    - GoogleUtilities/Environment (~> 6.5)
+    - GoogleUtilities/Logger (~> 6.5)
+  - FirebaseCoreDiagnostics (1.2.0):
+    - FirebaseCoreDiagnosticsInterop (~> 1.2)
+    - GoogleDataTransportCCTSupport (~> 1.3)
+    - GoogleUtilities/Environment (~> 6.5)
+    - GoogleUtilities/Logger (~> 6.5)
     - nanopb (~> 0.3.901)
-  - FirebaseCoreDiagnosticsInterop (1.1.0)
-  - FirebaseInstanceID (4.2.8):
-    - FirebaseCore (~> 6.5)
-    - GoogleUtilities/Environment (~> 6.4)
-    - GoogleUtilities/UserDefaults (~> 6.4)
-  - FirebaseMessaging (4.1.10):
-    - FirebaseAnalyticsInterop (~> 1.3)
-    - FirebaseCore (~> 6.2)
-    - FirebaseInstanceID (~> 4.1)
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.2)
-    - GoogleUtilities/Environment (~> 6.2)
-    - GoogleUtilities/Reachability (~> 6.2)
-    - GoogleUtilities/UserDefaults (~> 6.2)
+  - FirebaseCoreDiagnosticsInterop (1.2.0)
+  - FirebaseInstallations (1.1.0):
+    - FirebaseCore (~> 6.6)
+    - GoogleUtilities/UserDefaults (~> 6.5)
+    - PromisesObjC (~> 1.2)
+  - FirebaseInstanceID (4.3.1):
+    - FirebaseCore (~> 6.6)
+    - FirebaseInstallations (~> 1.0)
+    - GoogleUtilities/Environment (~> 6.5)
+    - GoogleUtilities/UserDefaults (~> 6.5)
+  - FirebaseMessaging (4.2.1):
+    - FirebaseAnalyticsInterop (~> 1.5)
+    - FirebaseCore (~> 6.6)
+    - FirebaseInstanceID (~> 4.3)
+    - GoogleUtilities/AppDelegateSwizzler (~> 6.5)
+    - GoogleUtilities/Environment (~> 6.5)
+    - GoogleUtilities/Reachability (~> 6.5)
+    - GoogleUtilities/UserDefaults (~> 6.5)
     - Protobuf (>= 3.9.2, ~> 3.9)
-  - FirebaseRemoteConfig (4.4.6):
+  - FirebaseRemoteConfig (4.4.7):
     - FirebaseABTesting (~> 3.1)
     - FirebaseAnalyticsInterop (~> 1.4)
     - FirebaseCore (~> 6.2)
@@ -92,33 +97,33 @@ PODS:
     - GoogleUtilities/Environment (~> 6.2)
     - "GoogleUtilities/NSData+zlib (~> 6.2)"
     - Protobuf (>= 3.9.2, ~> 3.9)
-  - GoogleAppMeasurement (6.1.7):
+  - GoogleAppMeasurement (6.2.2):
     - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
     - GoogleUtilities/MethodSwizzler (~> 6.0)
     - GoogleUtilities/Network (~> 6.0)
     - "GoogleUtilities/NSData+zlib (~> 6.0)"
     - nanopb (= 0.3.9011)
-  - GoogleDataTransport (3.2.0)
-  - GoogleDataTransportCCTSupport (1.2.3):
-    - GoogleDataTransport (~> 3.2)
+  - GoogleDataTransport (4.0.0)
+  - GoogleDataTransportCCTSupport (1.4.0):
+    - GoogleDataTransport (~> 4.0)
     - nanopb (~> 0.3.901)
-  - GoogleUtilities/AppDelegateSwizzler (6.4.0):
+  - GoogleUtilities/AppDelegateSwizzler (6.5.1):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (6.4.0)
-  - GoogleUtilities/Logger (6.4.0):
+  - GoogleUtilities/Environment (6.5.1)
+  - GoogleUtilities/Logger (6.5.1):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (6.4.0):
+  - GoogleUtilities/MethodSwizzler (6.5.1):
     - GoogleUtilities/Logger
-  - GoogleUtilities/Network (6.4.0):
+  - GoogleUtilities/Network (6.5.1):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (6.4.0)"
-  - GoogleUtilities/Reachability (6.4.0):
+  - "GoogleUtilities/NSData+zlib (6.5.1)"
+  - GoogleUtilities/Reachability (6.5.1):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (6.4.0):
+  - GoogleUtilities/UserDefaults (6.5.1):
     - GoogleUtilities/Logger
   - HexColors (2.3.0)
   - Highlightr (2.1.0)
@@ -154,7 +159,8 @@ PODS:
     - PromiseKit/CorePromise
   - PromiseKit/UIKit (6.13.0):
     - PromiseKit/CorePromise
-  - Protobuf (3.11.2)
+  - PromisesObjC (1.2.8)
+  - Protobuf (3.11.3)
   - Quick (2.2.0)
   - Reveal-SDK (24)
   - SDWebImage (5.5.2):
@@ -166,7 +172,7 @@ PODS:
     - CocoaLumberjack (~> 3.0)
   - SVProgressHUD (2.2.5)
   - SwiftDate (6.1.0)
-  - SwiftLint (0.38.2)
+  - SwiftLint (0.39.1)
   - SwiftyGif (5.2.0)
   - SwiftyJSON (5.0.0)
   - Tabman (2.8.0):
@@ -201,10 +207,10 @@ DEPENDENCIES:
   - Fabric (= 1.10.2)
   - FBSDKCoreKit (= 5.13.0)
   - FBSDKLoginKit (= 5.13.0)
-  - Firebase/Analytics (= 6.14.0)
-  - Firebase/Core (= 6.14.0)
-  - Firebase/Messaging (= 6.14.0)
-  - Firebase/RemoteConfig (= 6.14.0)
+  - Firebase/Analytics (= 6.17.0)
+  - Firebase/Core (= 6.17.0)
+  - Firebase/Messaging (= 6.17.0)
+  - Firebase/RemoteConfig (= 6.17.0)
   - Highlightr (= 2.1.0)
   - IQKeyboardManagerSwift (= 6.5.4)
   - Kanna (= 5.0.0)
@@ -224,7 +230,7 @@ DEPENDENCIES:
   - SVGKit (from `https://github.com/SVGKit/SVGKit.git`, branch `2.x`)
   - SVProgressHUD (= 2.2.5)
   - SwiftDate (= 6.1.0)
-  - SwiftLint (= 0.38.2)
+  - SwiftLint (= 0.39.1)
   - SwiftyJSON (= 5.0.0)
   - Tabman (= 2.8.0)
   - TSMessages (from `https://github.com/KrauseFx/TSMessages.git`)
@@ -259,6 +265,7 @@ SPEC REPOS:
     - FirebaseCore
     - FirebaseCoreDiagnostics
     - FirebaseCoreDiagnosticsInterop
+    - FirebaseInstallations
     - FirebaseInstanceID
     - FirebaseMessaging
     - FirebaseRemoteConfig
@@ -281,6 +288,7 @@ SPEC REPOS:
     - pop
     - Presentr
     - PromiseKit
+    - PromisesObjC
     - Protobuf
     - Quick
     - Reveal-SDK
@@ -332,20 +340,21 @@ SPEC CHECKSUMS:
   Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
   FBSDKCoreKit: b1645dba3dfdba6102f2d4026fdbfca8114dc229
   FBSDKLoginKit: 4aca55e93a63b1ff0cb9446208d49e32c13ab24a
-  Firebase: 0219bb4782eb1406f1b9b0628a2e625484ce910d
+  Firebase: 2672e5636b42f977177716317e68346ae5e9de25
   FirebaseABTesting: 0d10f3cdc3fa00f3f175b5b56c1003c8e888299f
-  FirebaseAnalytics: f68b9f3f1241385129ae0a83b63627fc420c05e5
-  FirebaseAnalyticsInterop: d48b6ab67bcf016a05e55b71fc39c61c0cb6b7f3
-  FirebaseCore: 632e05cc5e1199d9147122c16d92305eb04c34bd
-  FirebaseCoreDiagnostics: 511f4f3ed7d440bb69127e8b97c2bc8befae639e
-  FirebaseCoreDiagnosticsInterop: e9b1b023157e3a2fc6418b5cb601e79b9af7b3a0
-  FirebaseInstanceID: ce993a3c3670a8f5d47ce371ac5d143c560608c5
-  FirebaseMessaging: 089b7a4991425783384acc8bcefcd78c0af913bd
-  FirebaseRemoteConfig: c11d74d8b1ff8463b587fc8899d92ee089f9a691
-  GoogleAppMeasurement: db118eb61a97dd8c4f7014e368d3c335cbbcf80a
-  GoogleDataTransport: 8e9b210c97d55fbff306cc5468ff91b9cb32dcf5
-  GoogleDataTransportCCTSupport: 202d7cdf9c4a7d81a2bb7f7e7e1ba6faa421b1f2
-  GoogleUtilities: 29bd0d8f850efbd28cff6d99e8b7da1f8d236bcf
+  FirebaseAnalytics: cf95d3aab897612783020fbd98401d5366f135ee
+  FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
+  FirebaseCore: a1dd9dd6355a8356dd30a8f076839e242285a81c
+  FirebaseCoreDiagnostics: 5e78803ab276bc5b50340e3c539c06c3de35c649
+  FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
+  FirebaseInstallations: 575cd32f2aec0feeb0e44f5d0110a09e5e60b47b
+  FirebaseInstanceID: 031d7d0c8e7b5c030bbeb4d2a690550375e83fec
+  FirebaseMessaging: 9e23f9d603b1fb71ccbeb48d79bf0d4ba0272c84
+  FirebaseRemoteConfig: 4890e58b0e33c8328b8c5e8b7a5a237b9d851d8e
+  GoogleAppMeasurement: d0560d915abf15e692e8538ba1d58442217b6aff
+  GoogleDataTransport: 47fe3b8e1673e5187dfd615656a3c5034f150d69
+  GoogleDataTransportCCTSupport: 36f69887fd212db6d7ef4dd45ba44523717a434e
+  GoogleUtilities: 06eb53bb579efe7099152735900dd04bf09e7275
   HexColors: 6ad3947c3447a055a3aa8efa859def096351fe5f
   Highlightr: 595f3e100737c8de41113385da8bd0b5b65212c6
   IQKeyboardManagerSwift: 2dde0fc70110e8eac7ccce2a46fdbec6a850b414
@@ -361,7 +370,8 @@ SPEC CHECKSUMS:
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
   Presentr: 7078d7eb5d1661ebeaae60c9e42a1e534de1b993
   PromiseKit: c8668a559f26c98277a543192c51bc38dd2dfc76
-  Protobuf: dd1aaea7140debfe4dd0683fb8ef208e527ae153
+  PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
+  Protobuf: 0e94afe3b47cb11876eb6aee296638711a24bf75
   Quick: 7fb19e13be07b5dfb3b90d4f9824c855a11af40e
   Reveal-SDK: 5d7e56b8f018c0a88b3a2c10bf68d598bbd3b071
   SDWebImage: 4d5c027c935438f341ed33dbac53ff9f479922ca
@@ -370,7 +380,7 @@ SPEC CHECKSUMS:
   SVGKit: 8a2fc74258bdb2abb54d3b65f3dd68b0277a9c4d
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SwiftDate: fa2bb3962056bb44047b4b85a30044e5eae30b03
-  SwiftLint: 8f5d2f903e1c9bcbc832fd16771e80a263ac6cbb
+  SwiftLint: 55e96a4a4d537d4a3156859fc1c54bd24851a046
   SwiftyGif: b85c6b33a9411859d9e1db998b6a8214aea942df
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
   Tabman: f62ad94ee54a7d96e3fbab34f677d9ea4d38ece6
@@ -381,6 +391,6 @@ SPEC CHECKSUMS:
   VK-ios-sdk: 62a10b6571fbcda0657f455fedce7fedf55b4cd0
   YandexMobileMetrica: 1030df2959c886a7be3bc3d274eb54c8e86afd6f
 
-PODFILE CHECKSUM: b9360478efa119ccbcb0ae9fc4da864d52d5251e
+PODFILE CHECKSUM: 1fe1dfccefae881f76b2cbabadf3a8cf5460290b
 
 COCOAPODS: 1.8.4
diff --git a/Stepic.xcodeproj/project.pbxproj b/Stepic.xcodeproj/project.pbxproj
index 7f941be13e..99e8cf137c 100644
--- a/Stepic.xcodeproj/project.pbxproj
+++ b/Stepic.xcodeproj/project.pbxproj
@@ -6279,6 +6279,7 @@
 				"${BUILT_PRODUCTS_DIR}/Pageboy/Pageboy.framework",
 				"${BUILT_PRODUCTS_DIR}/Presentr/Presentr.framework",
 				"${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework",
+				"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
 				"${BUILT_PRODUCTS_DIR}/Protobuf/protobuf.framework",
 				"${PODS_ROOT}/Reveal-SDK/RevealServer/iOS/RevealServer.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
@@ -6332,6 +6333,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Pageboy.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Presentr.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/protobuf.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
@@ -6395,6 +6397,7 @@
 				"${BUILT_PRODUCTS_DIR}/Pageboy/Pageboy.framework",
 				"${BUILT_PRODUCTS_DIR}/Presentr/Presentr.framework",
 				"${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework",
+				"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
 				"${BUILT_PRODUCTS_DIR}/Protobuf/protobuf.framework",
 				"${PODS_ROOT}/Reveal-SDK/RevealServer/iOS/RevealServer.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
@@ -6444,6 +6447,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Pageboy.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Presentr.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/protobuf.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",

From 52a151930b4167594562907e1a09ab1cf8b87939 Mon Sep 17 00:00:00 2001
From: Ivan Magda <ivan.magda@stepik.org>
Date: Mon, 17 Feb 2020 00:48:10 +0300
Subject: [PATCH 5/9] Remove A/B `explore_search_bar_style` (#657)

* Remove a/b test

* Add cancel button for iPad

* Fix uncomment
---
 Stepic.xcodeproj/project.pbxproj              | 16 +---
 .../ActiveSplitTestsContainer.swift           |  4 +-
 .../ExploreSearchBarStyleSplitTest.swift      | 37 --------
 .../Explore/ExploreViewController.swift       | 37 +++++---
 .../Explore/View/ExploreSearchBar.swift       | 36 +++-----
 .../Explore/View/NewExploreSearchBar.swift    | 92 -------------------
 6 files changed, 41 insertions(+), 181 deletions(-)
 delete mode 100644 Stepic/Analytics/SplitTests/ActiveTests/ExploreSearchBarStyleSplitTest.swift
 delete mode 100644 Stepic/Sources/Modules/Explore/View/NewExploreSearchBar.swift

diff --git a/Stepic.xcodeproj/project.pbxproj b/Stepic.xcodeproj/project.pbxproj
index 99e8cf137c..74ca011b7a 100644
--- a/Stepic.xcodeproj/project.pbxproj
+++ b/Stepic.xcodeproj/project.pbxproj
@@ -659,8 +659,7 @@
 		2CC3519A1F68339A004255B6 /* AuthTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CC351991F68339A004255B6 /* AuthTextField.swift */; };
 		2CC3519C1F6837B4004255B6 /* RegistrationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CC3519B1F6837B4004255B6 /* RegistrationViewController.swift */; };
 		2CC3519D1F683E7C004255B6 /* AuthNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08D674921D78B46900B60963 /* AuthNavigationViewController.swift */; };
-		2CCA806723E81A4900057562 /* NewExploreSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CCA806623E81A4900057562 /* NewExploreSearchBar.swift */; };
-		2CCA806923E822A300057562 /* ExploreSearchBarStyleSplitTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CCA806823E822A300057562 /* ExploreSearchBarStyleSplitTest.swift */; };
+		2CCA806723E81A4900057562 /* ExploreSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CCA806623E81A4900057562 /* ExploreSearchBar.swift */; };
 		2CCC505E21E8EA88004D9FC1 /* PersonalDeadlinesTimeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08194EB920B813AC00B34327 /* PersonalDeadlinesTimeService.swift */; };
 		2CD462EA226F4279004E4725 /* FetchResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD462E9226F4279004E4725 /* FetchResult.swift */; };
 		2CD6E256234E042800F49303 /* EmailAddressesAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD6E255234E042800F49303 /* EmailAddressesAPI.swift */; };
@@ -1000,7 +999,6 @@
 		62E98F5FB06328B5D7212700 /* HighlightFakeButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E9802EAA7E12A5C9B4F800 /* HighlightFakeButton.swift */; };
 		62E98F602ED9E5CEA4E02D0A /* UIStackView+RemoveAllArrangedSubviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E980371A0458D70C61D357 /* UIStackView+RemoveAllArrangedSubviews.swift */; };
 		62E98F70C242A21FE473B4FC /* ContinueCourseOutputProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E982A16F209817B2EDF2A5 /* ContinueCourseOutputProtocol.swift */; };
-		62E98F7CC7326DFC895A894C /* ExploreSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E9846ED8A00A1041FFB84E /* ExploreSearchBar.swift */; };
 		62E98F9D4DFE12505014E204 /* ContinueCourseDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E983C0D92833ECC836D369 /* ContinueCourseDataFlow.swift */; };
 		62E98FAF7FFEFCAB3196CF16 /* UserCourse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98BB94C146AA2D8A9C2FF /* UserCourse.swift */; };
 		62E98FAFD474DA53CC09FE9C /* ImageDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98CF5FA317BCAFAE433A9 /* ImageDataProvider.swift */; };
@@ -1844,8 +1842,7 @@
 		2CC351961F683140004255B6 /* EmailAuthViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmailAuthViewController.swift; sourceTree = "<group>"; };
 		2CC351991F68339A004255B6 /* AuthTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthTextField.swift; sourceTree = "<group>"; };
 		2CC3519B1F6837B4004255B6 /* RegistrationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationViewController.swift; sourceTree = "<group>"; };
-		2CCA806623E81A4900057562 /* NewExploreSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewExploreSearchBar.swift; sourceTree = "<group>"; };
-		2CCA806823E822A300057562 /* ExploreSearchBarStyleSplitTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExploreSearchBarStyleSplitTest.swift; sourceTree = "<group>"; };
+		2CCA806623E81A4900057562 /* ExploreSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExploreSearchBar.swift; sourceTree = "<group>"; };
 		2CCC7DBD219F09C60000540F /* Model_course_language_code_v27.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model_course_language_code_v27.xcdatamodel; sourceTree = "<group>"; };
 		2CD462E9226F4279004E4725 /* FetchResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchResult.swift; sourceTree = "<group>"; };
 		2CD6E254234DFFD500F49303 /* Model_email_addresses.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model_email_addresses.xcdatamodel; sourceTree = "<group>"; };
@@ -2023,7 +2020,6 @@
 		62E9845643D7541307856023 /* UITableViewExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITableViewExtensions.swift; sourceTree = "<group>"; };
 		62E984651165CED551545B5C /* ProgressCircleImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProgressCircleImage.swift; sourceTree = "<group>"; };
 		62E9846CC7C917D3E460E8B7 /* CourseInfoTabInfoIntroVideoBlockView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseInfoTabInfoIntroVideoBlockView.swift; sourceTree = "<group>"; };
-		62E9846ED8A00A1041FFB84E /* ExploreSearchBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExploreSearchBar.swift; sourceTree = "<group>"; };
 		62E984954DECC6ECEF63441A /* TagsInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TagsInteractor.swift; sourceTree = "<group>"; };
 		62E98495AD977008DC9F856A /* HomeAssembly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeAssembly.swift; sourceTree = "<group>"; };
 		62E984C3F4EE78D2D22FF7BF /* BaseExplorePresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseExplorePresenter.swift; sourceTree = "<group>"; };
@@ -3822,7 +3818,6 @@
 			isa = PBXGroup;
 			children = (
 				08421BCA21764FC400E8A81B /* ActiveSplitTestsContainer.swift */,
-				2CCA806823E822A300057562 /* ExploreSearchBarStyleSplitTest.swift */,
 			);
 			path = ActiveTests;
 			sourceTree = "<group>";
@@ -5487,9 +5482,8 @@
 				62E98CCD8D3A65826FD76F26 /* CourseListContainerViewFactory.swift */,
 				62E987A905FB8549F2072DF4 /* ExploreBlockHeaderView.swift */,
 				62E98D95D858F6D7A5D25EC4 /* ExploreBlockPlaceholderView.swift */,
-				62E9846ED8A00A1041FFB84E /* ExploreSearchBar.swift */,
 				62E980A41B871F8FD6D3A412 /* ExploreStoriesContainerView.swift */,
-				2CCA806623E81A4900057562 /* NewExploreSearchBar.swift */,
+				2CCA806623E81A4900057562 /* ExploreSearchBar.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -6591,7 +6585,6 @@
 				081B7E2A1BAC208200554153 /* StandardsExtensions.swift in Sources */,
 				0860D9151F10EA690087D61B /* InputAccessoryBuilder.swift in Sources */,
 				08D2AE4A1C05127500BD8C3D /* AnalyticsHelper.swift in Sources */,
-				2CCA806923E822A300057562 /* ExploreSearchBarStyleSplitTest.swift in Sources */,
 				0860D9121F10C5480087D61B /* CodeSnippetSymbols.swift in Sources */,
 				083E49DD2072B684004896C0 /* IDFetchable.swift in Sources */,
 				2C29B63022C664C500730C16 /* ChoiceElementView.swift in Sources */,
@@ -7087,7 +7080,7 @@
 				62E981A406A91D91498A3B19 /* CourseInfoTabReviewsCellView.swift in Sources */,
 				62E98462B911999E78E315DB /* CourseInfoTabReviewsTableViewCell.swift in Sources */,
 				62E98E52C2821A15C7FA70F2 /* CourseInfoTabReviewsAssembly.swift in Sources */,
-				2CCA806723E81A4900057562 /* NewExploreSearchBar.swift in Sources */,
+				2CCA806723E81A4900057562 /* ExploreSearchBar.swift in Sources */,
 				2C53DFFB22DDDBFD0084BA2B /* NewCodeQuizViewController.swift in Sources */,
 				62E98BCFF2B85E440D0B23E8 /* CourseInfoTabReviewsViewController.swift in Sources */,
 				62E987367E4233CE076E5E04 /* CourseInfoTabReviewsInteractor.swift in Sources */,
@@ -7262,7 +7255,6 @@
 				62E9849D9108AE7405DBFD4C /* CourseListContainerViewFactory.swift in Sources */,
 				2C07DD8123913F5500286CAA /* StepStatisticsView.swift in Sources */,
 				62E98A414B3BFB6921F522D4 /* ExploreBlockHeaderView.swift in Sources */,
-				62E98F7CC7326DFC895A894C /* ExploreSearchBar.swift in Sources */,
 				62E98E591285E12F8D82759B /* ExploreBlockPlaceholderView.swift in Sources */,
 				62E98DFFFE47867392F62037 /* ExploreStoriesContainerView.swift in Sources */,
 				62E98CDFCB9B1A6953B0F161 /* ContentLanguageSwitchAvailabilityService.swift in Sources */,
diff --git a/Stepic/Analytics/SplitTests/ActiveTests/ActiveSplitTestsContainer.swift b/Stepic/Analytics/SplitTests/ActiveTests/ActiveSplitTestsContainer.swift
index ea26e239bf..e6014a991c 100644
--- a/Stepic/Analytics/SplitTests/ActiveTests/ActiveSplitTestsContainer.swift
+++ b/Stepic/Analytics/SplitTests/ActiveTests/ActiveSplitTestsContainer.swift
@@ -14,7 +14,5 @@ final class ActiveSplitTestsContainer {
         storage: UserDefaults.standard
     )
 
-    static func setActiveTestsGroups() {
-        self.splitTestingService.fetchSplitTest(ExploreSearchBarStyleSplitTest.self).setSplitTestGroup()
-    }
+    static func setActiveTestsGroups() {}
 }
diff --git a/Stepic/Analytics/SplitTests/ActiveTests/ExploreSearchBarStyleSplitTest.swift b/Stepic/Analytics/SplitTests/ActiveTests/ExploreSearchBarStyleSplitTest.swift
deleted file mode 100644
index a854cd4654..0000000000
--- a/Stepic/Analytics/SplitTests/ActiveTests/ExploreSearchBarStyleSplitTest.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-import Foundation
-
-final class ExploreSearchBarStyleSplitTest: SplitTestProtocol {
-    typealias GroupType = Group
-
-    static let identifier = "explore_search_bar_style"
-    static let minParticipatingStartVersion = "1.111"
-
-    var currentGroup: Group
-    var analytics: ABAnalyticsServiceProtocol
-
-    init(currentGroup: Group, analytics: ABAnalyticsServiceProtocol) {
-        self.currentGroup = currentGroup
-        self.analytics = analytics
-    }
-
-    enum Group: String, SplitTestGroupProtocol {
-        case control = "control"
-        case test = "test"
-
-        static var groups: [Group] = [.control, .test]
-
-        var searchBarStyle: SearchBarStyle {
-            switch self {
-            case .control:
-                return .legacy
-            case .test:
-                return .new
-            }
-        }
-    }
-
-    enum SearchBarStyle {
-        case new
-        case legacy
-    }
-}
diff --git a/Stepic/Sources/Modules/Explore/ExploreViewController.swift b/Stepic/Sources/Modules/Explore/ExploreViewController.swift
index fa11c8b9d6..aa359b25a6 100644
--- a/Stepic/Sources/Modules/Explore/ExploreViewController.swift
+++ b/Stepic/Sources/Modules/Explore/ExploreViewController.swift
@@ -32,18 +32,12 @@ final class ExploreViewController: BaseExploreViewController {
 
     private var searchResultsModuleInput: SearchResultsModuleInputProtocol?
     private var searchResultsController: UIViewController?
-    private lazy var searchBar: ExploreSearchBarProtocol = {
-        if ExploreSearchBarStyleSplitTest.shouldParticipate {
-            let splitTest = self.splitTestingService.fetchSplitTest(ExploreSearchBarStyleSplitTest.self)
-            switch splitTest.currentGroup.searchBarStyle {
-            case .new:
-                return NewExploreSearchBar()
-            case .legacy:
-                return ExploreSearchBar()
-            }
-        }
-        return ExploreSearchBar()
-    }()
+    private lazy var searchBar = ExploreSearchBar()
+    private lazy var ipadCancelSearchBarButtonItem = UIBarButtonItem(
+        barButtonSystemItem: .cancel,
+        target: self,
+        action: #selector(self.ipadCancelSearchButtonClicked)
+    )
 
     private var isStoriesHidden: Bool = false
 
@@ -231,6 +225,11 @@ final class ExploreViewController: BaseExploreViewController {
     private func showSearchResults() {
         self.searchResultsController?.view.isHidden = false
     }
+
+    @objc
+    private func ipadCancelSearchButtonClicked() {
+        self.searchBarCancelButtonClicked(self.searchBar)
+    }
 }
 
 extension Explore.Submodule: SubmoduleType {
@@ -280,6 +279,10 @@ extension ExploreViewController: ExploreViewControllerProtocol {
 
 extension ExploreViewController: UISearchBarDelegate {
     func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) {
+        if DeviceInfo.current.isPad {
+            self.navigationItem.setRightBarButton(self.ipadCancelSearchBarButtonItem, animated: true)
+        }
+
         self.showSearchResults()
         // Strange hack to hide search results (courses)
         self.searchResultsModuleInput?.searchStarted()
@@ -288,7 +291,17 @@ extension ExploreViewController: UISearchBarDelegate {
         AmplitudeAnalyticsEvents.Search.started.send()
     }
 
+    func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
+        if DeviceInfo.current.isPad {
+            self.navigationItem.setRightBarButton(nil, animated: true)
+        }
+    }
+
     func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {
+        if DeviceInfo.current.isPad {
+            self.searchBar.cancel()
+        }
+
         self.hideSearchResults()
         self.searchResultsModuleInput?.searchCancelled()
 
diff --git a/Stepic/Sources/Modules/Explore/View/ExploreSearchBar.swift b/Stepic/Sources/Modules/Explore/View/ExploreSearchBar.swift
index 075ae0b5d4..76a010f46a 100644
--- a/Stepic/Sources/Modules/Explore/View/ExploreSearchBar.swift
+++ b/Stepic/Sources/Modules/Explore/View/ExploreSearchBar.swift
@@ -1,14 +1,9 @@
 import SnapKit
 import UIKit
 
-final class ExploreSearchBar: UISearchBar, ExploreSearchBarProtocol {
+final class ExploreSearchBar: UISearchBar {
     enum Appearance {
-        static let searchFieldPositionAdjustment = UIOffset(horizontal: -6, vertical: 0)
-        static let textColor = UIColor.mainDark.withAlphaComponent(0.3)
-
-        // Height should be fixed and leq than 44pt (due to iOS 11+ strange nav bar)
-        static let barHeight: CGFloat = 44.0
-
+        static let textColor = UIColor.mainDark
         static let placeholderText = NSLocalizedString("SearchCourses", comment: "")
     }
 
@@ -22,23 +17,19 @@ final class ExploreSearchBar: UISearchBar, ExploreSearchBarProtocol {
         }
     }
 
-    // TODO: iOS 13 has `searchTextField` property, take a look.
     private var searchField: UITextField? {
         self.value(forKey: "searchField") as? UITextField
     }
 
     override init(frame: CGRect) {
         super.init(frame: frame)
-        self.delegate = self
 
-        self.isTranslucent = false
+        self.delegate = self
+        self.placeholder = Appearance.placeholderText
+        self.searchBarStyle = .minimal
 
         self.searchField?.backgroundColor = .clear
         self.searchField?.textColor = Appearance.textColor
-        self.placeholder = Appearance.placeholderText
-        self.searchField?.rightViewMode = .whileEditing
-
-        self.applySystemFixes()
     }
 
     @available(*, unavailable)
@@ -46,12 +37,11 @@ final class ExploreSearchBar: UISearchBar, ExploreSearchBarProtocol {
         fatalError("init(coder:) has not been implemented")
     }
 
-    private func applySystemFixes() {
-        self.searchFieldBackgroundPositionAdjustment = Appearance.searchFieldPositionAdjustment
-        self.translatesAutoresizingMaskIntoConstraints = false
-        self.snp.makeConstraints { make in
-            make.height.equalTo(Appearance.barHeight)
-        }
+    func cancel() {
+        self.resignFirstResponder()
+        self.text?.removeAll()
+        self.endEditing(true)
+        self.setShowsCancelButton(false, animated: true)
     }
 }
 
@@ -67,11 +57,7 @@ extension ExploreSearchBar: UISearchBarDelegate {
     }
 
     func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {
-        searchBar.resignFirstResponder()
-        searchBar.text?.removeAll()
-        searchBar.endEditing(true)
-
-        searchBar.setShowsCancelButton(false, animated: true)
+        self.cancel()
         self.searchBarDelegate?.searchBarCancelButtonClicked?(searchBar)
     }
 
diff --git a/Stepic/Sources/Modules/Explore/View/NewExploreSearchBar.swift b/Stepic/Sources/Modules/Explore/View/NewExploreSearchBar.swift
deleted file mode 100644
index eb252c92e7..0000000000
--- a/Stepic/Sources/Modules/Explore/View/NewExploreSearchBar.swift
+++ /dev/null
@@ -1,92 +0,0 @@
-import SnapKit
-import UIKit
-
-protocol ExploreSearchBarProtocol: UISearchBar {
-    var searchBarDelegate: UISearchBarDelegate? { get set }
-}
-
-final class NewExploreSearchBar: UISearchBar, ExploreSearchBarProtocol {
-    enum Appearance {
-        static let textColor = UIColor.mainDark
-
-        // Height should be fixed and leq than 44pt (due to iOS 11+ strange nav bar)
-        static let barHeight: CGFloat = 44.0
-
-        static let placeholderText = NSLocalizedString("SearchCourses", comment: "")
-    }
-
-    weak var searchBarDelegate: UISearchBarDelegate?
-
-    override var delegate: UISearchBarDelegate? {
-        willSet {
-            if newValue !== self {
-                fatalError("Use property searchBarDelegate to set or get delegate")
-            }
-        }
-    }
-
-    private var searchField: UITextField? {
-        if #available(iOS 13.0, *) {
-            return self.searchTextField
-        } else {
-            return self.value(forKey: "searchField") as? UITextField
-        }
-    }
-
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        self.delegate = self
-
-        self.isTranslucent = false
-
-        self.searchField?.backgroundColor = .clear
-        self.searchField?.textColor = Appearance.textColor
-        self.placeholder = Appearance.placeholderText
-        self.searchField?.rightViewMode = .whileEditing
-        self.searchBarStyle = .minimal
-
-        self.applySystemFixes()
-    }
-
-    @available(*, unavailable)
-    required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
-    private func applySystemFixes() {
-        self.translatesAutoresizingMaskIntoConstraints = false
-        self.snp.makeConstraints { make in
-            make.height.equalTo(Appearance.barHeight)
-        }
-    }
-}
-
-extension NewExploreSearchBar: UISearchBarDelegate {
-    func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) {
-        searchBar.setShowsCancelButton(true, animated: true)
-        self.searchBarDelegate?.searchBarTextDidBeginEditing?(searchBar)
-    }
-
-    func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
-        searchBar.setShowsCancelButton(false, animated: true)
-        self.searchBarDelegate?.searchBarTextDidEndEditing?(searchBar)
-    }
-
-    func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {
-        searchBar.resignFirstResponder()
-        searchBar.text?.removeAll()
-        searchBar.endEditing(true)
-
-        searchBar.setShowsCancelButton(false, animated: true)
-        self.searchBarDelegate?.searchBarCancelButtonClicked?(searchBar)
-    }
-
-    func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
-        self.searchBarDelegate?.searchBar?(searchBar, textDidChange: searchText)
-    }
-
-    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
-        searchBar.resignFirstResponder()
-        self.searchBarDelegate?.searchBarSearchButtonClicked?(searchBar)
-    }
-}

From 33fd62aac96bf3440e6d4f43625e082f88f920aa Mon Sep 17 00:00:00 2001
From: Ivan Magda <ivan.magda@stepik.org>
Date: Mon, 17 Feb 2020 02:34:14 +0300
Subject: [PATCH 6/9] Add A/B `course_list_see_all_text` (#658)

* Add a/b test

* Report to analytics
---
 Stepic.xcodeproj/project.pbxproj              |  4 ++
 .../Events/AmplitudeAnalyticsEvents.swift     |  2 +
 .../ActiveSplitTestsContainer.swift           |  4 +-
 .../CourseListSeeAllTextSplitTest.swift       | 38 +++++++++++++++++++
 .../View/CourseListContainerViewFactory.swift |  8 ++--
 .../Explore/View/ExploreBlockHeaderView.swift | 22 +++++++++--
 .../Views/ContentLanguageSwitchView.swift     |  2 +-
 .../Views/CourseListsCollectionView.swift     |  2 +-
 .../ExploreSubmodules/Tags/TagsView.swift     |  2 +-
 .../Modules/Home/HomeViewController.swift     |  4 +-
 Stepic/en.lproj/Localizable.strings           |  3 ++
 Stepic/ru.lproj/Localizable.strings           |  3 ++
 12 files changed, 80 insertions(+), 14 deletions(-)
 create mode 100644 Stepic/Analytics/SplitTests/ActiveTests/CourseListSeeAllTextSplitTest.swift

diff --git a/Stepic.xcodeproj/project.pbxproj b/Stepic.xcodeproj/project.pbxproj
index 74ca011b7a..15e8ed8469 100644
--- a/Stepic.xcodeproj/project.pbxproj
+++ b/Stepic.xcodeproj/project.pbxproj
@@ -685,6 +685,7 @@
 		2CDBCCCF23EB777E005D2370 /* SubmissionURLProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CDBCCCE23EB777E005D2370 /* SubmissionURLProvider.swift */; };
 		2CDE82E2221D5CCB00C41887 /* highlight.js in Resources */ = {isa = PBXBuildFile; fileRef = 2CDE82E1221D5CCB00C41887 /* highlight.js */; };
 		2CE02A772176649F009C633C /* UserNotificationsCenterDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE02A762176649F009C633C /* UserNotificationsCenterDelegate.swift */; };
+		2CE2425623F9FAF9004972A2 /* CourseListSeeAllTextSplitTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE2425523F9FAF9004972A2 /* CourseListSeeAllTextSplitTest.swift */; };
 		2CE3BCA71FBF13CE000AD405 /* SQLReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE3BCA61FBF13CE000AD405 /* SQLReply.swift */; };
 		2CE42D4423CCC4530073F774 /* StreamVideoQualityStorageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE42D4323CCC4530073F774 /* StreamVideoQualityStorageManager.swift */; };
 		2CE42D4623CCC6500073F774 /* VideoRateStorageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE42D4523CCC6500073F774 /* VideoRateStorageManager.swift */; };
@@ -1867,6 +1868,7 @@
 		2CDBCCCE23EB777E005D2370 /* SubmissionURLProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubmissionURLProvider.swift; sourceTree = "<group>"; };
 		2CDE82E1221D5CCB00C41887 /* highlight.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = highlight.js; sourceTree = "<group>"; };
 		2CE02A762176649F009C633C /* UserNotificationsCenterDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserNotificationsCenterDelegate.swift; sourceTree = "<group>"; };
+		2CE2425523F9FAF9004972A2 /* CourseListSeeAllTextSplitTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseListSeeAllTextSplitTest.swift; sourceTree = "<group>"; };
 		2CE3BCA61FBF13CE000AD405 /* SQLReply.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SQLReply.swift; sourceTree = "<group>"; };
 		2CE42D4323CCC4530073F774 /* StreamVideoQualityStorageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StreamVideoQualityStorageManager.swift; sourceTree = "<group>"; };
 		2CE42D4523CCC6500073F774 /* VideoRateStorageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoRateStorageManager.swift; sourceTree = "<group>"; };
@@ -3818,6 +3820,7 @@
 			isa = PBXGroup;
 			children = (
 				08421BCA21764FC400E8A81B /* ActiveSplitTestsContainer.swift */,
+				2CE2425523F9FAF9004972A2 /* CourseListSeeAllTextSplitTest.swift */,
 			);
 			path = ActiveTests;
 			sourceTree = "<group>";
@@ -7220,6 +7223,7 @@
 				62E985281E96C97ED82ABEBB /* CourseListsCollectionView.swift in Sources */,
 				62E98798A5A576F0C7258E35 /* CourseListsCollectionProvider.swift in Sources */,
 				62E988C7BC696512830AB928 /* CourseListsCollectionPersistenceService.swift in Sources */,
+				2CE2425623F9FAF9004972A2 /* CourseListSeeAllTextSplitTest.swift in Sources */,
 				62E9871AE0135BA1E6B5CEE3 /* CourseListsCollectionNetworkService.swift in Sources */,
 				62E985FFA36C4D5A3C0E63DD /* TagsAssembly.swift in Sources */,
 				62E989959BFCE8A398DA3F7B /* TagsViewController.swift in Sources */,
diff --git a/Stepic/Analytics/Events/AmplitudeAnalyticsEvents.swift b/Stepic/Analytics/Events/AmplitudeAnalyticsEvents.swift
index 21bb60e9d7..65941dcb69 100644
--- a/Stepic/Analytics/Events/AmplitudeAnalyticsEvents.swift
+++ b/Stepic/Analytics/Events/AmplitudeAnalyticsEvents.swift
@@ -349,6 +349,8 @@ struct AmplitudeAnalyticsEvents {
     // MARK: - CourseList -
 
     struct CourseList {
+        static var showAllClicked = AnalyticsEvent(name: "Course list show all clicked")
+
         static func opened(ID: String) -> AnalyticsEvent {
             return AnalyticsEvent(
                 name: "Course list opened",
diff --git a/Stepic/Analytics/SplitTests/ActiveTests/ActiveSplitTestsContainer.swift b/Stepic/Analytics/SplitTests/ActiveTests/ActiveSplitTestsContainer.swift
index e6014a991c..327a7925be 100644
--- a/Stepic/Analytics/SplitTests/ActiveTests/ActiveSplitTestsContainer.swift
+++ b/Stepic/Analytics/SplitTests/ActiveTests/ActiveSplitTestsContainer.swift
@@ -14,5 +14,7 @@ final class ActiveSplitTestsContainer {
         storage: UserDefaults.standard
     )
 
-    static func setActiveTestsGroups() {}
+    static func setActiveTestsGroups() {
+        self.splitTestingService.fetchSplitTest(CourseListSeeAllTextSplitTest.self).setSplitTestGroup()
+    }
 }
diff --git a/Stepic/Analytics/SplitTests/ActiveTests/CourseListSeeAllTextSplitTest.swift b/Stepic/Analytics/SplitTests/ActiveTests/CourseListSeeAllTextSplitTest.swift
new file mode 100644
index 0000000000..0879ece334
--- /dev/null
+++ b/Stepic/Analytics/SplitTests/ActiveTests/CourseListSeeAllTextSplitTest.swift
@@ -0,0 +1,38 @@
+import Foundation
+
+final class CourseListSeeAllTextSplitTest: SplitTestProtocol {
+    typealias GroupType = Group
+
+    static let identifier = "course_list_see_all_text"
+    static let minParticipatingStartVersion = "1.113"
+
+    var currentGroup: Group
+    var analytics: ABAnalyticsServiceProtocol
+
+    init(currentGroup: Group, analytics: ABAnalyticsServiceProtocol) {
+        self.currentGroup = currentGroup
+        self.analytics = analytics
+    }
+
+    enum Group: String, SplitTestGroupProtocol, CaseIterable {
+        case control = "control"
+        case testDetailIndicator = "test_detail_indicator"
+        case testText = "test_text"
+        case testTextDetailIndicator = "test_text_detail_indicator"
+
+        static var groups: [Group] = Self.allCases
+
+        var seeAllTitle: String {
+            switch self {
+            case .control:
+                return NSLocalizedString("ShowAll", comment: "")
+            case .testDetailIndicator:
+                return NSLocalizedString("ShowAllTestDetailIndicator", comment: "")
+            case .testText:
+                return NSLocalizedString("ShowAllTestText", comment: "")
+            case .testTextDetailIndicator:
+                return NSLocalizedString("ShowAllTestTextDetailIndicator", comment: "")
+            }
+        }
+    }
+}
diff --git a/Stepic/Sources/Modules/Explore/View/CourseListContainerViewFactory.swift b/Stepic/Sources/Modules/Explore/View/CourseListContainerViewFactory.swift
index 61d19877ed..21c5129d07 100644
--- a/Stepic/Sources/Modules/Explore/View/CourseListContainerViewFactory.swift
+++ b/Stepic/Sources/Modules/Explore/View/CourseListContainerViewFactory.swift
@@ -4,16 +4,16 @@ final class CourseListContainerViewFactory {
     struct HorizontalHeaderDescription {
         var title: String?
         var summary: String?
-        var shouldShowShowAllButton: Bool
+        var shouldShowAllButton: Bool
 
         init(
             title: String?,
             summary: String?,
-            shouldShowShowAllButton: Bool = true
+            shouldShowAllButton: Bool = true
         ) {
             self.title = title
             self.summary = summary
-            self.shouldShowShowAllButton = shouldShowShowAllButton
+            self.shouldShowAllButton = shouldShowAllButton
         }
     }
 
@@ -47,7 +47,7 @@ final class CourseListContainerViewFactory {
         let headerView = ExploreBlockHeaderView(
             appearance: self.colorMode.exploreBlockHeaderViewAppearance
         )
-        headerView.shouldShowShowAllButton = headerDescription.shouldShowShowAllButton
+        headerView.shouldShowAllButton = headerDescription.shouldShowAllButton
         headerView.titleText = headerDescription.title
         headerView.summaryText = headerDescription.summary
 
diff --git a/Stepic/Sources/Modules/Explore/View/ExploreBlockHeaderView.swift b/Stepic/Sources/Modules/Explore/View/ExploreBlockHeaderView.swift
index 63534f16fd..97f9e27646 100644
--- a/Stepic/Sources/Modules/Explore/View/ExploreBlockHeaderView.swift
+++ b/Stepic/Sources/Modules/Explore/View/ExploreBlockHeaderView.swift
@@ -25,6 +25,11 @@ extension ExploreBlockHeaderView {
 final class ExploreBlockHeaderView: UIView, ExploreBlockHeaderViewProtocol {
     let appearance: Appearance
 
+    private let splitTestingService = SplitTestingService(
+        analyticsService: AnalyticsUserProperties(),
+        storage: UserDefaults.standard
+    )
+
     private lazy var titleLabel: UILabel = {
         let label = UILabel()
         label.font = self.appearance.titleLabelFont
@@ -43,11 +48,18 @@ final class ExploreBlockHeaderView: UIView, ExploreBlockHeaderViewProtocol {
 
     private lazy var showAllButton: UIButton = {
         let button = UIButton(type: .system)
-        button.setTitle(NSLocalizedString("ShowAll", comment: ""), for: .normal)
         button.tintColor = self.appearance.showAllButtonColor
         button.titleLabel?.font = self.appearance.showAllButtonFont
         button.contentHorizontalAlignment = .right
         button.addTarget(self, action: #selector(self.showAllButtonClicked), for: .touchUpInside)
+
+        var showAllTitle = NSLocalizedString("ShowAll", comment: "")
+        if CourseListSeeAllTextSplitTest.shouldParticipate {
+            let splitTest = self.splitTestingService.fetchSplitTest(CourseListSeeAllTextSplitTest.self)
+            showAllTitle = splitTest.currentGroup.seeAllTitle
+        }
+        button.setTitle(showAllTitle, for: .normal)
+
         return button
     }()
 
@@ -73,10 +85,10 @@ final class ExploreBlockHeaderView: UIView, ExploreBlockHeaderViewProtocol {
         }
     }
 
-    var shouldShowShowAllButton: Bool = true {
+    var shouldShowAllButton: Bool = true {
         didSet {
-            // We should not only hiden button but resize cause there is no space
-            if self.shouldShowShowAllButton {
+            // We should not only hidden button but resize cause there is no space
+            if self.shouldShowAllButton {
                 self.showAllButton.isHidden = false
             } else {
                 self.showAllButton.isHidden = true
@@ -115,6 +127,8 @@ final class ExploreBlockHeaderView: UIView, ExploreBlockHeaderViewProtocol {
 
     @objc
     private func showAllButtonClicked() {
+        // FIXME: analytics dependency
+        AmplitudeAnalyticsEvents.CourseList.showAllClicked.send()
         self.onShowAllButtonClick?()
     }
 }
diff --git a/Stepic/Sources/Modules/ExploreSubmodules/ContentLanguageSwitch/Views/ContentLanguageSwitchView.swift b/Stepic/Sources/Modules/ExploreSubmodules/ContentLanguageSwitch/Views/ContentLanguageSwitchView.swift
index f93e3df2e6..a650f2a018 100644
--- a/Stepic/Sources/Modules/ExploreSubmodules/ContentLanguageSwitch/Views/ContentLanguageSwitchView.swift
+++ b/Stepic/Sources/Modules/ExploreSubmodules/ContentLanguageSwitch/Views/ContentLanguageSwitchView.swift
@@ -45,7 +45,7 @@ final class ContentLanguageSwitchView: UIView {
         let headerView = ExploreBlockHeaderView(appearance: appearance)
         headerView.titleText = NSLocalizedString("ChooseSearchLanguage", comment: "")
         headerView.summaryText = nil
-        headerView.shouldShowShowAllButton = false
+        headerView.shouldShowAllButton = false
         return headerView
     }()
 
diff --git a/Stepic/Sources/Modules/ExploreSubmodules/CourseListsCollection/Views/CourseListsCollectionView.swift b/Stepic/Sources/Modules/ExploreSubmodules/CourseListsCollection/Views/CourseListsCollectionView.swift
index 4acc7454f9..7bcbb1ab2f 100644
--- a/Stepic/Sources/Modules/ExploreSubmodules/CourseListsCollection/Views/CourseListsCollectionView.swift
+++ b/Stepic/Sources/Modules/ExploreSubmodules/CourseListsCollection/Views/CourseListsCollectionView.swift
@@ -14,7 +14,7 @@ final class CourseListsCollectionView: UIView {
 
         view.titleText = NSLocalizedString("RecommendationsExplore", comment: "")
         view.summaryText = NSLocalizedString("RecommendationsExploreDescription", comment: "")
-        view.shouldShowShowAllButton = false
+        view.shouldShowAllButton = false
         return view
     }()
 
diff --git a/Stepic/Sources/Modules/ExploreSubmodules/Tags/TagsView.swift b/Stepic/Sources/Modules/ExploreSubmodules/Tags/TagsView.swift
index 0e1b17ae72..432945923f 100644
--- a/Stepic/Sources/Modules/ExploreSubmodules/Tags/TagsView.swift
+++ b/Stepic/Sources/Modules/ExploreSubmodules/Tags/TagsView.swift
@@ -45,7 +45,7 @@ final class TagsView: UIView {
         let headerView = ExploreBlockHeaderView(appearance: appearance)
         headerView.titleText = NSLocalizedString("TrendingTopics", comment: "")
         headerView.summaryText = nil
-        headerView.shouldShowShowAllButton = false
+        headerView.shouldShowAllButton = false
         return headerView
     }()
 
diff --git a/Stepic/Sources/Modules/Home/HomeViewController.swift b/Stepic/Sources/Modules/Home/HomeViewController.swift
index 5157cf3465..f88d78a620 100644
--- a/Stepic/Sources/Modules/Home/HomeViewController.swift
+++ b/Stepic/Sources/Modules/Home/HomeViewController.swift
@@ -153,7 +153,7 @@ final class HomeViewController: BaseExploreViewController {
             CourseListContainerViewFactory.HorizontalHeaderDescription(
                 title: NSLocalizedString("Enrolled", comment: ""),
                 summary: nil,
-                shouldShowShowAllButton: self == .normal
+                shouldShowAllButton: self == .normal
             )
         }
 
@@ -250,7 +250,7 @@ final class HomeViewController: BaseExploreViewController {
             CourseListContainerViewFactory.HorizontalHeaderDescription(
                 title: NSLocalizedString("Popular", comment: ""),
                 summary: nil,
-                shouldShowShowAllButton: self == .normal
+                shouldShowAllButton: self == .normal
             )
         }
 
diff --git a/Stepic/en.lproj/Localizable.strings b/Stepic/en.lproj/Localizable.strings
index 0b7182b8cf..f2438a50d7 100644
--- a/Stepic/en.lproj/Localizable.strings
+++ b/Stepic/en.lproj/Localizable.strings
@@ -320,6 +320,9 @@ BadConnectionAuth = "Check your internet connection";
 
 ContinueLearningWidgetButtonTitle = "Continue learning";
 ShowAll = "All";
+ShowAllTestDetailIndicator = "All ›";
+ShowAllTestText = "See All";
+ShowAllTestTextDetailIndicator = "See All ›";
 Enrolled = "Enrolled";
 Popular = "Popular";
 Home = "Home";
diff --git a/Stepic/ru.lproj/Localizable.strings b/Stepic/ru.lproj/Localizable.strings
index 198a98aa44..1b7541c7a4 100644
--- a/Stepic/ru.lproj/Localizable.strings
+++ b/Stepic/ru.lproj/Localizable.strings
@@ -321,6 +321,9 @@ BadConnectionAuth = "Проверьте ваше интернет-соедине
 
 ContinueLearningWidgetButtonTitle = "Продолжить учиться";
 ShowAll = "Все";
+ShowAllTestDetailIndicator = "Все ›";
+ShowAllTestText = "Смотреть все";
+ShowAllTestTextDetailIndicator = "Смотреть все ›";
 Enrolled = "Мои курсы";
 Popular = "Популярные";
 Home = "Обучение";

From a8f0ecb40376e2c23ef12ebf0de1cd7fb4bc60e9 Mon Sep 17 00:00:00 2001
From: Ivan Magda <ivan.magda@stepik.org>
Date: Mon, 17 Feb 2020 02:45:24 +0300
Subject: [PATCH 7/9] Revert ExploreSearchBar applySystemFixes

---
 .../Modules/Explore/View/ExploreSearchBar.swift   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Stepic/Sources/Modules/Explore/View/ExploreSearchBar.swift b/Stepic/Sources/Modules/Explore/View/ExploreSearchBar.swift
index 76a010f46a..0f7259e17a 100644
--- a/Stepic/Sources/Modules/Explore/View/ExploreSearchBar.swift
+++ b/Stepic/Sources/Modules/Explore/View/ExploreSearchBar.swift
@@ -3,7 +3,12 @@ import UIKit
 
 final class ExploreSearchBar: UISearchBar {
     enum Appearance {
+        static let searchFieldPositionAdjustment = UIOffset(horizontal: -6, vertical: 0)
         static let textColor = UIColor.mainDark
+
+        // Height should be fixed and leq than 44pt (due to iOS 11+ strange nav bar)
+        static let barHeight: CGFloat = 44.0
+
         static let placeholderText = NSLocalizedString("SearchCourses", comment: "")
     }
 
@@ -30,6 +35,8 @@ final class ExploreSearchBar: UISearchBar {
 
         self.searchField?.backgroundColor = .clear
         self.searchField?.textColor = Appearance.textColor
+
+        self.applySystemFixes()
     }
 
     @available(*, unavailable)
@@ -43,6 +50,14 @@ final class ExploreSearchBar: UISearchBar {
         self.endEditing(true)
         self.setShowsCancelButton(false, animated: true)
     }
+
+    private func applySystemFixes() {
+        self.searchFieldBackgroundPositionAdjustment = Appearance.searchFieldPositionAdjustment
+        self.translatesAutoresizingMaskIntoConstraints = false
+        self.snp.makeConstraints { make in
+            make.height.equalTo(Appearance.barHeight)
+        }
+    }
 }
 
 extension ExploreSearchBar: UISearchBarDelegate {

From 132f21f338faf3d9d42db090cd7a82179a7ee7a6 Mon Sep 17 00:00:00 2001
From: Ivan Magda <ivan.magda@stepik.org>
Date: Mon, 17 Feb 2020 14:30:06 +0300
Subject: [PATCH 8/9] Reply to solutions (#659)

* Update step discussion count only for default thread type

* Remove setGraceTimeInterval

* Add reply
---
 Stepic/AppDelegate.swift                      |  1 -
 Stepic/Discussions/Comment.swift              | 19 +++++++++++-----
 .../Discussions/DiscussionsInteractor.swift   |  8 +++++--
 .../DiscussionsViewController.swift           | 22 +++++++++----------
 .../Views/Cell/DiscussionsCellView.swift      |  2 --
 .../WriteComment/WriteCommentDataFlow.swift   |  1 +
 .../WriteComment/WriteCommentInteractor.swift |  4 +++-
 .../WriteComment/WriteCommentPresenter.swift  |  8 +++++--
 8 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/Stepic/AppDelegate.swift b/Stepic/AppDelegate.swift
index 2778352803..d3b47903e1 100644
--- a/Stepic/AppDelegate.swift
+++ b/Stepic/AppDelegate.swift
@@ -50,7 +50,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         RemoteConfig.shared.setup()
 
         SVProgressHUD.setMinimumDismissTimeInterval(0.5)
-        SVProgressHUD.setGraceTimeInterval(0.1)
         SVProgressHUD.setDefaultMaskType(SVProgressHUDMaskType.clear)
         SVProgressHUD.setHapticsEnabled(true)
 
diff --git a/Stepic/Discussions/Comment.swift b/Stepic/Discussions/Comment.swift
index c4ea13cb10..a23f43b071 100644
--- a/Stepic/Discussions/Comment.swift
+++ b/Stepic/Discussions/Comment.swift
@@ -33,15 +33,21 @@ final class Comment: JSONSerializable {
     var abuseCount: Int = 0
     var actions: [Action] = []
     var submissionID: Submission.IdType?
+    var thread: String = DiscussionThread.ThreadType.default.rawValue
 
     var userInfo: UserInfo!
     var vote: Vote!
     var submission: Submission?
 
+    var threadType: DiscussionThread.ThreadType? {
+        DiscussionThread.ThreadType(rawValue: self.thread)
+    }
+
     var json: JSON {
         var dict: JSON = [
             JSONKey.target.rawValue: self.targetID,
-            JSONKey.text.rawValue: self.text
+            JSONKey.text.rawValue: self.text,
+            JSONKey.thread.rawValue: self.thread
         ]
 
         if let parentID = self.parentID {
@@ -55,8 +61,7 @@ final class Comment: JSONSerializable {
         if let submissionID = self.submissionID {
             try? dict.merge(
                 with: [
-                    JSONKey.submission.rawValue: submissionID,
-                    JSONKey.thread.rawValue: DiscussionThread.ThreadType.solutions.rawValue
+                    JSONKey.submission.rawValue: submissionID
                 ]
             )
         }
@@ -72,12 +77,14 @@ final class Comment: JSONSerializable {
         targetID: Step.IdType,
         text: String,
         parentID: IdType? = nil,
-        submissionID: Submission.IdType? = nil
+        submissionID: Submission.IdType? = nil,
+        threadType: DiscussionThread.ThreadType = .default
     ) {
         self.targetID = targetID
         self.text = text
         self.parentID = parentID
         self.submissionID = submissionID
+        self.thread = threadType.rawValue
     }
 
     func update(json: JSON) {
@@ -97,6 +104,7 @@ final class Comment: JSONSerializable {
         self.epicCount = json[JSONKey.epicCount.rawValue].intValue
         self.abuseCount = json[JSONKey.abuseCount.rawValue].intValue
         self.submissionID = json[JSONKey.submission.rawValue].int
+        self.thread = json[JSONKey.thread.rawValue].string ?? DiscussionThread.ThreadType.default.rawValue
 
         self.actions.removeAll(keepingCapacity: true)
         for (actionKey, value) in json[JSONKey.actions.rawValue].dictionaryValue {
@@ -168,7 +176,8 @@ extension Comment: CustomDebugStringConvertible {
         submissionID: \(submissionID ??? "nil"), \
         userInfo: \(userInfo ??? "nil"), \
         vote: \(vote ??? "nil"), \
-        submission: \(submission ??? "nil"))
+        submission: \(submission ??? "nil")) \
+        thread: \(thread))
         """
     }
 }
diff --git a/Stepic/Sources/Modules/Discussions/DiscussionsInteractor.swift b/Stepic/Sources/Modules/Discussions/DiscussionsInteractor.swift
index 1b9b862422..8aec18455d 100644
--- a/Stepic/Sources/Modules/Discussions/DiscussionsInteractor.swift
+++ b/Stepic/Sources/Modules/Discussions/DiscussionsInteractor.swift
@@ -234,7 +234,9 @@ final class DiscussionsInteractor: DiscussionsInteractorProtocol {
                 self.currentDiscussions.remove(at: discussionIndex)
                 self.currentReplies[commentID] = nil
 
-                self.provider.decrementStepDiscussionsCount(stepID: self.stepID).cauterize()
+                if self.discussionThreadType == .default {
+                    self.provider.decrementStepDiscussionsCount(stepID: self.stepID).cauterize()
+                }
             } else {
                 for (discussionID, replies) in self.currentReplies {
                     guard let replyIndex = replies.firstIndex(where: { $0.id == commentID }) else {
@@ -748,7 +750,9 @@ extension DiscussionsInteractor: WriteCommentOutputProtocol {
                 self.presenter.presentCommentCreate(response: .init(result: self.makeDiscussionsData()))
             }.cauterize()
 
-            self.provider.incrementStepDiscussionsCount(stepID: self.stepID).cauterize()
+            if self.discussionThreadType == .default {
+                self.provider.incrementStepDiscussionsCount(stepID: self.stepID).cauterize()
+            }
         }
     }
 
diff --git a/Stepic/Sources/Modules/Discussions/DiscussionsViewController.swift b/Stepic/Sources/Modules/Discussions/DiscussionsViewController.swift
index d183ba75f7..b56d4a0e3e 100644
--- a/Stepic/Sources/Modules/Discussions/DiscussionsViewController.swift
+++ b/Stepic/Sources/Modules/Discussions/DiscussionsViewController.swift
@@ -503,19 +503,17 @@ extension DiscussionsViewController: DiscussionsTableViewDataSourceDelegate {
             )
         )
 
-        if viewModel.solution == nil {
-            alert.addAction(
-                UIAlertAction(
-                    title: NSLocalizedString("Reply", comment: ""),
-                    style: .default,
-                    handler: { [weak self] _ in
-                        self?.interactor.doWriteCommentPresentation(
-                            request: .init(commentID: viewModel.id, presentationContext: .create)
-                        )
-                    }
-                )
+        alert.addAction(
+            UIAlertAction(
+                title: NSLocalizedString("Reply", comment: ""),
+                style: .default,
+                handler: { [weak self] _ in
+                    self?.interactor.doWriteCommentPresentation(
+                        request: .init(commentID: viewModel.id, presentationContext: .create)
+                    )
+                }
             )
-        }
+        )
 
         if viewModel.canEdit {
             alert.addAction(
diff --git a/Stepic/Sources/Modules/Discussions/Views/Cell/DiscussionsCellView.swift b/Stepic/Sources/Modules/Discussions/Views/Cell/DiscussionsCellView.swift
index 4770daf583..7794bbb6e8 100644
--- a/Stepic/Sources/Modules/Discussions/Views/Cell/DiscussionsCellView.swift
+++ b/Stepic/Sources/Modules/Discussions/Views/Cell/DiscussionsCellView.swift
@@ -321,8 +321,6 @@ final class DiscussionsCellView: UIView {
         } else {
             self.solutionContainerView.isHidden = true
         }
-
-        self.replyButton.isHidden = viewModel.solution != nil
     }
 
     func calculateContentHeight(maxPreferredWidth: CGFloat) -> CGFloat {
diff --git a/Stepic/Sources/Modules/WriteComment/WriteCommentDataFlow.swift b/Stepic/Sources/Modules/WriteComment/WriteCommentDataFlow.swift
index a8a800fc8b..d96e32c662 100644
--- a/Stepic/Sources/Modules/WriteComment/WriteCommentDataFlow.swift
+++ b/Stepic/Sources/Modules/WriteComment/WriteCommentDataFlow.swift
@@ -10,6 +10,7 @@ enum WriteComment {
 
     struct CommentData {
         let text: String
+        let parentID: WriteComment.ParentIDType?
         let comment: Comment?
         let submission: Submission?
         let discussionThreadType: DiscussionThread.ThreadType
diff --git a/Stepic/Sources/Modules/WriteComment/WriteCommentInteractor.swift b/Stepic/Sources/Modules/WriteComment/WriteCommentInteractor.swift
index 54b8ff2c6a..e274f5e918 100644
--- a/Stepic/Sources/Modules/WriteComment/WriteCommentInteractor.swift
+++ b/Stepic/Sources/Modules/WriteComment/WriteCommentInteractor.swift
@@ -67,7 +67,8 @@ final class WriteCommentInteractor: WriteCommentInteractorProtocol {
             targetID: self.targetID,
             text: htmlText,
             parentID: self.parentID,
-            submissionID: self.submission?.id
+            submissionID: self.submission?.id,
+            threadType: self.discussionThreadType
         )
 
         var actionPromise: Promise<Comment>
@@ -126,6 +127,7 @@ final class WriteCommentInteractor: WriteCommentInteractorProtocol {
     private func makeCommentData() -> WriteComment.CommentData {
         .init(
             text: self.currentText,
+            parentID: self.parentID,
             comment: self.comment,
             submission: self.submission,
             discussionThreadType: self.discussionThreadType
diff --git a/Stepic/Sources/Modules/WriteComment/WriteCommentPresenter.swift b/Stepic/Sources/Modules/WriteComment/WriteCommentPresenter.swift
index 9948d8bf98..6c4b2fee9a 100644
--- a/Stepic/Sources/Modules/WriteComment/WriteCommentPresenter.swift
+++ b/Stepic/Sources/Modules/WriteComment/WriteCommentPresenter.swift
@@ -91,18 +91,22 @@ final class WriteCommentPresenter: WriteCommentPresenterProtocol {
             return NSLocalizedString("WriteCommentSelectSolutionTitle", comment: "")
         }()
 
+        let isReply = data.parentID != nil
+
         let isFilled: Bool = {
-            if data.discussionThreadType == .solutions {
+            if !isReply && data.discussionThreadType == .solutions {
                 return !data.text.isEmpty && data.submission != nil
             }
             return !data.text.isEmpty
         }()
 
+        let isSolutionHidden = isReply || data.discussionThreadType != .solutions
+
         return .init(
             text: data.text,
             doneButtonTitle: doneButtonTitle,
             isFilled: isFilled,
-            isSolutionHidden: data.discussionThreadType != .solutions,
+            isSolutionHidden: isSolutionHidden,
             isSolutionSelected: data.submission != nil,
             isSolutionCorrect: data.submission?.isCorrect ?? false,
             solutionTitle: solutionTitle

From efadc56ea0f10f87b0a98edaee60e3179b2c09ba Mon Sep 17 00:00:00 2001
From: Stepik Bot <bot@stepik.org>
Date: Tue, 18 Feb 2020 03:02:40 +0000
Subject: [PATCH 9/9] "Set version to 1.113 & bump build"

---
 Stepic.xcodeproj/project.pbxproj | 4 ++--
 Stepic/Info.plist                | 4 ++--
 StepicTests/Info.plist           | 4 ++--
 StickerPackExtension/Info.plist  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Stepic.xcodeproj/project.pbxproj b/Stepic.xcodeproj/project.pbxproj
index 15e8ed8469..ea77ecd847 100644
--- a/Stepic.xcodeproj/project.pbxproj
+++ b/Stepic.xcodeproj/project.pbxproj
@@ -7821,7 +7821,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 182;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = Stepic/Info.plist;
@@ -7851,7 +7851,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 182;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = Stepic/Info.plist;
diff --git a/Stepic/Info.plist b/Stepic/Info.plist
index ba9091286f..5de2424085 100644
--- a/Stepic/Info.plist
+++ b/Stepic/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.112</string>
+	<string>1.113</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -54,7 +54,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>181</string>
+	<string>182</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
diff --git a/StepicTests/Info.plist b/StepicTests/Info.plist
index 6c82e95d01..6b6ab4d2b5 100644
--- a/StepicTests/Info.plist
+++ b/StepicTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.112</string>
+	<string>1.113</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>181</string>
+	<string>182</string>
 </dict>
 </plist>
diff --git a/StickerPackExtension/Info.plist b/StickerPackExtension/Info.plist
index 34638b9dfb..ccc3a1a867 100644
--- a/StickerPackExtension/Info.plist
+++ b/StickerPackExtension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.112</string>
+	<string>1.113</string>
 	<key>CFBundleVersion</key>
-	<string>181</string>
+	<string>182</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>