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.

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

Update charts from original repository #1

Merged
merged 70 commits into from
Jun 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
767d03d
Added delegate callback to detect when panning is finished, to potent…
AntonTheDev Aug 26, 2018
c3d3ed7
Changed the part of the code where the delegate gets called
AntonTheDev Aug 26, 2018
3d40b00
Make NSUIAccessibilityElement initializer public.
417-72KI Sep 19, 2018
08820aa
Add Parameters Section
kemchenj Sep 22, 2018
576d7af
Remove parameter prefix
kemchenj Sep 22, 2018
849acbe
Remove property’s `returns` section
kemchenj Sep 22, 2018
bad3eef
Add missing `-`
kemchenj Sep 22, 2018
f3fa752
Sort sections
kemchenj Sep 22, 2018
0edceea
Uppercased the section title
kemchenj Sep 22, 2018
c68ed07
fix function groupBars document error
kemchenj Sep 22, 2018
033bb11
Remove duplicated section
kemchenj Sep 22, 2018
33e8eb1
Update ChartViewBase.swift
AntonTheDev Oct 10, 2018
a4cae71
Add missing empty line between Summary and other section manually
kemchenj Oct 21, 2018
3b07904
Merge pull request #3654 from 417-72KI/accesibility_element_initializer
pmairoldi Oct 21, 2018
d59b2d8
fix wrong assignment to axisMaxLabels property
ggirotto Oct 28, 2018
a435669
Remove meaningless comment
kemchenj Oct 28, 2018
69e433a
Merge pull request #3721 from ggirotto/axis-base-bugfix
liuxuan30 Nov 1, 2018
c01a765
improvements in barRect height calculation (#3650)
potato04 Nov 1, 2018
076f260
Add missing properties to copy(with:) methods (#3715)
dstranz Nov 4, 2018
ce0d809
Merge pull request #3621 from kemchenj/master
liuxuan30 Nov 7, 2018
ee7a218
Fix legend offset bug for horizontal bar chart (Fixes #3301)
SvenMuc Nov 7, 2018
44ba57d
Fix applying lineCap value for line chart data sets (Fixes #3739)
Nov 9, 2018
271606e
Merge pull request #3736 from SvenMuc/fix_horbarchart_legend_offset
liuxuan30 Nov 15, 2018
9971afc
Merge pull request #3740 from anton-filimonov/bugfixes/lineChart_line…
liuxuan30 Nov 15, 2018
9f2c130
Update README.md (#3737)
justinlew Nov 15, 2018
2927f76
fix #3719
liuxuan30 Dec 11, 2018
2e2301d
Merge pull request #3778 from liuxuan30/3719
liuxuan30 Dec 11, 2018
0749a2e
add call chartScaled() after double tap (#3770)
artemiusmk Dec 11, 2018
7d2e2db
Remove delegate method call for translation when no translation reall…
Nov 13, 2018
0d99003
Removed use of `values` where appropriate
jjatie Jan 13, 2019
bd3d1eb
Merge pull request #3804 from anton-filimonov/bugfixes/scrolling_fixes
liuxuan30 Jan 14, 2019
290fd88
Fixed `addEntry` implementation
jjatie Jan 22, 2019
f2795b9
Merge pull request #3612 from AntonTheDev/master
liuxuan30 Jan 22, 2019
5e8c9b1
Deprecated direct usage of values
jjatie Jan 26, 2019
2a1ecb4
BarLineScatterCandleBubbleRenderer.XBounds conformance to RangeExpres…
jjatie Jan 26, 2019
8d38438
Merge pull request #3815 from danielgindi/dataset-collection-conformance
liuxuan30 Jan 28, 2019
d73b552
Draws the line chart the same way regardless of the number of colors …
stokatyan Feb 10, 2019
2fedfc6
Multiple colors for valueline (Fixes #3480) (#3709)
Feb 12, 2019
deae185
bump version to 3.2.2
liuxuan30 Feb 13, 2019
cf36285
update change log
liuxuan30 Feb 13, 2019
9b99d1b
Renamed `values` to `entries` to reflect the property's type
jjatie Feb 16, 2019
636f623
Fixed tests
jjatie Feb 17, 2019
af7a4a0
Create "chartViewDidEndAnimate" callback function in "ChartViewBase" …
Lcsmarcal Feb 20, 2019
a323ad0
Update protocol function description
Lcsmarcal Feb 20, 2019
d096474
Improve HorizontalBarChart offset calculation for negative value labe…
charliestg Feb 20, 2019
d59fe25
Replace AnyObject with Any
jjatie Feb 24, 2019
46a3018
Fixed target on NSUIDisplayLink
jjatie Feb 25, 2019
ad26e63
Merge pull request #3847 from danielgindi/dataset-values-accessors
liuxuan30 Feb 27, 2019
8e2b8c8
Removed unnecessary #if statements and unified style to align with Xc…
jjatie Mar 5, 2019
fe66742
Merge pull request #3864 from danielgindi/fix-objc-imports-anyobject
liuxuan30 Mar 6, 2019
10057bf
Velocity samples calculation (#3883)
jjatie Mar 6, 2019
4f5cbf7
Merge branch 'master' into cleanup-pound-if
jjatie Mar 6, 2019
b4e300a
Merge pull request #3884 from danielgindi/cleanup-pound-if
liuxuan30 Mar 7, 2019
a969c46
A fix for https://github.com/danielgindi/Charts/issues/3848. Use a st…
phughes Mar 9, 2019
53f7c3a
Migrating to built-in algorithms (#3892)
jjatie Mar 9, 2019
34dafbc
Align `ChartLimit.LabelPosition` naming with `UIRectCorner` (#3846)
jjatie Mar 9, 2019
e1f28b0
add animator reference to animatorDidStop ChartViewBase delegate call…
Mar 19, 2019
b1df472
Merge pull request #3852 from Lcsmarcal/didFinishAnimate
liuxuan30 Mar 20, 2019
5d0b99a
Merge pull request #3854 from chaaarly/master
liuxuan30 Mar 20, 2019
b155c2f
Minor updates for Swift 5 (#3874)
jjatie Apr 11, 2019
6fb075f
fix #3860. maxHeight didn't count the last label
liuxuan30 Mar 15, 2019
2896791
Reassess convenience initializers (#3862)
jjatie Apr 12, 2019
13623d0
Merge pull request #3900 from danielgindi/3860
liuxuan30 Apr 12, 2019
c6b4c67
Fix horizontal bar chart not drawing values and add unit tests (#3906)
liuxuan30 Apr 15, 2019
1b08577
Data as any (#3863)
jjatie Apr 15, 2019
2bde78f
bump version to 3.3
liuxuan30 Apr 15, 2019
a1f52c9
update change log
liuxuan30 Apr 15, 2019
4fef53c
update gemfile
liuxuan30 Apr 15, 2019
cd1120b
correct 3.3 to 3.3.0.
liuxuan30 Apr 24, 2019
899fe1d
For #3917. make init(label: String?) convenient initializer (#3973)
liuxuan30 Apr 30, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ language: objective-c
osx_image: xcode10
matrix:
include:
- osx_image: xcode10
- osx_image: xcode10.2
env: PLATFORM="iOS"
- osx_image: xcode10
- osx_image: xcode10.2
env: PLATFORM="tvOS"
- osx_image: xcode10
- osx_image: xcode10.2
env: PLATFORM="macOS"
env:
global:
Expand Down
334 changes: 303 additions & 31 deletions CHANGELOG.md

Large diffs are not rendered by default.

Empty file removed Cartfile
Empty file.
2 changes: 1 addition & 1 deletion Cartfile.private
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "facebook/ios-snapshot-test-case" "master"
github "uber/ios-snapshot-test-case"
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "facebook/ios-snapshot-test-case" "ed4e6a6e81bfb69a5223156e6c3d389a416cf6e3"
github "uber/ios-snapshot-test-case" "6.0.3"
4 changes: 2 additions & 2 deletions Charts.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Charts"
s.version = "3.2.1"
s.version = "3.3.0"
s.summary = "Charts is a powerful & easy to use chart library for iOS, tvOS and OSX (and Android)"
s.homepage = "https://github.com/danielgindi/Charts"
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
Expand All @@ -10,7 +10,7 @@ Pod::Spec.new do |s|
s.osx.deployment_target = "10.11"
s.source = { :git => "https://github.com/danielgindi/Charts.git", :tag => "v#{s.version}" }
s.default_subspec = "Core"
s.swift_version = '4.2'
s.swift_version = '5.0'
s.cocoapods_version = '>= 1.5.0'

s.subspec "Core" do |ss|
Expand Down
29 changes: 18 additions & 11 deletions Charts.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
B0D28C68BB9A958DC56EB214 /* DefaultValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 107D8F8163EE54D6D9E916B0 /* DefaultValueFormatter.swift */; };
B13C74B4FF705D7B595D01EF /* IAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BD9DF16AF59680A3BB49452 /* IAxisValueFormatter.swift */; };
B539114951455C35BADAE3F3 /* PieChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4FB5E3761EF8B4D1E1E1014 /* PieChartDataSet.swift */; };
B66817462241E3CC00017CF1 /* HorizontalBarChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66817452241E3CC00017CF1 /* HorizontalBarChartTests.swift */; };
B6BF9A561F91993A00E62A5D /* CombinedChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BF9A551F91993A00E62A5D /* CombinedChartTests.swift */; };
B6C9F450D937B87224D29D5C /* IFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 818AC6B12505B7C0A53D62F9 /* IFillFormatter.swift */; };
B6DCC229615EFE706F64A37D /* LineScatterCandleRadarRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 923206233CA89FD03565FF87 /* LineScatterCandleRadarRenderer.swift */; };
Expand Down Expand Up @@ -273,6 +274,7 @@
B137428B41C143D5115726C4 /* Description.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Description.swift; path = Source/Charts/Components/Description.swift; sourceTree = "<group>"; };
B1BA6B21CBDF77A15848994F /* RadarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RadarChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/RadarChartDataSet.swift; sourceTree = "<group>"; };
B44829AF0ADA583F1F0279B7 /* BubbleChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/BubbleChartDataSet.swift; sourceTree = "<group>"; };
B66817452241E3CC00017CF1 /* HorizontalBarChartTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = HorizontalBarChartTests.swift; path = Tests/Charts/HorizontalBarChartTests.swift; sourceTree = "<group>"; };
B6BF9A551F91993A00E62A5D /* CombinedChartTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CombinedChartTests.swift; path = Tests/Charts/CombinedChartTests.swift; sourceTree = "<group>"; };
BA157EFF2F952192C11DF937 /* AnimatedMoveViewJob.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnimatedMoveViewJob.swift; path = Source/Charts/Jobs/AnimatedMoveViewJob.swift; sourceTree = "<group>"; };
BA1A58428DC4780BAB4EAADC /* CandleStickChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleStickChartView.swift; path = Source/Charts/Charts/CandleStickChartView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -520,6 +522,7 @@
isa = PBXGroup;
children = (
5C3F5E1A69EC06E86505F7B1 /* BarChartTests.swift */,
B66817452241E3CC00017CF1 /* HorizontalBarChartTests.swift */,
224EFF981FBAAC4700CF9B3B /* EquatableTests.swift */,
7AB9062A28AAB9469752A954 /* ChartUtilsTests.swift */,
B6BF9A551F91993A00E62A5D /* CombinedChartTests.swift */,
Expand Down Expand Up @@ -734,7 +737,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1020;
TargetAttributes = {
A58A4ED274A941CA248EA921 = {
LastSwiftMigration = 0900;
Expand All @@ -749,6 +752,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = 865A1CF149F52850CAB7F177;
Expand Down Expand Up @@ -962,6 +966,7 @@
8E1192F7A7152E9DA92C56A9 /* ChartUtilsTests.swift in Sources */,
B6BF9A561F91993A00E62A5D /* CombinedChartTests.swift in Sources */,
2BF85BEA981B359A65E9BF67 /* LineChartTests.swift in Sources */,
B66817462241E3CC00017CF1 /* HorizontalBarChartTests.swift in Sources */,
135F11CE20425AF600D655A3 /* PieChartTests.swift in Sources */,
064989461F5C99C7006E8BB3 /* Snapshot.swift in Sources */,
224EFF991FBAAC4700CF9B3B /* EquatableTests.swift in Sources */,
Expand Down Expand Up @@ -996,7 +1001,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Source/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = YES;
Expand All @@ -1007,7 +1012,7 @@
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -1030,7 +1035,7 @@
);
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Tests/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MTL_ENABLE_DEBUG_INFO = YES;
Expand All @@ -1040,7 +1045,7 @@
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator appletvos appletvsimulator";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Debug;
Expand All @@ -1049,6 +1054,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
Expand Down Expand Up @@ -1090,7 +1096,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,4";
VALIDATE_PRODUCT = YES;
};
Expand All @@ -1100,6 +1106,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
Expand Down Expand Up @@ -1149,7 +1156,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,4";
};
name = Debug;
Expand All @@ -1170,7 +1177,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Source/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO;
Expand All @@ -1180,7 +1187,7 @@
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -1203,7 +1210,7 @@
);
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Tests/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
Expand All @@ -1212,7 +1219,7 @@
SDKROOT = macosx;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator appletvos appletvsimulator";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
21 changes: 12 additions & 9 deletions ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = dcg;
TargetAttributes = {
225B361C1F6EB9A50005B3D5 = {
Expand All @@ -672,6 +672,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -907,7 +908,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
Expand Down Expand Up @@ -936,7 +937,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.ChartsDemo-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
Expand All @@ -945,6 +946,7 @@
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;
Expand Down Expand Up @@ -986,18 +988,19 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
5B57BBD11A9B26AA0036A6CC /* Release */ = {
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;
Expand Down Expand Up @@ -1032,11 +1035,11 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -1057,7 +1060,7 @@
SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -1076,7 +1079,7 @@
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ open class BalloonMarker: MarkerImage
fileprivate var label: String?
fileprivate var _labelSize: CGSize = CGSize()
fileprivate var _paragraphStyle: NSMutableParagraphStyle?
fileprivate var _drawAttributes = [NSAttributedString.Key : AnyObject]()
fileprivate var _drawAttributes = [NSAttributedString.Key : Any]()

@objc public init(color: UIColor, font: UIFont, textColor: UIColor, insets: UIEdgeInsets)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@ - (void)setDataCount:(int)count range:(double)range
if (_chartView.data.dataSetCount > 0)
{
set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
set1.values = yVals;
[set1 replaceEntries:yVals];
[_chartView.data notifyDataChanged];
[_chartView notifyDataSetChanged];
}
else
{
set1 = [[BarChartDataSet alloc] initWithValues:yVals label:@"DataSet"];
set1 = [[BarChartDataSet alloc] initWithEntries:yVals label:@"DataSet"];
set1.colors = ChartColorTemplates.vordiplom;
set1.drawValuesEnabled = NO;

Expand Down
4 changes: 2 additions & 2 deletions ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,13 @@ - (void)setDataCount:(int)count range:(double)range
if (_chartView.data.dataSetCount > 0)
{
set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
set1.values = yVals;
[set1 replaceEntries: yVals];
[_chartView.data notifyDataChanged];
[_chartView notifyDataSetChanged];
}
else
{
set1 = [[BarChartDataSet alloc] initWithValues:yVals label:@"The year 2017"];
set1 = [[BarChartDataSet alloc] initWithEntries:yVals label:@"The year 2017"];
[set1 setColors:ChartColorTemplates.material];
set1.drawIconsEnabled = NO;

Expand Down
6 changes: 3 additions & 3 deletions ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,17 @@ - (void)setDataCount:(int)count range:(double)range
[yVals3 addObject:[[BubbleChartDataEntry alloc] initWithX:i y:val size:size]];
}

BubbleChartDataSet *set1 = [[BubbleChartDataSet alloc] initWithValues:yVals1 label:@"DS 1"];
BubbleChartDataSet *set1 = [[BubbleChartDataSet alloc] initWithEntries:yVals1 label:@"DS 1"];
set1.drawIconsEnabled = NO;
[set1 setColor:ChartColorTemplates.colorful[0] alpha:0.50f];
[set1 setDrawValuesEnabled:YES];

BubbleChartDataSet *set2 = [[BubbleChartDataSet alloc] initWithValues:yVals2 label:@"DS 2"];
BubbleChartDataSet *set2 = [[BubbleChartDataSet alloc] initWithEntries:yVals2 label:@"DS 2"];
set2.iconsOffset = CGPointMake(0, 15);
[set2 setColor:ChartColorTemplates.colorful[1] alpha:0.50f];
[set2 setDrawValuesEnabled:YES];

BubbleChartDataSet *set3 = [[BubbleChartDataSet alloc] initWithValues:yVals3 label:@"DS 3"];
BubbleChartDataSet *set3 = [[BubbleChartDataSet alloc] initWithEntries:yVals3 label:@"DS 3"];
[set3 setColor:ChartColorTemplates.colorful[2] alpha:0.50f];
[set3 setDrawValuesEnabled:YES];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ - (void)setDataCount:(int)count range:(double)range
[yVals1 addObject:[[CandleChartDataEntry alloc] initWithX:i shadowH:val + high shadowL:val - low open:even ? val + open : val - open close:even ? val - close : val + close icon: [UIImage imageNamed:@"icon"]]];
}

CandleChartDataSet *set1 = [[CandleChartDataSet alloc] initWithValues:yVals1 label:@"Data Set"];
CandleChartDataSet *set1 = [[CandleChartDataSet alloc] initWithEntries:yVals1 label:@"Data Set"];
set1.axisDependency = AxisDependencyLeft;
[set1 setColor:[UIColor colorWithWhite:80/255.f alpha:1.f]];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ - (LineChartData *)dataWithCount:(int)count range:(double)range
[yVals addObject:[[ChartDataEntry alloc] initWithX:i y:val]];
}

LineChartDataSet *set1 = [[LineChartDataSet alloc] initWithValues:yVals label:@"DataSet 1"];
LineChartDataSet *set1 = [[LineChartDataSet alloc] initWithEntries:yVals label:@"DataSet 1"];

set1.lineWidth = 1.75;
set1.circleRadius = 5.0;
Expand Down
Loading