From 8f999278616d3564a6f08ffe96930058df4cb080 Mon Sep 17 00:00:00 2001
From: Selim Mustafaev <selim@fastmail.fm>
Date: Fri, 14 Feb 2025 22:48:46 +0300
Subject: [PATCH] Fixes for macOS catalyst version

---
 .../xcdebugger/Breakpoints_v2.xcbkptlist         | 16 ----------------
 AutoCat/Controllers/MainTabController.swift      | 10 +++-------
 AutoCat/SceneDelegate.swift                      |  8 +++-----
 .../Services/VehicleService/VehicleService.swift |  4 ++++
 4 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index a0b0c58..1e00cef 100644
--- a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -49,21 +49,5 @@
             landmarkType = "0">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "88924AF0-7C20-4DBB-A9C1-7F575E0CE5C2"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "AutoCat/AppDelegate.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "115"
-            endingLineNumber = "115"
-            landmarkName = "application(_:configurationForConnecting:options:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/AutoCat/Controllers/MainTabController.swift b/AutoCat/Controllers/MainTabController.swift
index 3ddee42..0c337e3 100644
--- a/AutoCat/Controllers/MainTabController.swift
+++ b/AutoCat/Controllers/MainTabController.swift
@@ -11,13 +11,6 @@ class MainTabController: UITabBarController, UITabBarControllerDelegate {
         super.viewDidLoad()
         self.delegate = self
         
-        #if targetEnvironment(macCatalyst)
-        
-        // Remove "+" tab for macOS version (it will be on the toolbar)
-        viewControllers?.remove(at: 2)
-        
-        #endif
-        
         if #available(iOS 18, *) {
             // Setting the horizontal size class will force the tab bar
             // to be displayed at the bottom.
@@ -25,7 +18,10 @@ class MainTabController: UITabBarController, UITabBarControllerDelegate {
         }
         
         addHistoryTab()
+        
+#if !targetEnvironment(macCatalyst)
         addDummyTab()
+#endif
         Task { await addSettings() }
     }
     
diff --git a/AutoCat/SceneDelegate.swift b/AutoCat/SceneDelegate.swift
index abc58ae..a86c42b 100644
--- a/AutoCat/SceneDelegate.swift
+++ b/AutoCat/SceneDelegate.swift
@@ -230,17 +230,15 @@ extension SceneDelegate: NSToolbarDelegate {
     
     func checkNewNumber(_ number: String) {
         guard let split = self.window?.rootViewController as? MainSplitController,
-              let tabvc = split.viewControllers.first as? UITabBarController
+              let tabvc = split.viewControllers.first as? MainTabController
         else {
             return
         }
         
         tabvc.selectedIndex = 0
         
-        if let nav = tabvc.selectedViewController as? UINavigationController,
-           let checkController = nav.viewControllers.first as? CheckController {
-            
-            checkController.checkTapped(number: number)
+        Task {
+            await tabvc.historyViewModel?.checkNewNumber(number)
         }
     }
 }
diff --git a/AutoCatCore/Services/VehicleService/VehicleService.swift b/AutoCatCore/Services/VehicleService/VehicleService.swift
index 1deb558..6b293e6 100644
--- a/AutoCatCore/Services/VehicleService/VehicleService.swift
+++ b/AutoCatCore/Services/VehicleService/VehicleService.swift
@@ -74,7 +74,11 @@ extension VehicleService: VehicleServiceProtocol {
     
     public func check(number: String) async throws -> VehicleWithErrors {
         
+#if targetEnvironment(macCatalyst)
+        try await check(number: number, forceUpdate: false, trackLocation: false, dbUpdatePolicy: .always)
+#else
         try await check(number: number, forceUpdate: false, trackLocation: true, dbUpdatePolicy: .always)
+#endif
     }
     
     public func updateHistory(number: String) async throws -> VehicleWithErrors {