Merge branch 'master' into merge/hotfix_2.6.1_master

Author: ssathy2

Examples/GroceryExpress/AddressSelectionViewController.swift

@@ -16,7 +16,7 @@ final class AddressSelectionViewController: UIViewController {
     /// The result of the search
     struct Result {
         let placemark: MKPlacemark
-        let formattedAddress: String
+        let formattedAddress: String?
     }
 
     // MARK: - Public
@@ -29,6 +29,7 @@ final class AddressSelectionViewController: UIViewController {
     private var resultSearchController: UISearchController? = nil
     private let locationManager = CLLocationManager()
     private var selectedItem: Result? = nil
+    private var doneButton: UIBarButtonItem?
 
     static func instantiate() -> AddressSelectionViewController {
         guard let viewController = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "AddressSelectionViewController") as? AddressSelectionViewController else {
@@ -60,23 +61,73 @@ final class AddressSelectionViewController: UIViewController {
         resultSearchController?.obscuresBackgroundDuringPresentation = true
         definesPresentationContext = true
 
-        let continueButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(doneTapped))
-        navigationItem.rightBarButtonItem = continueButton
-        continueButton.isEnabled = false
+        let doneButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(doneTapped))
+        let latLongButton = UIBarButtonItem(title: "Lat/Long", style: .plain, target: self, action: #selector(latLongTapped))
+        navigationItem.rightBarButtonItems = [latLongButton, doneButton]
+        doneButton.isEnabled = false
+        self.doneButton = doneButton
     }
 
     @objc func doneTapped() {
         guard let selectedItem = selectedItem else { return }
         onAddressSelect?(selectedItem)
     }
+    
+    private func showErrorAlert(title: String, message: String?) {
+        let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        alertController.addAction(.init(title: "OK", style: .default, handler: nil))
+        present(alertController, animated: true)
+    }
+    
+    @objc func latLongTapped() {
+        let alertController = UIAlertController(
+            title: "Enter Latitude/Longitude",
+            message: "",
+            preferredStyle: .alert
+        )
+        
+        alertController.addTextField { textField in
+            textField.placeholder = "Latitude"
+        }
+        
+        alertController.addTextField { textField in
+            textField.placeholder = "Longitude"
+        }
+        
+        let confirmAction = UIAlertAction(title: "OK", style: .default) { [weak self] _ in
+            alertController.message = nil
+            
+            guard let latitudeTextFieldText = alertController.textFields?.first?.text,
+                  let longitudeTextFieldText = alertController.textFields?[1].text else { return }
+            
+            guard let latitude = CLLocationDegrees(latitudeTextFieldText) else {
+                self?.showErrorAlert(title: "Invalid Entry", message: "Please try again and enter a valid latitude.")
+                return
+            }
+            
+            guard let longitude = CLLocationDegrees(longitudeTextFieldText) else {
+                self?.showErrorAlert(title: "Invalid Entry", message: "Please try again and enter a valid longitude.")
+                return
+            }
+            
+            let coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
+            let placemark = MKPlacemark(coordinate: coordinate)
+            self?.onAddressSelect?(.init(placemark: placemark, formattedAddress: nil))
+        }
+        
+        alertController.addAction(confirmAction)
+        let cancelAction = UIAlertAction(title: "Cancel", style: .cancel, handler: nil)
+        alertController.addAction(cancelAction)
+        present(alertController, animated: true, completion: nil)
+    }
 }
 
 extension AddressSelectionViewController: LocationSearchSelectable {
     func didSelect(_ placemark: MKPlacemark, formattedAddress: String) {
         dismiss(animated: true, completion: { [weak self] in
             guard let self = self else { return }
 
-            self.navigationItem.rightBarButtonItem?.isEnabled = true
+            self.doneButton?.isEnabled = true
             self.selectedItem = .init(placemark: placemark, formattedAddress: formattedAddress)
             self.mapView.removeAnnotations(self.mapView.annotations)
             let annotation = MKPointAnnotation()

Examples/GroceryExpress/AddressUpdateViewController.swift

@@ -13,7 +13,6 @@ import IFTTTConnectSDK
 /// Generates a address update request based on the fields contained in the struct.
 private struct AddressUpdateRequestFactory {
     let token: String
-    let userId: String
     let entryPlacemark: MKPlacemark
     let entryAddress: String
     let entryRadius: Int
@@ -25,7 +24,7 @@ private struct AddressUpdateRequestFactory {
     func generate() -> URLRequest {
         let body = """
         {
-          "user_id": \(userId),
+          "user_id": 1,
           "services": [
             {
               "service_id": "location",
@@ -99,7 +98,6 @@ final class AddressUpdateViewController: UIViewController {
     @IBOutlet private weak var exitAddressLabel: UILabel!
     @IBOutlet private weak var exitRadiusTextField: UITextField!
     @IBOutlet private weak var updateButton: UIButton!
-    @IBOutlet private weak var userIdTextField: UITextField!
     @IBOutlet private weak var activityIndicator: UIActivityIndicatorView!
 
     /// The user token that comes back from the `ConnectButtonControllerDelegate` method `didFinishActivationWithResult`
@@ -131,9 +129,6 @@ final class AddressUpdateViewController: UIViewController {
 
         /// The geofence exit formatted address
         var exitAddress: String?
-        
-        /// The IFTTT user id for the user to update
-        var userId: String?
     }
 
     private var addressUpdate: AddressUpdate = .init()
@@ -176,16 +171,25 @@ final class AddressUpdateViewController: UIViewController {
         configureUpdateButton()
     }
 
+    private func generateText(placemark: MKPlacemark, formattedAddress: String?) -> String {
+        var str = ""
+        if let formattedAddress = formattedAddress {
+            str += formattedAddress
+        }
+        str += ("\n" + "Lat: \(placemark.coordinate.latitude), Lon: \(placemark.coordinate.longitude)")
+        return str
+    }
+    
     private func configureLabels() {
-        if let entry = addressUpdate.entryAddress {
-            enterAddressLabel.text = entry
+        if let entryPlacemark = addressUpdate.entryPlacemark {
+            enterAddressLabel.text = generateText(placemark: entryPlacemark, formattedAddress: addressUpdate.entryAddress)
             enterAddressLabel.isHidden = false
         } else {
             enterAddressLabel.isHidden = true
         }
 
-        if let exit = addressUpdate.exitAddress {
-            exitAddressLabel.text = exit
+        if let exitPlacemark = addressUpdate.exitPlacemark {
+            exitAddressLabel.text = generateText(placemark: exitPlacemark, formattedAddress: addressUpdate.exitAddress)
             exitAddressLabel.isHidden = false
         } else {
             exitAddressLabel.isHidden = true
@@ -195,7 +199,6 @@ final class AddressUpdateViewController: UIViewController {
     private func configureUpdateButton() {
         updateButton.isEnabled = addressUpdate.entryPlacemark != nil
             && addressUpdate.exitPlacemark != nil
-            && !(addressUpdate.userId?.isEmpty ?? true)
     }
 
     @IBAction private func updateButtonTapped(_ sender: Any) {
@@ -218,7 +221,6 @@ final class AddressUpdateViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        userIdTextField.delegate = self
         enterRadiusTextField.delegate = self
         exitRadiusTextField.delegate = self
 
@@ -266,15 +268,17 @@ final class AddressUpdateViewController: UIViewController {
     }
 
     private func makeRequest(completion: @escaping (Data?, Error?) -> Void) {
-        guard let userId = addressUpdate.userId,
-              let entryPlacemark = addressUpdate.entryPlacemark,
-              let entryAddress = addressUpdate.entryAddress?.replacingOccurrences(of: "\n", with: " "),
+        guard let entryPlacemark = addressUpdate.entryPlacemark,
               let entryRadius = addressUpdate.geofenceEntryRadius,
               let exitPlacemark = addressUpdate.exitPlacemark,
-              let exitAddress = addressUpdate.exitAddress?.replacingOccurrences(of: "\n", with: " "),
-              let exitRadius = addressUpdate.geofenceExitRadius else { return }
+              let exitRadius = addressUpdate.geofenceExitRadius else {
+            completion(nil, nil)
+            return
+        }
+        
+        let entryAddress = addressUpdate.entryAddress?.replacingOccurrences(of: "\n", with: " ") ?? ""
+        let exitAddress = addressUpdate.exitAddress?.replacingOccurrences(of: "\n", with: " ") ?? ""
         let requestFactory = AddressUpdateRequestFactory(token: token,
-                                                         userId: userId,
                                                          entryPlacemark: entryPlacemark,
                                                          entryAddress: entryAddress,
                                                          entryRadius: entryRadius,
@@ -300,9 +304,7 @@ extension AddressUpdateViewController: UITextFieldDelegate {
         guard let text = textField.text else { return true }
         let updatedText = (text as NSString).replacingCharacters(in: range, with: string)
 
-        if textField == userIdTextField {
-            addressUpdate.userId = updatedText
-        } else if textField == enterRadiusTextField {
+        if textField == enterRadiusTextField {
             addressUpdate.geofenceEntryRadius = Int(updatedText)
         } else if textField == exitRadiusTextField {
             addressUpdate.geofenceExitRadius = Int(updatedText)