Move VC setup code into init where possible.

propershark · Jun 5, 2017 · f07d619 · f07d619
1 parent 3ce70fe
commit f07d619
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/Proper/Controllers/POIMapViewController.swift b/Proper/Controllers/POIMapViewController.swift
@@ -46,22 +46,20 @@ class POIMapViewController: UIViewController, ProperViewController {
  self.isUserLocation = isUserLocation
  self.connection = connection
  super.init(nibName: nil, bundle: nil)
+
+ map.delegate = self
  }
 
  required init?(coder aDecoder: NSCoder) {
  fatalError("init(coder:) has not been implemented")
  }
 
- // MARK: Lifecycle
-
  override func loadView() {
  view = MKMapView()
  view.translatesAutoresizingMaskIntoConstraints = false
  }
 
- override func viewDidLoad() {
- map.delegate = self
- }
+ // MARK: Lifecycle
 
  override func viewWillAppear(_ animated: Bool) {
  super.viewWillAppear(animated)

diff --git a/Proper/Controllers/POITableViewController.swift b/Proper/Controllers/POITableViewController.swift
@@ -28,8 +28,15 @@ class POITableViewController: UITableViewController, ProperViewController {
  self.stations = stations
  self.mapPoint = mapPoint
  super.init(style: style)
+
+ tableView.translatesAutoresizingMaskIntoConstraints = false
+ tableView.dataSource = dataSource
+ tableView.register(UINib(nibName: "ArrivalTableViewCell", bundle: nil),
+ forCellReuseIdentifier: "arrivalCell")
+ tableView.register(UINib(nibName: "POIStationHeaderFooterView", bundle: nil),
+ forHeaderFooterViewReuseIdentifier: "stationHeader")
  }
- 
+
  required init?(coder aDecoder: NSCoder) {
  fatalError("init(coder:) has not been implemented")
  }
@@ -89,15 +96,6 @@ class POITableViewController: UITableViewController, ProperViewController {
 
  // MARK: Lifecycle
 
- override func viewDidLoad() {
- super.viewDidLoad()
- tableView.dataSource = dataSource
- tableView.register(UINib(nibName: "ArrivalTableViewCell", bundle: nil),
- forCellReuseIdentifier: "arrivalCell")
- tableView.register(UINib(nibName: "POIStationHeaderFooterView", bundle: nil),
- forHeaderFooterViewReuseIdentifier: "stationHeader")
- }
-
  override func viewDidAppear(_ animated: Bool) {
  super.viewDidAppear(animated)
 
@@ -114,11 +112,6 @@ class POITableViewController: UITableViewController, ProperViewController {
  super.viewDidDisappear(animated)
  }
 
- override func didReceiveMemoryWarning() {
- super.didReceiveMemoryWarning()
- // Dispose of any resources that can be recreated.
- }
-
  // MARK: Table View Delegate
  override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
  return POIViewModel.arrivalRowHeight