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

Refactored ChartData #3169

Merged
merged 52 commits into from
Apr 8, 2018
Merged
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
6e80eb0
Added Collection conformances
jjatie Nov 18, 2017
d36d11b
[#3018]
jjatie Nov 19, 2017
36ca566
Fixed required initializers
jjatie Nov 20, 2017
cb32b08
ChartData adopts ExressibleByArrayLiteral
jjatie Dec 1, 2017
ad0d148
Merge remote-tracking branch 'origin/chartdata-collection-conformance…
jjatie Dec 1, 2017
fcd9fa2
Modified demos
jjatie Dec 1, 2017
716f182
Pulled latest 4.0.0 and code style fixes
jjatie Jan 6, 2018
ca5afad
Updates for PR
jjatie Jan 11, 2018
0d41175
Pulled latest base
jjatie Jan 11, 2018
fdae403
Refactored ChartData
jjatie Jan 11, 2018
8976b95
PR review fixes
jjatie Jan 12, 2018
f28d3d5
Removed unnecessary `get` from subscripts.
jjatie Jan 12, 2018
793e437
Merge remote-tracking branch 'origin/chartdata-collection-conformance…
jjatie Jan 15, 2018
583dab6
Disabled `remove(at:)` for CombinedChartView
jjatie Jan 15, 2018
0cce64d
Merge remote-tracking branch 'origin/chartdata-collection-conformance…
jjatie Jan 15, 2018
47b6a1c
Removed redundant methods
jjatie Jan 15, 2018
c0b7d65
Relocated `appendEntry(_:todataSet:)`
jjatie Jan 15, 2018
1d1e380
Merge remote-tracking branch 'origin/chartdata-collection-conformance…
jjatie Jan 15, 2018
79cae83
Merge remote-tracking branch 'origin/chartdata-collection-refactor' i…
jjatie Jan 15, 2018
c76ed46
pulled latest 4.0.0
jjatie Jan 15, 2018
09d27a7
Disabled Collection support for CombinedChartData
jjatie Jan 15, 2018
a71f87c
Removed methods from CombinedChartData
jjatie Jan 15, 2018
efc5a72
Merge remote-tracking branch 'origin/chartdata-collection-conformance…
jjatie Jan 15, 2018
bfb750b
Merge branch '4.0.0' into chartdata-collection-refactor
jjatie Jan 15, 2018
6adde98
Merge branch '4.0.0' into chartdata-collection-refactor
jjatie Jan 15, 2018
023ff19
Merge remote-tracking branch 'origin/chartdata-collection-refactor' i…
jjatie Jan 16, 2018
e6eb970
Pulled latest 4.0
jjatie Jan 16, 2018
29d3e91
Fixes after merge
jjatie Jan 16, 2018
a388f8a
Removed used of dataSet(forIndex:)
jjatie Jan 16, 2018
ae8279a
Merge branch '4.0.0' into chartdata-collection-refactor
jjatie Jan 16, 2018
6de1114
Merge branch '4.0.0' into chartdata-collection-refactor
jjatie Jan 16, 2018
37b29ad
Merge branch '4.0.0' of https://github.com/danielgindi/Charts into ch…
jjatie Jan 21, 2018
329e00c
Fixed merge conflicts
jjatie Jan 21, 2018
2572f04
Merge remote-tracking branch 'upstream/4.0.0' into chartdata-collecti…
jjatie Jan 23, 2018
31a76eb
Fixed merge conflicts
jjatie Jan 23, 2018
5cbafb4
Merge remote-tracking branch 'origin/chartdata-collection-refactor' i…
jjatie Jan 23, 2018
b7e6f93
updated demos
jjatie Jan 26, 2018
5f3b528
Merge remote-tracking branch 'origin/chartdata-collection-refactor' i…
jjatie Jan 26, 2018
5816632
Merge remote-tracking branch 'upstream/4.0.0' into chartdata-cleanup
jjatie Jan 26, 2018
9f5a7f9
Pulled latest 4.0.0
jjatie Jan 26, 2018
b73ac7e
Fixed demos
jjatie Jan 26, 2018
33ed6b5
Fixed objective c demos
jjatie Jan 26, 2018
585e605
Merge remote-tracking branch 'origin/4.0.0' into chartdata-cleanup
jjatie Mar 13, 2018
b1ca0c5
Moved travis to Xcode 9.3 beta temporarily
jjatie Mar 13, 2018
5faad7b
Merge remote-tracking branch 'origin/4.0.0' into chartdata-cleanup
jjatie Mar 14, 2018
a049cd3
Merge remote-tracking branch 'origin/4.0.0' into chartdata-cleanup
jjatie Mar 14, 2018
251f501
Fixed macOS demo info.plist and tv demo device name
jjatie Mar 14, 2018
8031da7
PR Fixes
jjatie Mar 27, 2018
d371fa8
Fixed objective-c naming
jjatie Mar 27, 2018
43e32a5
PR Fixes
jjatie Mar 29, 2018
978857d
fix comment
jjatie Mar 30, 2018
fe0af58
pulled 4.0.0
jjatie Mar 30, 2018
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
Prev Previous commit
Next Next commit
Fixed macOS demo info.plist and tv demo device name
jjatie committed Mar 14, 2018
commit 251f50144a4bf66f590a662593d3574362c4790e
4 changes: 2 additions & 2 deletions ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -371,7 +371,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "ChartsDemo-OSX/Info.plist";
INFOPLIST_FILE = "$(SRCROOT)/ChartsDemo-macOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.ChartsDemo-OSX";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -389,7 +389,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "ChartsDemo-OSX/Info.plist";
INFOPLIST_FILE = "$(SRCROOT)/ChartsDemo-macOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.ChartsDemo-OSX";
PRODUCT_NAME = "$(TARGET_NAME)";
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -66,8 +66,8 @@ def devices
},
tvOS: {
sdk: 'appletvsimulator',
device: "name='Apple TV 1080p'",
name: 'Apple TV 1080p'
device: "name='Apple TV'",
name: 'Apple TV'
}
}
end