Fixed performance of height recalculation #178
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
- Fixed performance of height recalculation - Added logging Fixes #63
rubencagnie
force-pushed
the
performance
branch
from
bbd8fef
to
7c90f78
Compare
klundberg
reviewed
Aug 23, 2017
| @@ -284,7 +298,25 @@ extension BrickFlowLayout { | |||
| return contentSize | |||
| } | |||
|
|
|||
| func updateDirtyBricks(updatedAttributes: @escaping OnAttributesUpdatedHandler) { | |||
| for (section, item) in dirtyMap { | |||
| let layoutSection = sections![section]! | |||
There was a problem hiding this comment.
Is this force unwrapping safe?
| @@ -352,7 +384,21 @@ extension BrickFlowLayout { | |||
| } | |||
| let shouldInvalidate = preferredAttributes.frame.height != brickAttribute.originalFrame.height | |||
| brickAttribute.isEstimateSize = false | |||
| return shouldInvalidate | |||
|
|
|||
| // return shouldInvalidate | |||
| open override func invalidateLayout(with context: UICollectionViewLayoutInvalidationContext) { | ||
| BrickLogger.logVerbose(message: "Invalidate layout with context \(context)") | ||
| guard sections != nil else { // No need to invalidate if there are no sections |
There was a problem hiding this comment.
if this is guard let sections = sections then we don't need all the force unwraps below.
| @@ -25,7 +26,7 @@ enum BrickLayoutInvalidationContextType { | |||
| */ | |||
| var shouldInvalidateAllAttributes: Bool { | |||
| switch self { | |||
| case .rotation, .invalidate, .creation, .updateVisibility, .updateHeight(_): return true | |||
| case .rotation, .invalidate, .creation, .updateVisibility, .updateDirtyBricks /*, .updateHeight(_) */: return true | |||
There was a problem hiding this comment.
is it intended to not have updateHeight have this behavior? delete the commented code if so.
| } | ||
| // guard brickAttributes.originalFrame.height != height else { | ||
| // return | ||
| // } |
There was a problem hiding this comment.
delete this if it's not needed
| // if attributes.count < 100 { | ||
| // // Prevent that the "Huge" test aren't taking forever to complete | ||
| // BrickLogger.logVerbose(message: self.printAttributes()) | ||
| // } |
| @@ -307,7 +309,7 @@ internal class BrickLayoutSection { | |||
| /// - firstIndex: The index the calculation needs to start from (the main reason is to just calculate the next cells | |||
| /// - invalidate: Identifies if the attributes need to be invalidated (reset height etc) | |||
| /// - updatedAttributes: Callback for the attributes that have been updated | |||
| fileprivate func createOrUpdateCells(from firstIndex: Int, invalidate: Bool, updatedAttributes: OnAttributesUpdatedHandler?) { | |||
| public func createOrUpdateCells(from firstIndex: Int, invalidate: Bool, updatedAttributes: OnAttributesUpdatedHandler?) { | |||
There was a problem hiding this comment.
Is this meant to be called outside of brickkit? if not, could we make it internal instead?
| debugString += "Number of attributes: \(attributes.count) in frameOfInterest \(_dataSource.frameOfInterest)" | ||
| debugString += "\n" | ||
| debugString += "Total Frame: \(self.frame)" | ||
| debugString += "\n" |
There was a problem hiding this comment.
You should leave a // TODO in here to use multiline string literals when we can start building this with Xcode 9
Codecov Report
@@ Coverage Diff @@
## master #178 +/- ##
==========================================
- Coverage 93.48% 93.18% -0.31%
==========================================
Files 39 40 +1
Lines 4160 4239 +79
Branches 341 347 +6
==========================================
+ Hits 3889 3950 +61
- Misses 270 288 +18
Partials 1 1
Continue to review full report at Codecov.
|
jay18001
approved these changes
Aug 24, 2017
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.
Fixes #63