WIP: macOS new UI

.vscode/settings.json

@@ -16,7 +16,19 @@
   "cSpell.enabledFileTypes": {
     "swift": true
   },
-  "cSpell.words": ["Deinitialization", "GRDB", "stylex"],
+  "cSpell.words": [
+    "Autoresizing",
+    "Bezeled",
+    "Deinitialization",
+    "GRDB",
+    "Rajabifard",
+    "stylex",
+    "Sublayer",
+    "sublayers",
+    "Subview",
+    "Superlayer",
+    "superview"
+  ],
 
   // Protocol Buffers
   "protoc": {

apple/.swiftformat

@@ -12,7 +12,6 @@
 --hexgrouping 4
 --octalgrouping 4
 --exponentcase lowercase
---header strip
 --ifdef no-indent
 --linebreaks lf
 --patternlet hoist

apple/Inline.xcodeproj/project.pbxproj

@@ -1074,7 +1074,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 14.6;
+				MACOSX_DEPLOYMENT_TARGET = 15.2;
 				MARKETING_VERSION = 0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.inline.InlineMac.debug;
 				PRODUCT_NAME = Inline;
@@ -1111,7 +1111,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 14.6;
+				MACOSX_DEPLOYMENT_TARGET = 15.2;
 				MARKETING_VERSION = 0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.inline.InlineMac;
 				PRODUCT_NAME = Inline;
@@ -1304,7 +1304,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 14.6;
+				MACOSX_DEPLOYMENT_TARGET = 15.2;
 				MARKETING_VERSION = 0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.inline.InlineMac.debug2;
 				PRODUCT_NAME = Inline;

apple/InlineKit/Sources/InlineKit/ViewModels/HomeViewModel.swift

@@ -116,7 +116,7 @@ public struct HomeChatItem: Codable, FetchableRecord, PersistableRecord, Hashabl
   }
 
   // Add a static method to create the request
-  static func all() -> QueryInterfaceRequest<HomeChatItem> {
+  public static func all() -> QueryInterfaceRequest<HomeChatItem> {
     Dialog
       .including(
         optional: Dialog.peerUser
@@ -270,7 +270,7 @@ public extension AppDatabase {
 }
 
 public extension HomeViewModel {
-  nonisolated static func sortChats(_ chats: [HomeChatItem]) -> [HomeChatItem] {
+  nonisolated public static func sortChats(_ chats: [HomeChatItem]) -> [HomeChatItem] {
     chats.sorted { item1, item2 in
       // First sort by pinned status
       let pinned1 = item1.dialog.pinned ?? false
@@ -284,11 +284,11 @@ public extension HomeViewModel {
     }
   }
 
-  nonisolated static func filterArchived(_ chats: [HomeChatItem], archived: Bool) -> [HomeChatItem] {
+  nonisolated public static func filterArchived(_ chats: [HomeChatItem], archived: Bool) -> [HomeChatItem] {
     chats.filter { $0.dialog.archived == archived }
   }
 
-  nonisolated static func filterEmptyChats(_ chats: [HomeChatItem]) -> [HomeChatItem] {
+  nonisolated public static func filterEmptyChats(_ chats: [HomeChatItem]) -> [HomeChatItem] {
     chats.filter { $0.chat != nil }
   }
 }

apple/InlineMac/App/AppDelegate.swift

@@ -10,7 +10,7 @@ import UserNotifications
 
 class AppDelegate: NSObject, NSApplicationDelegate {
   // Main Window
-  private var mainWindowController: MainWindowController?
+  private var mainWindowController: NSWindowController?
 
   @MainActor private let dockBadgeService = DockBadgeService()
 
@@ -27,7 +27,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
   private var cancellables = Set<AnyCancellable>()
 
-  func applicationWillFinishLaunching(_ notification: Notification) {
+  func applicationWillFinishLaunching(_: Notification) {
     // Disable native tabbing
     NSWindow.allowsAutomaticWindowTabbing = false
 
@@ -41,7 +41,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     dependencies.logOut = logOut
   }
 
-  func applicationDidFinishLaunching(_ aNotification: Notification) {
+  func applicationDidFinishLaunching(_: Notification) {
     initializeServices()
     setupMainWindow()
     setupMainMenu()
@@ -85,7 +85,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     true
   }
 
-  func applicationDidResignActive(_ notification: Notification) {
+  func applicationDidResignActive(_: Notification) {
 //    Task {
 //      if Auth.shared.isLoggedIn {
 //        // Mark offline
@@ -94,7 +94,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 //    }
   }
 
-  func applicationDidBecomeActive(_ notification: Notification) {
+  func applicationDidBecomeActive(_: Notification) {
 //    Task {
 //      if Auth.shared.isLoggedIn {
 //        // Mark online
@@ -112,19 +112,24 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     // Create new window controller if it doesn't exist
-    let controller = MainWindowController(dependencies: dependencies)
+    let controller: NSWindowController
+    if AppSettings.shared.enableNewMacUI {
+      controller = MainWindowController(dependencies: dependencies)
+    } else {
+      controller = LegacyMainWindowController(dependencies: dependencies)
+    }
     controller.showWindow(nil)
     mainWindowController = controller
   }
 
-  func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
+  func applicationShouldHandleReopen(_: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
     if !flag {
       setupMainWindow()
     }
     return true
   }
 
-  func application(_ application: NSApplication, open urls: [URL]) {
+  func application(_: NSApplication, open urls: [URL]) {
     // Handle URLs when app is already running
     for url in urls {
       log.debug("Received URL via application:open: \(url)")
@@ -149,12 +154,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
       // Handle different URL patterns
       switch url.host {
-        case "user":
-          handleUserURL(pathComponents: pathComponents)
-        case "integrations":
-          NotificationCenter.default.post(name: .integrationCallback, object: url)
-        default:
-          log.warning("Unhandled URL host: \(url.host ?? "nil")")
+      case "user":
+        handleUserURL(pathComponents: pathComponents)
+      case "integrations":
+        NotificationCenter.default.post(name: .integrationCallback, object: url)
+      default:
+        log.warning("Unhandled URL host: \(url.host ?? "nil")")
       }
     }
   }
@@ -214,7 +219,7 @@ extension AppDelegate {
   }
 
   func application(
-    _ application: NSApplication,
+    _: NSApplication,
     didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data
   ) {
     log.debug("Registered for remote notifications: \(deviceToken)")
@@ -223,7 +228,7 @@ extension AppDelegate {
   }
 
   func application(
-    _ application: NSApplication,
+    _: NSApplication,
     didFailToRegisterForRemoteNotificationsWithError error: Error
   ) {
     log.error("Failed to register for remote notifications \(error)")
@@ -290,7 +295,7 @@ extension AppDelegate {
 // MARK: - URL Scheme Handling
 
 extension AppDelegate {
-  @objc func handleURLEvent(_ event: NSAppleEventDescriptor, withReplyEvent replyEvent: NSAppleEventDescriptor) {
+  @objc func handleURLEvent(_ event: NSAppleEventDescriptor, withReplyEvent _: NSAppleEventDescriptor) {
     guard let urlString = event.paramDescriptor(forKeyword: keyDirectObject)?.stringValue,
           let url = URL(string: urlString)
     else {

apple/InlineMac/App/AppDependencies.swift

@@ -18,6 +18,7 @@ public struct AppDependencies {
 
   // Per window
   let nav: Nav = .main
+  var nav2: Nav2? = nil
   var keyMonitor: KeyMonitor?
 
   // Optional
@@ -26,7 +27,8 @@ public struct AppDependencies {
 }
 
 extension View {
-  func environment(dependencies deps: AppDependencies) -> AnyView {
+  @ViewBuilder
+  func environment(dependencies deps: AppDependencies) -> some View {
     var result = environment(\.auth, deps.auth)
       .environmentObject(deps.viewModel)
       .environmentObject(deps.overlay)
@@ -42,12 +44,12 @@ extension View {
       .environment(\.logOut, deps.logOut)
       .environment(\.keyMonitor, deps.keyMonitor)
       .environment(\.dependencies, deps)
-      .eraseToAnyView()
+      .environment(deps.nav2)
 
     if let rootData = deps.rootData {
-      result = result.environmentObject(rootData).eraseToAnyView()
+      result.environmentObject(rootData)
+    } else {
+      result
     }
-
-    return result
   }
 }