Merged PlanViewController and PersonalViewController into one superclass inherited by separate ViewControllers, implemented Airbnb's MagazineLayout <3

2019-07-16 13:17:22 +02:00
parent 7e23bb2e5d
commit 347317a5e7
8 changed files with 323 additions and 343 deletions
@@ -7,17 +7,41 @@
 //

 import UIKit
+import MagazineLayout

-class PlanViewController : UIViewController, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
+class PlanViewController : UIViewController, UICollectionViewDataSource, UICollectionViewDelegateMagazineLayout {
    
-    let reuseIdentifier = "cell"
-    @IBOutlet weak var collectionView: UICollectionView!
-    var substs = Array<SubstModel>()
+    let identifier = "plan_cell"
+    var substs = [SubstModel]()
    private let refreshControl = UIRefreshControl()
    let df = DataFetcher()
+    let layout = MagazineLayout()
+    var collectionView: UICollectionView
+    
+    required init?(coder decoder: NSCoder) {
+        collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        super.init(coder: decoder)
+    }
+    
+    func getToolbarBottomAnchor() -> NSLayoutYAxisAnchor {
+        return view.topAnchor
+    }
    
    override func viewWillAppear(_ animated: Bool) {
        super.viewWillAppear(animated)
+        
+        view.addSubview(collectionView)
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: getToolbarBottomAnchor()),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+            ])
+        collectionView.register(UINib(nibName: "PlanViewCell", bundle: nil), forCellWithReuseIdentifier: identifier)
+        collectionView.dataSource = self
+        collectionView.delegate = self
+        
        if #available(iOS 10.0, *) {
            collectionView.refreshControl = refreshControl
        } else {
@@ -25,11 +49,23 @@ class PlanViewController : UIViewController, UICollectionViewDataSource, UIColle
        }
        refreshControl.addTarget(self, action: #selector(objDoAsync(_:)), for: .valueChanged)
        refreshControl.tintColor = UIColor(red: 0.39, green: 0.71, blue: 0.96, alpha: 1.0)
-        refreshControl.attributedTitle = NSAttributedString(string: "Fetching the plan...")
+        refreshControl.attributedTitle = NSAttributedString(string: getRefreshViewString())
+    }
+    
+    func getViewType() -> String {
+        return "plan"
+    }
+    
+    func getFromDatabase() -> [SubstModel] {
+        return self.df.getFromDatabase()
+    }
+    
+    func getRefreshViewString() -> String {
+        return "Fetching the plan..."
    }
    
    @objc private func objDoAsync(_ sender: Any) {
-        df.doAsync(do: "plan") { substitutions in
+        df.doAsync(do: getViewType()) { substitutions in
            self.substs = substitutions as! [SubstModel]
            self.collectionView.reloadData()
            self.refreshControl.endRefreshing()
@@ -40,7 +76,7 @@ class PlanViewController : UIViewController, UICollectionViewDataSource, UIColle
        super.viewDidLoad()
        collectionView.backgroundColor = UIColor(red: 0.8, green: 0.8, blue: 0.8, alpha: 1.0)
        
-        self.substs = self.df.getFromDatabase()
+        self.substs = getFromDatabase()
        self.collectionView.reloadData()
    }
    
@@ -49,7 +85,7 @@ class PlanViewController : UIViewController, UICollectionViewDataSource, UIColle
    }
    
    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: reuseIdentifier, for: indexPath as IndexPath) as! CollectionViewCell
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: identifier, for: indexPath as IndexPath) as! PlanViewCell
        if self.substs.count != 0 {
            cell.group.text = self.substs[indexPath.item].group
            cell.additional.text = self.substs[indexPath.item].additional
@@ -62,11 +98,11 @@ class PlanViewController : UIViewController, UICollectionViewDataSource, UIColle
            
            if image != nil {
                let attachment: NSTextAttachment = NSTextAttachment()
-                attachment.bounds = CGRect(x: 0, y: 0, width: cell.course.frame.height - 6, height: cell.course.frame.height - 6)
+                attachment.bounds = CGRect(x: 0, y: 0, width: 16, height: 16)
                attachment.image = image
                
                let courseImage = NSMutableAttributedString(attachment: attachment)
-                let courseString = NSAttributedString(string: " " + course)
+                let courseString = NSAttributedString(string: " \(course)")
                courseImage.append(courseString)
                
                cell.course.attributedText = courseImage
@@ -80,12 +116,40 @@ class PlanViewController : UIViewController, UICollectionViewDataSource, UIColle
        return cell
    }
    
-//    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-//        print("You selected cell#\(indexPath.item)!")
-//    }
+    // stubs
    
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-        return CGSize(width: view.frame.size.width, height: 108)
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeModeForItemAt indexPath: IndexPath) -> MagazineLayoutItemSizeMode {
+        let widthMode = MagazineLayoutItemWidthMode.fullWidth(respectsHorizontalInsets: true)
+        let heightMode = MagazineLayoutItemHeightMode.dynamic
+        return MagazineLayoutItemSizeMode(widthMode: widthMode, heightMode: heightMode)
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, visibilityModeForHeaderInSectionAtIndex index: Int) -> MagazineLayoutHeaderVisibilityMode {
+        return .hidden
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, visibilityModeForFooterInSectionAtIndex index: Int) -> MagazineLayoutFooterVisibilityMode {
+        return .hidden
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, visibilityModeForBackgroundInSectionAtIndex index: Int) -> MagazineLayoutBackgroundVisibilityMode {
+        return .hidden
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, horizontalSpacingForItemsInSectionAtIndex index: Int) -> CGFloat {
+        return 0
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, verticalSpacingForElementsInSectionAtIndex index: Int) -> CGFloat {
+        return 1
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetsForSectionAtIndex index: Int) -> UIEdgeInsets {
+        return UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetsForItemsInSectionAtIndex index: Int) -> UIEdgeInsets {
+        return UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
    }
 }