Replace old placeholders & empty states

Podfile

@@ -24,7 +24,6 @@ def all_pods
     pod 'SVProgressHUD'
     pod 'FLKAutoLayout', '1.0.1'
     pod 'TSMessages', :git => 'https://github.com/KrauseFx/TSMessages.git'
-    pod 'DZNEmptyDataSet'
     pod 'YandexMobileMetrica/Dynamic'
 
     pod 'FirebaseCore'

Stepic/Base.lproj/Main.storyboard

@@ -254,7 +254,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="L6O-ow-pfW">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="L6O-ow-pfW" customClass="StepikTableView" customModule="Adaptive_1838" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <viewLayoutGuide key="safeArea" id="GLF-og-ZMI"/>
@@ -297,7 +297,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Q7F-3H-ipp">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Q7F-3H-ipp" customClass="StepikTableView" customModule="Adaptive_1838" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="20" width="375" height="647"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <connections>
@@ -690,6 +690,6 @@
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="Ymm-um-wgY"/>
-        <segue reference="gVj-jL-WXR"/>
+        <segue reference="oyz-px-1HN"/>
     </inferredMetricsTieBreakers>
 </document>

Stepic/CardsStepsViewController.swift

@@ -10,8 +10,9 @@ import Foundation
 import PromiseKit
 import Koloda
 
-class CardsStepsViewController: UIViewController, CardsStepsView {
+class CardsStepsViewController: UIViewController, CardsStepsView, ControllerWithStepikPlaceholder {
 
+    var placeholderContainer: StepikPlaceholderControllerContainer = StepikPlaceholderControllerContainer()
     var presenter: CardsStepsPresenter?
 
     @IBOutlet weak var kolodaView: KolodaView!
@@ -25,34 +26,32 @@ class CardsStepsViewController: UIViewController, CardsStepsView {
         didSet {
             switch state {
             case .normal:
-                self.placeholderView.isHidden = true
-                self.kolodaView.isHidden = false
-            case .connectionError, .coursePassed:
-                self.placeholderView.isHidden = false
-                self.kolodaView.isHidden = true
-
-                self.placeholderView.datasource = self
+                isPlaceholderShown = false
+            case .connectionError:
+                showPlaceholder(for: .connectionError)
+            case .coursePassed:
+                showPlaceholder(for: .adaptiveCoursePassed)
             default:
                 break
             }
         }
     }
 
-    lazy var placeholderView: PlaceholderView = {
-        let v = PlaceholderView()
-        self.view.insertSubview(v, aboveSubview: self.view)
-        v.align(toView: self.kolodaView)
-        v.delegate = self
-        v.datasource = self
-        v.backgroundColor = self.view.backgroundColor
-        return v
-    }()
-
     // Can be overriden in the children classes (for adaptive app)
     var cardView: StepCardView {
         return StepCardView()
     }
 
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        registerPlaceholder(placeholder: StepikPlaceholder(.noConnection, action: { [weak self] in
+            self?.presenter?.tryAgain()
+        }), for: .connectionError)
+
+        registerPlaceholder(placeholder: StepikPlaceholder(.adaptiveCoursePassed), for: .adaptiveCoursePassed)
+    }
+
     func refreshCards() {
         if kolodaView.delegate == nil {
             kolodaView.dataSource = self
@@ -199,62 +198,6 @@ extension CardsStepsViewController: KolodaViewDataSource {
     }
 }
 
-extension CardsStepsViewController: PlaceholderViewDataSource {
-    func placeholderImage() -> UIImage? {
-        switch state {
-        case .connectionError:
-            return Images.placeholders.connectionError
-        case .coursePassed:
-            return Images.placeholders.coursePassed
-        default:
-            return nil
-        }
-    }
-
-    func placeholderButtonTitle() -> String? {
-        switch state {
-        case .connectionError:
-            return NSLocalizedString("TryAgain", comment: "")
-        default:
-            return nil
-        }
-    }
-
-    func placeholderDescription() -> String? {
-        switch state {
-        case .connectionError:
-            return nil
-        case .coursePassed:
-            return NSLocalizedString("NoRecommendations", comment: "")
-        default:
-            return nil
-        }
-    }
-
-    func placeholderStyle() -> PlaceholderStyle {
-        var style = PlaceholderStyle()
-        style.button.textColor = UIColor.mainDark
-        return style
-    }
-
-    func placeholderTitle() -> String? {
-        switch state {
-        case .connectionError:
-            return NSLocalizedString("ConnectionErrorText", comment: "")
-        case .coursePassed:
-            return NSLocalizedString("CoursePassed", comment: "")
-        default:
-            return nil
-        }
-    }
-}
-
-extension CardsStepsViewController: PlaceholderViewDelegate {
-    func placeholderButtonDidPress() {
-        presenter?.tryAgain()
-    }
-}
-
 extension CardsStepsViewController: CardStepDelegate {
     func stepSubmissionDidCorrect() {
         AnalyticsReporter.reportEvent(AnalyticsEvents.Adaptive.Step.correctAnswer)

Stepic/CertificatesStoryboard.storyboard

@@ -34,7 +34,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="xIF-ha-DwF">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="xIF-ha-DwF" customClass="StepikTableView" customModule="Stepic">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <viewLayoutGuide key="safeArea" id="pdh-3F-YzY"/>

Stepic/CertificatesViewController.swift

@@ -7,24 +7,17 @@
 //
 
 import Foundation
-import DZNEmptyDataSet
 
-enum CertificatesEmptyDatasetState {
-    case anonymous, error, empty, refreshing
-}
+class CertificatesViewController: UIViewController, CertificatesView, ControllerWithStepikPlaceholder {
+
+    var placeholderContainer: StepikPlaceholderControllerContainer = StepikPlaceholderControllerContainer()
 
-class CertificatesViewController: UIViewController, CertificatesView {
-    @IBOutlet weak var tableView: UITableView!
+    @IBOutlet weak var tableView: StepikTableView!
 
     var presenter: CertificatesPresenter?
 
     var certificates: [CertificateViewData] = []
     var showNextPageFooter: Bool = false
-    var emptyState: CertificatesEmptyDatasetState = .empty {
-        didSet {
-            tableView.reloadEmptyDataSet()
-        }
-    }
 
     let refreshControl = UIRefreshControl()
 
@@ -33,14 +26,26 @@ class CertificatesViewController: UIViewController, CertificatesView {
         tableView.delegate = self
         tableView.dataSource = self
 
+        tableView.emptySetPlaceholder = StepikPlaceholder(.emptyCertificates) { [weak self] in
+            self?.tabBarController?.selectedIndex = 1
+        }
+        tableView.loadingPlaceholder = StepikPlaceholder(.emptyCertificatesLoading)
+
+        registerPlaceholder(placeholder: StepikPlaceholder(.login, action: { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            RoutingManager.auth.routeFrom(controller: strongSelf, success: nil, cancel: nil)
+        }), for: .anonymous)
+        registerPlaceholder(placeholder: StepikPlaceholder(.noConnection, action: { [weak self] in
+            self?.presenter?.checkStatus()
+        }), for: .connectionError)
+
         title = NSLocalizedString("Certificates", comment: "")
 
         presenter = CertificatesPresenter(certificatesAPI: ApiDataDownloader.certificates, coursesAPI: ApiDataDownloader.courses, presentationContainer: PresentationContainer.certificates, view: self)
         presenter?.view = self
 
-        tableView.emptyDataSetSource = self
-        tableView.emptyDataSetDelegate = self
-
         tableView.register(UINib(nibName: "CertificateTableViewCell", bundle: nil), forCellReuseIdentifier: "CertificateTableViewCell")
 
         self.tableView.estimatedRowHeight = 161
@@ -125,21 +130,23 @@ class CertificatesViewController: UIViewController, CertificatesView {
 
     func displayAnonymous() {
         refreshControl.endRefreshing()
-        emptyState = .anonymous
+        showPlaceholder(for: .anonymous)
     }
 
     func displayError() {
         refreshControl.endRefreshing()
-        emptyState = .error
+        showPlaceholder(for: .connectionError)
     }
 
     func displayEmpty() {
         refreshControl.endRefreshing()
-        emptyState = .empty
+        tableView.reloadData()
+        self.isPlaceholderShown = false
     }
 
     func displayRefreshing() {
-        emptyState = .refreshing
+        tableView.showLoadingPlaceholder()
+        self.isPlaceholderShown = false
     }
 
     func displayLoadNextPageError() {
@@ -172,30 +179,6 @@ class CertificatesViewController: UIViewController, CertificatesView {
     }
 }
 
-extension CertificatesViewController : DZNEmptyDataSetDelegate {
-    func emptyDataSetShouldAllowScroll(_ scrollView: UIScrollView!) -> Bool {
-        return true
-    }
-
-    func emptyDataSetDidTapButton(_ scrollView: UIScrollView!) {
-        switch emptyState {
-        case .anonymous:
-            RoutingManager.auth.routeFrom(controller: self, success: nil, cancel: nil)
-            break
-
-        case .empty:
-            self.tabBarController?.selectedIndex = 1
-            break
-
-        case .error:
-            break
-
-        case .refreshing:
-            break
-        }
-    }
-}
-
 extension CertificatesViewController : UITableViewDelegate {
 
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
@@ -272,96 +255,3 @@ extension CertificatesViewController : UITableViewDataSource {
         return cell
     }
 }
-
-extension CertificatesViewController : DZNEmptyDataSetSource {
-    func image(forEmptyDataSet scrollView: UIScrollView!) -> UIImage! {
-        //Add correct placeholders here
-        switch emptyState {
-        case .anonymous:
-            return Images.placeholders.anonymous
-        case .empty:
-            return Images.placeholders.certificates
-        case .error:
-            return Images.placeholders.connectionError
-        case .refreshing:
-            return Images.placeholders.certificates
-        }
-    }
-
-    func title(forEmptyDataSet scrollView: UIScrollView!) -> NSAttributedString! {
-        var text: String = ""
-
-        switch emptyState {
-        case .anonymous:
-            text = NSLocalizedString("AnonymousCertificatesTitle", comment: "")
-        case .empty:
-            text = NSLocalizedString("EmptyCertificatesTitle", comment: "")
-            break
-        case .error:
-            text = NSLocalizedString("ConnectionErrorTitle", comment: "")
-            break
-        case .refreshing:
-            text = NSLocalizedString("Refreshing", comment: "")
-            break
-        }
-
-        let attributes = [NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: 18.0),
-                          NSAttributedStringKey.foregroundColor: UIColor.darkGray]
-
-        return NSAttributedString(string: text, attributes: attributes)
-    }
-
-    func description(forEmptyDataSet scrollView: UIScrollView!) -> NSAttributedString! {
-        var text: String = ""
-
-        switch emptyState {
-        case .anonymous:
-            text = NSLocalizedString("SignInToHaveCertificates", comment: "")
-            break
-        case .empty:
-            text = NSLocalizedString("EmptyCertificatesDescription", comment: "")
-            break
-        case .error:
-            text = NSLocalizedString("ConnectionErrorPullToRefresh", comment: "")
-            break
-        case .refreshing:
-            text = NSLocalizedString("RefreshingDescription", comment: "")
-            break
-        }
-
-        let paragraph = NSMutableParagraphStyle()
-        paragraph.lineBreakMode = .byWordWrapping
-        paragraph.alignment = .center
-
-        let attributes = [NSAttributedStringKey.font: UIFont.systemFont(ofSize: 14.0),
-                          NSAttributedStringKey.foregroundColor: UIColor.lightGray,
-                          NSAttributedStringKey.paragraphStyle: paragraph]
-
-        return NSAttributedString(string: text, attributes: attributes)
-    }
-
-    func buttonTitle(forEmptyDataSet scrollView: UIScrollView!, for state: UIControlState) -> NSAttributedString! {
-        var text: String = ""
-        switch emptyState {
-        case .anonymous:
-            text = NSLocalizedString("SignIn", comment: "")
-        case .empty:
-            text = NSLocalizedString("ChooseCourse", comment: "")
-        case .error:
-            text = ""
-            break
-        case .refreshing:
-            text = ""
-            break
-        }
-
-        let attributes = [NSAttributedStringKey.font: UIFont.systemFont(ofSize: 16.0),
-                          NSAttributedStringKey.foregroundColor: UIColor.mainDark]
-
-        return NSAttributedString(string: text, attributes: attributes)
-    }
-
-    func backgroundColor(forEmptyDataSet scrollView: UIScrollView!) -> UIColor! {
-        return UIColor.groupTableViewBackground
-    }
-}