Skip to content
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

Swift 5 support #54

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Swift 5 support #54

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
Empty file modified README.md
100644 → 100755
View file
Open in desktop
Empty file.
27 changes: 23 additions & 4 deletions linechart.xcodeproj/project.pbxproj
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 1030;
ORGANIZATIONNAME = zemirco;
TargetAttributes = {
C06F8E141962FFD7000AC9AF = {
Expand All @@ -171,10 +171,11 @@
};
buildConfigurationList = C06F8E101962FFD7000AC9AF /* Build configuration list for PBXProject "linechart" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = C06F8E0C1962FFD7000AC9AF;
productRefGroup = C06F8E161962FFD7000AC9AF /* Products */;
Expand Down Expand Up @@ -239,18 +240,27 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
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_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -285,18 +295,27 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
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_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -330,7 +349,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.example.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -344,7 +363,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.example.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
Empty file modified linechart.xcodeproj/project.xcworkspace/contents.xcworkspacedata
100644 → 100755
View file
Open in desktop
Empty file.
8 changes: 8 additions & 0 deletions linechart.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Empty file modified linechart.xcodeproj/project.xcworkspace/xcshareddata/linechart.xccheckout
100644 → 100755
View file
Open in desktop
Empty file.
Binary file added ...deproj/project.xcworkspace/xcuserdata/fo011505.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
Empty file modified ...proj/project.xcworkspace/xcuserdata/zeissmirco.xcuserdatad/UserInterfaceState.xcuserstate
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ...odeproj/project.xcworkspace/xcuserdata/zemirco.xcuserdatad/UserInterfaceState.xcuserstate
100644 → 100755
View file
Open in desktop
Empty file.
14 changes: 14 additions & 0 deletions linechart.xcodeproj/xcuserdata/fo011505.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>linechart.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
Empty file modified linechart.xcodeproj/xcuserdata/zeissmirco.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified linechart.xcodeproj/xcuserdata/zeissmirco.xcuserdatad/xcschemes/linechart.xcscheme
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified linechart.xcodeproj/xcuserdata/zeissmirco.xcuserdatad/xcschemes/xcschememanagement.plist
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified linechart.xcodeproj/xcuserdata/zemirco.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified linechart.xcodeproj/xcuserdata/zemirco.xcuserdatad/xcschemes/linechart.xcscheme
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified linechart.xcodeproj/xcuserdata/zemirco.xcuserdatad/xcschemes/xcschememanagement.plist
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion linechart/AppDelegate.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
internal func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
self.window = UIWindow(frame: UIScreen.main.bounds)
self.window!.backgroundColor = UIColor.white
self.window!.rootViewController = MainViewController()
Expand Down
Empty file modified linechart/Images.xcassets/AppIcon.appiconset/Contents.json
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified linechart/Images.xcassets/LaunchImage.launchimage/Contents.json
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified linechart/Info.plist
100644 → 100755
View file
Open in desktop
Empty file.
10 changes: 5 additions & 5 deletions linechart/LineChart.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ open class LineChart: UIView {
if (self.dataStore.isEmpty) {
return
}
let point: AnyObject! = touches.anyObject() as AnyObject!
let point: AnyObject! = touches.anyObject() as AnyObject?
let xValue = point.location(in: self).x
let inverted = self.x.invert(xValue - x.axis.inset)
let rounded = Int(round(Double(inverted)))
Expand All @@ -252,7 +252,7 @@ open class LineChart: UIView {
* Listen on touch end event.
*/
override open func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
handleTouchEvents(touches as NSSet!, event: event!)
handleTouchEvents(touches as NSSet?, event: event!)
}


Expand All @@ -261,7 +261,7 @@ open class LineChart: UIView {
* Listen on touch move event
*/
override open func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
handleTouchEvents(touches as NSSet!, event: event!)
handleTouchEvents(touches as NSSet?, event: event!)
}


Expand Down Expand Up @@ -511,7 +511,7 @@ open class LineChart: UIView {
for (index, _) in xAxisData.enumerated() {
let xValue = self.x.scale(CGFloat(index)) + x.axis.inset - (width / 2)
let label = UILabel(frame: CGRect(x: xValue, y: y, width: width, height: x.axis.inset))
label.font = UIFont.preferredFont(forTextStyle: UIFontTextStyle.caption2)
label.font = UIFont.preferredFont(forTextStyle: UIFont.TextStyle.caption2)
label.textAlignment = .center
if (x.labels.values.count != 0) {
text = x.labels.values[index]
Expand All @@ -534,7 +534,7 @@ open class LineChart: UIView {
for i in stride(from: start, through: stop, by: step){
yValue = self.bounds.height - self.y.scale(i) - (y.axis.inset * 1.5)
let label = UILabel(frame: CGRect(x: 0, y: yValue, width: y.axis.inset, height: y.axis.inset))
label.font = UIFont.preferredFont(forTextStyle: UIFontTextStyle.caption2)
label.font = UIFont.preferredFont(forTextStyle: UIFont.TextStyle.caption2)
label.textAlignment = .center
label.text = String(Int(round(i)))
self.addSubview(label)
Expand Down
Empty file modified linechart/MainViewController.swift
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified linechartTests/Info.plist
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified linechartTests/linechartTests.swift
100644 → 100755
View file
Open in desktop
Empty file.