chore: address low-priority cleanup items

datlechin · datlechin · commit f5eb34852043 · 2026-03-21T18:38:10.000+07:00
- Replace deprecated .cornerRadius() with .clipShape(RoundedRectangle()) in 8 files - Remove dead nonisolated deinit from AppDelegate - Replace DispatchQueue.main.async with Task in @mainactor SQLEditorCoordinator - Add @mainactor to UserDefaults+RecentDatabases.trackDatabaseAccess - Add Logger warning on invalid hex color fallback in Color+Hex - Document AppLanguage.apply() side effect - Use ThemeEngine typography in ConnectionSwitcherPopover (replace hardcoded sizes)
diff --git a/TablePro/AppDelegate.swift b/TablePro/AppDelegate.swift
@@ -118,8 +118,4 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     func applicationWillTerminate(_ notification: Notification) {
         SSHTunnelManager.shared.terminateAllProcessesSync()
     }
-
-    nonisolated deinit {
-        NotificationCenter.default.removeObserver(self)
-    }
 }
diff --git a/TablePro/Extensions/Color+Hex.swift b/TablePro/Extensions/Color+Hex.swift
@@ -3,15 +3,19 @@
 //  TablePro
 //
 
+import os
 import SwiftUI
 
 extension Color {
+    private static let logger = Logger(subsystem: "com.TablePro", category: "Color+Hex")
+
     init(hex: String) {
         let cleaned = hex
             .trimmingCharacters(in: .whitespacesAndNewlines)
             .trimmingCharacters(in: CharacterSet(charactersIn: "#"))
 
         guard cleaned.count == 6, let rgbValue = UInt64(cleaned, radix: 16) else {
+            Self.logger.warning("Invalid hex color: \(hex)")
             self = .gray
             return
         }
diff --git a/TablePro/Extensions/UserDefaults+RecentDatabases.swift b/TablePro/Extensions/UserDefaults+RecentDatabases.swift
@@ -25,7 +25,7 @@ extension UserDefaults {
     /// - Parameters:
     ///   - database: Database name to track
     ///   - connectionId: The connection UUID
-    func trackDatabaseAccess(_ database: String, for connectionId: UUID) {
+    @MainActor func trackDatabaseAccess(_ database: String, for connectionId: UUID) {
         var dict = (dictionary(forKey: Self.recentDatabasesKey) as? [String: [String]]) ?? [:]
         var recent = dict[connectionId.uuidString] ?? []
 
diff --git a/TablePro/Models/Settings/AppSettings.swift b/TablePro/Models/Settings/AppSettings.swift
@@ -46,6 +46,7 @@ enum AppLanguage: String, Codable, CaseIterable, Identifiable {
         }
     }
 
+    // Side effect: sets UserDefaults AppleLanguages. Consider moving to AppSettingsManager.
     func apply() {
         if self == .system {
             UserDefaults.standard.removeObject(forKey: "AppleLanguages")
diff --git a/TablePro/Views/Components/SectionHeaderView.swift b/TablePro/Views/Components/SectionHeaderView.swift
@@ -81,7 +81,7 @@ struct SectionHeaderView<Actions: View>: View {
                 ThemeEngine.shared.colors.ui.controlBackgroundSwiftUI.opacity(0.5) :
                 Color.clear
         )
-        .cornerRadius(ThemeEngine.shared.activeTheme.cornerRadius.medium)
+        .clipShape(RoundedRectangle(cornerRadius: ThemeEngine.shared.activeTheme.cornerRadius.medium))
         .contentShape(Rectangle())
     }
 }
diff --git a/TablePro/Views/DatabaseSwitcher/DatabaseSwitcherSheet.swift b/TablePro/Views/DatabaseSwitcher/DatabaseSwitcherSheet.swift
@@ -170,7 +170,7 @@ struct DatabaseSwitcherSheet: View {
             .padding(.horizontal, 8)
             .padding(.vertical, 6)
             .background(Color(nsColor: .controlBackgroundColor))
-            .cornerRadius(6)
+            .clipShape(RoundedRectangle(cornerRadius: 6))
 
             // Refresh
             Button(action: {
diff --git a/TablePro/Views/Editor/SQLEditorCoordinator.swift b/TablePro/Views/Editor/SQLEditorCoordinator.swift
@@ -80,7 +80,7 @@ final class SQLEditorCoordinator: TextViewCoordinator {
 
         // Deferred to next run loop because prepareCoordinator runs during
         // TextViewController.init, before the view hierarchy is fully loaded.
-        DispatchQueue.main.async { [weak self] in
+        Task { @MainActor [weak self] in
             guard let self else { return }
             self.fixFindPanelHitTesting(controller: controller)
             self.applyHorizontalScrollFix(controller: controller)
@@ -98,7 +98,7 @@ final class SQLEditorCoordinator: TextViewCoordinator {
         vimEngine?.invalidateLineCache()
 
         // Notify inline suggestion manager immediately (lightweight)
-        DispatchQueue.main.async { [weak self] in
+        Task { @MainActor [weak self] in
             self?.inlineSuggestionManager?.handleTextChange()
             self?.vimCursorManager?.updatePosition()
         }
@@ -133,7 +133,7 @@ final class SQLEditorCoordinator: TextViewCoordinator {
         guard let range = newPositions.first?.range, range.location != NSNotFound else { return }
 
         // Defer to next run loop to let EmphasisManager finish its work first.
-        DispatchQueue.main.async { [weak controller] in
+        Task { @MainActor [weak controller] in
             controller?.textView.scrollToRange(range)
         }
     }
@@ -297,7 +297,7 @@ final class SQLEditorCoordinator: TextViewCoordinator {
         ) { [weak self, weak controller] _ in
             guard let self, let controller else { return }
             // Defer so it runs AFTER reloadUI() → styleTextView()
-            DispatchQueue.main.async { [weak self, weak controller] in
+            Task { @MainActor [weak self, weak controller] in
                 guard let self, let controller else { return }
                 self.setHorizontalScrollProperties(controller: controller)
                 self.handleVimSettingsChange(controller: controller)
diff --git a/TablePro/Views/Filter/FilterRowView.swift b/TablePro/Views/Filter/FilterRowView.swift
@@ -137,7 +137,7 @@ struct FilterRowView: View {
             .padding(.horizontal, 8)
             .padding(.vertical, 5)
             .background(Color(nsColor: .controlBackgroundColor))
-            .cornerRadius(4)
+            .clipShape(RoundedRectangle(cornerRadius: 4))
             .overlay(
                 RoundedRectangle(cornerRadius: 4)
                     .stroke(Color(nsColor: .separatorColor), lineWidth: 0.5)
@@ -174,7 +174,7 @@ struct FilterRowView: View {
             .padding(.horizontal, 8)
             .padding(.vertical, 5)
             .background(Color(nsColor: .controlBackgroundColor))
-            .cornerRadius(4)
+            .clipShape(RoundedRectangle(cornerRadius: 4))
             .overlay(
                 RoundedRectangle(cornerRadius: 4)
                     .stroke(Color(nsColor: .separatorColor), lineWidth: 0.5)
@@ -202,7 +202,7 @@ struct FilterRowView: View {
             .padding(.horizontal, 8)
             .padding(.vertical, 5)
             .background(Color(nsColor: .textBackgroundColor))
-            .cornerRadius(4)
+            .clipShape(RoundedRectangle(cornerRadius: 4))
             .overlay(
                 RoundedRectangle(cornerRadius: 4)
                     .stroke(Color(nsColor: .separatorColor), lineWidth: 0.5)
@@ -217,7 +217,7 @@ struct FilterRowView: View {
                 .padding(.horizontal, 8)
                 .padding(.vertical, 5)
                 .background(Color(nsColor: .textBackgroundColor))
-                .cornerRadius(4)
+                .clipShape(RoundedRectangle(cornerRadius: 4))
                 .overlay(
                     RoundedRectangle(cornerRadius: 4)
                         .stroke(Color(nsColor: .separatorColor), lineWidth: 0.5)
@@ -241,7 +241,7 @@ struct FilterRowView: View {
                 .padding(.horizontal, 8)
                 .padding(.vertical, 5)
                 .background(Color(nsColor: .textBackgroundColor))
-                .cornerRadius(4)
+                .clipShape(RoundedRectangle(cornerRadius: 4))
                 .overlay(
                     RoundedRectangle(cornerRadius: 4)
                         .stroke(Color(nsColor: .separatorColor), lineWidth: 0.5)
diff --git a/TablePro/Views/Filter/SQLPreviewSheet.swift b/TablePro/Views/Filter/SQLPreviewSheet.swift
@@ -39,7 +39,7 @@ struct SQLPreviewSheet: View {
             }
             .frame(maxHeight: 180)
             .background(Color(nsColor: .textBackgroundColor))
-            .cornerRadius(6)
+            .clipShape(RoundedRectangle(cornerRadius: 6))
             .overlay(
                 RoundedRectangle(cornerRadius: 6)
                     .stroke(Color(nsColor: .separatorColor), lineWidth: 0.5)
diff --git a/TablePro/Views/Import/ImportDialog.swift b/TablePro/Views/Import/ImportDialog.swift
@@ -214,7 +214,7 @@ struct ImportDialog: View {
 
             SQLCodePreview(text: $filePreview)
                 .frame(height: availableFormats.count > 1 ? 220 : 280)
-                .cornerRadius(6)
+                .clipShape(RoundedRectangle(cornerRadius: 6))
                 .overlay(
                     RoundedRectangle(cornerRadius: 6)
                         .stroke(Color(nsColor: .separatorColor), lineWidth: 1)
diff --git a/TablePro/Views/Import/ImportErrorView.swift b/TablePro/Views/Import/ImportErrorView.swift
@@ -51,7 +51,7 @@ struct ImportErrorView: View {
                     .frame(height: 150)
                     .padding(8)
                     .background(Color(nsColor: .textBackgroundColor))
-                    .cornerRadius(4)
+                    .clipShape(RoundedRectangle(cornerRadius: 4))
                 } else {
                     Text(error?.localizedDescription ?? String(localized: "Unknown error"))
                         .font(.system(size: 13))
diff --git a/TablePro/Views/QuickSwitcher/QuickSwitcherView.swift b/TablePro/Views/QuickSwitcher/QuickSwitcherView.swift
@@ -107,7 +107,7 @@ internal struct QuickSwitcherSheet: View {
         .padding(.horizontal, 8)
         .padding(.vertical, 6)
         .background(Color(nsColor: .controlBackgroundColor))
-        .cornerRadius(6)
+        .clipShape(RoundedRectangle(cornerRadius: 6))
         .padding(.horizontal, 12)
         .padding(.vertical, 8)
     }
diff --git a/TablePro/Views/Structure/SchemaPreviewSheet.swift b/TablePro/Views/Structure/SchemaPreviewSheet.swift
@@ -106,7 +106,7 @@ struct SchemaPreviewSheet: View {
                 .padding()
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .background(Color(nsColor: .controlBackgroundColor))
-                .cornerRadius(8)
+                .clipShape(RoundedRectangle(cornerRadius: 8))
                 .overlay(
                     RoundedRectangle(cornerRadius: 8)
                         .stroke(Color.secondary.opacity(0.2), lineWidth: 1)
diff --git a/TablePro/Views/Toolbar/ConnectionSwitcherPopover.swift b/TablePro/Views/Toolbar/ConnectionSwitcherPopover.swift
@@ -223,12 +223,12 @@ struct ConnectionSwitcherPopover: View {
             // Connection info
             VStack(alignment: .leading, spacing: 1) {
                 Text(connection.name)
-                    .font(.system(size: 13, weight: isActive ? .semibold : .regular))
+                    .font(.system(size: ThemeEngine.shared.activeTheme.typography.body, weight: isActive ? .semibold : .regular))
                     .foregroundStyle(isHighlighted ? .white : .primary)
                     .lineLimit(1)
 
                 Text(connectionSubtitle(connection))
-                    .font(.system(size: 11))
+                    .font(.system(size: ThemeEngine.shared.activeTheme.typography.small))
                     .foregroundStyle(isHighlighted ? .white.opacity(0.7) : .secondary)
                     .lineLimit(1)
             }
@@ -242,7 +242,7 @@ struct ConnectionSwitcherPopover: View {
             } else if isActive {
                 Image(systemName: "checkmark.circle.fill")
                     .foregroundStyle(isHighlighted ? .white : Color(nsColor: .systemGreen))
-                    .font(.system(size: 14))
+                    .font(.system(size: ThemeEngine.shared.activeTheme.iconSizes.default))
             } else if isConnected {
                 Circle()
                     .fill(isHighlighted ? Color.white : Color(nsColor: .systemGreen))
@@ -251,7 +251,7 @@ struct ConnectionSwitcherPopover: View {
 
             // Database type badge
             Text(connection.type.rawValue.uppercased())
-                .font(.system(size: 9, weight: .medium, design: .monospaced))
+                .font(.system(size: ThemeEngine.shared.activeTheme.typography.tiny, weight: .medium, design: .monospaced))
                 .foregroundStyle(isHighlighted ? .white : .secondary)
                 .padding(.horizontal, 4)
                 .padding(.vertical, 2)

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,4 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`118`	`118`	`func applicationWillTerminate(_ notification: Notification) {`
`119`	`119`	`SSHTunnelManager.shared.terminateAllProcessesSync()`
`120`	`120`	`}`
`121`		`-`
`122`		`- nonisolated deinit {`
`123`		`- NotificationCenter.default.removeObserver(self)`
`124`		`- }`
`125`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ enum AppLanguage: String, Codable, CaseIterable, Identifiable {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ // Side effect: sets UserDefaults AppleLanguages. Consider moving to AppSettingsManager.`
`49`	`50`	`func apply() {`
`50`	`51`	`if self == .system {`
`51`	`52`	`UserDefaults.standard.removeObject(forKey: "AppleLanguages")`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ struct SectionHeaderView<Actions: View>: View {`
`81`	`81`	`ThemeEngine.shared.colors.ui.controlBackgroundSwiftUI.opacity(0.5) :`
`82`	`82`	`Color.clear`
`83`	`83`	`)`
`84`		`- .cornerRadius(ThemeEngine.shared.activeTheme.cornerRadius.medium)`
	`84`	`+ .clipShape(RoundedRectangle(cornerRadius: ThemeEngine.shared.activeTheme.cornerRadius.medium))`
`85`	`85`	`.contentShape(Rectangle())`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ struct SQLPreviewSheet: View {`
`39`	`39`	`}`
`40`	`40`	`.frame(maxHeight: 180)`
`41`	`41`	`.background(Color(nsColor: .textBackgroundColor))`
`42`		`- .cornerRadius(6)`
	`42`	`+ .clipShape(RoundedRectangle(cornerRadius: 6))`
`43`	`43`	`.overlay(`
`44`	`44`	`RoundedRectangle(cornerRadius: 6)`
`45`	`45`	`.stroke(Color(nsColor: .separatorColor), lineWidth: 0.5)`