Merge pull request #22 from jeantimex/auto-height-support

Added auto height support.

Author: jeantimex

ios-swift-collapsible-table-section.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		0A12C8C21D9C3AAF00D0BEE3 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A12C8C11D9C3AAF00D0BEE3 /* Extensions.swift */; };
+		0A8465851F1DBC6E002CD874 /* CollapsibleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A8465841F1DBC6E002CD874 /* CollapsibleTableViewCell.swift */; };
 		0A908DEF1CFCAA9200470F33 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A908DEE1CFCAA9200470F33 /* AppDelegate.swift */; };
 		0A908DF61CFCAA9200470F33 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0A908DF51CFCAA9200470F33 /* Assets.xcassets */; };
 		0A908DF91CFCAA9200470F33 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0A908DF71CFCAA9200470F33 /* LaunchScreen.storyboard */; };
@@ -17,6 +18,7 @@
 
 /* Begin PBXFileReference section */
 		0A12C8C11D9C3AAF00D0BEE3 /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
+		0A8465841F1DBC6E002CD874 /* CollapsibleTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollapsibleTableViewCell.swift; sourceTree = "<group>"; };
 		0A908DEB1CFCAA9200470F33 /* ios-swift-collapsible-table-section.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ios-swift-collapsible-table-section.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		0A908DEE1CFCAA9200470F33 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		0A908DF51CFCAA9200470F33 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -63,6 +65,7 @@
 				0A908E001CFCAC7500470F33 /* CollapsibleTableViewController.swift */,
 				0A908E021CFCB8D600470F33 /* CollapsibleTableViewHeader.swift */,
 				0A12C8C11D9C3AAF00D0BEE3 /* Extensions.swift */,
+				0A8465841F1DBC6E002CD874 /* CollapsibleTableViewCell.swift */,
 			);
 			path = "ios-swift-collapsible-table-section";
 			sourceTree = "<group>";
@@ -140,6 +143,7 @@
 			files = (
 				0A908E011CFCAC7500470F33 /* CollapsibleTableViewController.swift in Sources */,
 				0A908E031CFCB8D600470F33 /* CollapsibleTableViewHeader.swift in Sources */,
+				0A8465851F1DBC6E002CD874 /* CollapsibleTableViewCell.swift in Sources */,
 				0A908DEF1CFCAA9200470F33 /* AppDelegate.swift in Sources */,
 				0A12C8C21D9C3AAF00D0BEE3 /* Extensions.swift in Sources */,
 			);

ios-swift-collapsible-table-section/CollapsibleTableViewCell.swift

@@ -0,0 +1,48 @@
+//
+//  CollapsibleTableViewCell.swift
+//  ios-swift-collapsible-table-section
+//
+//  Created by Yong Su on 7/17/17.
+//  Copyright © 2017 Yong Su. All rights reserved.
+//
+
+import UIKit
+
+class CollapsibleTableViewCell: UITableViewCell {
+    
+    let nameLabel = UILabel()
+    let detailLabel = UILabel()
+    
+    // MARK: Initalizers
+    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        
+        let marginGuide = contentView.layoutMarginsGuide
+        
+        // configure nameLabel
+        contentView.addSubview(nameLabel)
+        nameLabel.translatesAutoresizingMaskIntoConstraints = false
+        nameLabel.leadingAnchor.constraint(equalTo: marginGuide.leadingAnchor).isActive = true
+        nameLabel.topAnchor.constraint(equalTo: marginGuide.topAnchor).isActive = true
+        nameLabel.trailingAnchor.constraint(equalTo: marginGuide.trailingAnchor).isActive = true
+        nameLabel.numberOfLines = 0
+        nameLabel.font = UIFont.systemFont(ofSize: 16)
+        
+        // configure detailLabel
+        contentView.addSubview(detailLabel)
+        detailLabel.lineBreakMode = .byWordWrapping
+        detailLabel.translatesAutoresizingMaskIntoConstraints = false
+        detailLabel.leadingAnchor.constraint(equalTo: marginGuide.leadingAnchor).isActive = true
+        detailLabel.bottomAnchor.constraint(equalTo: marginGuide.bottomAnchor).isActive = true
+        detailLabel.trailingAnchor.constraint(equalTo: marginGuide.trailingAnchor).isActive = true
+        detailLabel.topAnchor.constraint(equalTo: nameLabel.bottomAnchor, constant: 5).isActive = true
+        detailLabel.numberOfLines = 0
+        detailLabel.font = UIFont.systemFont(ofSize: 12)
+        detailLabel.textColor = UIColor.lightGray
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+}

ios-swift-collapsible-table-section/CollapsibleTableViewController.swift

@@ -11,12 +11,22 @@ import UIKit
 //
 // MARK: - Section Data Structure
 //
+struct Item {
+    var name: String
+    var detail: String
+    
+    init(name: String, detail: String) {
+        self.name = name
+        self.detail = detail
+    }
+}
+
 struct Section {
-    var name: String!
-    var items: [String]!
-    var collapsed: Bool!
+    var name: String
+    var items: [Item]
+    var collapsed: Bool
 
-    init(name: String, items: [String], collapsed: Bool = false) {
+    init(name: String, items: [Item], collapsed: Bool = false) {
         self.name = name
         self.items = items
         self.collapsed = collapsed
@@ -33,14 +43,37 @@ class CollapsibleTableViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        // Auto resizing the height of the cell
+        tableView.estimatedRowHeight = 44.0
+        tableView.rowHeight = UITableViewAutomaticDimension
+        
         self.title = "Apple Products"
 
         // Initialize the sections array
         // Here we have three sections: Mac, iPad, iPhone
         sections = [
-            Section(name: "Mac", items: ["MacBook", "MacBook Air", "MacBook Pro", "iMac", "Mac Pro", "Mac mini", "Accessories", "OS X El Capitan"]),
-            Section(name: "iPad", items: ["iPad Pro", "iPad Air 2", "iPad mini 4", "Accessories"]),
-            Section(name: "iPhone", items: ["iPhone 6s", "iPhone 6", "iPhone SE", "Accessories"]),
+            Section(name: "Mac", items: [
+                Item(name: "MacBook", detail: "Apple's ultraportable laptop, trading portability for speed and connectivity."),
+                Item(name: "MacBook Air", detail: "While the screen could be sharper, the updated 11-inch MacBook Air is a very light ultraportable that offers great performance and battery life for the price."),
+                Item(name: "MacBook Pro", detail: "Retina Display The brightest, most colorful Mac notebook display ever. The display in the MacBook Pro is the best ever in a Mac notebook."),
+                Item(name: "iMac", detail: "iMac combines enhanced performance with our best ever Retina display for the ultimate desktop experience in two sizes."),
+                Item(name: "Mac Pro", detail: "Mac Pro is equipped with pro-level graphics, storage, expansion, processing power, and memory. It's built for creativity on an epic scale."),
+                Item(name: "Mac mini", detail: "Mac mini is an affordable powerhouse that packs the entire Mac experience into a 7.7-inch-square frame."),
+                Item(name: "OS X El Capitan", detail: "The twelfth major release of OS X (now named macOS)."),
+                Item(name: "Accessories", detail: "")
+            ]),
+            Section(name: "iPad", items: [
+                Item(name: "iPad Pro", detail: "iPad Pro delivers epic power, in 12.9-inch and a new 10.5-inch size."),
+                Item(name: "iPad Air 2", detail: "The second-generation iPad Air tablet computer designed, developed, and marketed by Apple Inc."),
+                Item(name: "iPad mini 4", detail: "iPad mini 4 puts uncompromising performance and potential in your hand."),
+                Item(name: "Accessories", detail: "")
+            ]),
+            Section(name: "iPhone", items: [
+                Item(name: "iPhone 6s", detail: "The iPhone 6S has a similar design to the 6 but updated hardware, including a strengthened chassis and upgraded system-on-chip, a 12-megapixel camera, improved fingerprint recognition sensor, and LTE Advanced support."),
+                Item(name: "iPhone 6", detail: "The iPhone 6 and iPhone 6 Plus are smartphones designed and marketed by Apple Inc."),
+                Item(name: "iPhone SE", detail: "The iPhone SE was received positively by critics, who noted its familiar form factor and design, improved hardware over previous 4-inch iPhone models, as well as its overall performance and battery life."),
+                Item(name: "Accessories", detail: "")
+            ])
         ]
     }
 
@@ -56,20 +89,24 @@ extension CollapsibleTableViewController {
     }
 
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return sections[section].items.count
+        return sections[section].collapsed ? 0 : sections[section].items.count
     }
 
     // Cell
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: "cell") as UITableViewCell? ?? UITableViewCell(style: .default, reuseIdentifier: "cell")
+        let cell: CollapsibleTableViewCell = tableView.dequeueReusableCell(withIdentifier: "cell") as? CollapsibleTableViewCell ??
+            CollapsibleTableViewCell(style: .default, reuseIdentifier: "cell")
+        
+        let item: Item = sections[(indexPath as NSIndexPath).section].items[(indexPath as NSIndexPath).row]
 
-        cell.textLabel?.text = sections[(indexPath as NSIndexPath).section].items[(indexPath as NSIndexPath).row]
+        cell.nameLabel.text = item.name
+        cell.detailLabel.text = item.detail
 
         return cell
     }
 
     override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return sections[(indexPath as NSIndexPath).section].collapsed! ? 0 : 44.0
+        return sections[(indexPath as NSIndexPath).section].collapsed ? 0 : UITableViewAutomaticDimension
     }
 
     // Header
@@ -108,12 +145,7 @@ extension CollapsibleTableViewController: CollapsibleTableViewHeaderDelegate {
         sections[section].collapsed = collapsed
         header.setCollapsed(collapsed)
 
-        // Adjust the height of the rows inside the section
-        tableView.beginUpdates()
-        for i in 0 ..< sections[section].items.count {
-            tableView.reloadRows(at: [IndexPath(row: i, section: section)], with: .automatic)
-        }
-        tableView.endUpdates()
+        tableView.reloadSections(NSIndexSet(index: section) as IndexSet, with: .automatic)
     }
 
 }

ios-swift-collapsible-table-section/CollapsibleTableViewHeader.swift

@@ -97,7 +97,7 @@ class CollapsibleTableViewHeader: UITableViewHeaderFooterView {
         //
         // Animate the arrow rotation (see Extensions.swf)
         //
-        arrowLabel.rotate(collapsed ? 0.0 : CGFloat(M_PI_2))
+        arrowLabel.rotate(collapsed ? 0.0 : .pi / 2)
     }
 
 }