Skip to content

Updated to Swift 3 #6 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mozharovsky merged 1 commit into from
Nov 27, 2016
Merged

Updated to Swift 3 #6 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added Example/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added Example/Athlee-InteractiveGraphView/.DS_Store
View file
Open in desktop
Binary file not shown.
19 changes: 17 additions & 2 deletions Example/Athlee-InteractiveGraphView/Athlee-InteractiveGraphView.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
040670441D56805100521457 /* CubicCurveAlgorithm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 040670431D56805100521457 /* CubicCurveAlgorithm.swift */; };
04A488E01D49803F00BCB35E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A488DF1D49803F00BCB35E /* AppDelegate.swift */; };
04A488E21D49803F00BCB35E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A488E11D49803F00BCB35E /* ViewController.swift */; };
04A488E51D49803F00BCB35E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 04A488E31D49803F00BCB35E /* Main.storyboard */; };
Expand Down Expand Up @@ -37,6 +38,7 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
040670431D56805100521457 /* CubicCurveAlgorithm.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CubicCurveAlgorithm.swift; sourceTree = "<group>"; };
04A488DC1D49803F00BCB35E /* Athlee-InteractiveGraphView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Athlee-InteractiveGraphView.app"; sourceTree = BUILT_PRODUCTS_DIR; };
04A488DF1D49803F00BCB35E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
04A488E11D49803F00BCB35E /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -133,6 +135,7 @@
04A489081D49805000BCB35E /* InteractiveGraphViewDataSource.swift */,
04A489091D49805000BCB35E /* InteractiveGraphViewDelegate.swift */,
04A4890A1D49805000BCB35E /* PathBuilder.swift */,
040670431D56805100521457 /* CubicCurveAlgorithm.swift */,
);
name = Source;
path = ../../Source;
Expand Down Expand Up @@ -188,9 +191,12 @@
TargetAttributes = {
04A488DB1D49803F00BCB35E = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = RG4N372RZE;
LastSwiftMigration = 0810;
};
04A488EF1D49803F00BCB35E = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0810;
TestTargetID = 04A488DB1D49803F00BCB35E;
};
};
Expand Down Expand Up @@ -247,6 +253,7 @@
04A4890E1D49805000BCB35E /* Drawable.swift in Sources */,
04A4890C1D49805000BCB35E /* CurveView.swift in Sources */,
04A489101D49805000BCB35E /* InteractiveGraphDecorator.swift in Sources */,
040670441D56805100521457 /* CubicCurveAlgorithm.swift in Sources */,
04A489141D49805000BCB35E /* InteractiveGraphViewDelegate.swift in Sources */,
04A4890F1D49805000BCB35E /* InteractiveGraphDecorations.swift in Sources */,
04A489121D49805000BCB35E /* InteractiveGraphView.swift in Sources */,
Expand Down Expand Up @@ -380,21 +387,25 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = RG4N372RZE;
INFOPLIST_FILE = "Athlee-InteractiveGraphView/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "io.athlee.Athlee-InteractiveGraphView";
PRODUCT_BUNDLE_IDENTIFIER = "io.athlee.Athlee-InteractiveGraphView-Demo";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
04A488FB1D49803F00BCB35E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = RG4N372RZE;
INFOPLIST_FILE = "Athlee-InteractiveGraphView/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "io.athlee.Athlee-InteractiveGraphView";
PRODUCT_BUNDLE_IDENTIFIER = "io.athlee.Athlee-InteractiveGraphView-Demo";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -406,6 +417,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "io.athlee.Athlee-InteractiveGraphViewTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Athlee-InteractiveGraphView.app/Athlee-InteractiveGraphView";
};
name = Debug;
Expand All @@ -418,6 +430,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "io.athlee.Athlee-InteractiveGraphViewTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Athlee-InteractiveGraphView.app/Athlee-InteractiveGraphView";
};
name = Release;
Expand All @@ -441,6 +454,7 @@
04A488FB1D49803F00BCB35E /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
04A488FC1D49803F00BCB35E /* Build configuration list for PBXNativeTarget "Athlee-InteractiveGraphViewTests" */ = {
isa = XCConfigurationList;
Expand All @@ -449,6 +463,7 @@
04A488FE1D49803F00BCB35E /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
12 changes: 6 additions & 6 deletions Example/Athlee-InteractiveGraphView/Athlee-InteractiveGraphView/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}

func applicationWillResignActive(application: UIApplication) {
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) {
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) {
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) {
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) {
func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}

Expand Down
18 changes: 11 additions & 7 deletions Example/Athlee-InteractiveGraphView/Athlee-InteractiveGraphView/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand All @@ -15,15 +19,15 @@
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<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" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="syW-1e-0g5" customClass="InteractiveGraphView" customModule="Athlee_InteractiveGraphView" customModuleProvider="target">
<rect key="frame" x="0.0" y="150" width="600" height="300"/>
<color key="backgroundColor" red="0.0" green="0.70588235290000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<rect key="frame" x="0.0" y="167" width="375" height="333.5"/>
<color key="backgroundColor" red="0.0" green="0.70588235290000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
</subviews>
<color key="backgroundColor" red="0.0" green="0.70588235290000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.0" green="0.70588235290000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="syW-1e-0g5" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="4RY-u4-RKv"/>
<constraint firstItem="syW-1e-0g5" firstAttribute="height" secondItem="8bC-Xf-vdC" secondAttribute="height" multiplier="1/2" id="FeL-B6-Gsx"/>
Expand Down
8 changes: 4 additions & 4 deletions Example/Athlee-InteractiveGraphView/Athlee-InteractiveGraphView/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ extension ViewController: InteractiveGraphViewDataSource, InteractiveGraphViewDe
return 7
}

func interactiveGraphView(interactiveGraphView: InteractiveGraphView, valueAtIndex index: Int) -> Double {
func interactiveGraphView(_ interactiveGraphView: InteractiveGraphView, valueAtIndex index: Int) -> Double {
switch index {
case 0:
return 10
Expand All @@ -46,7 +46,7 @@ extension ViewController: InteractiveGraphViewDataSource, InteractiveGraphViewDe
}
}

func interactiveGraphView(interactiveGraphView: InteractiveGraphView, titleAtIndex index: Int) -> String {
func interactiveGraphView(_ interactiveGraphView: InteractiveGraphView, titleAtIndex index: Int) -> String {
switch index {
case 0:
return "MON"
Expand All @@ -67,9 +67,9 @@ extension ViewController: InteractiveGraphViewDataSource, InteractiveGraphViewDe
}
}

func interactiveGraphView(interactiveGraphView: InteractiveGraphView, didSelectPointAtIndex index: Int) {
func interactiveGraphView(_ interactiveGraphView: InteractiveGraphView, didSelectPointAtIndex index: Int) {
if let value = interactiveGraphView.valueForIndex(index) {
print("Selected value=\(value)")
}
}
}
}
2 changes: 1 addition & 1 deletion ...eractiveGraphView/Athlee-InteractiveGraphViewTests/Athlee_InteractiveGraphViewTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Athlee_InteractiveGraphViewTests: XCTestCase {

func testPerformanceExample() {
// This is an example of a performance test case.
self.measureBlock {
self.measure {
// Put the code you want to measure the time of here.
}
}
Expand Down
Binary file added Source/.DS_Store
View file
Open in desktop
Binary file not shown.
Loading