From a45fdb3bd4394e8afc96d5277e99d1de05e767ce Mon Sep 17 00:00:00 2001 From: Ryan Nystrom Date: Sun, 26 Nov 2017 12:34:29 -0500 Subject: [PATCH] warm label event size caches (#1090) --- Classes/Issues/GithubClient+Issues.swift | 6 ++++-- Classes/Issues/Issue+IssueType.swift | 6 ++++-- Classes/Issues/Labeled/IssueLabeledModel.swift | 5 +++-- Classes/Issues/PullRequest+IssueType.swift | 6 ++++-- Classes/Views/CodeView.swift | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Classes/Issues/GithubClient+Issues.swift b/Classes/Issues/GithubClient+Issues.swift index 38738351..1ae22c8a 100644 --- a/Classes/Issues/GithubClient+Issues.swift +++ b/Classes/Issues/GithubClient+Issues.swift @@ -350,7 +350,8 @@ extension GithubClient { date: Date(), type: .added, repoOwner: owner, - repoName: repo + repoName: repo, + width: 0 )) } } @@ -364,7 +365,8 @@ extension GithubClient { date: Date(), type: .removed, repoOwner: owner, - repoName: repo + repoName: repo, + width: 0 )) } } diff --git a/Classes/Issues/Issue+IssueType.swift b/Classes/Issues/Issue+IssueType.swift index 85bea460..50c697d4 100644 --- a/Classes/Issues/Issue+IssueType.swift +++ b/Classes/Issues/Issue+IssueType.swift @@ -93,7 +93,8 @@ extension IssueOrPullRequestQuery.Data.Repository.IssueOrPullRequest.AsIssue: Is date: date, type: .removed, repoOwner: owner, - repoName: repo + repoName: repo, + width: width ) results.append(model) } else if let labeled = node.asLabeledEvent, @@ -106,7 +107,8 @@ extension IssueOrPullRequestQuery.Data.Repository.IssueOrPullRequest.AsIssue: Is date: date, type: .added, repoOwner: owner, - repoName: repo + repoName: repo, + width: width ) results.append(model) } else if let closed = node.asClosedEvent, diff --git a/Classes/Issues/Labeled/IssueLabeledModel.swift b/Classes/Issues/Labeled/IssueLabeledModel.swift index bb5ab322..c9efd77e 100644 --- a/Classes/Issues/Labeled/IssueLabeledModel.swift +++ b/Classes/Issues/Labeled/IssueLabeledModel.swift @@ -32,7 +32,8 @@ final class IssueLabeledModel: ListDiffable { date: Date, type: EventType, repoOwner: String, - repoName: String + repoName: String, + width: CGFloat ) { self.id = id self.actor = actor @@ -94,7 +95,7 @@ final class IssueLabeledModel: ListDiffable { // Set self.attributedString = NSAttributedStringSizing( - containerWidth: 0, + containerWidth: width, attributedText: attributedString, inset: IssueLabeledCell.insets, backgroundColor: Styles.Colors.Gray.lighter.color diff --git a/Classes/Issues/PullRequest+IssueType.swift b/Classes/Issues/PullRequest+IssueType.swift index 92756328..9a24d8c8 100644 --- a/Classes/Issues/PullRequest+IssueType.swift +++ b/Classes/Issues/PullRequest+IssueType.swift @@ -99,7 +99,8 @@ extension IssueOrPullRequestQuery.Data.Repository.IssueOrPullRequest.AsPullReque date: date, type: .removed, repoOwner: owner, - repoName: repo + repoName: repo, + width: width ) results.append(model) } else if let labeled = node.asLabeledEvent, @@ -112,7 +113,8 @@ extension IssueOrPullRequestQuery.Data.Repository.IssueOrPullRequest.AsPullReque date: date, type: .added, repoOwner: owner, - repoName: repo + repoName: repo, + width: width ) results.append(model) } else if let closed = node.asClosedEvent, diff --git a/Classes/Views/CodeView.swift b/Classes/Views/CodeView.swift index be7325c4..668fc98f 100644 --- a/Classes/Views/CodeView.swift +++ b/Classes/Views/CodeView.swift @@ -50,7 +50,7 @@ final class CodeView: UIScrollView { func set(attributedCode: NSAttributedString) { textView.attributedText = attributedCode let max = CGFloat.greatestFiniteMagnitude - let size = textVi ew.sizeThatFits(CGSize(width: max, height: max)) + let size = textView.sizeThatFits(CGSize(width: max, height: max)) textView.frame = CGRect(origin: .zero, size: size) contentSize = size }