Modernize the Rectangle UI

Rectangle.xcodeproj/xcshareddata/xcschemes/Rectangle.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "2700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Rectangle/AccessibilityAuthorization/AccessibilityAuthorization.swift

@@ -1,43 +1,94 @@
 /// AccessibilityAuthorization.swift
 
 import Foundation
-import Cocoa
+import SwiftUI
 
-class AccessibilityAuthorization {
+class AccessibilityAuthorization: ObservableObject {
 
-    private var accessibilityWindowController: NSWindowController?
+    private var windowController: NSWindowController?
+    private var timer: Timer?
 
+    @discardableResult
     public func checkAccessibility(completion: @escaping () -> Void) -> Bool {
         if !AXIsProcessTrusted() {
-
-            accessibilityWindowController = NSStoryboard(name: "Main", bundle: nil).instantiateController(withIdentifier: "AccessibilityWindowController") as? NSWindowController
-
-            NSApp.activate(ignoringOtherApps: true)
-            accessibilityWindowController?.showWindow(self)
-            pollAccessibility(completion: completion)
+            showWindow(completion: completion)
+            startPolling(completion: completion)
             return false
         } else {
             return true
         }
     }
 
-    private func pollAccessibility(completion: @escaping () -> Void) {
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+    private func showWindow(completion: @escaping () -> Void) {
+        if windowController == nil {
+            let rootView = AccessibilityView(manager: self)
+            let hostingController = NSHostingController(rootView: rootView)
+
+            let window = CustomAccessibilityWindow(
+                contentViewController: hostingController
+            )
+
+            let wc = NSWindowController(window: window)
+            self.windowController = wc
+        }
+
+        NSApp.activate(ignoringOtherApps: true)
+        DispatchQueue.main.async {
+            self.windowController?.window?.center()
+            self.windowController?.showWindow(self)
+        }
+    }
+
+    private func startPolling(completion: @escaping () -> Void) {
+        timer?.invalidate()
+        timer = Timer.scheduledTimer(withTimeInterval: 0.3, repeats: true) { [weak self] t in
+            guard let self = self else { return }
+
             if AXIsProcessTrusted() {
-                self.accessibilityWindowController?.close()
-                self.accessibilityWindowController = nil
+                t.invalidate()
+                self.timer = nil
+                self.closeWindow()
                 completion()
-            } else {
-                self.pollAccessibility(completion: completion)
             }
         }
     }
 
     func showAuthorizationWindow() {
-        if accessibilityWindowController?.window?.isMiniaturized == true {
-            accessibilityWindowController?.window?.deminiaturize(self)
+        if windowController?.window?.isMiniaturized == true {
+            windowController?.window?.deminiaturize(self)
         }
         NSApp.activate(ignoringOtherApps: true)
     }
 
+    private func closeWindow() {
+        windowController?.close()
+        windowController = nil
+    }
+}
+
+// MARK: - Window Handling Termination on Close
+
+private class CustomAccessibilityWindow: NSWindow {
+
+    init(contentViewController: NSViewController) {
+        super.init(
+            contentRect: NSRect(x: 0, y: 0, width: 320, height: 380),
+            styleMask: [.titled, .closable, .fullSizeContentView],
+            backing: .buffered,
+            defer: false
+        )
+
+        self.contentViewController = contentViewController
+        self.titlebarAppearsTransparent = true
+        self.titleVisibility = .hidden
+        self.isMovableByWindowBackground = true
+
+        let closeButton = self.standardWindowButton(.closeButton)
+        closeButton?.target = self
+        closeButton?.action = #selector(closeButtonClicked)
+    }
+
+    @objc private func closeButtonClicked() {
+        exit(1)
+    }
 }

Rectangle/AccessibilityAuthorization/AccessibilityView.swift

@@ -0,0 +1,70 @@
+/// AccessibilityView.swift
+
+import SwiftUI
+import AppKit
+
+// MARK: - SwiftUI Views
+
+struct AccessibilityView: View {
+    @ObservedObject var manager: AccessibilityAuthorization
+
+    var body: some View {
+        VStack(spacing: 16) {
+            Text("Authorize Rectangle")
+                .font(.system(size: 20, weight: .semibold))
+
+            if let appIcon = NSApp.applicationIconImage {
+                Image(nsImage: appIcon)
+                    .resizable()
+                    .aspectRatio(contentMode: .fit)
+                    .frame(width: 64, height: 64)
+                    .cornerRadius(12)
+            }
+
+            Text("Rectangle needs your permission to control your window positions.")
+                .font(.system(size: 13, weight: .regular))
+                .foregroundColor(.secondary)
+                .fixedSize(horizontal: false, vertical: true)
+                .multilineTextAlignment(.center)
+
+            Text(systemSettingsPath)
+                .font(.system(size: 11, weight: .medium))
+                .foregroundColor(.secondary)
+                .multilineTextAlignment(.center)
+                .fixedSize(horizontal: false, vertical: true)
+                .frame(maxWidth: 250)
+
+            Button(action: openSystemSettings) {
+                Text("Open System Settings")
+                    .font(.system(size: 13, weight: .medium))
+                    .frame(maxWidth: .infinity)
+                    .padding(.vertical, 4)
+            }
+            .buttonStyle(.borderedProminent)
+            .controlSize(.large)
+            .padding(.horizontal, 20)
+
+            Text("Enable Rectangle.app")
+                .font(.system(size: 13, weight: .medium))
+                .foregroundColor(.secondary)
+                .padding(.bottom, 8)
+        }
+        .padding(24)
+        .frame(width: 320)
+    }
+
+    private var systemSettingsPath: String {
+        if #available(macOS 27, *) {
+            return String(localized: "Go to System Settings → Privacy & Security → Device Control and Data Access")
+        } else {
+            return String(localized: "Go to System Settings → Privacy & Security → Accessibility")
+        }
+    }
+
+    private func openSystemSettings() {
+        if let url = URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility") {
+            NSWorkspace.shared.open(url)
+        }
+    }
+}
+

Rectangle/AppDelegate.swift

@@ -28,7 +28,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     private var titleBarManager: TitleBarManager!
     private var greenButtonManager: GreenButtonManager!
 
-    private var prefsWindowController: NSWindowController?
+    private var settingsWindowController: NSWindowController?
 
     private var prevActiveAppObservation: NSKeyValueObservation?
     private var prevActiveApp: NSRunningApplication?
@@ -56,7 +56,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         checkLaunchOnLogin()
 
         let alreadyTrusted = accessibilityAuthorization.checkAccessibility {
-            self.showWelcomeWindow()
+            WelcomeView.show()
             self.checkForConflictingApps()
             self.openPreferences(self)
             self.statusItem.statusMenu = self.mainStatusMenu
@@ -254,11 +254,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     @IBAction func openPreferences(_ sender: Any) {
-        if prefsWindowController == nil {
-            prefsWindowController = NSStoryboard(name: "Main", bundle: nil).instantiateController(withIdentifier: "PrefsWindowController") as? NSWindowController
+        if settingsWindowController == nil {
+            settingsWindowController = SettingsWindowController()
         }
         NSApp.activate(ignoringOtherApps: true)
-        prefsWindowController?.showWindow(self)
+        settingsWindowController?.showWindow(self)
     }
 
     @IBAction func showAbout(_ sender: Any) {
@@ -304,7 +304,7 @@ extension AppDelegate: NSMenuDelegate {
         }
 
         if let frontAppName = ApplicationToggle.frontAppName {
-            let ignoreString = NSLocalizedString("D99-0O-MB6.title", tableName: "Main", value: "Ignore frontmost.app", comment: "")
+            let ignoreString = String(localized: "Ignore frontmost.app")
             ignoreMenuItem.title = ignoreString.replacingOccurrences(of: "frontmost.app", with: frontAppName)
             ignoreMenuItem.state = ApplicationToggle.shortcutsDisabled ? .on : .off
             ignoreMenuItem.isHidden = false
@@ -374,7 +374,7 @@ extension AppDelegate: NSMenuDelegate {
         var menuIndex = 0
         var categoryMenus: [CategoryMenu] = []
         for action in WindowAction.active {
-            guard let displayName = action.displayName else { continue }
+            guard !action.excludedFromMenu, let displayName = action.displayName else { continue }
             let newMenuItem = NSMenuItem(title: displayName, action: #selector(executeMenuWindowAction), keyEquivalent: "")
             newMenuItem.representedObject = action
             if #available(macOS 27.0, *) {
@@ -484,26 +484,26 @@ extension AppDelegate {
     private func addTodoModeMenuItems(startingIndex: Int) {
         var menuIndex = startingIndex
 
-        let todoModeItemTitle = NSLocalizedString("Enable Todo Mode", tableName: "Main", value: "", comment: "")
+        let todoModeItemTitle = String(localized: "Enable Todo Mode")
         let todoModeMenuItem = NSMenuItem(title: todoModeItemTitle, action: #selector(toggleTodoMode), keyEquivalent: "")
         todoModeMenuItem.tag = TodoItem.mode.tag
         todoModeMenuItem.target = self
         mainStatusMenu.insertItem(todoModeMenuItem, at: menuIndex)
         menuIndex += 1
 
-        let todoAppItemTitle = NSLocalizedString("Use frontmost.app as Todo App", tableName: "Main", value: "", comment: "")
+        let todoAppItemTitle = String(localized: "Use frontmost.app as Todo App")
         let todoAppMenuItem = NSMenuItem(title: todoAppItemTitle, action: #selector(setTodoApp), keyEquivalent: "")
         todoAppMenuItem.tag = TodoItem.app.tag
         mainStatusMenu.insertItem(todoAppMenuItem, at: menuIndex)
         menuIndex += 1
 
-        let todoWindowItemTitle = NSLocalizedString("Use as Todo Window", tableName: "Main", value: "", comment: "")
+        let todoWindowItemTitle = String(localized: "Use as Todo Window")
         let todoWindowMenuItem = NSMenuItem(title: todoWindowItemTitle, action: #selector(setTodoWindow), keyEquivalent: "")
         todoWindowMenuItem.tag = TodoItem.window.tag
         mainStatusMenu.insertItem(todoWindowMenuItem, at: menuIndex)
         menuIndex += 1
 
-        let todoReflowItemTitle = NSLocalizedString("Reflow Todo", tableName: "Main", value: "", comment: "")
+        let todoReflowItemTitle = String(localized: "Reflow Todo")
         let todoReflowItem = NSMenuItem(title: todoReflowItemTitle, action: #selector(todoReflow), keyEquivalent: "")
         todoReflowItem.tag = TodoItem.reflow.tag
         mainStatusMenu.insertItem(todoReflowItem, at: menuIndex)
@@ -554,7 +554,7 @@ extension AppDelegate {
         }
 
         if let frontAppName = ApplicationToggle.frontAppName {
-            let appString = NSLocalizedString("Use frontmost.app as Todo App", tableName: "Main", value: "", comment: "")
+            let appString = String(localized: "Use frontmost.app as Todo App")
             todoAppMenuItem.title = appString.replacingOccurrences(
                 of: "frontmost.app", with: frontAppName)
             todoAppMenuItem.isEnabled = !applicationToggle.todoAppIsActive()

Rectangle/Assets.xcassets/WindowPositions/tileColumnsTemplate.imageset/Contents.json

@@ -2,10 +2,10 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "tileColumnsTemplate.png",
       "scale" : "1x"
     },
     {
+      "filename" : "screenIcons-tileRowsCols.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }

Rectangle/Assets.xcassets/WindowPositions/tileRowsTemplate.imageset/Contents.json

@@ -2,10 +2,10 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "tileRowsTemplate.png",
       "scale" : "1x"
     },
     {
+      "filename" : "tileRows.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }

Rectangle/Assets.xcassets/appSettingsTemplate.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "appSettingsTemplate.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "appSettingsTemplate_2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}