lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Enable SwiftLint rule 'conditional_returns_on_newline' and fix all violations

Browse source
This commit is contained in:
Danny Moesch 2020-07-04 21:57:26 +02:00 • committed by Mingshen Sun
parent fdca54a0ab
commit 08473f8f05
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.swiftlint.yml
View file

@ -20,7 +20,7 @@ whitelist_rules:
- colon - colon
- comma - comma
- compiler_protocol_init - compiler_protocol_init
# - conditional_returns_on_newline - conditional_returns_on_newline
- contains_over_filter_count - contains_over_filter_count
- contains_over_filter_is_empty - contains_over_filter_is_empty
# - contains_over_first_not_nil # - contains_over_first_not_nil

16
pass/Controllers/PasswordsViewController.swift
View file

@ -283,8 +283,12 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
func didTapNavigationBar(_ sender: UITapGestureRecognizer) { func didTapNavigationBar(_ sender: UITapGestureRecognizer) {
let location = sender.location(in: navigationController?.navigationBar) let location = sender.location(in: navigationController?.navigationBar)
let hitView = navigationController?.navigationBar.hitTest(location, with: nil) let hitView = navigationController?.navigationBar.hitTest(location, with: nil)
guard !(hitView is UIControl) else { return } guard !(hitView is UIControl) else {
guard passwordStore.numberOfLocalCommits != 0 else { return } return
}
guard passwordStore.numberOfLocalCommits != 0 else {
return
}
let ac = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) let ac = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
let allAction = UIAlertAction(title: "All Passwords", style: .default) { _ in let allAction = UIAlertAction(title: "All Passwords", style: .default) { _ in
@ -405,7 +409,9 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
@objc @objc
func backAction(_: Any?) { func backAction(_: Any?) {
guard Defaults.isShowFolderOn else { return } guard Defaults.isShowFolderOn else {
return
}
var anim: CATransition? = transitionFromLeft var anim: CATransition? = transitionFromLeft
if parentPasswordEntity == nil { if parentPasswordEntity == nil {
anim = nil anim = nil
@ -640,7 +646,9 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
@objc @objc
func actOnReloadTableViewRelatedNotification() { func actOnReloadTableViewRelatedNotification() {
DispatchQueue.main.async { [weak weakSelf = self] in DispatchQueue.main.async { [weak weakSelf = self] in
guard let strongSelf = weakSelf else { return } guard let strongSelf = weakSelf else {
return
}
// Reset selectedScopeButtonIndex to make sure the correct reloadTableView // Reset selectedScopeButtonIndex to make sure the correct reloadTableView
strongSelf.searchController.searchBar.selectedScopeButtonIndex = 0 strongSelf.searchController.searchBar.selectedScopeButtonIndex = 0
strongSelf.initPasswordsTableEntries(parent: nil) strongSelf.initPasswordsTableEntries(parent: nil)

4
passKit/Controllers/PasscodeLockPresenter.swift
View file

@ -19,7 +19,9 @@ open class PasscodeLockPresenter {
} }
open func present(windowLevel: CGFloat?) { open func present(windowLevel: CGFloat?) {
guard PasscodeLock.shared.hasPasscode else { return } guard PasscodeLock.shared.hasPasscode else {
return
}
// dismiss the original window // dismiss the original window
dismiss() dismiss()