From 66a6741cf30a696aad0cfdbf6a06c105bf215b96 Mon Sep 17 00:00:00 2001 From: susemi99 Date: Fri, 31 May 2019 23:44:49 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=97=86=EC=9D=B4=20?= =?UTF-8?q?=EC=9E=A5=EC=86=8C=EB=A7=8C=20=EC=9E=88=EC=9D=84=20=EB=95=8C=20?= =?UTF-8?q?=EC=8B=9C=EC=9E=91/=EC=A2=85=EB=A3=8C=20=EC=A7=80=EC=A0=90?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20=EC=8B=9C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GPXTracker/GPXTracker/MapViewController.swift | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/GPXTracker/GPXTracker/MapViewController.swift b/GPXTracker/GPXTracker/MapViewController.swift index a1f7dcf..2ed44d5 100644 --- a/GPXTracker/GPXTracker/MapViewController.swift +++ b/GPXTracker/GPXTracker/MapViewController.swift @@ -103,6 +103,10 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD } @IBAction func goToStartPin(_ sender: Any) { + if startPins.count == 0 { + return + } + moveTo(location: startPins[startPinIndex].coordinate) startPinIndex += 1 @@ -112,6 +116,10 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD } @IBAction func goToEndPin(_ sender: Any) { + if endPins.count == 0 { + return + } + moveTo(location: endPins[endPinIndex].coordinate) endPinIndex += 1 From c0c135e4632b4abcdb996ee18ccf60df5cfa1cfe Mon Sep 17 00:00:00 2001 From: susemi99 Date: Tue, 23 Jul 2019 08:55:30 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Xcode=2010.3,=20=E1=84=85=E1=85=A1=E1=84=8B?= =?UTF-8?q?=E1=85=B5=E1=84=87=E1=85=B3=E1=84=85=E1=85=A5=E1=84=85=E1=85=B5?= =?UTF-8?q?=20=E1=84=8B=E1=85=A5=E1=86=B8=E1=84=83=E1=85=A6=E1=84=8B?= =?UTF-8?q?=E1=85=B5=E1=84=90=E1=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GPXTracker/Cartfile.resolved | 2 +- .../PKHUD/Demo/DemoViewController.swift | 18 ++++ .../Carthage/Checkouts/PKHUD/Demo/Info.plist | 2 +- .../PKHUD/Demo/Storyboard.storyboard | 85 ++++++++++++------- .../Carthage/Checkouts/PKHUD/PKHUD.podspec | 4 +- .../PKHUD/PKHUD.xcodeproj/project.pbxproj | 19 +++-- .../xcschemes/PKHUD Demo.xcscheme | 2 +- .../xcshareddata/xcschemes/PKHUD.xcscheme | 2 +- .../xcschemes/PKHUDDemoUITests.xcscheme | 2 +- .../Checkouts/PKHUD/PKHUD/FrameView.swift | 14 +-- .../Carthage/Checkouts/PKHUD/PKHUD/HUD.swift | 9 ++ .../Carthage/Checkouts/PKHUD/PKHUD/Info.plist | 2 +- .../Checkouts/PKHUD/PKHUD/PKHUD.swift | 8 ++ .../Checkouts/PKHUD/PKHUD/Window.swift | 72 +++++++++++++++- .../PKHUD/PKHUDDemoUITests/Info.plist | 2 +- 15 files changed, 185 insertions(+), 58 deletions(-) diff --git a/GPXTracker/Cartfile.resolved b/GPXTracker/Cartfile.resolved index f3b5ce4..45c81bb 100644 --- a/GPXTracker/Cartfile.resolved +++ b/GPXTracker/Cartfile.resolved @@ -1,3 +1,3 @@ github "marmelroy/Zip" "1.1.0" -github "pkluz/PKHUD" "5.2.1" +github "pkluz/PKHUD" "5.3.0" github "tid-kijyun/Kanna" "5.0.0" diff --git a/GPXTracker/Carthage/Checkouts/PKHUD/Demo/DemoViewController.swift b/GPXTracker/Carthage/Checkouts/PKHUD/Demo/DemoViewController.swift index 7ce1a08..2a60cb7 100644 --- a/GPXTracker/Carthage/Checkouts/PKHUD/Demo/DemoViewController.swift +++ b/GPXTracker/Carthage/Checkouts/PKHUD/Demo/DemoViewController.swift @@ -10,13 +10,27 @@ import UIKit import PKHUD class DemoViewController: UIViewController { + + let hiddenTextField = UITextField(frame: CGRect.zero) + override func viewDidLoad() { super.viewDidLoad() + view.addSubview(hiddenTextField) + HUD.registerForKeyboardNotifications() + HUD.dimsBackground = false HUD.allowsInteraction = false } + + @IBAction func showHideKeyboard(_ sender: Any) { + if hiddenTextField.isEditing { + view.endEditing(true) + } else { + hiddenTextField.becomeFirstResponder() + } + } @IBAction func showAnimatedSuccessHUD(_ sender: AnyObject) { HUD.flash(.success, delay: 2.0) @@ -50,6 +64,10 @@ class DemoViewController: UIViewController { print("License Obtained.") } } + + deinit { + HUD.deregisterFromKeyboardNotifications() + } /* diff --git a/GPXTracker/Carthage/Checkouts/PKHUD/Demo/Info.plist b/GPXTracker/Carthage/Checkouts/PKHUD/Demo/Info.plist index 7f4b4a3..ba80b85 100644 --- a/GPXTracker/Carthage/Checkouts/PKHUD/Demo/Info.plist +++ b/GPXTracker/Carthage/Checkouts/PKHUD/Demo/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.2.0 + 5.2.2 CFBundleSignature ???? CFBundleVersion diff --git a/GPXTracker/Carthage/Checkouts/PKHUD/Demo/Storyboard.storyboard b/GPXTracker/Carthage/Checkouts/PKHUD/Demo/Storyboard.storyboard index 0a1f7c0..b21ddf8 100644 --- a/GPXTracker/Carthage/Checkouts/PKHUD/Demo/Storyboard.storyboard +++ b/GPXTracker/Carthage/Checkouts/PKHUD/Demo/Storyboard.storyboard @@ -1,8 +1,12 @@ - - + + + + + - - + + + @@ -14,100 +18,115 @@ - + - + - - + + +