Merge pull request #62 from loudnate/fix-modal-transitions

loudnate · web-flow · commit 89b7e045ffb2 · 2016-07-04T22:29:26.000-07:00
Fixing the transition state to Carb and Bolus entry view controllers
diff --git a/Loop/View Controllers/BolusViewController.swift b/Loop/View Controllers/BolusViewController.swift
@@ -69,10 +69,6 @@ class BolusViewController: UITableViewController, IdentifiableClass, UITextField
         }
     }
 
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
-        super.prepareForSegue(segue, sender: sender)
-    }
-
     private lazy var decimalFormatter: NSNumberFormatter = {
         let numberFormatter = NSNumberFormatter()
 
diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift
@@ -624,7 +624,11 @@ class StatusTableViewController: UITableViewController, UIGestureRecognizerDeleg
     override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
         super.prepareForSegue(segue, sender: sender)
 
-        switch segue.destinationViewController {
+        guard let navVC = segue.destinationViewController as? UINavigationController else {
+            return
+        }
+
+        switch navVC.topViewController {
         case let vc as CarbEntryTableViewController:
             vc.carbStore = dataManager.carbStore
             vc.hidesBottomBarWhenPushed = true

Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,6 @@ class BolusViewController: UITableViewController, IdentifiableClass, UITextField`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {`
`73`		`- super.prepareForSegue(segue, sender: sender)`
`74`		`- }`
`75`		`-`
`76`	`72`	`private lazy var decimalFormatter: NSNumberFormatter = {`
`77`	`73`	`let numberFormatter = NSNumberFormatter()`
`78`	`74`