Bug report setting (#29)

Author: rz-openai

Snap-O/ADB/ADBExec.swift

@@ -24,15 +24,17 @@ struct ADBExec: Sendable {
   func startScreenrecord(
     deviceID: String,
     bitRateMbps: Int = 8,
-    timeLimitSeconds: Int = 60 * 60 * 3
+    timeLimitSeconds: Int = 60 * 60 * 3,
+    bugReport: Bool = false
   ) async throws -> RecordingSession {
     let sizeHint = try? await displaySize(deviceID: deviceID)
     let remote = "/data/local/tmp/snapo_recording_\(UUID().uuidString).mp4"
     let command = makeScreenRecordCommand(
       bitRateMbps: bitRateMbps,
       timeLimitSeconds: timeLimitSeconds,
       size: sizeHint,
-      destination: remote
+      destination: remote,
+      bugReport: bugReport
     )
 
     let connection = try await makeConnection()
@@ -308,11 +310,13 @@ struct ADBExec: Sendable {
     timeLimitSeconds: Int,
     size: String?,
     destination: String,
-    outputFormat: String? = nil
+    outputFormat: String? = nil,
+    bugReport: Bool = false
   ) -> String {
     var command = "screenrecord --bit-rate \(bitRateMbps * 1_000_000) --time-limit \(timeLimitSeconds)"
     if let outputFormat, !outputFormat.isEmpty { command += " --output-format=\(outputFormat)" }
     if let size, !size.isEmpty { command += " --size \(size)" }
+    if bugReport { command += " --bugreport" }
     command += " \(destination)"
     return command
   }

Snap-O/App/AppSettings.swift

@@ -7,13 +7,21 @@ final class AppSettings: ObservableObject {
 
   @Published var showTouchesDuringCapture: Bool {
     didSet {
-      UserDefaults.standard.set(showTouchesDuringCapture, forKey: Self.key)
+      UserDefaults.standard.set(showTouchesDuringCapture, forKey: Self.showTouchesKey)
     }
   }
 
-  private static let key = "showTouchesDuringCapture"
+  @Published var recordAsBugReport: Bool {
+    didSet {
+      UserDefaults.standard.set(recordAsBugReport, forKey: Self.bugReportKey)
+    }
+  }
+
+  private static let showTouchesKey = "showTouchesDuringCapture"
+  private static let bugReportKey = "recordAsBugReport"
 
   init() {
-    showTouchesDuringCapture = UserDefaults.standard.object(forKey: Self.key) as? Bool ?? true
+    showTouchesDuringCapture = UserDefaults.standard.object(forKey: Self.showTouchesKey) as? Bool ?? true
+    recordAsBugReport = UserDefaults.standard.object(forKey: Self.bugReportKey) as? Bool ?? false
   }
 }

Snap-O/App/CaptureService.swift

@@ -12,7 +12,11 @@ actor CaptureService {
   private var lastCaptureTimestamp: Date? // Keeps filenames unique when captures share a real timestamp.
   private var showTouchesOverrides: [String: Task<Bool?, Never>] = [:]
 
-  init(adb: ADBService, fileStore: FileStore, deviceTracker: DeviceTracker) {
+  init(
+    adb: ADBService,
+    fileStore: FileStore,
+    deviceTracker: DeviceTracker
+  ) {
     self.adb = adb
     self.fileStore = fileStore
     self.deviceTracker = deviceTracker
@@ -55,14 +59,18 @@ actor CaptureService {
   func startRecordings(for devices: [Device]) async -> ([String: RecordingSession], Error?) {
     var sessions: [String: RecordingSession] = [:]
     var encounteredError: Error?
+    let targetBugReport = await AppSettings.shared.recordAsBugReport
 
     await withTaskGroup(of: (String, Result<RecordingSession, Error>).self) { group in
+      let exec = await adb.exec()
       for device in devices {
         group.addTask {
-          let exec = await self.adb.exec()
+          await self.beginShowTouchesOverride(deviceID: device.id)
           do {
-            let session = try await exec.startScreenrecord(deviceID: device.id)
-            await self.beginShowTouchesOverride(deviceID: device.id)
+            let session = try await exec.startScreenrecord(
+              deviceID: device.id,
+              bugReport: targetBugReport
+            )
             return (device.id, .success(session))
           } catch {
             await self.scheduleRestoreShowTouches(deviceID: device.id)
@@ -147,8 +155,9 @@ actor CaptureService {
   }
 
   func startLivePreview(for deviceID: String) async throws -> LivePreviewSession {
+    beginShowTouchesOverride(deviceID: deviceID)
+
     do {
-      beginShowTouchesOverride(deviceID: deviceID)
       return try await LivePreviewSession(deviceID: deviceID, adb: adb)
     } catch {
       await scheduleRestoreShowTouches(deviceID: deviceID)
@@ -197,10 +206,10 @@ actor CaptureService {
     guard showTouchesOverrides[deviceID] == nil else { return }
 
     let task = Task<Bool?, Never> {
+      let targetValue = await AppSettings.shared.showTouchesDuringCapture
+      let exec = await adb.exec()
       do {
-        let exec = await adb.exec()
         let originalValue = try await exec.getShowTouches(deviceID: deviceID)
-        let targetValue = await AppSettings.shared.showTouchesDuringCapture
         if originalValue != targetValue {
           try await exec.setShowTouches(deviceID: deviceID, enabled: targetValue)
         }
@@ -217,10 +226,10 @@ actor CaptureService {
   }
 
   private func scheduleRestoreShowTouches(deviceID: String) async {
-    guard let state = showTouchesOverrides.removeValue(forKey: deviceID) else { return }
+    guard let task = showTouchesOverrides.removeValue(forKey: deviceID) else { return }
     let exec = await adb.exec()
     Task.detached(priority: .utility) {
-      let originalValue = await state.value
+      let originalValue = await task.value
       guard let originalValue else { return }
       do {
         try await exec.setShowTouches(deviceID: deviceID, enabled: originalValue)

Snap-O/App/SnapOCommands.swift

@@ -114,6 +114,7 @@ struct SnapOCommands: Commands {
       .disabled(!hasAlternativeMedia)
       Divider()
       Toggle("Show Touches During Capture", isOn: $settings.showTouchesDuringCapture)
+      Toggle("Record Screen as Bug Report", isOn: $settings.recordAsBugReport)
     }
     CommandMenu("ADB") {
       Button("Set ADB path…") {

Snap-O/CaptureWindow/CaptureToolbar.swift

@@ -2,6 +2,7 @@ import SwiftUI
 
 struct CaptureToolbar: ToolbarContent {
   @ObservedObject var controller: CaptureWindowController
+  @ObservedObject var settings: AppSettings
 
   var body: some ToolbarContent {
     if controller.isRecording {
@@ -14,6 +15,7 @@ struct CaptureToolbar: ToolbarContent {
       }
     } else {
       IdleToolbarControls(
+        settings: settings,
         screenshot: { Task { await controller.captureScreenshots() } },
         canCaptureNow: controller.canCaptureNow,
         startRecording: { Task { await controller.startRecording() } },
@@ -26,6 +28,8 @@ struct CaptureToolbar: ToolbarContent {
 
   @ViewBuilder
   private func recordingControls() -> some View {
+    let bugReportEnabled = settings.recordAsBugReport
+
     if controller.isProcessing {
       ProgressView()
         .progressViewStyle(.circular)
@@ -37,7 +41,7 @@ struct CaptureToolbar: ToolbarContent {
       Button {
         Task { await controller.stopRecording() }
       } label: {
-        Label("Stop", systemImage: "stop.fill")
+        Label("Stop Recording", systemImage: bugReportEnabled ? "ant.fill" : "stop.fill")
           .fontWeight(.semibold)
           .padding(.horizontal, 8)
           .padding(.vertical, 6)
@@ -70,6 +74,7 @@ struct CaptureToolbar: ToolbarContent {
 }
 
 struct IdleToolbarControls: ToolbarContent {
+  @ObservedObject var settings: AppSettings
   let screenshot: @MainActor () -> Void
   let canCaptureNow: Bool
   let startRecording: @MainActor () -> Void
@@ -88,13 +93,35 @@ struct IdleToolbarControls: ToolbarContent {
       .help("New Screenshot (⌘R)")
       .disabled(!canCaptureNow)
 
-      Button {
-        startRecording()
-      } label: {
-        Label("Record", systemImage: "record.circle")
+      if settings.recordAsBugReport {
+        Menu {
+          Button("Disable Bug Report Mode") {
+            settings.recordAsBugReport = false
+          }
+        } label: {
+          Label("Record", systemImage: "ant.circle")
+        } primaryAction: {
+          startRecording()
+        }
+        .overlay(alignment: .bottomTrailing) {
+          Image(systemName: "chevron.down")
+            .font(.system(size: 5, weight: .bold))
+            .offset(x: -6, y: -2)
+        }
+        .padding(.horizontal, -3)
+        .menuIndicator(.hidden)
+        .menuStyle(.button)
+        .help("Start Recording Bug Report (⌘⇧R)")
+        .disabled(!canStartRecordingNow)
+      } else {
+        Button {
+          startRecording()
+        } label: {
+          Label("Record", systemImage: "record.circle")
+        }
+        .help("Start Recording (⌘⇧R)")
+        .disabled(!canStartRecordingNow)
       }
-      .help("Start Recording (⌘⇧R)")
-      .disabled(!canStartRecordingNow)
 
       Button {
         startLivePreview()

Snap-O/CaptureWindow/CaptureWindow.swift

@@ -2,6 +2,7 @@ import SwiftUI
 
 struct CaptureWindow: View {
   @StateObject private var controller = CaptureWindowController()
+  @StateObject private var settings = AppSettings.shared
 
   var body: some View {
     ZStack {
@@ -40,7 +41,7 @@ struct CaptureWindow: View {
       .frame(width: 0, height: 0)
     )
     .toolbar {
-      CaptureToolbar(controller: controller)
+      CaptureToolbar(controller: controller, settings: settings)
 
       if let progress = controller.captureProgressText {
         ToolbarItem(placement: .status) {