Log

.github/workflows/format.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   format:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
       - name: Run Ultralytics Formatting
         uses: ultralytics/actions@main
@@ -23,6 +23,7 @@ jobs:
           python: true # format Python code and docstrings
           markdown: true # format Markdown
           prettier: true # format YAML
+          swift: true # format Swift
           spelling: false # check spelling
           links: false # check broken links
           summary: true # print PR summary with GPT4 (requires 'openai_api_key' or 'openai_azure_api_key' and 'openai_azure_endpoint')

YOLO.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 63;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -13,14 +13,13 @@
 		636EFCAF21E62DD300DE43BC /* VideoCapture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 636EFCA221E62DD300DE43BC /* VideoCapture.swift */; };
 		636EFCB321E62DD300DE43BC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 636EFCA721E62DD300DE43BC /* AppDelegate.swift */; };
 		636EFCB921E62E3900DE43BC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 636EFCB821E62E3900DE43BC /* Assets.xcassets */; };
-		6381D2182B7817C200ABA4E8 /* yolov8l.mlpackage in Sources */ = {isa = PBXBuildFile; fileRef = 6381D2132B7817C200ABA4E8 /* yolov8l.mlpackage */; };
-		6381D2192B7817C200ABA4E8 /* yolov8x.mlpackage in Sources */ = {isa = PBXBuildFile; fileRef = 6381D2142B7817C200ABA4E8 /* yolov8x.mlpackage */; };
-		6381D21A2B7817C200ABA4E8 /* yolov8s.mlpackage in Sources */ = {isa = PBXBuildFile; fileRef = 6381D2152B7817C200ABA4E8 /* yolov8s.mlpackage */; };
-		6381D21B2B7817C200ABA4E8 /* yolov8m.mlpackage in Sources */ = {isa = PBXBuildFile; fileRef = 6381D2162B7817C200ABA4E8 /* yolov8m.mlpackage */; };
-		6381D21C2B7817C200ABA4E8 /* yolov8n.mlpackage in Sources */ = {isa = PBXBuildFile; fileRef = 6381D2172B7817C200ABA4E8 /* yolov8n.mlpackage */; };
 		63CF371F2514455300E2DEA1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6323C44D22186177008AE681 /* LaunchScreen.storyboard */; };
 		63CF37202514455300E2DEA1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6323C44F22186177008AE681 /* Main.storyboard */; };
 		63CF37212514455300E2DEA1 /* ultralytics_yolo_logotype.png in Resources */ = {isa = PBXBuildFile; fileRef = 6323C45122186177008AE681 /* ultralytics_yolo_logotype.png */; };
+		730E72CD2BFC43BF000E1F45 /* PostProcessing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 730E72CC2BFC43BF000E1F45 /* PostProcessing.swift */; };
+		73A4E7752C0EA36D00218E8F /* HumanModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73A4E7742C0EA36D00218E8F /* HumanModel.swift */; };
+		73A4E7772C0EA37300218E8F /* TrackingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73A4E7762C0EA37300218E8F /* TrackingModel.swift */; };
+		73FE95772C2B5A2D00C6C806 /* SaveResults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73FE95762C2B5A2D00C6C806 /* SaveResults.swift */; };
 		8EDAA33950796844333D60A7 /* BoundingBoxView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8EDAA633C1F2B50286D16008 /* BoundingBoxView.swift */; };
 /* End PBXBuildFile section */
 
@@ -35,12 +34,11 @@
 		636EFCA221E62DD300DE43BC /* VideoCapture.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoCapture.swift; sourceTree = "<group>"; };
 		636EFCA721E62DD300DE43BC /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		636EFCB821E62E3900DE43BC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		6381D2132B7817C200ABA4E8 /* yolov8l.mlpackage */ = {isa = PBXFileReference; lastKnownFileType = folder.mlpackage; path = yolov8l.mlpackage; sourceTree = "<group>"; };
-		6381D2142B7817C200ABA4E8 /* yolov8x.mlpackage */ = {isa = PBXFileReference; lastKnownFileType = folder.mlpackage; path = yolov8x.mlpackage; sourceTree = "<group>"; };
-		6381D2152B7817C200ABA4E8 /* yolov8s.mlpackage */ = {isa = PBXFileReference; lastKnownFileType = folder.mlpackage; path = yolov8s.mlpackage; sourceTree = "<group>"; };
-		6381D2162B7817C200ABA4E8 /* yolov8m.mlpackage */ = {isa = PBXFileReference; lastKnownFileType = folder.mlpackage; path = yolov8m.mlpackage; sourceTree = "<group>"; };
-		6381D2172B7817C200ABA4E8 /* yolov8n.mlpackage */ = {isa = PBXFileReference; lastKnownFileType = folder.mlpackage; path = yolov8n.mlpackage; sourceTree = "<group>"; };
 		63B8B0A821E62A890026FBC3 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
+		730E72CC2BFC43BF000E1F45 /* PostProcessing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PostProcessing.swift; sourceTree = "<group>"; };
+		73A4E7742C0EA36D00218E8F /* HumanModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HumanModel.swift; sourceTree = "<group>"; };
+		73A4E7762C0EA37300218E8F /* TrackingModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrackingModel.swift; sourceTree = "<group>"; };
+		73FE95762C2B5A2D00C6C806 /* SaveResults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SaveResults.swift; sourceTree = "<group>"; };
 		7BCB411721C3096100BFC4D0 /* YOLO.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YOLO.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		8EDAA633C1F2B50286D16008 /* BoundingBoxView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BoundingBoxView.swift; sourceTree = "<group>"; };
 		8EDAAA4507D2D23D7FAB827F /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -60,8 +58,12 @@
 		636166E72514438D0054FA7E /* Utilities */ = {
 			isa = PBXGroup;
 			children = (
+				73A4E7762C0EA37300218E8F /* TrackingModel.swift */,
+				73A4E7742C0EA36D00218E8F /* HumanModel.swift */,
+				730E72CC2BFC43BF000E1F45 /* PostProcessing.swift */,
 				636166E9251443B20054FA7E /* ThresholdProvider.swift */,
 				8EDAA633C1F2B50286D16008 /* BoundingBoxView.swift */,
+				73FE95762C2B5A2D00C6C806 /* SaveResults.swift */,
 			);
 			path = Utilities;
 			sourceTree = "<group>";
@@ -87,11 +89,6 @@
 		63A946D8271800E20001C3ED /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				6381D2132B7817C200ABA4E8 /* yolov8l.mlpackage */,
-				6381D2162B7817C200ABA4E8 /* yolov8m.mlpackage */,
-				6381D2172B7817C200ABA4E8 /* yolov8n.mlpackage */,
-				6381D2152B7817C200ABA4E8 /* yolov8s.mlpackage */,
-				6381D2142B7817C200ABA4E8 /* yolov8x.mlpackage */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -160,6 +157,7 @@
 				Base,
 			);
 			mainGroup = 7BCB410E21C3096100BFC4D0;
+			minimizedProjectReferenceProxies = 1;
 			productRefGroup = 7BCB411821C3096100BFC4D0 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -210,16 +208,15 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6381D21B2B7817C200ABA4E8 /* yolov8m.mlpackage in Sources */,
-				6381D21C2B7817C200ABA4E8 /* yolov8n.mlpackage in Sources */,
+				730E72CD2BFC43BF000E1F45 /* PostProcessing.swift in Sources */,
 				636EFCAF21E62DD300DE43BC /* VideoCapture.swift in Sources */,
 				636166EA251443B20054FA7E /* ThresholdProvider.swift in Sources */,
-				6381D2182B7817C200ABA4E8 /* yolov8l.mlpackage in Sources */,
-				6381D21A2B7817C200ABA4E8 /* yolov8s.mlpackage in Sources */,
-				6381D2192B7817C200ABA4E8 /* yolov8x.mlpackage in Sources */,
 				636EFCB321E62DD300DE43BC /* AppDelegate.swift in Sources */,
+				73A4E7772C0EA37300218E8F /* TrackingModel.swift in Sources */,
 				636EFCAA21E62DD300DE43BC /* ViewController.swift in Sources */,
 				8EDAA33950796844333D60A7 /* BoundingBoxView.swift in Sources */,
+				73A4E7752C0EA36D00218E8F /* HumanModel.swift in Sources */,
+				73FE95772C2B5A2D00C6C806 /* SaveResults.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -350,8 +347,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
-				DEVELOPMENT_TEAM = 3MR4P6CL3X;
+				CURRENT_PROJECT_VERSION = 2.2;
+				DEVELOPMENT_TEAM = MFN25KNUGJ;
 				INFOPLIST_FILE = YOLO/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Ultralytics YOLO";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
@@ -378,8 +375,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
-				DEVELOPMENT_TEAM = 3MR4P6CL3X;
+				CURRENT_PROJECT_VERSION = 2.2;
+				DEVELOPMENT_TEAM = MFN25KNUGJ;
 				INFOPLIST_FILE = YOLO/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Ultralytics YOLO";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
@@ -389,7 +386,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 8.2.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.ultralytics.iDetection;
+				PRODUCT_BUNDLE_IDENTIFIER = com.YoloiOSApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;

YOLO.xcodeproj/xcshareddata/xcschemes/YOLO.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7BCB411621C3096100BFC4D0"
+               BuildableName = "YOLO.app"
+               BlueprintName = "YOLO"
+               ReferencedContainer = "container:YOLO.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7BCB411621C3096100BFC4D0"
+            BuildableName = "YOLO.app"
+            BlueprintName = "YOLO"
+            ReferencedContainer = "container:YOLO.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7BCB411621C3096100BFC4D0"
+            BuildableName = "YOLO.app"
+            BlueprintName = "YOLO"
+            ReferencedContainer = "container:YOLO.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

YOLO/AppDelegate.swift

@@ -17,49 +17,61 @@ import UIKit
 /// The main application delegate, handling global app behavior and configuration.
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-    var window: UIWindow?
+  var window: UIWindow?
 
-    /// Called when the app finishes launching, used here to set global app settings.
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        // Disable screen dimming and auto-lock to keep the app active during long operations.
-        UIApplication.shared.isIdleTimerDisabled = true
+  /// Called when the app finishes launching, used here to set global app settings.
+  func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+  ) -> Bool {
+    // Disable screen dimming and auto-lock to keep the app active during long operations.
+    UIApplication.shared.isIdleTimerDisabled = true
 
-        // Enable battery monitoring to allow the app to adapt its behavior based on battery level.
-        UIDevice.current.isBatteryMonitoringEnabled = true
+    // Enable battery monitoring to allow the app to adapt its behavior based on battery level.
+    UIDevice.current.isBatteryMonitoringEnabled = true
 
-        // Store the app version and build version in UserDefaults for easy access elsewhere in the app.
-        if let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String,
-           let buildVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as? String {
-            UserDefaults.standard.set("\(appVersion) (\(buildVersion))", forKey: "app_version")
-        }
+    // Store the app version and build version in UserDefaults for easy access elsewhere in the app.
+    if let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String,
+      let buildVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as? String
+    {
+      UserDefaults.standard.set("\(appVersion) (\(buildVersion))", forKey: "app_version")
+    }
 
-        // Store the device's UUID in UserDefaults for identification purposes.
-        if let uuid = UIDevice.current.identifierForVendor?.uuidString {
-            UserDefaults.standard.set(uuid, forKey: "uuid")
-        }
+    // Store the device's UUID in UserDefaults for identification purposes.
+    if let uuid = UIDevice.current.identifierForVendor?.uuidString {
+      UserDefaults.standard.set(uuid, forKey: "uuid")
+    }
 
-        // Ensure UserDefaults changes are immediately saved.
-        UserDefaults.standard.synchronize()
+    // Ensure UserDefaults changes are immediately saved.
+    UserDefaults.standard.synchronize()
 
-        return true
-    }
+    return true
+  }
+
+  func applicationDidBecomeActive(_ application: UIApplication) {
+    NotificationCenter.default.post(name: .settingsChanged, object: nil)
+  }
+}
+
+extension Notification.Name {
+  static let settingsChanged = Notification.Name("settingsChanged")
 }
 
 /// Extension to CALayer to add functionality for generating screenshots of any layer.
 extension CALayer {
-    var screenShot: UIImage? {
-        // Begin a new image context, using the device's screen scale to ensure high-resolution output.
-        UIGraphicsBeginImageContextWithOptions(frame.size, false, UIScreen.main.scale)
-        defer {
-            UIGraphicsEndImageContext()
-        }  // Ensure the image context is cleaned up correctly.
+  var screenShot: UIImage? {
+    // Begin a new image context, using the device's screen scale to ensure high-resolution output.
+    UIGraphicsBeginImageContextWithOptions(frame.size, false, UIScreen.main.scale)
+    defer {
+      UIGraphicsEndImageContext()
+    }  // Ensure the image context is cleaned up correctly.
 
-        if let context = UIGraphicsGetCurrentContext() {
-            // Render the layer into the current context.
-            render(in: context)
-            // Attempt to generate an image from the current context.
-            return UIGraphicsGetImageFromCurrentImageContext()
-        }
-        return nil  // Return nil if the operation fails.
+    if let context = UIGraphicsGetCurrentContext() {
+      // Render the layer into the current context.
+      render(in: context)
+      // Attempt to generate an image from the current context.
+      return UIGraphicsGetImageFromCurrentImageContext()
     }
+    return nil  // Return nil if the operation fails.
+  }
 }

YOLO/Assets.xcassets/Focus.imageset/Contents.json

@@ -1,21 +1,23 @@
 {
   "images": [
     {
+      "filename": "ultralytics_square_focus_image.png",
       "idiom": "universal",
       "scale": "1x"
     },
     {
+      "filename": "ultralytics_square_focus_image 1.png",
       "idiom": "universal",
       "scale": "2x"
     },
     {
+      "filename": "ultralytics_square_focus_image 2.png",
       "idiom": "universal",
-      "filename": "ultralytics_square_focus_image.png",
       "scale": "3x"
     }
   ],
   "info": {
-    "version": 1,
-    "author": "xcode"
+    "author": "xcode",
+    "version": 1
   }
 }

YOLO/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>24</string>
+	<string>386</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
@@ -52,6 +52,8 @@
 	<string>UIStatusBarStyleDefault</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>

YOLO/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>