Merge pull request #4 from ski-u/run-swiftformat

Run SwiftFormat
ski-u · Aug 19, 2024 · e00ceb8 · e00ceb8
2 parents 2a73671 + bf9c762
commit e00ceb8
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 69 deletions.
diff --git a/Features/Sources/APIClient/APIClient.swift b/Features/Sources/APIClient/APIClient.swift
@@ -5,7 +5,7 @@ import XCTestDynamicOverlay
 
 public struct APIClient: Sendable {
     public var apod: @Sendable () async throws -> AstronomyPicture
-    
+
     public init(
         apod: @escaping @Sendable () async throws -> AstronomyPicture
     ) {
@@ -19,28 +19,28 @@ extension APIClient: TestDependencyKey {
     )
 }
 
-extension DependencyValues {
-    public var apiClient: APIClient {
+public extension DependencyValues {
+    var apiClient: APIClient {
         get { self[APIClient.self] }
         set { self[APIClient.self] = newValue }
     }
 }
 
 extension APIClient: DependencyKey {
-    private(set) public static var apiKey: APIKey?
-    
+    public private(set) static var apiKey: APIKey?
+
     public static let liveValue = APIClient(
         apod: {
             var components = URLComponents(string: "https://api.nasa.gov/planetary/apod")!
             components.queryItems = [
                 URLQueryItem(name: "api_key", value: apiKey?.rawValue),
             ]
-            
+
             let (data, _) = try await URLSession.shared.data(from: components.url!)
             return try JSONDecoder().decode(AstronomyPicture.self, from: data)
         }
     )
-    
+
     public static func setAPIKey(_ key: APIKey) {
         apiKey = key
     }

diff --git a/Features/Sources/AppFeature/AppReducer.swift b/Features/Sources/AppFeature/AppReducer.swift
@@ -8,22 +8,22 @@ public struct AppReducer {
     public struct State: Equatable {
         var settings = Settings.State()
         var today = TodayReducer.State()
-        
+
         public init() {}
     }
-    
+
     public enum Action {
         case settings(Settings.Action)
         case today(TodayReducer.Action)
     }
-    
+
     public init() {}
-    
+
     public var body: some ReducerOf<Self> {
         Scope(state: \.settings, action: \.settings) {
             Settings()
         }
-        
+
         Scope(state: \.today, action: \.today) {
             TodayReducer()
         }

diff --git a/Features/Sources/AppFeature/AppView.swift b/Features/Sources/AppFeature/AppView.swift
@@ -5,11 +5,11 @@ import Today
 
 public struct AppView: View {
     var store: StoreOf<AppReducer>
-    
+
     public init(store: StoreOf<AppReducer>) {
         self.store = store
     }
-    
+
     public var body: some View {
         TabView {
             NavigationStack {
@@ -21,14 +21,14 @@ public struct AppView: View {
                     Text("Today")
                 }
             }
-            
+
             SettingsView(store: store.scope(state: \.settings, action: \.settings))
-            .tabItem {
-                VStack {
-                    Image(systemName: "gear")
-                    Text("Settings")
+                .tabItem {
+                    VStack {
+                        Image(systemName: "gear")
+                        Text("Settings")
+                    }
                 }
-            }
         }
     }
 }
diff --git a/Features/Sources/Models/APIKey.swift b/Features/Sources/Models/APIKey.swift
@@ -1,6 +1,6 @@
 public struct APIKey: RawRepresentable, Equatable {
     public var rawValue: String
-    
+
     public init(rawValue: String) {
         self.rawValue = rawValue
     }

diff --git a/Features/Sources/Models/AstronomyPicture.swift b/Features/Sources/Models/AstronomyPicture.swift
@@ -8,7 +8,7 @@ public struct AstronomyPicture: Decodable, Equatable, Sendable {
     public var mediaType: String
     public var title: String
     public var url: String
-    
+
     public init(
         copyright: String? = nil,
         date: String,

diff --git a/Features/Sources/Settings/APIKey/APIKeySetting.swift b/Features/Sources/Settings/APIKey/APIKeySetting.swift
@@ -7,32 +7,32 @@ public struct APIKeySetting {
     public struct State: Equatable {
         var apiKeyInput: APIKey
         var initialAPIKey: APIKey
-        
+
         var isEdited: Bool {
             apiKeyInput != initialAPIKey
         }
-        
+
         public init(
             apiKeyInput: APIKey = APIClient.apiKey ?? .init(rawValue: "")
         ) {
             self.apiKeyInput = apiKeyInput
             initialAPIKey = apiKeyInput
         }
     }
-    
+
     public enum Action: Equatable {
         case setAPIKeyInput(String)
         case updateButtonTapped
     }
-    
+
     public init() {}
-    
+
     public func reduce(into state: inout State, action: Action) -> Effect<Action> {
         switch action {
         case let .setAPIKeyInput(input):
             state.apiKeyInput = .init(rawValue: input)
             return .none
-            
+
         case .updateButtonTapped:
             // TODO: Persist API key
             APIClient.setAPIKey(state.apiKeyInput)

diff --git a/Features/Sources/Settings/APIKey/APIKeySettingView.swift b/Features/Sources/Settings/APIKey/APIKeySettingView.swift
@@ -4,12 +4,12 @@ import SwiftUI
 struct APIKeySettingView: View {
     let store: StoreOf<APIKeySetting>
     @ObservedObject private var viewStore: ViewStoreOf<APIKeySetting>
-    
+
     init(store: StoreOf<APIKeySetting>) {
         self.store = store
         viewStore = .init(store, observe: { $0 })
     }
-    
+
     var body: some View {
         List {
             Section(footer: link) {
@@ -34,7 +34,7 @@ struct APIKeySettingView: View {
             }
         }
     }
-    
+
     private var link: some View {
         VStack(alignment: .leading, spacing: 4) {
             Text("You can generate your API key on:")

diff --git a/Features/Sources/Settings/Settings/Settings.swift b/Features/Sources/Settings/Settings/Settings.swift
@@ -6,19 +6,19 @@ public struct Settings {
     public enum Path {
         case apiKeySetting(APIKeySetting)
     }
-    
+
     @ObservableState
     public struct State: Equatable {
         var path = StackState<Path.State>()
-        
+
         public init() {}
     }
-    
+
     public enum Action {
         case path(StackActionOf<Path>)
         case popToRoot
     }
-    
+
     public var body: some ReducerOf<Self> {
         Reduce { state, action in
             switch action {
@@ -27,18 +27,18 @@ public struct Settings {
                 case let .element(id: id, action: .apiKeySetting(.updateButtonTapped)):
                     state.path.pop(from: id)
                     return .none
-                    
+
                 default:
                     return .none
                 }
-                
+
             case .popToRoot:
                 state.path.removeAll()
                 return .none
             }
         }
         .forEach(\.path, action: \.path)
     }
-    
+
     public init() {}
 }
diff --git a/Features/Sources/Settings/Settings/SettingsView.swift b/Features/Sources/Settings/Settings/SettingsView.swift
@@ -4,11 +4,11 @@ import SwiftUI
 
 public struct SettingsView: View {
     @Bindable var store: StoreOf<Settings>
-    
+
     public init(store: StoreOf<Settings>) {
         self.store = store
     }
-    
+
     public var body: some View {
         NavigationStack(path: $store.scope(state: \.path, action: \.path)) {
             List {
@@ -28,14 +28,14 @@ public struct SettingsView: View {
                             .padding(.trailing, 8)
 
                         Text("API Key")
-                        
+
                         Spacer()
-                        
+
                         Text(APIClient.apiKey?.rawValue ?? "None")
                             .foregroundStyle(Color.secondary)
                     }
                 }
-                
+
                 NavigationLink {
                     LanguageView()
                 } label: {

diff --git a/Features/Sources/Today/TodayReducer.swift b/Features/Sources/Today/TodayReducer.swift
@@ -9,7 +9,7 @@ public struct TodayReducer {
         var error: TextState?
         var isLoading = false
         var picture: AstronomyPicture?
-        
+
         public init(
             error: TextState? = nil,
             isLoading: Bool = false,
@@ -20,18 +20,18 @@ public struct TodayReducer {
             self.picture = picture
         }
     }
-    
+
     public enum Action: Equatable {
         case fetch
         case response(TaskResult<AstronomyPicture>)
     }
-    
+
     public init() {}
-    
+
     @Dependency(\.apiClient) private var client
-    
+
     private enum CancelID { case fetch }
-    
+
     public func reduce(into state: inout State, action: Action) -> Effect<Action> {
         switch action {
         case .fetch:
@@ -48,12 +48,12 @@ public struct TodayReducer {
                 )
             }
             .cancellable(id: CancelID.fetch, cancelInFlight: true)
-            
+
         case let .response(.success(picture)):
             state.isLoading = false
             state.picture = picture
             return .none
-            
+
         case let .response(.failure(error)):
             state.error = .init(error.localizedDescription)
             state.isLoading = false

diff --git a/Features/Sources/Today/TodayView.swift b/Features/Sources/Today/TodayView.swift
@@ -4,9 +4,9 @@ import SwiftUI
 public struct TodayView: View {
     let store: StoreOf<TodayReducer>
     @ObservedObject private var viewStore: ViewStoreOf<TodayReducer>
-    
+
     @State private var isPresentedFullScreenImage = false
-    
+
     public init(store: StoreOf<TodayReducer>) {
         self.store = store
         viewStore = .init(store, observe: { $0 })
@@ -30,10 +30,10 @@ public struct TodayView: View {
         }
         .navigationTitle("Today")
     }
-    
+
     @ViewBuilder
     private var content: some View {
-        Section (
+        Section(
             header: Group {
                 if let picture = viewStore.picture {
                     switch picture.mediaTypeEnum {

diff --git a/Features/Sources/Today/WebView.swift b/Features/Sources/Today/WebView.swift
@@ -3,14 +3,14 @@ import WebKit
 
 struct WebView: UIViewRepresentable {
     let url: URL
-    
-    func makeUIView(context: Context) -> WKWebView {
+
+    func makeUIView(context _: Context) -> WKWebView {
         let webView = WKWebView()
         webView.load(URLRequest(url: url))
         return webView
     }
-    
-    func updateUIView(_ uiView: WKWebView, context: Context) {}
+
+    func updateUIView(_: WKWebView, context _: Context) {}
 }
 
 struct WebView_Previews: PreviewProvider {

diff --git a/Features/Tests/ModelsTests/ModelsTests.swift b/Features/Tests/ModelsTests/ModelsTests.swift
@@ -1,4 +1,4 @@
-import XCTest
 @testable import Models
+import XCTest
 
 final class ModelsTests: XCTestCase {}