Merge branch 'lint_format'

sgr-ksmt · Sep 29, 2019 · e8e46bc · e8e46bc
2 parents 441d400 + 712f456
commit e8e46bc
Show file tree

Hide file tree

Showing 29 changed files with 171 additions and 71 deletions.
diff --git a/.swiftformat b/.swiftformat
@@ -0,0 +1,9 @@
+
+# exclude files
+--exclude Carthage,Pods
+
+# change rules
+--stripunusedargs closure-only
+
+# disable rules
+--disable strongOutlets,numberFormatting,emptyBraces,andOperator
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -0,0 +1,41 @@
+disabled_rules:
+  - colon
+  - comma
+  - control_statement
+  - identifier_name
+  - type_name
+  - trailing_comma
+  - multiple_closures_with_trailing_closure
+  - opening_brace
+
+opt_in_rules:
+  - empty_count
+  - sorted_imports
+  - anyobject_protocol
+
+excluded:
+  - Carthage
+  - Pods
+  - vendor/bundle
+
+force_cast: error
+
+force_try:
+  severity: error
+
+type_body_length:
+  - 300
+  - 400
+
+function_body_length:
+  - 200
+  - 300
+
+file_length:
+  - 500
+  - 1000
+
+line_length: 200
+
+nesting:
+  type_level: 3
diff --git a/FireTodo.xcodeproj/project.pbxproj b/FireTodo.xcodeproj/project.pbxproj
@@ -349,6 +349,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 160702982337231400A57BE8 /* Build configuration list for PBXNativeTarget "FireTodo" */;
 			buildPhases = (
+				166451F82340FE0400E0E7AB /* SwiftLint */,
 				678E1EE18A824791FD50167E /* [CP] Check Pods Manifest.lock */,
 				160702802337231300A57BE8 /* Sources */,
 				160702812337231300A57BE8 /* Frameworks */,
@@ -412,6 +413,24 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		166451F82340FE0400E0E7AB /* SwiftLint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = SwiftLint;
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "${SRCROOT}/Pods/SwiftLint/swiftlint\n";
+		};
 		6332EE6E8916A88AE530C93A /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/FireTodo/AppDelegate.swift b/FireTodo/AppDelegate.swift
@@ -2,8 +2,8 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
-import UIKit
 import Firebase
+import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -19,4 +19,3 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
     }
 }
-
diff --git a/FireTodo/Combine/Auth+Combine.swift b/FireTodo/Combine/Auth+Combine.swift
@@ -26,7 +26,7 @@ extension CombineAuth {
             let listener = addListener(auth) { auth, user in
                 _ = subscriber.receive((auth, user))
             }
-            self._cancel = { removeListener($0, listener) }
+            _cancel = { removeListener($0, listener) }
         }
 
         public func request(_ demand: Subscribers.Demand) {}
@@ -53,7 +53,7 @@ extension CombineAuth {
             self.removeListener = removeListener
         }
 
-        public func receive<S>(subscriber: S) where S : Subscriber, S.Failure == Failure, S.Input == Output {
+        public func receive<S>(subscriber: S) where S: Subscriber, S.Failure == Failure, S.Input == Output {
             subscriber.receive(subscription: Subscription(
                 subscriber: subscriber,
                 auth: auth,

diff --git a/FireTodo/ContentView.swift b/FireTodo/ContentView.swift
@@ -2,8 +2,8 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
-import SwiftUI
 import Combine
+import SwiftUI
 
 struct ContentView: View {
     @EnvironmentObject private var store: AppStore
@@ -19,11 +19,9 @@ struct ContentView: View {
                     return AnyView(SignUpView())
                 }
             }
-        }())
-        .onAppear { self.store.dispatch(AuthAction.subscribe()) }
-        .onDisappear {
-            self.store.dispatch(AuthAction.subscribe())
-        }
+            }())
+            .onAppear { self.store.dispatch(AuthAction.subscribe()) }
+            .onDisappear { self.store.dispatch(AuthAction.subscribe()) }
     }
 }
 

diff --git a/FireTodo/Firebase/Model.swift b/FireTodo/Firebase/Model.swift
@@ -2,8 +2,8 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
-import Foundation
 import FireSnapshot
+import Foundation
 
 /// Name space for Cloud Firestore document models.
 enum Model {

diff --git a/FireTodo/Firebase/Snapshot+Identifiable.swift b/FireTodo/Firebase/Snapshot+Identifiable.swift
@@ -2,8 +2,8 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
-import Foundation
 import FireSnapshot
+import Foundation
 
 extension Snapshot: Identifiable {
     public var id: String {

diff --git a/FireTodo/Redux/Auth/AuthAction.swift b/FireTodo/Redux/Auth/AuthAction.swift
@@ -2,12 +2,12 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
+import Combine
+import Firebase
+import FireSnapshot
 import Foundation
 import ReSwift
 import ReSwiftThunk
-import Firebase
-import FireSnapshot
-import Combine
 
 enum AuthAction: Action {
     case finishInitialLoad
@@ -36,8 +36,8 @@ enum AuthAction: Action {
                         finishInitialLoad()
                         return AuthAction.updateUser(user: nil)
                     }
-            }
-            .sink(receiveValue: dispatch)
+                }
+                .sink(receiveValue: dispatch)
 
             dispatch(AuthAction.subscribeAuthChange(cancellable: cancellable))
         }

diff --git a/FireTodo/Redux/Auth/AuthState.swift b/FireTodo/Redux/Auth/AuthState.swift
@@ -2,17 +2,18 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
-import Foundation
-import ReSwift
+import Combine
 import Firebase
 import FireSnapshot
-import Combine
+import Foundation
+import ReSwift
 
 struct AuthState: StateType {
     enum LoadingState {
         case initial
         case loaded
     }
+
     var loadingState: LoadingState = .initial
     var user: Snapshot<Model.User>?
     var listenerHandle: AuthStateDidChangeListenerHandle?

diff --git a/FireTodo/Redux/EditTask/EditTaskAction.swift b/FireTodo/Redux/EditTask/EditTaskAction.swift
@@ -2,9 +2,9 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
+import FireSnapshot
 import Foundation
 import ReSwift
-import FireSnapshot
 
 enum EditTaskAction: Action {
     case startRequest
@@ -13,7 +13,7 @@ enum EditTaskAction: Action {
     case reset
 
     static func saveTask(_ taskData: Model.Task, userID: String) -> AppThunkAction {
-        AppThunkAction { dispatch, getState in
+        AppThunkAction { dispatch, _ in
             dispatch(EditTaskAction.startRequest)
             Snapshot(data: taskData, path: Model.Path.tasks(userID: userID)).create { result in
                 dispatch(EditTaskAction.endRequest)
@@ -28,7 +28,7 @@ enum EditTaskAction: Action {
     }
 
     static func updateTask(_ taskData: Model.Task, taskID: String, userID: String) -> AppThunkAction {
-        AppThunkAction { dispatch, getState in
+        AppThunkAction { dispatch, _ in
             dispatch(EditTaskAction.startRequest)
             Snapshot(data: taskData, path: Model.Path.task(userID: userID, taskID: taskID)).update { result in
                 dispatch(EditTaskAction.endRequest)

diff --git a/FireTodo/Redux/Main/AppStore.swift b/FireTodo/Redux/Main/AppStore.swift
@@ -2,9 +2,9 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
+import Combine
 import Foundation
 import ReSwift
-import Combine
 
 final class AppStore: StoreSubscriber, DispatchingStoreType, ObservableObject {
     private let store: Store<AppState>

diff --git a/FireTodo/Redux/Middleware/Logging/LoggingMiddleware.swift b/FireTodo/Redux/Middleware/Logging/LoggingMiddleware.swift
@@ -6,7 +6,7 @@ import Foundation
 import ReSwift
 
 func createLoggingMiddleware() -> Middleware<AppState> {
-    return { dispatch, getState in
+    return { _, _ in
         { next in
             { action in
                 print(">  \(action)")

diff --git a/FireTodo/Redux/SignUp/SignUpAction.swift b/FireTodo/Redux/SignUp/SignUpAction.swift
@@ -2,11 +2,11 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
+import Firebase
+import FireSnapshot
 import Foundation
 import ReSwift
 import ReSwiftThunk
-import Firebase
-import FireSnapshot
 
 enum SignUpAction: Action {
     case signUpStarted
@@ -31,7 +31,7 @@ enum SignUpAction: Action {
     }
 
     private static func createUser(with uid: String, name: String, db: Firestore = .firestore()) -> AppThunkAction {
-        AppThunkAction { dispatch, getState in
+        AppThunkAction { dispatch, _ in
             let user = Model.User(username: name)
             Snapshot<Model.User>.init(data: user, path: Model.Path.user(userID: uid)).create { result in
                 switch result {

diff --git a/FireTodo/Redux/Tasks/TasksAction.swift b/FireTodo/Redux/Tasks/TasksAction.swift
@@ -2,18 +2,18 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
-import Foundation
-import ReSwift
 import Firebase
 import FireSnapshot
+import Foundation
+import ReSwift
 
 enum TasksAction: Action {
     case updateTasks(tasks: [Snapshot<Model.Task>])
     case registerListener(listener: ListenerRegistration)
     case removeListener
 
     static func subscribe(userID: String) -> AppThunkAction {
-        AppThunkAction { dispatch, getState in
+        AppThunkAction { dispatch, _ in
             let listener = Snapshot<Model.Task>.listen(Model.Path.tasks(userID: userID)) { result in
                 switch result {
                 case let .success(tasks):
@@ -36,13 +36,13 @@ enum TasksAction: Action {
     }
 
     static func deleteTask(_ task: Snapshot<Model.Task>) -> AppThunkAction {
-        AppThunkAction { dispatch, getState in
+        AppThunkAction { _, _ in
             task.remove()
         }
     }
 
     static func toggleTaskCompleted(_ task: Snapshot<Model.Task>) -> AppThunkAction {
-        AppThunkAction { dispatch, getState in
+        AppThunkAction { _, _ in
             task.data.completed.toggle()
             task.update()
         }

diff --git a/FireTodo/Redux/Tasks/TasksReducer.swift b/FireTodo/Redux/Tasks/TasksReducer.swift
@@ -15,7 +15,7 @@ enum TasksReducer {
                 case let .updateTasks(tasks):
                     state.tasks = tasks
                     return state
-                case .registerListener(let listener):
+                case let .registerListener(listener):
                     state.tasksListener = listener
                     return state
                 case .removeListener:

diff --git a/FireTodo/Redux/Tasks/TasksState.swift b/FireTodo/Redux/Tasks/TasksState.swift
@@ -2,10 +2,10 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
-import Foundation
-import ReSwift
 import Firebase
 import FireSnapshot
+import Foundation
+import ReSwift
 
 struct TasksState: StateType {
     var tasks: [Snapshot<Model.Task>] = []

diff --git a/FireTodo/SceneDelegate.swift b/FireTodo/SceneDelegate.swift
@@ -2,12 +2,11 @@
 // Copyright © Suguru Kishimoto. All rights reserved.
 //
 
-import UIKit
-import SwiftUI
 import ReSwift
+import SwiftUI
+import UIKit
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
-
     var window: UIWindow?
     private lazy var main: AppMain = .init()
 
@@ -37,4 +36,3 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     func sceneDidEnterBackground(_ scene: UIScene) {
     }
 }
-
diff --git a/FireTodo/Views/Common/LoadingView.swift b/FireTodo/Views/Common/LoadingView.swift
@@ -9,6 +9,7 @@ struct LoadingView: View {
     init(isLoading: Bool) {
         self.isLoading = isLoading
     }
+
     var body: some View {
         ZStack {
             if isLoading {
@@ -25,8 +26,10 @@ struct LoadingView: View {
     }
 }
 
+#if DEBUG
 struct LoadingView_Previews: PreviewProvider {
     static var previews: some View {
         LoadingView(isLoading: true)
     }
 }
+#endif