Skip to content

Commit af4e20c

Browse files
author
Romano Bayol
committed
Merge commit 'f2795b9813e7e8c2bcdac3f4c3cc74790116999e' into refactoring/swift-4.2
* commit 'f2795b9813e7e8c2bcdac3f4c3cc74790116999e': (108 commits) Remove delegate method call for translation when no translation really occured add call chartScaled() after double tap (ChartsOrg#3770) fix ChartsOrg#3719 Update README.md (ChartsOrg#3737) Fix applying lineCap value for line chart data sets (Fixes ChartsOrg#3739) Fix legend offset bug for horizontal bar chart (Fixes ChartsOrg#3301) Add missing properties to copy(with:) methods (ChartsOrg#3715) improvements in barRect height calculation (ChartsOrg#3650) Remove meaningless comment fix wrong assignment to axisMaxLabels property Add missing empty line between Summary and other section manually fix casting warnings Fix guard statement format. Fix memory leak for macOS. Update ChartViewBase.swift bump version to 3.2.1 close ChartsOrg#3659: fix index out of bounds issue when using stacked bar chart Fix memory leak after rendering close ChartsOrg#3661: update podspec to include swift verison fix issue ChartsOrg#3662 ... # Conflicts: # Charts.xcodeproj/project.pbxproj # ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj # ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m # ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m # ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift # Rakefile # Source/Charts/Charts/BarLineChartViewBase.swift # Source/Charts/Charts/ChartViewBase.swift # Source/Charts/Charts/HorizontalBarChartView.swift # Source/Charts/Charts/PieChartView.swift # Source/Charts/Charts/RadarChartView.swift # Source/Charts/Components/Legend.swift # Source/Charts/Components/Marker.swift # Source/Charts/Components/YAxis.swift # Source/Charts/Data/Implementations/ChartBaseDataSet.swift # Source/Charts/Data/Implementations/Standard/ChartData.swift # Source/Charts/Data/Implementations/Standard/PieChartData.swift # Source/Charts/Data/Interfaces/ChartDataSetProtocol.swift # Source/Charts/Data/Interfaces/ScatterChartDataSetProtocol.swift # Source/Charts/Filters/DataApproximator+N.swift # Source/Charts/Formatters/FillFormatter.swift # Source/Charts/Formatters/ValueFormatter.swift # Source/Charts/Highlight/BarHighlighter.swift # Source/Charts/Highlight/ChartHighlighter.swift # Source/Charts/Highlight/HorizontalBarHighlighter.swift # Source/Charts/Renderers/AxisRendererBase.swift # Source/Charts/Renderers/BarChartRenderer.swift # Source/Charts/Renderers/BarLineScatterCandleBubbleRenderer.swift # Source/Charts/Renderers/BubbleChartRenderer.swift # Source/Charts/Renderers/CandleStickChartRenderer.swift # Source/Charts/Renderers/ChartDataRendererBase.swift # Source/Charts/Renderers/CombinedChartRenderer.swift # Source/Charts/Renderers/HorizontalBarChartRenderer.swift # Source/Charts/Renderers/LegendRenderer.swift # Source/Charts/Renderers/LineChartRenderer.swift # Source/Charts/Renderers/PieChartRenderer.swift # Source/Charts/Renderers/RadarChartRenderer.swift # Source/Charts/Renderers/Renderer.swift # Source/Charts/Renderers/ScatterChartRenderer.swift # Source/Charts/Renderers/XAxisRenderer.swift # Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift # Source/Charts/Renderers/XAxisRendererRadarChart.swift # Source/Charts/Renderers/YAxisRenderer.swift # Source/Charts/Renderers/YAxisRendererHorizontalBarChart.swift # Source/Charts/Renderers/YAxisRendererRadarChart.swift # Source/Charts/Utils/ChartUtils.swift # Source/Charts/Utils/ViewPortHandler.swift # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testAllRightAxisDependency_iOS_375.0_667.0@2x.png # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testAllRightAxisDependency_tvOS_1920.0_1080.0.png # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testDefaultAxisDependency_iOS_375.0_667.0@2x.png # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testDefaultAxisDependency_tvOS_1920.0_1080.0.png # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testLeftRightAxisDependency_iOS_375.0_667.0@2x.png # Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testLeftRightAxisDependency_tvOS_1920.0_1080.0.png
2 parents 2422377 + f2795b9 commit af4e20c

File tree

445 files changed

+7691
-4471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

445 files changed

+7691
-4471
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
> ℹ Please fill out this template when filing an issue.
2+
> All lines beginning with an ℹ symbol instruct you with what info we expect. You can delete those lines once you've filled in the info.
3+
>
4+
> Per our [*CONTRIBUTING guidelines](https://github.com/jjatie/Charts/blob/master/CONTRIBUTING.md), we use GitHub for
5+
> bugs and feature requests, not general support. Other issues should be opened on Stack Overflow with the tag [`ios-charts`.](https://stackoverflow.com/questions/tagged/ios-charts)
6+
>
7+
> Please remove this line and everything above it before submitting.
8+
9+
* [ ] I've read, understood, and done my best to follow the [*CONTRIBUTING guidelines](https://github.com/jjatie/Charts/blob/master/CONTRIBUTING.md).
10+
11+
## What did you do?
12+
13+
ℹ Please replace this with what you did.
14+
15+
## What did you expect to happen?
16+
17+
ℹ Please replace this with what you expected to happen.
18+
19+
## What happened instead?
20+
21+
ℹ Please replace this with of what happened instead.
22+
23+
## Charts Environment
24+
25+
**Charts version/Branch/Commit Number:**
26+
**Xcode version:**
27+
**Swift version:**
28+
**Platform(s) running Charts:**
29+
**macOS version running Xcode:**
30+
31+
## Demo Project
32+
33+
ℹ Please link to or upload a project we can download that reproduces the issue.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
### Issue Link :link:
2+
<!-- What issue does this fix? If an issue doesn't exist, remove this section. -->
3+
4+
### Goals :soccer:
5+
<!-- List the high-level objectives of this pull request. -->
6+
<!-- Include any relevant context. -->
7+
8+
### Implementation Details :construction:
9+
<!-- Explain the reasoning behind any architectural changes. -->
10+
<!-- Highlight any new functionality. -->
11+
12+
### Testing Details :mag:
13+
<!-- Describe what tests you've added for your changes. -->

‎.swift-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
language: objective-c
2-
osx_image: xcode9
2+
osx_image: xcode10
33
matrix:
44
include:
5-
- osx_image: xcode9
5+
- osx_image: xcode10
66
env: PLATFORM="iOS"
7-
- osx_image: xcode9
7+
- osx_image: xcode10
88
env: PLATFORM="tvOS"
9-
- osx_image: xcode9
9+
- osx_image: xcode10
1010
env: PLATFORM="macOS"
1111
env:
1212
global:

‎CHANGELOG.md‎

Lines changed: 796 additions & 10 deletions
Large diffs are not rendered by default.

‎Charts.podspec.bak‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Charts"
3-
s.version = "3.0.4"
3+
s.version = "3.2.1"
44
s.summary = "Charts is a powerful & easy to use chart library for iOS, tvOS and OSX (and Android)"
55
s.homepage = "https://github.com/danielgindi/Charts"
66
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
@@ -10,6 +10,8 @@ Pod::Spec.new do |s|
1010
s.osx.deployment_target = "10.11"
1111
s.source = { :git => "https://github.com/danielgindi/Charts.git", :tag => "v#{s.version}" }
1212
s.default_subspec = "Core"
13+
s.swift_version = '4.2'
14+
s.cocoapods_version = '>= 1.5.0'
1315

1416
s.subspec "Core" do |ss|
1517
ss.source_files = "Source/Charts/**/*.swift"

‎Charts.xcodeproj/project.pbxproj‎

Lines changed: 128 additions & 132 deletions
Large diffs are not rendered by default.

‎Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,82 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
99
<BuildActionEntry
10-
buildForAnalyzing = "YES"
1110
buildForTesting = "YES"
1211
buildForRunning = "YES"
1312
buildForProfiling = "YES"
14-
buildForArchiving = "YES">
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
1515
<BuildableReference
16-
BuildableIdentifier = 'primary'
17-
BlueprintIdentifier = 'A58A4ED274A941CA248EA921'
18-
BlueprintName = 'Charts'
19-
ReferencedContainer = 'container:Charts.xcodeproj'
20-
BuildableName = 'Charts.framework'>
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "A58A4ED274A941CA248EA921"
18+
BuildableName = "Charts.framework"
19+
BlueprintName = "Charts"
20+
ReferencedContainer = "container:Charts.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug"
30-
codeCoverageEnabled = "NO">
31-
<AdditionalOptions>
32-
</AdditionalOptions>
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3330
<Testables>
3431
<TestableReference
3532
skipped = "NO">
3633
<BuildableReference
37-
BuildableIdentifier = 'primary'
38-
BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
39-
BlueprintName = 'ChartsTests'
40-
ReferencedContainer = 'container:Charts.xcodeproj'
41-
BuildableName = 'ChartsTests.xctest'>
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
36+
BuildableName = "ChartsTests.xctest"
37+
BlueprintName = "ChartsTests"
38+
ReferencedContainer = "container:Charts.xcodeproj">
4239
</BuildableReference>
4340
</TestableReference>
4441
</Testables>
42+
<AdditionalOptions>
43+
</AdditionalOptions>
4544
</TestAction>
4645
<LaunchAction
46+
buildConfiguration = "Debug"
4747
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4848
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4949
launchStyle = "0"
5050
useCustomWorkingDirectory = "NO"
5151
ignoresPersistentStateOnLaunch = "NO"
5252
debugDocumentVersioning = "YES"
5353
debugServiceExtension = "internal"
54-
buildConfiguration = "Debug"
5554
allowLocationSimulation = "YES">
56-
<AdditionalOptions>
57-
</AdditionalOptions>
55+
<MacroExpansion>
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "A58A4ED274A941CA248EA921"
59+
BuildableName = "Charts.framework"
60+
BlueprintName = "Charts"
61+
ReferencedContainer = "container:Charts.xcodeproj">
62+
</BuildableReference>
63+
</MacroExpansion>
5864
<EnvironmentVariables>
5965
<EnvironmentVariable
60-
key = 'FB_REFERENCE_IMAGE_DIR'
61-
value = '$(SOURCE_ROOT)/Tests/ReferenceImages'
62-
isEnabled = 'YES'>
66+
key = "FB_REFERENCE_IMAGE_DIR"
67+
value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
68+
isEnabled = "YES">
6369
</EnvironmentVariable>
6470
</EnvironmentVariables>
71+
<AdditionalOptions>
72+
</AdditionalOptions>
6573
</LaunchAction>
6674
<ProfileAction
75+
buildConfiguration = "Release"
76+
shouldUseLaunchSchemeArgsEnv = "YES"
6777
savedToolIdentifier = ""
6878
useCustomWorkingDirectory = "NO"
69-
debugDocumentVersioning = "YES"
70-
buildConfiguration = "Release"
71-
shouldUseLaunchSchemeArgsEnv = "YES">
79+
debugDocumentVersioning = "YES">
7280
</ProfileAction>
7381
<AnalyzeAction
7482
buildConfiguration = "Debug">

‎Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,83 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
99
<BuildActionEntry
10-
buildForAnalyzing = "YES"
1110
buildForTesting = "YES"
1211
buildForRunning = "YES"
1312
buildForProfiling = "YES"
14-
buildForArchiving = "YES">
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
1515
<BuildableReference
16-
BuildableIdentifier = 'primary'
17-
BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
18-
BlueprintName = 'ChartsTests'
19-
ReferencedContainer = 'container:Charts.xcodeproj'
20-
BuildableName = 'ChartsTests.xctest'>
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
18+
BuildableName = "ChartsTests.xctest"
19+
BlueprintName = "ChartsTests"
20+
ReferencedContainer = "container:Charts.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug"
30-
codeCoverageEnabled = "YES">
31-
<AdditionalOptions>
32-
</AdditionalOptions>
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3331
<Testables>
3432
<TestableReference
3533
skipped = "NO">
3634
<BuildableReference
37-
BuildableIdentifier = 'primary'
38-
BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
39-
BlueprintName = 'ChartsTests'
40-
ReferencedContainer = 'container:Charts.xcodeproj'
41-
BuildableName = 'ChartsTests.xctest'>
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
37+
BuildableName = "ChartsTests.xctest"
38+
BlueprintName = "ChartsTests"
39+
ReferencedContainer = "container:Charts.xcodeproj">
4240
</BuildableReference>
4341
</TestableReference>
4442
</Testables>
43+
<AdditionalOptions>
44+
</AdditionalOptions>
4545
</TestAction>
4646
<LaunchAction
47+
buildConfiguration = "Debug"
4748
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4849
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4950
launchStyle = "0"
5051
useCustomWorkingDirectory = "NO"
5152
ignoresPersistentStateOnLaunch = "NO"
5253
debugDocumentVersioning = "YES"
5354
debugServiceExtension = "internal"
54-
buildConfiguration = "Debug"
5555
allowLocationSimulation = "YES">
56-
<AdditionalOptions>
57-
</AdditionalOptions>
56+
<MacroExpansion>
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
60+
BuildableName = "ChartsTests.xctest"
61+
BlueprintName = "ChartsTests"
62+
ReferencedContainer = "container:Charts.xcodeproj">
63+
</BuildableReference>
64+
</MacroExpansion>
5865
<EnvironmentVariables>
5966
<EnvironmentVariable
60-
key = 'FB_REFERENCE_IMAGE_DIR'
61-
value = '$(SOURCE_ROOT)/Tests/ReferenceImages'
62-
isEnabled = 'YES'>
67+
key = "FB_REFERENCE_IMAGE_DIR"
68+
value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
69+
isEnabled = "YES">
6370
</EnvironmentVariable>
6471
</EnvironmentVariables>
72+
<AdditionalOptions>
73+
</AdditionalOptions>
6574
</LaunchAction>
6675
<ProfileAction
76+
buildConfiguration = "Release"
77+
shouldUseLaunchSchemeArgsEnv = "YES"
6778
savedToolIdentifier = ""
6879
useCustomWorkingDirectory = "NO"
69-
debugDocumentVersioning = "YES"
70-
buildConfiguration = "Release"
71-
shouldUseLaunchSchemeArgsEnv = "YES">
80+
debugDocumentVersioning = "YES">
7281
</ProfileAction>
7382
<AnalyzeAction
7483
buildConfiguration = "Debug">

‎Charts.xcworkspace/contents.xcworkspacedata‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)