Merge pull request #1 from NordicSemiconductor/develop

Release 1.0.1

Author: mostafaberg

CHANGELOG

@@ -0,0 +1,5 @@
+- **1.0.1**:
+    - Bugfix: Fixed an issue where swiping back from the peripheral view without actually dismissing would cause the app not to reconnect to the Blinky peripheral.
+
+- **1.0**:
+    - Initial implementation

nRFBlinky/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

nRFBlinky/ViewControllers/BlinkyView/BlinkyViewController.swift

@@ -52,15 +52,7 @@ class BlinkyViewController: UITableViewController, CBCentralManagerDelegate {
         }
     }
 
-    //MARK: - UITableViewDelegate
-    override func tableView(_ tableView: UITableView, shouldHighlightRowAt indexPath: IndexPath) -> Bool {
-        return false
-    }
-    
-    //MARK: - UIViewController
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
+    private func setupDependencies() {
         //This will run on iOS 10 or above
         //and will generate a tap feedback when the button is tapped on the Dev kit.
         prepareHaptics()
@@ -70,7 +62,7 @@ class BlinkyViewController: UITableViewController, CBCentralManagerDelegate {
         buttonStateLabel.text = "Reading ..."
         ledStateLabel.text    = "Reading ..."
         ledToggleSwitch.isEnabled = false
-
+        
         print("Adding button notification and LED write callback handlers")
         blinkyPeripheral.setButtonCallback { (isPressed) -> (Void) in
             DispatchQueue.main.async {
@@ -88,7 +80,7 @@ class BlinkyViewController: UITableViewController, CBCentralManagerDelegate {
                 if !self.ledToggleSwitch.isEnabled {
                     self.ledToggleSwitch.isEnabled = true
                 }
-
+                
                 if isOn {
                     self.ledStateLabel.text = "ON"
                     if self.ledToggleSwitch.isOn == false {
@@ -103,18 +95,33 @@ class BlinkyViewController: UITableViewController, CBCentralManagerDelegate {
             }
         }
     }
+    //MARK: - UITableViewDelegate
+    override func tableView(_ tableView: UITableView, shouldHighlightRowAt indexPath: IndexPath) -> Bool {
+        return false
+    }
+    
+    //MARK: - UIViewController
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        guard blinkyPeripheral.basePeripheral.state != .connected else {
+            //View is coming back from a swipe, everything is already setup
+            return
+        }
+        //This is the first time view appears, setup the subviews and dependencies
+        setupDependencies()
+    }
 
-    override func viewWillDisappear(_ animated: Bool) {
+    override func viewDidDisappear(_ animated: Bool) {
         print("Removing button notification and LED write callback handlers")
         blinkyPeripheral.removeLEDCallback()
         blinkyPeripheral.removeButtonCallback()
 
         if blinkyPeripheral.basePeripheral.state == .connected {
             centralManager.cancelPeripheralConnection(blinkyPeripheral.basePeripheral)
         }
-
-        super.viewWillDisappear(animated)
+        super.viewDidDisappear(animated)
     }
+
     //MARK: - CBCentralManagerDelegate
     func centralManagerDidUpdateState(_ central: CBCentralManager) {
         if central.state != .poweredOn {

nRFBlinky/ViewControllers/ScannerView/ScannerTableViewController.swift

@@ -104,10 +104,13 @@ class ScannerTableViewController: UITableViewController, CBCentralManagerDelegat
     // MARK: - UIViewController
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        centralManager.delegate = self
         discoveredPeripherals.removeAll()
         tableView.reloadData()
-        
+    }
+    
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        centralManager.delegate = self
         if centralManager.state == .poweredOn {
             activityIndicator.startAnimating()
             centralManager.scanForPeripherals(withServices: [BlinkyPeripheral.nordicBlinkyServiceUUID], options: [CBCentralManagerScanOptionAllowDuplicatesKey : true])