New profile architecture

Podfile

@@ -61,6 +61,7 @@ def all_pods
     pod 'Charts', '3.0.4'
     pod 'EasyTipView', :git => 'https://github.com/igorkislyuk/EasyTipView.git'
     pod 'ActionSheetPicker-3.0'
+    pod 'SkeletonView'
 end
 
 def testing_pods

Stepic/ContentExpandableMenuBlockTableViewCell.swift

@@ -0,0 +1,96 @@
+//
+//  ContentExpandableMenuBlockTableViewCell.swift
+//  Stepic
+//
+//  Created by Vladislav Kiryukhin on 27.05.2018.
+//  Copyright © 2018 Alex Karpov. All rights reserved.
+//
+
+import UIKit
+
+class ContentExpandableMenuBlockTableViewCell: MenuBlockTableViewCell {
+    @IBOutlet weak var titleLabel: StepikLabel!
+    @IBOutlet weak var container: UIView!
+    @IBOutlet weak var arrowButton: UIButton!
+
+    var bottomTitleConstraint: NSLayoutConstraint?
+
+    var block: ContentExpandableMenuBlock?
+    var updateTableHeightBlock: (() -> Void)?
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+    }
+
+    override func initWithBlock(block: MenuBlock) {
+        super.initWithBlock(block: block)
+        titleLabel.text = block.title
+
+        if let block = block as? ContentExpandableMenuBlock {
+            self.block = block
+            if let contentView = block.contentView {
+                container.addSubview(contentView)
+                contentView.alignTop("0", leading: "0", bottom: "0", trailing: "0", toView: container)
+                layoutIfNeeded()
+            }
+
+            if block.isExpanded {
+                expand(shouldAnimate: false)
+            } else {
+                shrink(shouldAnimate: false)
+            }
+        }
+    }
+
+    @IBAction func arrowButtonPressed(_ sender: UIButton) {
+        expandPressed()
+    }
+
+    func expandPressed() {
+        guard let block = block else {
+            return
+        }
+
+        block.onExpanded?(!block.isExpanded)
+        if block.isExpanded {
+            expand()
+        } else {
+            shrink()
+        }
+        layoutIfNeeded()
+        updateTableHeightBlock?()
+    }
+
+    func expand(shouldAnimate: Bool = true) {
+        bottomTitleConstraint?.isActive = false
+        container.isHidden = false
+
+        let animationBlock: () -> Void = { [weak self] in
+            self?.arrowButton.transform = CGAffineTransform.identity
+        }
+        if shouldAnimate {
+            UIView.animate(withDuration: 0.3, animations: animationBlock)
+        } else {
+            animationBlock()
+        }
+    }
+
+    func shrink(shouldAnimate: Bool = true) {
+        container.isHidden = true
+        if bottomTitleConstraint == nil {
+            bottomTitleConstraint = titleLabel.alignBottomEdge(withView: self.contentView, predicate: "-26")
+        } else {
+            bottomTitleConstraint?.isActive = true
+        }
+
+        let animationBlock: () -> Void = { [weak self] in
+            self?.arrowButton.transform = CGAffineTransform(rotationAngle: CGFloat.pi)
+        }
+        if shouldAnimate {
+            UIView.animate(withDuration: 0.3, animations: animationBlock)
+        } else {
+            animationBlock()
+        }
+    }
+
+}

Stepic/TitleContentExpandableMenuBlockTableViewCell.xib → Stepic/ContentExpandableMenuBlockTableViewCell.xib

@@ -1,58 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="84" id="KGk-i7-Jjw" customClass="TitleContentExpandableMenuBlockTableViewCell" customModule="Adaptive_1838" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="84"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="282" id="eqn-wM-KyJ" customClass="ContentExpandableMenuBlockTableViewCell" customModule="Stepic" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="282"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="83.5"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eqn-wM-KyJ" id="JFM-KY-cWV">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="281.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title + content" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eIR-zG-AdZ" customClass="StepikLabel" customModule="Adaptive_1838" customModuleProvider="target">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title + content" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ceg-ul-UxG" customClass="StepikLabel" customModule="Stepic" customModuleProvider="target">
                         <rect key="frame" x="24" y="24" width="240" height="20.5"/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="17"/>
                         <color key="textColor" red="0.32549019610000002" green="0.32549019610000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ktK-VW-1Ci">
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0wM-0x-akp">
                         <rect key="frame" x="272" y="18" width="32" height="32"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="32" id="bUi-Xq-cmf"/>
-                            <constraint firstAttribute="width" constant="32" id="ioE-MN-4ll"/>
+                            <constraint firstAttribute="height" constant="32" id="ckq-mH-3BN"/>
+                            <constraint firstAttribute="width" constant="32" id="uu1-kF-KXg"/>
                         </constraints>
                         <inset key="contentEdgeInsets" minX="8" minY="8" maxX="8" maxY="8"/>
-                        <state key="normal" image="menu_arrow_bottom"/>
+                        <state key="normal" image="menu_arrow_top"/>
                         <connections>
-                            <action selector="arrowButtonPressed:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="OnQ-KP-VEs"/>
+                            <action selector="arrowButtonPressed:" destination="eqn-wM-KyJ" eventType="touchUpInside" id="d7H-CE-Ae1"/>
                         </connections>
                     </button>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A2e-ME-rNQ">
+                        <rect key="frame" x="0.0" y="52.5" width="320" height="213"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="213" placeholder="YES" id="Alv-65-clh"/>
+                        </constraints>
+                    </view>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="ktK-VW-1Ci" firstAttribute="leading" secondItem="eIR-zG-AdZ" secondAttribute="trailing" constant="8" id="1Su-qe-4V1"/>
-                    <constraint firstAttribute="trailing" secondItem="ktK-VW-1Ci" secondAttribute="trailing" constant="16" id="SlO-Q5-Fxu"/>
-                    <constraint firstItem="eIR-zG-AdZ" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" constant="13" id="V27-wL-E9l"/>
-                    <constraint firstAttribute="leading" secondItem="eIR-zG-AdZ" secondAttribute="leading" constant="-24" id="vrL-qL-f1a"/>
-                    <constraint firstItem="ktK-VW-1Ci" firstAttribute="centerY" secondItem="eIR-zG-AdZ" secondAttribute="centerY" id="yyz-rf-CCP"/>
+                    <constraint firstItem="0wM-0x-akp" firstAttribute="centerY" secondItem="ceg-ul-UxG" secondAttribute="centerY" id="PoI-QM-liM"/>
+                    <constraint firstItem="A2e-ME-rNQ" firstAttribute="top" secondItem="ceg-ul-UxG" secondAttribute="bottom" constant="8" id="QzF-lP-Kpm"/>
+                    <constraint firstAttribute="trailing" secondItem="0wM-0x-akp" secondAttribute="trailing" constant="16" id="WOO-d2-mkB"/>
+                    <constraint firstItem="0wM-0x-akp" firstAttribute="leading" secondItem="ceg-ul-UxG" secondAttribute="trailing" constant="8" id="XiL-lR-5ky"/>
+                    <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="A2e-ME-rNQ" secondAttribute="bottom" constant="16" id="j8O-9o-1gq"/>
+                    <constraint firstAttribute="trailing" secondItem="A2e-ME-rNQ" secondAttribute="trailing" id="kXq-op-Ox3"/>
+                    <constraint firstAttribute="leading" secondItem="ceg-ul-UxG" secondAttribute="leading" constant="-24" id="quc-cR-Kdq"/>
+                    <constraint firstItem="A2e-ME-rNQ" firstAttribute="leading" secondItem="JFM-KY-cWV" secondAttribute="leading" id="yTj-Jp-x0O"/>
+                    <constraint firstItem="ceg-ul-UxG" firstAttribute="top" secondItem="JFM-KY-cWV" secondAttribute="topMargin" constant="13" id="z4H-Vi-VPQ"/>
                 </constraints>
             </tableViewCellContentView>
             <connections>
-                <outlet property="arrowButton" destination="ktK-VW-1Ci" id="0K7-oH-LSJ"/>
-                <outlet property="titleLabel" destination="eIR-zG-AdZ" id="scd-r2-4RJ"/>
+                <outlet property="arrowButton" destination="0wM-0x-akp" id="iMx-0w-qwW"/>
+                <outlet property="container" destination="A2e-ME-rNQ" id="Qwt-NQ-jfX"/>
+                <outlet property="titleLabel" destination="ceg-ul-UxG" id="Bye-aV-fd4"/>
             </connections>
-            <point key="canvasLocation" x="-124" y="78"/>
+            <point key="canvasLocation" x="26" y="-120"/>
         </tableViewCell>
     </objects>
     <resources>
-        <image name="menu_arrow_bottom" width="44" height="44"/>
+        <image name="menu_arrow_top" width="44" height="44"/>
     </resources>
 </document>

Stepic/DeepLinkRouter.swift

@@ -119,6 +119,16 @@ class DeepLinkRouter {
             return
         }
 
+        if components.count == 3 && components[1].lowercased() == "users" {
+            guard let userId = getID(components[2], reversed: false) else {
+                completion([])
+                return
+            }
+
+            routeToProfileWithId(userId, completion: completion)
+            return
+        }
+
         if components.count >= 3 && components[1].lowercased() == "course" {
             guard let courseId = getID(components[2], reversed: true) else {
                 completion([])
@@ -189,6 +199,16 @@ class DeepLinkRouter {
         return
     }
 
+    static func routeToProfileWithId(_ userId: Int, completion: @escaping ([UIViewController]) -> Void) {
+        guard let vc = ControllerHelper.instantiateViewController(identifier: "ProfileViewController", storyboardName: "Profile") as? ProfileViewController else {
+            completion([])
+            return
+        }
+
+        vc.otherUserId = userId
+        completion([vc])
+    }
+
     fileprivate static func routeToCourseWithId(_ courseId: Int, completion: @escaping ([UIViewController]) -> Void) {
         if let vc = ControllerHelper.instantiateViewController(identifier: "CoursePreviewViewController") as?  CoursePreviewViewController {
             do {

Stepic/DiscussionTableViewCell.swift

@@ -10,7 +10,12 @@ import UIKit
 import FLKAutoLayout
 import SDWebImage
 
+protocol DiscussionTableViewCellDelegate: class {
+    func didOpenProfile(for userWithId: Int)
+}
+
 class DiscussionTableViewCell: UITableViewCell {
+    weak var delegate: DiscussionTableViewCellDelegate?
 
     @IBOutlet weak var userAvatarImageView: AvatarImageView!
     @IBOutlet weak var nameLabel: StepikLabel!
@@ -145,6 +150,22 @@ class DiscussionTableViewCell: UITableViewCell {
         super.awakeFromNib()
         constructLabel()
         badgeLabel.setRoundedCorners(cornerRadius: 10)
+
+        let tapActionNameLabel = UITapGestureRecognizer(target: self, action: #selector(self.actionUserTapped))
+        nameLabel?.isUserInteractionEnabled = true
+        nameLabel?.addGestureRecognizer(tapActionNameLabel)
+
+        let tapActionAvatarView = UITapGestureRecognizer(target: self, action: #selector(self.actionUserTapped))
+        userAvatarImageView?.isUserInteractionEnabled = true
+        userAvatarImageView?.addGestureRecognizer(tapActionAvatarView)
+    }
+
+    @objc func actionUserTapped() {
+        guard let userId = comment?.userInfo.id else {
+            return
+        }
+
+        delegate?.didOpenProfile(for: userId)
     }
 
     override func prepareForReuse() {

Stepic/DiscussionsViewController.swift

@@ -670,6 +670,7 @@ extension DiscussionsViewController : UITableViewDataSource {
 
                 cell.initWithComment(comment, separatorType: cellsInfo[(indexPath as NSIndexPath).row].separatorType)
 
+                cell.delegate = self
                 return cell
 //            } else {
 //                let cell = tableView.dequeueReusableCellWithIdentifier("DiscussionWebTableViewCell", forIndexPath: indexPath) as! DiscussionWebTableViewCell
@@ -742,3 +743,14 @@ extension DiscussionsViewController : WriteCommentDelegate {
         }
     }
 }
+
+extension DiscussionsViewController: DiscussionTableViewCellDelegate {
+    func didOpenProfile(for userWithId: Int) {
+        DeepLinkRouter.routeToProfileWithId(userWithId) { [weak self] viewControllers in
+            if var stack = self?.navigationController?.viewControllers {
+                stack.append(contentsOf: viewControllers)
+                self?.navigationController?.setViewControllers(stack, animated: true)
+            }
+        }
+    }
+}

Stepic/Images.xcassets/icon-settings-profile.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon-settings-profile.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Stepic/MenuBlockTableViewCell.swift

@@ -17,6 +17,10 @@ class MenuBlockTableViewCell: UITableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
 
+        let selectedView = UIView()
+        selectedView.backgroundColor = UIColor.mainLight.withAlphaComponent(0.75)
+        self.selectedBackgroundView = selectedView
+
         separator.isHidden = false
         separator.backgroundColor = UIColor(hex: 0x535366).withAlphaComponent(0.05)
         self.contentView.addSubview(separator)

Stepic/MenuBlocks.swift

@@ -32,13 +32,13 @@ class ExpandableMenuBlock: MenuBlock {
     var isExpanded: Bool = false
 }
 
-class TitleContentExpandableMenuBlock: ExpandableMenuBlock {
-    typealias TitleContent = (title: String, content: String)
-    var content: [TitleContent] = []
-}
+class ContentExpandableMenuBlock: ExpandableMenuBlock {
+    weak var contentView: UIView?
 
-class PinsMapExpandableMenuBlock: ExpandableMenuBlock {
-    var pins: [Int] = []
+    convenience init(id: String, title: String, contentView: UIView?) {
+        self.init(id: id, title: title)
+        self.contentView = contentView
+    }
 }
 
 class TransitionMenuBlock: MenuBlock {
@@ -66,3 +66,9 @@ class SwitchMenuBlock: MenuBlock {
         super.init(id: id, title: title)
     }
 }
+
+class PlaceholderMenuBlock: MenuBlock {
+    func animate() {
+        (cell as? PlaceholderTableViewCell)?.startAnimating()
+    }
+}