Added static string where possible (#2535)

Author: Huddie

Classes/Bookmark/BookmarkNavigationController.swift

@@ -58,7 +58,7 @@ final class BookmarkNavigationController {
     //for timeframe between viewDidLoad() and bookmark info is loaded 
     static var disabledNavigationItem: UIBarButtonItem {
         let item = UIBarButtonItem()
-        item.image = UIImage(named: "nav-bookmark")?.withRenderingMode(.alwaysTemplate)
+        item.image = UIImage(named: "nav-bookmark").withRenderingMode(.alwaysTemplate)
         item.isEnabled = false
         item.imageInsets = BookmarkNavigationController.iconImageInset
         return item
@@ -69,13 +69,13 @@ final class BookmarkNavigationController {
     @objc func add(sender: UIBarButtonItem) {
         Haptic.triggerSelection()
         sender.action = #selector(BookmarkNavigationController.remove(sender:))
-        sender.image = UIImage(named: "nav-bookmark-selected")?.withRenderingMode(.alwaysTemplate)
+        sender.image = UIImage(named: "nav-bookmark-selected").withRenderingMode(.alwaysTemplate)
         store.add(graphQLID: graphQLID)
     }
 
     @objc func remove(sender: UIBarButtonItem) {
         sender.action = #selector(BookmarkNavigationController.add(sender:))
-        sender.image = UIImage(named: "nav-bookmark")?.withRenderingMode(.alwaysTemplate)
+        sender.image = UIImage(named: "nav-bookmark").withRenderingMode(.alwaysTemplate)
         store.remove(graphQLID: graphQLID)
     }
 

Classes/Bookmark/BookmarkRepoCell.swift

@@ -11,7 +11,7 @@ import SnapKit
 
 final class BookmarkRepoCell: SelectableCell {
 
-    private let imageView = UIImageView(image: UIImage(named: "repo")?.withRenderingMode(.alwaysTemplate))
+    private let imageView = UIImageView(image: UIImage(named: "repo").withRenderingMode(.alwaysTemplate))
     private let label = UILabel()
 
     override init(frame: CGRect) {

Classes/History/PathCommitCell.swift

@@ -19,7 +19,7 @@ final class PathCommitCell: SelectableCell {
     )
 
     private let textView = MarkdownStyledTextView()
-    private let disclosureImageView = UIImageView(image: UIImage(named: "chevron-right")?.withRenderingMode(.alwaysTemplate))
+    private let disclosureImageView = UIImageView(image: UIImage(named: "chevron-right").withRenderingMode(.alwaysTemplate))
 
     override init(frame: CGRect) {
         super.init(frame: frame)

Classes/Issues/Comments/Details/IssueDetailBadgeView.swift

@@ -12,7 +12,7 @@ final class IssueDetailBadgeView: UIImageView {
 
     init() {
         super.init(frame: .zero)
-        image = UIImage(named: "githawk-badge")?.withRenderingMode(.alwaysTemplate)
+        image = UIImage(named: "githawk-badge").withRenderingMode(.alwaysTemplate)
         tintColor = Styles.Colors.Blue.medium.color
 
         isUserInteractionEnabled = true

Classes/Issues/Comments/IssueCommentBaseCell.swift

@@ -37,7 +37,7 @@ class IssueCommentBaseCell: UICollectionViewCell, UIGestureRecognizerDelegate {
         ]
         collapseLayer.locations = [0, 0.5, 1]
 
-        collapseButton.setImage(UIImage(named: "bullets")?.withRenderingMode(.alwaysTemplate), for: .normal)
+        collapseButton.setImage(UIImage(named: "bullets").withRenderingMode(.alwaysTemplate), for: .normal)
         collapseButton.backgroundColor = Styles.Colors.Blue.medium.color
         collapseButton.accessibilityTraits = UIAccessibilityTraitNone
         collapseButton.tintColor = .white

Classes/Issues/Comments/Markdown/String+CustomBuilding.swift

@@ -101,12 +101,11 @@ private struct CustomHandlingMatch {
     let handler: CustomHandlingMatcher
 }
 
-private let shortlinkRegex = try! NSRegularExpression(pattern: "(^|\\s|[^a-zA-Z0-9/])(([\\w|-]+)/([\\w|-]+))?#([0-9]+)(?![a-zA-Z0-9])", options: [])
-
 extension String {
 
     func detectAndHandleCustomRegex(owner: String, repo: String, builder: StyledTextBuilder) {
         let nsrange = self.nsrange
+        let shortlinkRegex = NSRegularExpression("(^|\\s|[^a-zA-Z0-9/])(([\\w|-]+)/([\\w|-]+))?#([0-9]+)(?![a-zA-Z0-9])")
 
         let shortlinkMatches = shortlinkRegex.matches(in: self, options: [], range: nsrange).map {
             CustomHandlingMatch(result: $0, handler: ShortlinkMatcher())

Classes/Issues/Comments/Markdown/String+Shortlink.swift

@@ -9,7 +9,8 @@
 import Foundation
 import StringHelpers
 
-private let regex = try! NSRegularExpression(pattern: "https?:\\/\\/.*github.com\\/(\\w*)\\/([^/]*?)\\/issues\\/([0-9]+)", options: [])
+private let regex = NSRegularExpression("https?:\\/\\/.*github.com\\/(\\w*)\\/([^/]*?)\\/issues\\/([0-9]+)")
+
 extension String {
     var shortlinkInfo: (owner: String, repo: String, number: Int)? {
         guard let match = regex.firstMatch(in: self, options: [], range: nsrange),

Classes/Issues/Comments/Markdown/String+StripHTMLComments.swift

@@ -9,7 +9,7 @@
 import Foundation
 import StringHelpers
 
-private let regex = try! NSRegularExpression(pattern: "<!--((.|\n|\r)*?)-->", options: [])
+private let regex = NSRegularExpression("<!--((.|\n|\r)*?)-->")
 
 extension String {
 

Classes/Issues/Comments/Reactions/IssueCommentReactionCell.swift

@@ -47,7 +47,7 @@ UICollectionViewDelegateFlowLayout {
         addButton.setTitle("+", for: .normal)
         addButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 10)
         addButton.setTitleColor(Styles.Colors.Gray.light.color, for: .normal)
-        addButton.setImage(UIImage(named: "smiley-small")?.withRenderingMode(.alwaysTemplate), for: .normal)
+        addButton.setImage(UIImage(named: "smiley-small").withRenderingMode(.alwaysTemplate), for: .normal)
         addButton.addTarget(self, action: #selector(IssueCommentReactionCell.onAddButton(sender:)), for: .touchUpInside)
         addButton.accessibilityLabel = NSLocalizedString("Add reaction", comment: "")
         addButton.setContentCompressionResistancePriority(.required, for: .horizontal)
@@ -57,7 +57,7 @@ UICollectionViewDelegateFlowLayout {
             make.bottom.equalToSuperview().offset(-Styles.Sizes.rowSpacing)
         }
 
-        moreButton.setImage(UIImage(named: "bullets-small")?.withRenderingMode(.alwaysTemplate), for: .normal)
+        moreButton.setImage(UIImage(named: "bullets-small").withRenderingMode(.alwaysTemplate), for: .normal)
         moreButton.contentVerticalAlignment = .center
         moreButton.contentHorizontalAlignment = .right
         moreButton.imageView?.contentMode = .center

Classes/Issues/Commit/IssueCommitCell.swift

@@ -18,7 +18,7 @@ final class IssueCommitCell: UICollectionViewCell {
 
     weak var delegate: IssueCommitCellDelegate?
 
-    private let commitImageView = UIImageView(image: UIImage(named: "git-commit-small")?.withRenderingMode(.alwaysTemplate))
+    private let commitImageView = UIImageView(image: UIImage(named: "git-commit-small").withRenderingMode(.alwaysTemplate))
     private let avatarImageView = UIImageView()
     private let messageLabel = UILabel()
 

Classes/Issues/Files/IssueFileCell.swift

@@ -13,7 +13,7 @@ final class IssueFileCell: SelectableCell {
 
     private let changeLabel = UILabel()
     private let pathLabel = UILabel()
-    private let disclosure = UIImageView(image: UIImage(named: "chevron-right")?.withRenderingMode(.alwaysTemplate))
+    private let disclosure = UIImageView(image: UIImage(named: "chevron-right").withRenderingMode(.alwaysTemplate))
 
     override init(frame: CGRect) {
         super.init(frame: frame)

Classes/Issues/IssueManageButton.swift

@@ -10,9 +10,8 @@ import UIKit
 
 func IssueManageButton() -> UIButton {
     let button = UIButton()
-    if let image = UIImage(named: "three-bars")?.withRenderingMode(.alwaysTemplate) {
-        button.setImage(image, for: .normal)
-    }
+    let image = UIImage(named: "three-bars").withRenderingMode(.alwaysTemplate)
+    button.setImage(image, for: .normal)
     button.tintColor = .white
     button.backgroundColor = Styles.Colors.Blue.medium.color
     let width = Styles.Sizes.tableCellHeight

Classes/Issues/IssueTextActionsView.swift

@@ -143,7 +143,7 @@ final class IssueTextActionsView: UIView, UICollectionViewDataSource, UICollecti
             let blue = Styles.Colors.Blue.medium.color
             sendButton.tintColor = blue
             sendButton.imageView?.tintColor = blue
-            sendButton.setImage(UIImage(named: "send")?.withRenderingMode(.alwaysTemplate), for: .normal)
+            sendButton.setImage(UIImage(named: "send").withRenderingMode(.alwaysTemplate), for: .normal)
             sendButton.addTarget(self, action: #selector(onSend), for: .touchUpInside)
             addSubview(sendButton)
 

Classes/Issues/Labels/IssueLabelStatusCell.swift

@@ -73,7 +73,7 @@ final class IssueLabelStatusCell: UICollectionViewCell, ListBindable {
             label.text = viewModel
             label.textColor = tint
             imageView.tintColor = tint
-            imageView.image = UIImage(named: "lock-small")?.withRenderingMode(.alwaysTemplate)
+            imageView.image = UIImage(named: "lock-small").withRenderingMode(.alwaysTemplate)
         }
     }
 

Classes/Issues/Managing/IssueManagingExpansionCell.swift

@@ -20,7 +20,7 @@ final class IssueManagingRoundedBackgroundView: UIView {
 final class IssueManagingExpansionCell: UICollectionViewCell, ListBindable {
 
     private let label = UILabel()
-    private let chevron = UIImageView(image: UIImage(named: "chevron-down-small")?.withRenderingMode(.alwaysTemplate))
+    private let chevron = UIImageView(image: UIImage(named: "chevron-down-small").withRenderingMode(.alwaysTemplate))
     private let backgroundHighlightView = IssueManagingRoundedBackgroundView()
 
     override init(frame: CGRect) {

Classes/Issues/Merge/MergeButton.swift

@@ -36,8 +36,8 @@ final class MergeButton: UIView {
 
         layer.cornerRadius = Styles.Sizes.avatarCornerRadius
 
-        let image = UIImage(named: "chevron-down")?.withRenderingMode(.alwaysTemplate)
-        let optionButtonWidth = (image?.size.width ?? 0) + (2 * Styles.Sizes.gutter)
+        let image = UIImage(named: "chevron-down").withRenderingMode(.alwaysTemplate)
+        let optionButtonWidth = (image.size.width ?? 0) + (2 * Styles.Sizes.gutter)
         optionIconView.contentMode = .center
         optionIconView.image = image
         optionIconView.isAccessibilityElement = true

Classes/Labels/LabelMenuCell.swift

@@ -12,7 +12,7 @@ import SnapKit
 final class LabelMenuCell: SelectableCell {
 
     public let button = UIButton()
-    public let checkedImageView = UIImageView(image: UIImage(named: "check-small")?.withRenderingMode(.alwaysTemplate))
+    public let checkedImageView = UIImageView(image: UIImage(named: "check-small").withRenderingMode(.alwaysTemplate))
 
     override init(frame: CGRect) {
         super.init(frame: frame)

Classes/Milestones/MilestoneCell.swift

@@ -13,7 +13,7 @@ final class MilestoneCell2: SelectableCell {
 
     public let label = UILabel()
     public let detailLabel = UILabel()
-    private let checkedImageView = UIImageView(image: UIImage(named: "check-small")?.withRenderingMode(.alwaysTemplate))
+    private let checkedImageView = UIImageView(image: UIImage(named: "check-small").withRenderingMode(.alwaysTemplate))
 
     override init(frame: CGRect) {
         super.init(frame: frame)

Classes/Notifications/NewFeaturesCell.swift

@@ -47,7 +47,7 @@ final class NewFeaturesCell: UICollectionViewCell {
         label.isAccessibilityElement = false
 
         let closeButtonSize = Styles.Sizes.icon.width
-        closeButton.setImage(UIImage(named: "x-small")?.withRenderingMode(.alwaysTemplate), for: .normal)
+        closeButton.setImage(UIImage(named: "x-small").withRenderingMode(.alwaysTemplate), for: .normal)
         closeButton.tintColor = tint
         closeButton.layer.cornerRadius = closeButtonSize / 2
         closeButton.addTarget(self, action: #selector(onCloseButton), for: .touchUpInside)

Classes/Notifications/NotificationCell.swift

@@ -99,7 +99,7 @@ final class NotificationCell: SelectableCell, CAAnimationDelegate {
         commentButton.setTitleColor(grey, for: .normal)
         commentButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: -2, right: 0)
         commentButton.titleEdgeInsets = UIEdgeInsets(top: -4, left: 2, bottom: 0, right: 0)
-        commentButton.setImage(UIImage(named: "comment-small")?.withRenderingMode(.alwaysTemplate), for: .normal)
+        commentButton.setImage(UIImage(named: "comment-small").withRenderingMode(.alwaysTemplate), for: .normal)
         commentButton.contentHorizontalAlignment = .left
         commentButton.snp.makeConstraints { make in
             make.width.equalTo(actionsHeight)
@@ -113,15 +113,15 @@ final class NotificationCell: SelectableCell, CAAnimationDelegate {
         }
 
         readButton.tintColor = grey
-        readButton.setImage(UIImage(named: "check-small")?.withRenderingMode(.alwaysTemplate), for: .normal)
+        readButton.setImage(UIImage(named: "check-small").withRenderingMode(.alwaysTemplate), for: .normal)
         readButton.addTarget(self, action: #selector(onRead(sender:)), for: .touchUpInside)
         readButton.contentHorizontalAlignment = .center
         readButton.snp.makeConstraints { make in
             make.width.equalTo(actionsHeight)
         }
 
         moreButton.tintColor = grey
-        moreButton.setImage(UIImage(named: "bullets-small")?.withRenderingMode(.alwaysTemplate), for: .normal)
+        moreButton.setImage(UIImage(named: "bullets-small").withRenderingMode(.alwaysTemplate), for: .normal)
         moreButton.addTarget(self, action: #selector(onMore(sender:)), for: .touchUpInside)
         moreButton.contentHorizontalAlignment = .right
         moreButton.snp.makeConstraints { make in

Classes/People/PeopleCell.swift

@@ -39,7 +39,7 @@ final class PeopleCell: SelectableCell {
             make.left.equalTo(avatarImageView.snp.right).offset(Styles.Sizes.gutter)
         }
 
-        checkmarkImageView.image = UIImage(named: "check-small")?.withRenderingMode(.alwaysTemplate)
+        checkmarkImageView.image = UIImage(named: "check-small").withRenderingMode(.alwaysTemplate)
         checkmarkImageView.tintColor = Styles.Colors.Blue.medium.color
         checkmarkImageView.contentMode = .scaleAspectFit
 

Classes/PullRequestReviews/PullRequestReviewReplyCell.swift

@@ -18,7 +18,7 @@ final class PullRequestReviewReplyCell: IssueCommentBaseCell {
 
         let color = Styles.Colors.Blue.medium.color
         button.setTitle(NSLocalizedString("Reply", comment: ""), for: .normal)
-        button.setImage(UIImage(named: "reply")?.withRenderingMode(.alwaysTemplate), for: .normal)
+        button.setImage(UIImage(named: "reply").withRenderingMode(.alwaysTemplate), for: .normal)
         button.tintColor = color
         button.setTitleColor(color, for: .normal)
         button.titleLabel?.font = Styles.Text.body.preferredFont

Classes/Repository/RepositoryBranches/RepositoryBranchesCell.swift

@@ -10,7 +10,7 @@ import UIKit
 
 final class RepositoryBranchCell: SelectableCell {
     public let label = UILabel()
-    private let checkedImageView = UIImageView(image: UIImage(named: "check-small")?.withRenderingMode(.alwaysTemplate))
+    private let checkedImageView = UIImageView(image: UIImage(named: "check-small").withRenderingMode(.alwaysTemplate))
 
     override init(frame: CGRect) {
         super.init(frame: frame)

Classes/Repository/RepositoryFileCell.swift

@@ -13,7 +13,7 @@ final class RepositoryFileCell: SelectableCell {
 
     private let imageView = UIImageView()
     private let label = UILabel()
-    private let disclosure = UIImageView(image: UIImage(named: "chevron-right")?.withRenderingMode(.alwaysTemplate))
+    private let disclosure = UIImageView(image: UIImage(named: "chevron-right").withRenderingMode(.alwaysTemplate))
 
     override init(frame: CGRect) {
         super.init(frame: frame)

Classes/Systems/Rating/RatingCell.swift

@@ -50,7 +50,7 @@ final class RatingCell: UICollectionViewCell {
             make.centerX.equalTo(contentView)
         }
 
-        dismissButton.setImage(UIImage(named: "x")?.withRenderingMode(.alwaysTemplate), for: .normal)
+        dismissButton.setImage(UIImage(named: "x").withRenderingMode(.alwaysTemplate), for: .normal)
         dismissButton.tintColor = tint
         dismissButton.addTarget(self, action: #selector(RatingCell.onDismiss), for: .touchUpInside)
         contentView.addSubview(dismissButton)

Classes/Utility/NSRegularExpression+StaticString.swift

@@ -0,0 +1,21 @@
+//
+//  NSRegularExpression+StaticString.swift
+//  Freetime
+//
+//  Created by Ehud Adler on 12/7/18.
+//  Copyright © 2018 Ryan Nystrom. All rights reserved.
+//
+
+import Foundation
+
+
+extension NSRegularExpression {
+
+    convenience init(_ pattern: StaticString, options: NSRegularExpression.Options = []) {
+        do {
+            try self.init(pattern: "\(pattern)", options: options)
+        } catch {
+            preconditionFailure("Illegal Regex pattern: \(pattern)")
+        }
+    }
+}

Classes/Utility/UIImage+StaticString.swift

@@ -0,0 +1,16 @@
+//
+//  UIImage+StaticString.swift
+//  Freetime
+//
+//  Created by Ehud Adler on 12/7/18.
+//  Copyright © 2018 Ryan Nystrom. All rights reserved.
+//
+
+import Foundation
+
+extension UIImage {
+
+    convenience init(named: StaticString) {
+        self.init(named: "\(named)")!
+    }
+}

Classes/View Controllers/RootViewControllers.swift

@@ -18,8 +18,8 @@ func newSettingsRootViewController(
     if let first = nav.viewControllers.first as? SettingsViewController {
         first.sessionManager = sessionManager
         nav.tabBarItem.title = NSLocalizedString("Settings", comment: "")
-        nav.tabBarItem.image = UIImage(named: "tab-gear")?.withRenderingMode(.alwaysOriginal)
-        nav.tabBarItem.selectedImage = UIImage(named: "tab-gear-selected")?.withRenderingMode(.alwaysOriginal)
+        nav.tabBarItem.image = UIImage(named: "tab-gear").withRenderingMode(.alwaysOriginal)
+        nav.tabBarItem.selectedImage = UIImage(named: "tab-gear-selected").withRenderingMode(.alwaysOriginal)
     }
 
     return nav
@@ -34,17 +34,17 @@ func newNotificationsRootViewController(client: GithubClient) -> UIViewControlle
     controller.title = title
     let nav = UINavigationController(rootViewController: controller)
     nav.tabBarItem.title = title
-    nav.tabBarItem.image = UIImage(named: "tab-inbox")?.withRenderingMode(.alwaysOriginal)
-    nav.tabBarItem.selectedImage = UIImage(named: "tab-inbox-selected")?.withRenderingMode(.alwaysOriginal)
+    nav.tabBarItem.image = UIImage(named: "tab-inbox").withRenderingMode(.alwaysOriginal)
+    nav.tabBarItem.selectedImage = UIImage(named: "tab-inbox-selected").withRenderingMode(.alwaysOriginal)
     return nav
 }
 
 func newSearchRootViewController(client: GithubClient) -> UIViewController {
     let controller = SearchViewController(client: client)
     let nav = UINavigationController(rootViewController: controller)
     nav.tabBarItem.title = Constants.Strings.search
-    nav.tabBarItem.image = UIImage(named: "tab-search")?.withRenderingMode(.alwaysOriginal)
-    nav.tabBarItem.selectedImage = UIImage(named: "tab-search-selected")?.withRenderingMode(.alwaysOriginal)
+    nav.tabBarItem.image = UIImage(named: "tab-search").withRenderingMode(.alwaysOriginal)
+    nav.tabBarItem.selectedImage = UIImage(named: "tab-search-selected").withRenderingMode(.alwaysOriginal)
     return nav
 }
 
@@ -69,8 +69,8 @@ func newBookmarksRootViewController(client: GithubClient) -> UIViewController {
     controller.makeBackBarItemEmpty()
     controller.title = title
     let nav = UINavigationController(rootViewController: controller)
-    nav.tabBarItem.image = UIImage(named: "tab-bookmark")?.withRenderingMode(.alwaysOriginal)
-    nav.tabBarItem.selectedImage = UIImage(named: "tab-bookmark-selected")?.withRenderingMode(.alwaysOriginal)
+    nav.tabBarItem.image = UIImage(named: "tab-bookmark").withRenderingMode(.alwaysOriginal)
+    nav.tabBarItem.selectedImage = UIImage(named: "tab-bookmark-selected").withRenderingMode(.alwaysOriginal)
     nav.tabBarItem.title = title
     return nav
 }

Classes/Views/ButtonCell.swift

@@ -34,7 +34,7 @@ final class ButtonCell: SelectableCell {
             make.left.equalTo(Styles.Sizes.gutter)
         }
 
-        disclosureImageView.image = UIImage(named: "chevron-right")?.withRenderingMode(.alwaysTemplate)
+        disclosureImageView.image = UIImage(named: "chevron-right").withRenderingMode(.alwaysTemplate)
         disclosureImageView.tintColor = Styles.Colors.Gray.light.color
         contentView.addSubview(disclosureImageView)
         disclosureImageView.snp.makeConstraints { make in