Browse Source

Minor cleanup and refactoring

Mattt Thompson 11 năm trước cách đây
mục cha
commit
8f89714a4d
2 tập tin đã thay đổi với 19 bổ sung22 xóa
  1. 19 17
      Example/DetailViewController.swift
  2. 0 5
      Example/MasterViewController.swift

+ 19 - 17
Example/DetailViewController.swift

@@ -29,18 +29,14 @@ class DetailViewController: UITableViewController {
     }
 
     var request: Alamofire.Request? {
-        willSet {
-            if self.request != nil {
-                self.request?.cancel()
-                self.refreshControl?.endRefreshing()
-                self.headers.removeAll()
-                self.body = nil
-                self.elapsedTime = nil
-            }
-        }
-
         didSet {
+            oldValue?.cancel()
+
             self.title = self.request?.description
+            self.refreshControl?.endRefreshing()
+            self.headers.removeAll()
+            self.body = nil
+            self.elapsedTime = nil
         }
     }
 
@@ -128,11 +124,15 @@ class DetailViewController: UITableViewController {
     }
 
     override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String {
+        if self.tableView(tableView, numberOfRowsInSection: section) == 0 {
+            return ""
+        }
+
         switch Sections.fromRaw(section)! {
         case .Headers:
-            return self.headers.isEmpty ? "" : "Headers"
+            return "Headers"
         case .Body:
-            return self.body == nil ? "" : "Body"
+            return "Body"
         }
     }
 
@@ -146,12 +146,14 @@ class DetailViewController: UITableViewController {
     }
 
     override func tableView(tableView: UITableView, titleForFooterInSection section: Int) -> String {
-        switch Sections.fromRaw(section)! {
-        case .Body:
-            return self.elapsedTime == nil ? "" : "Elapsed Time: \(self.elapsedTime!) sec"
-        default:
-            return ""
+        if Sections.fromRaw(section)! == .Body && self.elapsedTime != nil {
+            let numberFormatter = NSNumberFormatter()
+            numberFormatter.numberStyle = .DecimalStyle
+
+            return "Elapsed Time: \(numberFormatter.stringFromNumber(self.elapsedTime!)) sec"
         }
+
+        return ""
     }
 }
 

+ 0 - 5
Example/MasterViewController.swift

@@ -34,10 +34,6 @@ class MasterViewController: UITableViewController {
         super.awakeFromNib()
 
         self.navigationItem.titleView = self.titleImageView
-//        if UIDevice.currentDevice().userInterfaceIdiom == .Pad {
-//            self.clearsSelectionOnViewWillAppear = false
-//            self.preferredContentSize = CGSize(width: 320.0, height: 600.0)
-//        }
     }
 
     // MARK: - UIViewController
@@ -59,7 +55,6 @@ class MasterViewController: UITableViewController {
                 switch segue.identifier {
                     case "GET", "POST", "PUT", "DELETE":
                         let method = Alamofire.Method.fromRaw(segue.identifier)!
-
                         return Alamofire.request(method, HTTPBinRoute.Method(method))
                     default:
                         return nil