Fix swiftlint warnings

pqrs-org · Nov 4, 2023 · 63581c7 · 63581c7
1 parent 5d17afa
commit 63581c7
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 68 deletions.
diff --git a/src/ShowyEdge/swift/AppDelegate.swift b/src/ShowyEdge/swift/AppDelegate.swift
@@ -51,19 +51,19 @@ public class AppDelegate: NSObject, NSApplicationDelegate {
 
     // ----------------------------------------
     let screens = NSScreen.screens
-    var firstScreenFrame = NSZeroRect
+    var firstScreenFrame = NSRect.zero
     if screens.count > 0 {
       firstScreenFrame = screens[0].frame
     }
 
     for (i, w) in windows.enumerated() {
-      var screenFrame = NSZeroRect
+      var screenFrame = NSRect.zero
       if i < screens.count {
         screenFrame = screens[i].frame
       }
 
       let menuOriginX = screenFrame.origin.x
-      let menuOriginY = firstScreenFrame.size.height - NSMaxY(screenFrame)
+      let menuOriginY = firstScreenFrame.size.height - screenFrame.maxY
 
       let isFullScreenSpace = !WorkspaceData.shared.menubarOrigins.contains(
         CGPoint(

diff --git a/src/ShowyEdge/swift/MenuController.swift b/src/ShowyEdge/swift/MenuController.swift
@@ -14,7 +14,7 @@ class MenuController: NSObject {
 
       let menu = NSMenu(title: "ShowyEdge")
 
-      let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as! String
+      let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") ?? ""
       menu.addItem(withTitle: "ShowyEdge \(version)", action: nil, keyEquivalent: "")
 
       menu.addItem(NSMenuItem.separator())

diff --git a/src/ShowyEdge/swift/Views/Settings/SettingsActionView.swift b/src/ShowyEdge/swift/Views/Settings/SettingsActionView.swift
@@ -6,21 +6,25 @@ struct SettingsActionView: View {
       GroupBox(label: Text("Action")) {
         VStack(alignment: .leading, spacing: 16) {
           HStack {
-            Button(action: {
-              Relauncher.relaunch()
-            }) {
-              Label("Restart ShowyEdge", systemImage: "arrow.clockwise")
-            }
+            Button(
+              action: {
+                Relauncher.relaunch()
+              },
+              label: {
+                Label("Restart ShowyEdge", systemImage: "arrow.clockwise")
+              })
 
             Spacer()
           }
 
           HStack {
-            Button(action: {
-              NSApplication.shared.terminate(self)
-            }) {
-              Label("Quit ShowyEdge", systemImage: "xmark.circle.fill")
-            }
+            Button(
+              action: {
+                NSApplication.shared.terminate(self)
+              },
+              label: {
+                Label("Quit ShowyEdge", systemImage: "xmark.circle.fill")
+              })
 
             Spacer()
           }

diff --git a/src/ShowyEdge/swift/Views/Settings/SettingsBasicView.swift b/src/ShowyEdge/swift/Views/Settings/SettingsBasicView.swift
@@ -58,13 +58,15 @@ struct SettingsBasicView: View {
 
                   Spacer()
 
-                  Button(action: {
-                    userSettings.removeCustomizedLanguageColor(
-                      languageColor.inputSourceID
-                    )
-                  }) {
-                    Label("Delete", systemImage: "xmark")
-                  }
+                  Button(
+                    action: {
+                      userSettings.removeCustomizedLanguageColor(
+                        languageColor.inputSourceID
+                      )
+                    },
+                    label: {
+                      Label("Delete", systemImage: "xmark")
+                    })
                 }
 
                 HStack(spacing: 0) {
@@ -99,11 +101,15 @@ struct SettingsBasicView: View {
             }
           }
 
-          Button(action: {
-            userSettings.appendCustomizedLanguageColor(workspaceData.currentInputSourceID)
-          }) {
-            Label("Add custom color of \(workspaceData.currentInputSourceID)", systemImage: "plus")
-          }.disabled(
+          Button(
+            action: {
+              userSettings.appendCustomizedLanguageColor(workspaceData.currentInputSourceID)
+            },
+            label: {
+              Label(
+                "Add custom color of \(workspaceData.currentInputSourceID)", systemImage: "plus")
+            }
+          ).disabled(
             userSettings.customizedLanguageColor(inputSourceID: workspaceData.currentInputSourceID)
               != nil
           )

diff --git a/src/ShowyEdge/swift/Views/Settings/SettingsUpdateView.swift b/src/ShowyEdge/swift/Views/Settings/SettingsUpdateView.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 
 struct SettingsUpdateView: View {
-  let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as! String
+  let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") ?? ""
 
   var body: some View {
     VStack(alignment: .leading, spacing: 25.0) {
@@ -21,14 +21,18 @@ struct SettingsUpdateView: View {
 
       GroupBox(label: Text("Websites")) {
         HStack(spacing: 20.0) {
-          Button(action: { NSWorkspace.shared.open(URL(string: "https://showyedge.pqrs.org")!) }) {
-            Label("Open official website", systemImage: "house")
-          }
-          Button(action: {
-            NSWorkspace.shared.open(URL(string: "https://github.com/pqrs-org/ShowyEdge")!)
-          }) {
-            Label("Open GitHub (source code)", systemImage: "network")
-          }
+          Button(
+            action: { NSWorkspace.shared.open(URL(string: "https://showyedge.pqrs.org")!) },
+            label: {
+              Label("Open official website", systemImage: "house")
+            })
+          Button(
+            action: {
+              NSWorkspace.shared.open(URL(string: "https://github.com/pqrs-org/ShowyEdge")!)
+            },
+            label: {
+              Label("Open GitHub (source code)", systemImage: "network")
+            })
           Spacer()
         }.padding()
       }
@@ -43,9 +47,12 @@ struct SettingsUpdateView: View {
     @ObservedObject private var updater = Updater.shared
 
     var body: some View {
-      Button(action: { updater.checkForUpdatesStableOnly() }) {
-        Label("Check for updates...", systemImage: "star")
-      }
+      Button(
+        action: { updater.checkForUpdatesStableOnly() },
+        label: {
+          Label("Check for updates...", systemImage: "star")
+        }
+      )
       .disabled(!updater.canCheckForUpdates)
     }
   }
@@ -56,9 +63,12 @@ struct SettingsUpdateView: View {
     @ObservedObject private var updater = Updater.shared
 
     var body: some View {
-      Button(action: { updater.checkForUpdatesWithBetaVersion() }) {
-        Label("Check for beta updates...", systemImage: "star.circle")
-      }
+      Button(
+        action: { updater.checkForUpdatesWithBetaVersion() },
+        label: {
+          Label("Check for beta updates...", systemImage: "star.circle")
+        }
+      )
       .disabled(!updater.canCheckForUpdates)
     }
   }

diff --git a/src/ShowyEdge/swift/Views/SettingsView.swift b/src/ShowyEdge/swift/Views/SettingsView.swift
@@ -11,51 +11,64 @@ enum NavigationTag: String {
 struct SettingsView: View {
   @State private var selection: NavigationTag = NavigationTag.basic
 
-  let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as! String
-
   var body: some View {
     VStack {
       HStack {
         VStack(alignment: .leading, spacing: 0) {
           Group {
-            Button(action: {
-              selection = .basic
-            }) {
-              SidebarLabelView(text: "Basic", systemImage: "gearshape")
-            }
+            Button(
+              action: {
+                selection = .basic
+              },
+              label: {
+                SidebarLabelView(text: "Basic", systemImage: "gearshape")
+              }
+            )
             .sidebarButtonStyle(selected: selection == .basic)
 
-            Button(action: {
-              selection = .indicator
-            }) {
-              SidebarLabelView(text: "Indicator", systemImage: "wrench")
-            }
+            Button(
+              action: {
+                selection = .indicator
+              },
+              label: {
+                SidebarLabelView(text: "Indicator", systemImage: "wrench")
+              }
+            )
             .sidebarButtonStyle(selected: selection == .indicator)
 
-            Button(action: {
-              selection = .customFrame
-            }) {
-              SidebarLabelView(text: "Custom Frame", systemImage: "hammer")
-            }
+            Button(
+              action: {
+                selection = .customFrame
+              },
+              label: {
+                SidebarLabelView(text: "Custom Frame", systemImage: "hammer")
+              }
+            )
             .sidebarButtonStyle(selected: selection == .customFrame)
 
-            Button(action: {
-              selection = .update
-            }) {
-              SidebarLabelView(text: "Update", systemImage: "network")
-            }
+            Button(
+              action: {
+                selection = .update
+              },
+              label: {
+                SidebarLabelView(text: "Update", systemImage: "network")
+              }
+            )
             .sidebarButtonStyle(selected: selection == .update)
           }
 
           Divider()
             .padding(.vertical, 10.0)
 
           Group {
-            Button(action: {
-              selection = .action
-            }) {
-              SidebarLabelView(text: "Quit, Restart", systemImage: "bolt.circle")
-            }
+            Button(
+              action: {
+                selection = .action
+              },
+              label: {
+                SidebarLabelView(text: "Quit, Restart", systemImage: "bolt.circle")
+              }
+            )
             .sidebarButtonStyle(selected: selection == .action)
           }