Fixed all SwiftLint violations

Author: ccrama

.github/workflows/core_data_tests.yml

@@ -41,11 +41,10 @@ jobs:
         run: |
           sh ./bootstrap.sh
           pod install
-      #Disable for now, too many swift lint items :/
-      #- name: Run code validation 
-        #run: bundle exec danger
-        #env: 
-        #  DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_TOKEN }}
+      - name: Run code validation
+        run: bundle exec danger
+        env:
+          DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_TOKEN }}
       - name: Run tests
         run: bundle exec fastlane scan
     env:

CoreData_Models/CommentModel+CoreDataProperties.swift

@@ -7,8 +7,8 @@
 //
 //
 
-import Foundation
 import CoreData
+import Foundation
 
 extension CommentModel {
 

CoreData_Models/SubmissionComments+CoreDataProperties.swift

@@ -7,8 +7,8 @@
 //
 //
 
-import Foundation
 import CoreData
+import Foundation
 
 extension SubmissionComments {
 

CoreData_Models/SubmissionModel+CoreDataClass.swift

@@ -7,8 +7,8 @@
 //
 //
 
-import Foundation
 import CoreData
+import Foundation
 
 @objc(SubmissionModel)
 public class SubmissionModel: NSManagedObject {

CoreData_Models/SubredditPosts+CoreDataClass.swift

@@ -7,8 +7,8 @@
 //
 //
 
-import Foundation
 import CoreData
+import Foundation
 
 @objc(SubredditPosts)
 public class SubredditPosts: NSManagedObject {

Slide for Reddit/Onboarding2/OnboardingViewController.swift

@@ -13,18 +13,13 @@ import UIKit
 class OnboardingViewController: UIViewController {
 
      let models: [OnboardingPageViewModel] = [
-        .splash(text: "Welcome to\nSlide v6", subText: "Swipe to see what's new", image: UIImage(named: "ic_retroapple")!),
-        .video(text: "Subreddits have a new home!", subText: "Swipe from the left edge of the homepage to access your profile, search, and communities.", video: "v6howtonavigate", aspectRatio: 0.679),
-        .hardcodedChangelog(order: ["Subreddits have a new home",
-                                    "iOS 14 ready", "Your subreddits have a new look",
-                                    "The details",
-        ],
-                            paragraphs: [
-                                "Subreddits have a new home": "Navigating your subreddits and favorite Slide features has never been easier! Simply swipe from the left edge of the homepage to view the new-and-improved navigation menu. \nClosed something by accident? Swipe from the right edge of any toolbar to go back to where you were!",
-                                "iOS 14 ready": "Cover your homescreen in widgets yet? We sure have. Be sure to check out the new Subreddit Shortcut and Hot Posts widgets!",
-                                "Your subreddits have a new look": "Subreddit colors and branding really come through in v6. Slide has already pulled themes from your favorite communities, but you can create your own styles using the improved Subreddit theme editor.",
-                                "The details": "• Search improvements across the board, including more accurate subreddit search results and quick previews of top search results when browsing posts\n• Gestures have been revamped, with a new style on submissions and improvements to the Gestures settings page\n• Pin your most-used Slide features to the navigation menu\n• Improved r/random support with a new navigation menu button\n• Media views will now show the title of the post you clicked from\n• New sorting indicators on the homepage and comments views\n• Added a History browser\n• Subreddit support for Siri Shortcuts\n• Redesigned split-page layout for iPad\n• Redesigned gestures system\n• Support for Reddit Galleries and Polls\n• Support for iPad Magic Keyboard\n• Pull-to-refresh is easier to do now\n• Reduced Slide’s memory usage by up to 70%\n• Bugs were squashed, performance was improved\n• Removed many bags of coffee (from my kitchen)",
-                            ])
+        //TODO this for 6.1
+        .splash(text: "Welcome to\nSlide v6.1", subText: "Swipe to see what's new", image: UIImage(named: "ic_retroapple")!),
+        .hardcodedChangelog(order: [
+                                "AutoCache, Revamped",
+                            ], paragraphs: [
+                                "AutoCache, Revamped": "Something here",
+                            ]),
     ]
 
     var pageViewController: OnboardingPageViewController!

Slide for Reddit/SplitMainViewController.swift

@@ -11,11 +11,11 @@ import Anchorage
 import AudioToolbox
 import BadgeSwift
 import MaterialComponents.MDCActivityIndicator
-import SDWebImage
-import SwiftyJSON
 import reddift
 import SDCAlertView
+import SDWebImage
 import StoreKit
+import SwiftyJSON
 import UIKit
 import WatchConnectivity
 #if canImport(WidgetKit)
@@ -443,7 +443,7 @@ class SplitMainViewController: MainViewController {
                 keyWindow = UIApplication.shared.connectedScenes
                     .filter({ $0.activationState == .foregroundActive })
                     .map({ $0 as? UIWindowScene })
-                    .compactMap({$0})
+                    .compactMap({ $0 })
                     .first?.windows
                     .filter({ $0.isKeyWindow }).first
             }
@@ -490,7 +490,7 @@ class SplitMainViewController: MainViewController {
                 keyWindow = UIApplication.shared.connectedScenes
                     .filter({ $0.activationState == .foregroundActive })
                     .map({ $0 as? UIWindowScene })
-                    .compactMap({$0})
+                    .compactMap({ $0 })
                     .first?.windows
                     .filter({ $0.isKeyWindow }).first
             }

Slide for Reddit/WebsiteViewController.swift

@@ -23,7 +23,8 @@ class WebsiteViewController: MediaViewController, WKNavigationDelegate {
     var needsReload = false
     var completionFound = false
     var csrfToken = ""
-    
+    var progressObservation: NSKeyValueObservation?
+
     var savedChallengeURL: String? //Used for login with Apple
     public var reloadCallback: (() -> Void)?
 
@@ -245,17 +246,13 @@ class WebsiteViewController: MediaViewController, WKNavigationDelegate {
     var setObserver = false
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        webView.addObserver(self, forKeyPath: #keyPath(WKWebView.estimatedProgress), options: .new, context: nil)
-        setObserver = true
-    }
-    
-    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
-        if keyPath == "estimatedProgress" {
-            myProgressView.progress = Float(webView.estimatedProgress)
+        
+        progressObservation = webView.observe(\.estimatedProgress, options: .new, changeHandler: { (webView, _) in
+            self.myProgressView.progress = Float(webView.estimatedProgress)
             if webView.estimatedProgress > 0.98 {
-                myProgressView.isHidden = true
-                if needsReload { //Show a loader and wait for NSURLSession cache to sync Cookies. 3 seconds worked for me, but there is no event handler for this
-                    needsReload = false
+                self.myProgressView.isHidden = true
+                if self.needsReload { //Show a loader and wait for NSURLSession cache to sync Cookies. 3 seconds worked for me, but there is no event handler for this
+                    self.needsReload = false
                     webView.alpha = 0
                     webView.superview?.backgroundColor = ColorUtil.theme.backgroundColor
                     let pending = UIAlertController(title: "Syncing with Reddit...", message: nil, preferredStyle: .alert)
@@ -269,7 +266,7 @@ class WebsiteViewController: MediaViewController, WKNavigationDelegate {
 
                     self.present(pending, animated: true, completion: nil)
 
-                    checkCookiesUntilCompletion {
+                    self.checkCookiesUntilCompletion {
                         self.completionFound = true
 
                         self.webView.reload()
@@ -278,9 +275,10 @@ class WebsiteViewController: MediaViewController, WKNavigationDelegate {
                     }
                 }
             } else {
-                myProgressView.isHidden = false
+                self.myProgressView.isHidden = false
             }
-        }
+        })
+        setObserver = true
     }
 
     func checkCookiesUntilCompletion(tries: Int = 0, _ completion: @escaping () -> Void) {