Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
17 changed files
with
1,007 additions
and
159 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,3 +65,4 @@ fastlane/report.xml | |
| fastlane/Preview.html | ||
| fastlane/screenshots | ||
| fastlane/test_output | ||
| .DS_Store | ||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // | ||
| // GPSRequestCell.swift | ||
| // DemoApp | ||
| // | ||
| // Created by dan on 23/04/2019. | ||
| // Copyright © 2019 SwiftLocation. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import CoreLocation | ||
| import MapKit | ||
|
|
||
| public class BeaconsRequestCell: UITableViewCell { | ||
| public static let height: CGFloat = 70 | ||
|
|
||
| @IBOutlet public var titleLabel: UILabel! | ||
| @IBOutlet public var descriptionLabel: UILabel! | ||
| @IBOutlet public var stopButton: UIButton! | ||
|
|
||
| internal weak var monitorController: RequestsMonitorController? | ||
|
|
||
| @IBAction public func didPressStop() { | ||
| if let request = request { | ||
| switch request.state { | ||
| case .expired: | ||
| monitorController?.completedRequests.removeAll(where: { $0.id == request.id }) | ||
| monitorController?.reload() | ||
| default: | ||
| request.stop() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public var request: BeaconsRequest? { | ||
| didSet { | ||
| stopButton.setTitle( (request?.state == .running ? "Stop" : "Remove"), for: .normal) | ||
| titleLabel.text = "BEACONS MONITORING" | ||
|
|
||
| guard let beacons = request?.value else { | ||
| descriptionLabel.text = "(not received)" | ||
| return | ||
| } | ||
|
|
||
| let descritpion = beacons.compactMap { "\($0.major) \($0.minor)" }.joined(separator: " | ") | ||
| descriptionLabel.text = descritpion | ||
| stopButton.isEnabled = true | ||
| stopButton.alpha = 1.0 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| // | ||
| // NewGPSRequestController.swift | ||
| // SwiftLocation | ||
| // | ||
| // Created by dan on 23/04/2019. | ||
| // Copyright © 2019 SwiftLocation. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
| import CoreLocation | ||
|
|
||
| public class NewBeaconsRequestController: UIViewController { | ||
|
|
||
| @IBOutlet public var timeoutButton: UIButton! | ||
| @IBOutlet public var modeButton: UIButton! | ||
| @IBOutlet public var distanceFilter: UITextField! | ||
| @IBOutlet public var proximityUUID: UITextField! | ||
| @IBOutlet public var activityButton: UIButton! | ||
|
|
||
| private var timeout: Timeout.Mode? = nil { | ||
| didSet { | ||
| reload() | ||
| } | ||
| } | ||
|
|
||
| private var mode: BeaconsRequest.Subscription = .oneShot { | ||
| didSet { | ||
| reload() | ||
| } | ||
| } | ||
|
|
||
| private var activityType: CLActivityType = .other { | ||
| didSet { | ||
| reload() | ||
| } | ||
| } | ||
|
|
||
| public static func create() -> UINavigationController { | ||
| let storyboard = UIStoryboard(name: "Main", bundle: Bundle.main) | ||
| let vc = storyboard.instantiateViewController(withIdentifier: "NewBeaconsRequestController") as! NewBeaconsRequestController | ||
| return UINavigationController(rootViewController: vc) | ||
| } | ||
|
|
||
| public override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
|
|
||
| self.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(didPressCancel)) | ||
| self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Create", style: .plain, target: self, action: #selector(createRequest)) | ||
|
|
||
| self.timeout = .delayed(10) | ||
| self.mode = .oneShot | ||
| reload() | ||
| } | ||
|
|
||
| @objc func didPressCancel() { | ||
| self.dismiss(animated: true, completion: nil) | ||
| } | ||
|
|
||
|
|
||
| @IBAction public func setMode() { | ||
| let options: [SelectionItem<BeaconsRequest.Subscription>] = BeaconsRequest.Subscription.all.map { | ||
| return SelectionItem(title: $0.description, value: $0) | ||
| } | ||
| self.showPicker(title: "Select a Subscription mode", msg: nil, options: options, onSelect: { item in | ||
| self.mode = item.value! | ||
| }) | ||
| } | ||
|
|
||
| @IBAction public func setActivityType() { | ||
| var options: [SelectionItem<CLActivityType>] = [ | ||
| SelectionItem(title: "other", value: CLActivityType.other), | ||
| SelectionItem(title: "automotiveNavigation", value: CLActivityType.automotiveNavigation), | ||
| SelectionItem(title: "fitness", value: CLActivityType.fitness), | ||
| SelectionItem(title: "otherNavigation", value: CLActivityType.otherNavigation), | ||
| ] | ||
|
|
||
| if #available(iOS 12.0, *) { | ||
| options.append(SelectionItem(title: "airborne", value: CLActivityType.airborne)) | ||
| } | ||
|
|
||
| self.showPicker(title: "Select an Activity", msg: nil, options: options, onSelect: { item in | ||
| self.activityType = item.value! | ||
| }) | ||
| } | ||
|
|
||
| @IBAction public func setTimeout() { | ||
| let options: [SelectionItem<Timeout.Mode>] = [ | ||
| .init(title: "Absolute 5s", value: .absolute(5)), | ||
| .init(title: "Absolute 10s", value: .absolute(10)), | ||
| .init(title: "Absolute 20s", value: .absolute(20)), | ||
| .init(title: "Delayed 5s", value: .delayed(5)), | ||
| .init(title: "Delayed 10s", value: .delayed(10)), | ||
| .init(title: "Delayed 20s", value: .delayed(20)), | ||
| .init(title: "No Timeout", value: nil), | ||
| ] | ||
| self.showPicker(title: "Select a Timeout", msg: nil, options: options, onSelect: { item in | ||
| self.timeout = item.value | ||
| }) | ||
| } | ||
|
|
||
| private func reload() { | ||
| timeoutButton.setTitle(timeout?.description ?? "not set", for: .normal) | ||
| modeButton.setTitle(mode.description, for: .normal) | ||
| activityButton.setTitle(activityType.description, for: .normal) | ||
| } | ||
|
|
||
| @objc public func createRequest() { | ||
| guard let proximityUUID = UUID(uuidString: proximityUUID.text ?? "") else { | ||
| let alert = UIAlertController(title: "Invalid Proximity UUID", message: "Invalid identifier of the beacon.", preferredStyle: .alert) | ||
| alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil)) | ||
| self.present(alert, animated: true, completion: nil) | ||
| return | ||
| } | ||
|
|
||
| LocationManager.shared.locateFromBeacons(self.mode, | ||
| proximityUUID: proximityUUID, | ||
| result: nil) | ||
| self.dismiss(animated: true, completion: nil) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.