Address issues found by Periphery

p0deje · Sep 14, 2024 · e056650 · e056650
1 parent 28fd68c
commit e056650
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 61 deletions.
diff --git a/.periphery.yml b/.periphery.yml
@@ -0,0 +1,6 @@
+project: Maccy.xcodeproj
+retain_objc_accessible: true
+schemes:
+- Maccy
+targets:
+- Maccy
diff --git a/Maccy/Clipboard.swift b/Maccy/Clipboard.swift
@@ -29,7 +29,6 @@ class Clipboard {
     .concealed,
     .transient
   ]
-  private let modifiedTypes: Set<NSPasteboard.PasteboardType> = [.modified]
 
   private var enabledTypes: Set<NSPasteboard.PasteboardType> { Defaults[.enabledPasteboardTypes] }
   private var disabledTypes: Set<NSPasteboard.PasteboardType> { supportedTypes.subtracting(enabledTypes) }

diff --git a/Maccy/Extensions/NSApplication+Windows.swift b/Maccy/Extensions/NSApplication+Windows.swift
@@ -3,12 +3,4 @@ import AppKit
 extension NSApplication {
   var alertWindow: NSWindow? { windows.first { $0.className == "_NSAlertPanel" } }
   var characterPickerWindow: NSWindow? { windows.first { $0.className == "NSPanelViewBridge" } }
-  var menuWindow: NSWindow? {
-    windows.first { window in
-      window.className == "NSPopupMenuWindow" // macOS 14 and later
-        || window.className == "NSMenuWindowManagerWindow" // macOS 13 - 14
-        || window.className == "NSCarbonMenuWindow" // macOS 12 and earlier
-    }
-  }
-  var statusBarWindow: NSWindow? { windows.first { $0.className == "NSStatusBarWindow" } }
 }
diff --git a/Maccy/KeyChord.swift b/Maccy/KeyChord.swift
@@ -29,7 +29,6 @@ enum KeyChord: CaseIterable {
   case moveToPrevious
   case moveToFirst
   case openPreferences
-  case paste
   case pinOrUnpin
   case selectCurrentItem
   case close
@@ -80,42 +79,4 @@ enum KeyChord: CaseIterable {
     }
   }
   // swiftlint:enable cyclomatic_complexity
-
-  static let keysToSkip = [
-    Key.home,
-    Key.pageUp,
-    Key.pageDown,
-    Key.end,
-    Key.downArrow,
-    Key.leftArrow,
-    Key.rightArrow,
-    Key.upArrow,
-    Key.tab,
-    Key.f1,
-    Key.f2,
-    Key.f3,
-    Key.f4,
-    Key.f5,
-    Key.f6,
-    Key.f7,
-    Key.f8,
-    Key.f9,
-    Key.f10,
-    Key.f11,
-    Key.f12,
-    Key.f13,
-    Key.f14,
-    Key.f15,
-    Key.f16,
-    Key.f17,
-    Key.f18,
-    Key.f19,
-    Key.eisu,
-    Key.kana
-  ]
-  private static let modifiersToSkip = NSEvent.ModifierFlags([
-    .command,
-    .control,
-    .option
-  ])
 }
diff --git a/Maccy/Settings/AppearanceSettingsPane.swift b/Maccy/Settings/AppearanceSettingsPane.swift
@@ -116,7 +116,7 @@ struct AppearanceSettingsPane: View {
 
       Settings.Section(label: { Text("NumberOfItems", tableName: "AppearanceSettings") }) {
         HStack {
-          TextField("", value: $numberOfItems, formatter: imageHeightFormatter)
+          TextField("", value: $numberOfItems, formatter: numberOfItemsFormatter)
             .frame(width: 120)
             .help(Text("NumberOfItemsTooltip", tableName: "AppearanceSettings"))
           Stepper("", value: $numberOfItems, in: 0...100)

diff --git a/Maccy/Settings/GeneralSettingsPane.swift b/Maccy/Settings/GeneralSettingsPane.swift
@@ -56,7 +56,9 @@ struct GeneralSettingsPane: View {
           ForEach(Search.Mode.allCases) { mode in
             Text(mode.description)
           }
-        }.labelsHidden().frame(width: 180)
+        }
+        .labelsHidden()
+        .frame(width: 180)
       }
 
       Settings.Section(
@@ -65,15 +67,23 @@ struct GeneralSettingsPane: View {
       ) {
         Defaults.Toggle(key: .pasteByDefault) {
           Text("PasteAutomatically", tableName: "GeneralSettings")
-        }.onChange(refreshModifiers).fixedSize()
+        }
+        .onChange(refreshModifiers)
+        .fixedSize()
+
         Defaults.Toggle(key: .removeFormattingByDefault) {
           Text("PasteWithoutFormatting", tableName: "GeneralSettings")
-        }.onChange(refreshModifiers).fixedSize()
+        }
+        .onChange(refreshModifiers)
+        .fixedSize()
 
         Text(String(
           format: NSLocalizedString("Modifiers", tableName: "GeneralSettings", comment: ""),
           copyModifier, pasteModifier, pasteWithoutFormatting
-        )).fixedSize(horizontal: false, vertical: true).foregroundStyle(.gray).controlSize(.small)
+        ))
+        .fixedSize(horizontal: false, vertical: true)
+        .foregroundStyle(.gray)
+        .controlSize(.small)
       }
 
       Settings.Section(title: "") {

diff --git a/Maccy/Views/FooterItemView.swift b/Maccy/Views/FooterItemView.swift
@@ -3,9 +3,6 @@ import SwiftUI
 struct FooterItemView: View {
   @Bindable var item: FooterItem
 
-  @Environment(AppState.self) private var appState
-  @Environment(ModifierFlags.self) private var modifierFlags
-
   var body: some View {
     ConfirmationView(item: item) {
       ListItemView(id: item.id, shortcuts: item.shortcuts, isSelected: item.isSelected) {

diff --git a/Maccy/Views/KeyboardShortcutView.swift b/Maccy/Views/KeyboardShortcutView.swift
@@ -1,8 +1,6 @@
 import SwiftUI
 
 struct KeyboardShortcutView: View {
-  @Environment(ModifierFlags.self) private var modifierFlags
-
   var shortcut: KeyShortcut?
 
   var modifiers: String {
@@ -12,6 +10,7 @@ struct KeyboardShortcutView: View {
     }
     return ""
   }
+
   var character: String {
     return shortcut?.description.last?.description ?? ""
   }

diff --git a/Maccy/Views/ListItemTitleView.swift b/Maccy/Views/ListItemTitleView.swift
@@ -2,7 +2,6 @@ import SwiftUI
 
 struct ListItemTitleView<Title: View>: View {
   var attributedTitle: AttributedString? = nil
-  var isSelected: Bool
   @ViewBuilder var title: () -> Title
 
   var body: some View {

diff --git a/Maccy/Views/ListItemView.swift b/Maccy/Views/ListItemView.swift
@@ -12,7 +12,6 @@ struct ListItemView<Title: View>: View {
 
   @Environment(AppState.self) private var appState
   @Environment(ModifierFlags.self) private var modifierFlags
-  @Default(.imageMaxHeight) private var imageMaxHeight
 
   var body: some View {
     HStack(spacing: 0) {
@@ -21,7 +20,7 @@ struct ListItemView<Title: View>: View {
           .padding(.leading, 10)
           .padding(.vertical, 5)
       }
-      ListItemTitleView(attributedTitle: attributedTitle, isSelected: isSelected, title: title)
+      ListItemTitleView(attributedTitle: attributedTitle, title: title)
       Spacer()
       if !shortcuts.isEmpty {
         ZStack {