From 915973ffe111e9e961a73144b6b79678fd805f3c Mon Sep 17 00:00:00 2001 From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com> Date: Mon, 7 Nov 2022 19:46:03 -0800 Subject: [PATCH] Linter fixes --- DB/Sources/DB/Content/ContentDatabase.swift | 2 +- Views/UIKit/CompositionPollView.swift | 21 ++++++++++---------- Views/UIKit/Content Views/LoadMoreView.swift | 7 ++++++- Views/UIKit/PollView.swift | 8 ++++++-- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/DB/Sources/DB/Content/ContentDatabase.swift b/DB/Sources/DB/Content/ContentDatabase.swift index a428758..8c38a98 100644 --- a/DB/Sources/DB/Content/ContentDatabase.swift +++ b/DB/Sources/DB/Content/ContentDatabase.swift @@ -325,7 +325,7 @@ public extension ContentDatabase { } func createList(_ list: List) -> AnyPublisher { - databaseWriter.mutatingPublisher{ try TimelineRecord(timeline: Timeline.list(list)).save($0) } + databaseWriter.mutatingPublisher { try TimelineRecord(timeline: Timeline.list(list)).save($0) } } func deleteList(id: List.Id) -> AnyPublisher { diff --git a/Views/UIKit/CompositionPollView.swift b/Views/UIKit/CompositionPollView.swift index ef42fe5..4e55850 100644 --- a/Views/UIKit/CompositionPollView.swift +++ b/Views/UIKit/CompositionPollView.swift @@ -116,18 +116,17 @@ private extension CompositionPollView { addChoiceButton.isEnabled = $0.count < CompositionViewModel.maxPollOptionCount - for (index, option) in $0.enumerated() { - if !self.pollOptionViews.contains(where: { $0.option === option }) { - let optionView = CompositionPollOptionView( - viewModel: self.viewModel, - parentViewModel: self.parentViewModel, - option: option) + for (index, option) in $0.enumerated() + where !self.pollOptionViews.contains(where: { $0.option === option }) { + let optionView = CompositionPollOptionView( + viewModel: self.viewModel, + parentViewModel: self.parentViewModel, + option: option) - optionView.textField.placeholder = String.localizedStringWithFormat( - NSLocalizedString("status.poll.option-%ld", comment: ""), - index + 1) - self.stackView.insertArrangedSubview(optionView, at: index) - } + optionView.textField.placeholder = String.localizedStringWithFormat( + NSLocalizedString("status.poll.option-%ld", comment: ""), + index + 1) + self.stackView.insertArrangedSubview(optionView, at: index) } for (index, optionView) in self.pollOptionViews.enumerated() { diff --git a/Views/UIKit/Content Views/LoadMoreView.swift b/Views/UIKit/Content Views/LoadMoreView.swift index 34bc7b3..3b3877d 100644 --- a/Views/UIKit/Content Views/LoadMoreView.swift +++ b/Views/UIKit/Content Views/LoadMoreView.swift @@ -156,7 +156,12 @@ private extension LoadMoreView { guard let self = self else { return } self.label.isHidden = $0 - $0 ? self.activityIndicatorView.startAnimating() : self.activityIndicatorView.stopAnimating() + + if $0 { + self.activityIndicatorView.startAnimating() + } else { + self.activityIndicatorView.stopAnimating() + } } } diff --git a/Views/UIKit/PollView.swift b/Views/UIKit/PollView.swift index 547aa97..83aa436 100644 --- a/Views/UIKit/PollView.swift +++ b/Views/UIKit/PollView.swift @@ -183,8 +183,12 @@ extension PollView { let open = !poll.expired && !poll.voted for option in poll.options { - height += open ? PollOptionButton.estimatedHeight(width: width, title: option.title) - : PollResultView.estimatedHeight(width: width, title: option.title) + if open { + height += PollOptionButton.estimatedHeight(width: width, title: option.title) + } else { + height += PollResultView.estimatedHeight(width: width, title: option.title) + } + height += .defaultSpacing }