Skip to content

Enable SwiftLint rule: collection_alignment #25562

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.

Sign up for GitHub

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

Open
mokagio wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Enable SwiftLint rule: collection_alignment #25562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .swiftlint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ only_rules:
# Prefer `Array(xs)` over `xs.map { $0 }`.
- array_init

# All elements in a collection literal should be vertically aligned.
- collection_alignment

# Colons should be next to the identifier when specifying a type.
- colon

Expand Down
2 changes: 1 addition & 1 deletion Sources/WordPressData/Swift/CoreDataHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public extension CoreDataStack {

do {
let options = [NSMigratePersistentStoresAutomaticallyOption: true,
NSInferMappingModelAutomaticallyOption: true]
NSInferMappingModelAutomaticallyOption: true]
try storeCoordinator.addPersistentStore(ofType: NSSQLiteStoreType,
configurationName: nil,
at: currentDatabaseLocation,
Expand Down
48 changes: 24 additions & 24 deletions Tests/WordPressKitTests/WordPressKitTests/Tests/MediaServiceRemoteRESTTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,18 +267,18 @@ class MediaServiceRemoteRESTTests: RemoteTestCase, RESTTestable {
let width = 432

let jsonDictionary: [String: Any] = ["ID": id,
"URL": url,
"guid": guid,
"date": date,
"post_ID": postID,
"mime_type": mimeType,
"file": file,
"title": title,
"caption": caption,
"description": description,
"alt": alt,
"height": height,
"width": width]
"URL": url,
"guid": guid,
"date": date,
"post_ID": postID,
"mime_type": mimeType,
"file": file,
"title": title,
"caption": caption,
"description": description,
"alt": alt,
"height": height,
"width": width]

let remoteMedia = MediaServiceRemoteREST.remoteMedia(fromJSONDictionary: jsonDictionary)
XCTAssertEqual(remoteMedia?.mediaID?.intValue, id)
Expand Down Expand Up @@ -327,18 +327,18 @@ class MediaServiceRemoteRESTTests: RemoteTestCase, RESTTestable {
"width": width]

let jsonDictionary2: [String: Any] = ["ID": id2,
"URL": url,
"guid": guid,
"date": date,
"post_ID": postID,
"mime_type": mimeType,
"file": file,
"title": title,
"caption": caption,
"description": description,
"alt": alt,
"height": height,
"width": width]
"URL": url,
"guid": guid,
"date": date,
"post_ID": postID,
"mime_type": mimeType,
"file": file,
"title": title,
"caption": caption,
"description": description,
"alt": alt,
"height": height,
"width": width]
let jsonArray = [jsonDictionary1, jsonDictionary2]

let remoteMediaArray: [RemoteMedia] = MediaServiceRemoteREST.remoteMedia(fromJSONArray: jsonArray) as! [RemoteMedia]
Expand Down
6 changes: 3 additions & 3 deletions WordPress/Classes/ViewRelated/Blog/Site Management/DeleteSiteViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ open class DeleteSiteViewController: UITableViewController {
paragraphStyle.alignment = .natural

let attributes: [NSAttributedString.Key: Any] = [.font: WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular),
.foregroundColor: UIAppColor.neutral(.shade70),
.paragraphStyle: paragraphStyle ]
.foregroundColor: UIAppColor.neutral(.shade70),
.paragraphStyle: paragraphStyle ]
let htmlAttributes: StyledHTMLAttributes = [.BodyAttribute: attributes]

let attributedText1 = NSAttributedString.attributedStringWithHTML(paragraph1, attributes: htmlAttributes)
Expand All @@ -142,7 +142,7 @@ open class DeleteSiteViewController: UITableViewController {
sectionThreeBody.textColor = UIAppColor.neutral(.shade70)

let contactButtonAttributes: [NSAttributedString.Key: Any] = [.foregroundColor: UIAppColor.primary,
.underlineStyle: NSUnderlineStyle.single.rawValue]
.underlineStyle: NSUnderlineStyle.single.rawValue]
supportButton.setAttributedTitle(NSAttributedString(string: NSLocalizedString("Contact Support",
comment: "Button label for contacting support"),
attributes: contactButtonAttributes),
Expand Down
8 changes: 4 additions & 4 deletions ...ress/Classes/ViewRelated/Gutenberg/Layout Picker/GutenbergLightNavigationController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ class GutenbergLightNavigationController: UINavigationController {
let barButtonItemAppearance = UIBarButtonItem.appearance(whenContainedInInstancesOf: [GutenbergLightNavigationController.self])
barButtonItemAppearance.tintColor = tintColor
barButtonItemAppearance.setTitleTextAttributes([NSAttributedString.Key.font: WPFontManager.systemRegularFont(ofSize: 17.0),
NSAttributedString.Key.foregroundColor: tintColor],
for: .normal)
NSAttributedString.Key.foregroundColor: tintColor],
for: .normal)
barButtonItemAppearance.setTitleTextAttributes([NSAttributedString.Key.font: WPFontManager.systemRegularFont(ofSize: 17.0),
NSAttributedString.Key.foregroundColor: tintColor.withAlphaComponent(0.25)],
for: .disabled)
NSAttributedString.Key.foregroundColor: tintColor.withAlphaComponent(0.25)],
for: .disabled)

setNeedsStatusBarAppearanceUpdate()
}
Expand Down
6 changes: 3 additions & 3 deletions WordPress/Classes/ViewRelated/Me/App Settings/AppSettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ class AppSettingsViewController: UITableViewController {
let title = NSLocalizedString("appSettings.media.imageQuality.title", value: "Quality", comment: "The quality of image used when uploading")

let settingsSelectionConfiguration = [SettingsSelectionDefaultValueKey: currentImageQuality,
SettingsSelectionTitleKey: title,
SettingsSelectionTitlesKey: titles,
SettingsSelectionValuesKey: values] as [String: Any]
SettingsSelectionTitleKey: title,
SettingsSelectionTitlesKey: titles,
SettingsSelectionValuesKey: values] as [String: Any]

let viewController = SettingsSelectionViewController(dictionary: settingsSelectionConfiguration)

Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/ViewRelated/Plugins/Views/PluginDetailViewHeaderCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class PluginDetailViewHeaderCell: UITableViewCell, NibLoadable {
let author = directoryEntry.author

let defaultAttributes: [NSAttributedString.Key: Any] = [.font: UIFont.preferredFont(forTextStyle: .subheadline),
.foregroundColor: UIAppColor.neutral(.shade70)]
.foregroundColor: UIAppColor.neutral(.shade70)]

let authorAttributes: [NSAttributedString.Key: Any] = [.foregroundColor: UIAppColor.primary(.shade40)]

Expand Down
26 changes: 13 additions & 13 deletions ...asses/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,19 +858,19 @@ private extension SiteStatsInsightsDetailsViewModel {
}

return [StatsTotalRowData(name: AnnualSiteStats.totalPosts,
data: annualInsights.totalPostsCount.abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.totalComments,
data: annualInsights.totalCommentsCount.abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.commentsPerPost,
data: Int(round(annualInsights.averageCommentsCount)).abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.totalLikes,
data: annualInsights.totalLikesCount.abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.likesPerPost,
data: Int(round(annualInsights.averageLikesCount)).abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.totalWords,
data: annualInsights.totalWordsCount.abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.wordsPerPost,
data: Int(round(annualInsights.averageWordsCount)).abbreviatedString())]
data: annualInsights.totalPostsCount.abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.totalComments,
data: annualInsights.totalCommentsCount.abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.commentsPerPost,
data: Int(round(annualInsights.averageCommentsCount)).abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.totalLikes,
data: annualInsights.totalLikesCount.abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.likesPerPost,
data: Int(round(annualInsights.averageLikesCount)).abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.totalWords,
data: annualInsights.totalWordsCount.abbreviatedString()),
StatsTotalRowData(name: AnnualSiteStats.wordsPerPost,
data: Int(round(annualInsights.averageWordsCount)).abbreviatedString())]
}

// MARK: - Posts and Pages
Expand Down
8 changes: 4 additions & 4 deletions WordPress/Classes/ViewRelated/Support/SupportTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,10 +654,10 @@ class ButtonCell: WPTableViewCellDefault {

NSLayoutConstraint.activate([
button.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: SupportTableLayoutSpacing.sidePadding),
button.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -SupportTableLayoutSpacing.sidePadding),
button.topAnchor.constraint(equalTo: contentView.topAnchor, constant: SupportTableLayoutSpacing.topBottomPadding),
button.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -SupportTableLayoutSpacing.topBottomPadding)
])
button.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -SupportTableLayoutSpacing.sidePadding),
button.topAnchor.constraint(equalTo: contentView.topAnchor, constant: SupportTableLayoutSpacing.topBottomPadding),
button.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -SupportTableLayoutSpacing.topBottomPadding)
])
}

enum LayoutSpacing {
Expand Down
6 changes: 3 additions & 3 deletions WordPress/WordPressShareExtension/Sources/UI/ShareExtensionEditorViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class ShareExtensionEditorViewController: ShareExtensionAbstractViewController {
self.configureDefaultProperties(for: textView, accessibilityLabel: accessibilityLabel)

let linkAttributes: [NSAttributedString.Key: Any] = [.underlineStyle: NSUnderlineStyle.single.rawValue,
.foregroundColor: ShareColors.aztecLinkColor]
.foregroundColor: ShareColors.aztecLinkColor]

textView.delegate = self
textView.formattingDelegate = self
Expand Down Expand Up @@ -94,8 +94,8 @@ class ShareExtensionEditorViewController: ShareExtensionAbstractViewController {
titleParagraphStyle.alignment = .natural

let attributes: [NSAttributedString.Key: Any] = [.foregroundColor: UIColor.label,
.font: ShareFonts.title,
.paragraphStyle: titleParagraphStyle]
.font: ShareFonts.title,
.paragraphStyle: titleParagraphStyle]

let textView = UITextView()

Expand Down