Merge branch 'geowarsong-master'

.travis.yml

@@ -1,13 +1,13 @@
 language: objective-c  #1
-osx_image: xcode7.3 #2
+osx_image: xcode8 #2
 xcode_workspace: Example/EPSignature.xcworkspace #3
 xcode_scheme: EPSignature #4
-xcode_sdk: iphonesimulator #5
+xcode_sdk: iphonesimulator10.0 #5
 
 before_install:
 - xcodebuild -version
 script:
-- DESTINATION="-destination \"platform=iOS Simulator,name=iPhone 6s,OS=latest\""
+- DESTINATION="-destination \"platform=iOS Simulator,name=iPhone 7,OS=latest\""
 - COMMAND="xcodebuild -workspace \"$TRAVIS_XCODE_WORKSPACE\" -scheme \"$TRAVIS_XCODE_SCHEME\" $DESTINATION"
 - eval $COMMAND clean build &>/dev/null
 - set -o pipefail

Example/EPSignature.xcodeproj/project.pbxproj

@@ -13,7 +13,6 @@
 		607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
 		607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
 		D46ABFB2E6199B4F1D8B00FD /* Pods_EPSignature_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5A699D3F98BA092EEC579 /* Pods_EPSignature_Tests.framework */; };
-		F4610E941C4E435800D093B5 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = F4610E921C4E435800D093B5 /* Info.plist */; };
 		F4610E951C4E435800D093B5 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4610E931C4E435800D093B5 /* Tests.swift */; };
 		FD2F4DBD994F6A970D127DFD /* Pods_EPSignature_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15E9D6DBDBE3EC5A2A4839C3 /* Pods_EPSignature_Example.framework */; };
 /* End PBXBuildFile section */
@@ -205,14 +204,18 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
+						DevelopmentTeam = DG779MAMM2;
+						LastSwiftMigration = 0800;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
+						DevelopmentTeam = DG779MAMM2;
+						LastSwiftMigration = 0800;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -251,7 +254,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F4610E941C4E435800D093B5 /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -411,8 +413,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -456,8 +460,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -476,6 +482,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -484,12 +491,15 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FCA533009FE604848E395F85 /* Pods-EPSignature_Example.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = DG779MAMM2;
 				INFOPLIST_FILE = EPSignature/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -498,12 +508,15 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 658CF1F0E9BEF08F55584BFB /* Pods-EPSignature_Example.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = DG779MAMM2;
 				INFOPLIST_FILE = EPSignature/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -512,11 +525,10 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 468298BC80AC5F52E266174E /* Pods-EPSignature_Tests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				DEVELOPMENT_TEAM = DG779MAMM2;
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -525,6 +537,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EPSignature_Example.app/EPSignature_Example";
 			};
 			name = Debug;
@@ -533,15 +546,15 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 1E1F1CEB9FE94501D18455C5 /* Pods-EPSignature_Tests.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				DEVELOPMENT_TEAM = DG779MAMM2;
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EPSignature_Example.app/EPSignature_Example";
 			};
 			name = Release;

Example/EPSignature.xcodeproj/xcshareddata/xcschemes/EPSignature-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/EPSignature/AppDelegate.swift

@@ -3,6 +3,7 @@
 //  EPSignature
 //
 //  Created by Prabaharan on 01/13/2016.
+//  Modified By C0mrade on 27/09/2016.
 //  Copyright (c) 2016 Prabaharan. All rights reserved.
 //
 
@@ -12,35 +13,9 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
-
-
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
-        // Override point for customization after application launch.
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
+        // Application launch state
         return true
     }
-
-    func applicationWillResignActive(application: UIApplication) {
-        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-    }
-
-    func applicationDidEnterBackground(application: UIApplication) {
-        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-    }
-
-    func applicationWillEnterForeground(application: UIApplication) {
-        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-    }
-
-    func applicationDidBecomeActive(application: UIApplication) {
-        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-    }
-
-    func applicationWillTerminate(application: UIApplication) {
-        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-    }
-
-
 }
 

Example/EPSignature/Base.lproj/Main.storyboard

@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,38 +15,36 @@
                         <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eNl-8i-VIW">
-                                <rect key="frame" x="180" y="150" width="240" height="300"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="240" id="F8s-Fi-FE2"/>
-                                    <constraint firstAttribute="height" constant="300" id="UgZ-bq-Jq6"/>
+                                    <constraint firstAttribute="width" constant="240" id="7CY-LA-m1o"/>
+                                    <constraint firstAttribute="height" constant="300" id="sy0-nZ-JjE"/>
                                 </constraints>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="F49-k1-lFh">
-                                <rect key="frame" x="232" y="460" width="136" height="30"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="136" id="BMh-En-qRB"/>
-                                    <constraint firstAttribute="height" constant="30" id="pVx-FR-U3x"/>
+                                    <constraint firstAttribute="width" constant="136" id="rXq-XI-ub3"/>
+                                    <constraint firstAttribute="height" constant="30" id="vYa-xh-dif"/>
                                 </constraints>
                                 <state key="normal" title="Add my Signature"/>
                                 <connections>
-                                    <action selector="onTouchSignatureButton:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="4tW-YP-bJp"/>
+                                    <action selector="onTouchSignatureButtonWithSender:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="7Gq-Ox-puA"/>
                                 </connections>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="eNl-8i-VIW" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="5aE-i6-uqA"/>
-                            <constraint firstItem="F49-k1-lFh" firstAttribute="centerX" secondItem="eNl-8i-VIW" secondAttribute="centerX" id="Gkg-CL-guS"/>
-                            <constraint firstItem="eNl-8i-VIW" firstAttribute="centerY" secondItem="kh9-bI-dsS" secondAttribute="centerY" id="UeN-F0-Ch5"/>
-                            <constraint firstItem="F49-k1-lFh" firstAttribute="top" secondItem="eNl-8i-VIW" secondAttribute="bottom" constant="10" id="hhS-WD-jWT"/>
+                            <constraint firstItem="F49-k1-lFh" firstAttribute="top" secondItem="eNl-8i-VIW" secondAttribute="bottom" constant="8" id="1Pc-Lb-3n2"/>
+                            <constraint firstItem="eNl-8i-VIW" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="LcW-vx-hgA"/>
+                            <constraint firstItem="eNl-8i-VIW" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" constant="163" id="V89-tr-E2q"/>
+                            <constraint firstItem="F49-k1-lFh" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="j3e-mv-wSt"/>
                         </constraints>
                     </view>
                     <connections>
-                        <outlet property="imgViewSignature" destination="eNl-8i-VIW" id="qrV-1C-yB6"/>
+                        <outlet property="imgViewSignature" destination="eNl-8i-VIW" id="2uF-FQ-cLn"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>

Example/EPSignature/Info.plist

@@ -30,6 +30,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIRequiresFullScreen</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

Example/EPSignature/ViewController.swift

@@ -3,6 +3,7 @@
 //  EPSignature
 //
 //  Created by Prabaharan on 01/13/2016.
+//  Modified By C0mrade on 27/09/2016.
 //  Copyright (c) 2016 Prabaharan. All rights reserved.
 //
 
@@ -12,22 +13,12 @@ import EPSignature
 class ViewController: UIViewController, EPSignatureDelegate {
     @IBOutlet weak var imgViewSignature: UIImageView!
 
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        // Do any additional setup after loading the view, typically from a nib.
-    }
-
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-
     @IBAction func onTouchSignatureButton(sender: AnyObject) {
         let signatureVC = EPSignatureViewController(signatureDelegate: self, showsDate: true, showsSaveSignatureOption: true)
         signatureVC.subtitleText = "I agree to the terms and conditions"
         signatureVC.title = "John Doe"
         let nav = UINavigationController(rootViewController: signatureVC)
-        presentViewController(nav, animated: true, completion: nil)
+        present(nav, animated: true, completion: nil)
     }
 
     func epSignature(_: EPSignatureViewController, didCancel error : NSError) {

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - EPSignature (1.0.1)
+  - EPSignature (1.0.2)
 
 DEPENDENCIES:
   - EPSignature (from `../`)
@@ -9,6 +9,6 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  EPSignature: 3bb269db08c47041bcc92151688600ab835b5a80
+  EPSignature: 1f925f20b837046de46b4d396bc6e432ea383908
 
 COCOAPODS: 0.39.0