diff --git a/.gitignore b/.gitignore index 18108c0..83236d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,68 @@ +# Adapted from https://github.com/github/gitignore/blob/master/Objective-C.gitignore + +# Finder .DS_Store -.DS_Store? -._* -.Spotlight-V100 -.Trashes -Icon? -ehthumbs.db -Thumbs.db + +# Xcode +## Build generated +build/ +DerivedData/ + +## Various settings +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 xcuserdata/ -*.xcuserstate -*.xcuserstate +## Other +*.moved-aside +*.xccheckout +*.xcscmblueprint + +## Obj-C/Swift specific +*.hmap +*.ipa +*.dSYM.zip +*.dSYM + +# CocoaPods +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control + +Pods/ + +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode -*.xcuserstate +iOSInjectionProject/ diff --git a/.travis.yml b/.travis.yml index 4336cc3..0342dd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode7 +osx_image: xcode9.4 # xcode_project: Sample Project/SimpleLineChart.xcodeproj # xcode_scheme: SimpleLineChartTests # xcode_sdk: iphonesimulator diff --git a/Classes/BEMSimpleLineGraphView.h b/Classes/BEMSimpleLineGraphView.h index b77717a..049eded 100644 --- a/Classes/BEMSimpleLineGraphView.h +++ b/Classes/BEMSimpleLineGraphView.h @@ -233,10 +233,12 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView xAxisLabels objectAtIndex:lastMatchIndex]; CGRect r = CGRectIntersection(prevLabel.frame, label.frame); if (CGRectIsNull(r)) lastMatchIndex = idx; else [overlapLabels addObject:label]; // Overlapped @@ -1030,7 +1061,7 @@ - (void)drawYAxis { BOOL fullyContainsLabel = CGRectContainsRect(self.bounds, label.frame); if (!fullyContainsLabel) { [overlapLabels addObject:label]; - [yAxisLabelPoints removeObject:@(label.center.y)]; + [self->yAxisLabelPoints removeObject:@(label.center.y)]; } }]; @@ -1356,7 +1387,7 @@ - (void)handleGestureAction:(UIGestureRecognizer *)recognizer { [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{ if (self.alwaysDisplayDots == NO && self.displayDotsOnly == NO) { - closestDot.alpha = 0; + self->closestDot.alpha = 0; } self.touchInputLine.alpha = 0; diff --git a/Sample Project/SimpleLineChart.xcodeproj/project.pbxproj b/Sample Project/SimpleLineChart.xcodeproj/project.pbxproj index e5ba803..0ccf1a6 100644 --- a/Sample Project/SimpleLineChart.xcodeproj/project.pbxproj +++ b/Sample Project/SimpleLineChart.xcodeproj/project.pbxproj @@ -249,7 +249,7 @@ C3FD814D186DFD9A00FD8ED3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0940; ORGANIZATIONNAME = "Boris Emorine"; TargetAttributes = { C3FD8175186DFD9A00FD8ED3 = { @@ -380,14 +380,22 @@ 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; @@ -424,14 +432,22 @@ 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; @@ -457,7 +473,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SimpleLineChart/SimpleLineChart-Prefix.pch"; INFOPLIST_FILE = "SimpleLineChart/SimpleLineChart-Info.plist"; @@ -471,7 +487,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SimpleLineChart/SimpleLineChart-Prefix.pch"; INFOPLIST_FILE = "SimpleLineChart/SimpleLineChart-Info.plist"; diff --git a/Sample Project/SimpleLineChart.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Sample Project/SimpleLineChart.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Sample Project/SimpleLineChart.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Sample Project/SimpleLineChart.xcodeproj/xcshareddata/xcschemes/SimpleLineChart.xcscheme b/Sample Project/SimpleLineChart.xcodeproj/xcshareddata/xcschemes/SimpleLineChart.xcscheme index 002aac5..fba1f44 100644 --- a/Sample Project/SimpleLineChart.xcodeproj/xcshareddata/xcschemes/SimpleLineChart.xcscheme +++ b/Sample Project/SimpleLineChart.xcodeproj/xcshareddata/xcschemes/SimpleLineChart.xcscheme @@ -1,6 +1,6 @@ - + + + + + - + + @@ -15,17 +19,17 @@ - + - + diff --git a/Sample Project/SimpleLineChart/Base.lproj/Main.storyboard b/Sample Project/SimpleLineChart/Base.lproj/Main.storyboard index 9edd2cd..d437eba 100644 --- a/Sample Project/SimpleLineChart/Base.lproj/Main.storyboard +++ b/Sample Project/SimpleLineChart/Base.lproj/Main.storyboard @@ -1,9 +1,13 @@ - - + + + + + - + + @@ -11,6 +15,7 @@ + @@ -30,11 +35,11 @@ - + - + @@ -46,13 +51,13 @@ - + - + - + @@ -61,13 +66,13 @@ - + - + - + @@ -82,22 +87,22 @@ - + @@ -107,7 +112,7 @@ - + @@ -118,37 +123,37 @@ - + - + - + @@ -158,13 +163,13 @@ - + - + @@ -174,7 +179,7 @@ - + @@ -210,151 +215,151 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -365,23 +370,23 @@ - + - + - + - + @@ -409,34 +414,36 @@ - + - + - + - + @@ -447,204 +454,228 @@ In a future commit, this table will have options to see how each property affect - + - + - + - + - + - + - + - + - + - + - + - + @@ -655,56 +686,62 @@ In a future commit, this table will have options to see how each property affect - + - + - + - + @@ -715,214 +752,238 @@ In a future commit, this table will have options to see how each property affect - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -933,192 +994,214 @@ In a future commit, this table will have options to see how each property affect - + - + - + - + - + - + - + - + - + - + - + - + @@ -1129,112 +1212,124 @@ In a future commit, this table will have options to see how each property affect - + - + - + - + - + - + - + - + @@ -1245,84 +1340,93 @@ In a future commit, this table will have options to see how each property affect - + - + - + - + - + - + @@ -1333,140 +1437,155 @@ In a future commit, this table will have options to see how each property affect - + - + - + - + - + - + - + - + - + - + @@ -1477,56 +1596,62 @@ In a future commit, this table will have options to see how each property affect - + - + - + - + @@ -1537,56 +1662,62 @@ In a future commit, this table will have options to see how each property affect - + - + - + - + @@ -1597,28 +1728,31 @@ In a future commit, this table will have options to see how each property affect - + - + @@ -1632,21 +1766,22 @@ In a future commit, this table will have options to see how each property affect - + - + - + @@ -1678,34 +1813,36 @@ In a future commit, this table will have options to see how each property affect - + - + - + - + @@ -1716,28 +1853,31 @@ The only required property is enableAverageLine (if you wish to use this feature - + - + @@ -1748,28 +1888,31 @@ The only required property is enableAverageLine (if you wish to use this feature - + - + @@ -1780,112 +1923,124 @@ The only required property is enableAverageLine (if you wish to use this feature - + - + - + - + - + - + - + - + @@ -1896,21 +2051,22 @@ The only required property is enableAverageLine (if you wish to use this feature - + - + - + @@ -1938,5 +2094,5 @@ The only required property is enableAverageLine (if you wish to use this feature - + diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png deleted file mode 100644 index 87a937d..0000000 Binary files a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png and /dev/null differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png deleted file mode 100644 index a7a3d39..0000000 Binary files a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png and /dev/null differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png deleted file mode 100644 index 5c7a532..0000000 Binary files a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png and /dev/null differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Contents.json b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Contents.json index 7bed748..c8477e6 100644 --- a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,26 +1,158 @@ { + "info" : { + "author" : "xcode", + "version" : 1 + }, "images" : [ { + "filename" : "Icon-40.png", + "size" : "40x40", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Icon-40@2x.png", + "size" : "40x40", + "idiom" : "ipad", + "scale" : "2x" + }, + { + "filename" : "Icon-60@2x.png", + "size" : "60x60", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "Icon-72.png", + "size" : "72x72", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Icon-72@2x.png", + "size" : "72x72", + "idiom" : "ipad", + "scale" : "2x" + }, + { + "filename" : "Icon-76.png", + "size" : "76x76", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Icon-76@2x.png", + "size" : "76x76", + "idiom" : "ipad", + "scale" : "2x" + }, + { + "filename" : "Icon-Small-50.png", + "size" : "50x50", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Icon-Small-50@2x.png", + "size" : "50x50", + "idiom" : "ipad", + "scale" : "2x" + }, + { + "filename" : "Icon-Small.png", + "size" : "29x29", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "Icon-Small@2x.png", "size" : "29x29", "idiom" : "iphone", - "filename" : "AppIcon29x29@2x.png", "scale" : "2x" }, { - "size" : "40x40", + "filename" : "Icon.png", + "size" : "57x57", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "Icon@2x.png", + "size" : "57x57", "idiom" : "iphone", - "filename" : "AppIcon40x40@2x.png", "scale" : "2x" }, { + "filename" : "Icon-Small@3x.png", + "size" : "29x29", + "idiom" : "iphone", + "scale" : "3x" + }, + { + "filename" : "Icon-40@3x.png", + "size" : "40x40", + "idiom" : "iphone", + "scale" : "3x" + }, + { + "filename" : "Icon-60@3x.png", "size" : "60x60", "idiom" : "iphone", - "filename" : "AppIcon60x60@2x.png", + "scale" : "3x" + }, + { + "filename" : "Icon-40@2x.png", + "size" : "40x40", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "Icon-Small.png", + "size" : "29x29", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Icon-Small@2x.png", + "size" : "29x29", + "idiom" : "ipad", + "scale" : "2x" + }, + { + "filename" : "Icon-83.5@2x.png", + "size" : "83.5x83.5", + "idiom" : "ipad", + "scale" : "2x" + }, + { + "filename" : "NotificationIcon@2x.png", + "size" : "20x20", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "NotificationIcon@3x.png", + "size" : "20x20", + "idiom" : "iphone", + "scale" : "3x" + }, + { + "filename" : "NotificationIcon~ipad.png", + "size" : "20x20", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "NotificationIcon~ipad@2x.png", + "size" : "20x20", + "idiom" : "ipad", "scale" : "2x" + }, + { + "filename" : "ios-marketing.png", + "size" : "1024x1024", + "idiom" : "ios-marketing", + "scale" : "1x" } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } + ] } \ No newline at end of file diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-40.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-40.png new file mode 100644 index 0000000..878ae71 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-40.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png new file mode 100644 index 0000000..5cb1cd6 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png new file mode 100644 index 0000000..af00634 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png new file mode 100644 index 0000000..af00634 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png new file mode 100644 index 0000000..513bedb Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-72.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-72.png new file mode 100644 index 0000000..b1aa7f6 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-72.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png new file mode 100644 index 0000000..a7c7699 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-76.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-76.png new file mode 100644 index 0000000..0ee0bc2 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png new file mode 100644 index 0000000..dd383a7 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png new file mode 100644 index 0000000..b4df95a Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png new file mode 100644 index 0000000..aaf6be7 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png new file mode 100644 index 0000000..092fa88 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small.png new file mode 100644 index 0000000..397b5d2 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png new file mode 100644 index 0000000..340abeb Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png new file mode 100644 index 0000000..4da2eb6 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon.png new file mode 100644 index 0000000..091e6f1 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon@2x.png new file mode 100644 index 0000000..9a9b379 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/Icon@2x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon@2x.png new file mode 100644 index 0000000..878ae71 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon@2x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon@3x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon@3x.png new file mode 100644 index 0000000..178a3f5 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon@3x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png new file mode 100644 index 0000000..f62a5c1 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png new file mode 100644 index 0000000..878ae71 Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/ios-marketing.png b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/ios-marketing.png new file mode 100644 index 0000000..1788daf Binary files /dev/null and b/Sample Project/SimpleLineChart/Images.xcassets/AppIcon.appiconset/ios-marketing.png differ diff --git a/Sample Project/SimpleLineChart/Images.xcassets/Contents.json b/Sample Project/SimpleLineChart/Images.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/Sample Project/SimpleLineChart/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Sample Project/SimpleLineChart/Images.xcassets/LaunchImage.launchimage/Contents.json b/Sample Project/SimpleLineChart/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100644 index c79ebd3..0000000 --- a/Sample Project/SimpleLineChart/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "subtype" : "retina4", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Sample Project/SimpleLineChart/ViewController.m b/Sample Project/SimpleLineChart/ViewController.m index 4394b4d..f24d5f6 100644 --- a/Sample Project/SimpleLineChart/ViewController.m +++ b/Sample Project/SimpleLineChart/ViewController.m @@ -41,7 +41,12 @@ - (void)viewDidLoad { }; // Apply the gradient to the bottom portion of the graph - self.myGraph.gradientBottom = CGGradientCreateWithColorComponents(colorspace, components, locations, num_locations); + CGGradientRef gradientBottom = CGGradientCreateWithColorComponents(colorspace, components, locations, num_locations); + self.myGraph.gradientBottom = gradientBottom; + CGColorSpaceRelease(colorspace); + colorspace = nil; + CGGradientRelease(gradientBottom); + gradientBottom = nil; // Enable and disable various graph properties and axis displays self.myGraph.enableTouchReport = YES; diff --git a/Sample Project/SimpleLineChartTests/CustomizationTests.m b/Sample Project/SimpleLineChartTests/CustomizationTests.m index 6eb8b8b..6e7b19c 100644 --- a/Sample Project/SimpleLineChartTests/CustomizationTests.m +++ b/Sample Project/SimpleLineChartTests/CustomizationTests.m @@ -39,6 +39,8 @@ - (void)setUp { #pragma mark BEMSimpleLineGraph Data Source +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-implementations" - (NSInteger)numberOfPointsInLineGraph:(BEMSimpleLineGraphView * __nonnull)graph { return numberOfPoints; } @@ -50,6 +52,7 @@ - (CGFloat)lineGraph:(BEMSimpleLineGraphView * __nonnull)graph valueForPointAtIn - (NSString *)lineGraph:(nonnull BEMSimpleLineGraphView *)graph labelOnXAxisForIndex:(NSInteger)index { return xAxisLabelString; } +#pragma clang diagnostic pop - (NSString *)popUpPrefixForlineGraph:(BEMSimpleLineGraphView * __nonnull)graph { return popUpPrefix; diff --git a/Sample Project/SimpleLineChartTests/SimpleLineChartTests.m b/Sample Project/SimpleLineChartTests/SimpleLineChartTests.m index bfabd9f..d67c437 100644 --- a/Sample Project/SimpleLineChartTests/SimpleLineChartTests.m +++ b/Sample Project/SimpleLineChartTests/SimpleLineChartTests.m @@ -41,6 +41,8 @@ - (void)setUp { #pragma mark BEMSimpleLineGraph Data Source +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-implementations" - (NSInteger)numberOfPointsInLineGraph:(BEMSimpleLineGraphView * __nonnull)graph { return numberOfPoints; } @@ -52,6 +54,7 @@ - (CGFloat)lineGraph:(BEMSimpleLineGraphView * __nonnull)graph valueForPointAtIn - (NSString *)lineGraph:(nonnull BEMSimpleLineGraphView *)graph labelOnXAxisForIndex:(NSInteger)index { return xAxisLabelString; } +#pragma clang diagnostic pop #pragma mark Test Methods