Updating 4.0.0 with latest changes in master #3130
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Since the framework is entirely Swift, internal properties do not need to be marked as @objc
in favour of the Swift `is`
* `Animator` is now non-optional in `Renderer` types * Fixed merge with master
* `ViewPortHandler` is now non-optional in all, if not most cases * Removed unnecessary `init()`s from `ViewPortHandler` and related * `Renderer` now has a constant `ViewPortHandler` * Pulled latest master * Fixes for PR review Removed extraneous comment Removed extra whitespace * Removed extra new lines
* `ViewPortHandler` is now non-optional in all, if not most cases * Removed unnecessary `init()`s from `ViewPortHandler` and related * `Renderer` now has a constant `ViewPortHandler` * `ChartRenderer`'s must be initialized with a chart * CombinedChartRenderer gets the same treatment * Pulled latest master * Pulled latest master * Removed unnecessary comment * Removed unnecessary whitespace
Removed `isKind(of:)`
Removed @objc from internal properties
Fix turning off drag in X and Y axes separately.
almsot all cases of fileprivate were meant to be private. If there is a need to use fileprivate in the future, it should be considered then. Not now.
for #2745. chart should be weak.
* Fix a bug may cause infinite loop. * Update BarLineChartViewBase.swift put nil check first seems better
…t` (#2993) * Replaced `ChartUtils.Math` in favour of an extension on `FloatingPoint` Increases readability, and in many cases removes a set of parentheses to ensure order of operations. * Moved `normalizedAngled` into `FloatingPoint` extension Improves readability * Fix after merge * Pulled latest master * Renamed deg2rad/rad2deg
* The backing far is not necessary. Appears to have been a way to expose the var to obj-c like so many others in the framework. * Corrections for PR * Pulled master * count -> endIndex where appropriate * fix a typo ifnot -> if not Just find a typo ifnot -> if not * Removed redundant notifyDataSetChanged()
for #3061 fix animation crash
* Removed methods and properties deprecated in 1.0 * Removed old bridging functions These were only being used by deprecated methods. * Pulled latest master
* Use example drawEntryLabelsEnabled instead of removed drawSliceTextEnabled * Use in example ILineChartDataSet.mode property instead of removed drawSteppedEnabled one
Minor changes to Formatter logic
Resubmit of #2730
Codecov Report
@@ Coverage Diff @@
## 4.0.0 #3130 +/- ##
==========================================
+ Coverage 19.77% 20.64% +0.87%
==========================================
Files 113 114 +1
Lines 13663 15431 +1768
Branches 0 256 +256
==========================================
+ Hits 2702 3186 +484
- Misses 10961 12208 +1247
- Partials 0 37 +37
Continue to review full report at Codecov.
|
|
@jjatie please try squash the commits into 4.0 as well. Now you have the access, I think we could come up a new model how do we deal with 4.0 refactoring. e.g. do you push all changes into 4.0, and we review once for all, or still we review every PR? The cons and pros are that, with a huge single PR from 4.0 to master, it would took lot of time to review. With sub PRs, the workload is split, but the review progress may slow you down. |
|
We want to squash commits coming from the master too? I assumed I would squash everything except for what was in master. |
|
the idea is to make the commit logs simple, so the old fashion is we squash into one commit before filing the PR. But now since Github provide such feature, we are not forcing quash on client side anymore. |
|
Will do! |
|
welcome on board :) |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.