feat: add sharing debug information option to main settings screen - WPB-24712

WireFoundation/Sources/WireFoundation/WirePrimitives/UITestConfig.swift

@@ -28,6 +28,14 @@ public struct UITestConfig: Codable {
 
     public var isBuildBlacklisted = false
 
+    /// When `true`, a triple-tap on the app window triggers the same action as the shake gesture.
+    /// On XCUITests, shake gesture is not available.
+    public var useTripleTapForShakeGesture = true
+
+    /// Developer flags to apply at launch, keyed by `DeveloperFlag.rawValue`.
+    /// Overrides any flags already stored in `UserDefaults`.
+    public var developerFlags: [String: Bool] = [:]
+
     // MARK: - Init
 
     public init() {}

WireFoundation/Sources/WireTesting/Utilities/SnapshotHelper.swift

@@ -34,7 +34,14 @@ public struct SnapshotHelper {
 
     private var defaultRecordMode: SnapshotTestingConfiguration.Record? {
         let ci = ProcessInfo.processInfo.environment["CI"]
-        return (ci == nil || ci?.isEmpty == true) ? .missing : .never
+        if let value = ProcessInfo.processInfo.environment["SNAPSHOT_TESTING_RECORD"],
+           let record = SnapshotTestingConfiguration.Record(rawValue: value) {
+            return record
+        } else if ci == nil || ci?.isEmpty == true {
+            return .missing
+        } else {
+            return .never
+        }
     }
 
     public init() {}
@@ -360,7 +367,7 @@ public struct SnapshotHelper {
         matching value: UIViewController,
         size: CGSize? = nil,
         named name: String? = nil,
-        record recording: Bool = false,
+        record recording: Bool? = nil,
         file: StaticString = #filePath,
         testName: String = #function,
         safeArea: UIEdgeInsets = .zero,
@@ -522,7 +529,7 @@ public struct SnapshotHelper {
     public func verify(
         matching value: UIImage,
         named name: String? = nil,
-        record recording: Bool = false,
+        record recording: Bool? = nil,
         file: StaticString = #filePath,
         testName: String = #function,
         line: UInt = #line

WireLogging/Sources/WireLogging/LogFilesProviding.swift

@@ -21,28 +21,19 @@ public import Foundation
 // sourcery: AutoMockable
 public protocol LogFilesProviding {
 
-    /// Generates a zip file containing all log files and returns its data before removing the files
-    ///
-    /// - Returns: the log files archive data
+    /// All log file URLs to include in the archive.
+    var logFileURLs: [URL] { get }
 
-    func generateLogFilesData() throws -> Data
-
-    /// Generates a zip file containing all log files
-    ///
-    /// - Returns: the log files archive URL
-
-    func generateLogFilesZip() throws -> URL
+    /// Returns system and app info, optionally including journal entries for the given user.
+    func info(selfUserID: UUID?) -> String
 
     /// Clears the logs directory.
-    /// Call once you are done using the URL returned by `generateLogFilesZip` to clean up.
-
+    /// Call once you are done using the URL returned by `CreateDebugReportUseCase` to clean up.
     func clearLogsDirectory(fileManager: FileManager) throws
 
     /// Clears individual log files from their source locations.
-
     func removeLogFiles(fileManager: FileManager) throws
 
-    /// Deletes all log-related legacy archives
-
+    /// Deletes all log-related legacy archives.
     func removeLegacyLogArchives() throws
 }

WireUI/Sources/WireDesign/Appearance/UITabBarController+applyMainTabBarControllerAppearance.swift

@@ -28,10 +28,10 @@ public extension UITabBarController {
 
         let tabBarAppearance = UITabBarAppearance()
         tabBarAppearance.configureWithDefaultBackground()
-        tabBarAppearance.backgroundColor = ColorTheme.Backgrounds.background
+        tabBarAppearance.backgroundColor = ColorTheme.Backgrounds.backgroundVariant
         tabBarAppearance.stackedLayoutAppearance = tabBarItemAppearance
 
-        tabBar.backgroundColor = ColorTheme.Backgrounds.background
+        tabBar.backgroundColor = ColorTheme.Backgrounds.backgroundVariant
         tabBar.unselectedItemTintColor = ColorTheme.Base.secondaryText
         tabBar.standardAppearance = tabBarAppearance
     }

WireUI/Sources/WireDesign/Colors/ColorTheme.swift

@@ -201,6 +201,16 @@
     public enum NotificationBadge {
         public static let fill = ColorTheme.Base.error
     }
+
+    // MARK: - Wire Design System
+
+    // TODO: [WPB-25347] implement the new color system
+    public enum Content {
+        public enum Base {
+            public static let secondary = UIColor(light: .gray70, dark: .gray60)
+        }
+    }
+
 }
 
 private extension UIColor {

WireUI/Sources/WireDesign/Typography/WireTextStyle.swift

@@ -20,18 +20,43 @@
 
 public enum WireTextStyle: String, CaseIterable, Sendable {
 
+    /// Style iOS & Figma: ?
     case largeTitle
+
+    /// Style iOS & Figma: Title 3
     case h1
+
+    /// Style iOS & Figma: Title 3 (bold) - Emphasized
     case h2
+
+    /// Style iOS & Figma: Headline
     case h3
+
+    /// Style iOS & Figma: Subheadline
     case h4
+
+    /// Style iOS & Figma: Footnote
     case h5
+
+    /// Style iOS & Figma: Body
     case body1
+
+    /// Style iOS & Figma: Body 2 (custom)
     case body2
+
+    /// Figma: Callout (bold) - Emphasized
     case body3
+
+    /// Style iOS & Figma: Caption 1
     case subline1
+
+    /// Style iOS & Figma: Caption 1 (bold) - Emphasized
     case subline2
+
+    /// Style iOS & Figma: Button Small (custom)
     case buttonSmall
+
+    /// Style iOS & Figma: Button Big (custom)
     case buttonBig
 
 }

WireUI/Sources/WireLocators/Locators.swift

@@ -89,6 +89,28 @@ public enum Locators {
 
         case accountCell
         case optionsCell
+        case shareDebugBanner
+    }
+
+    public enum ShareDebugReportPage: String {
+
+        case actionSheet = "Having trouble?"
+        case shareViaWireButton = "ShareDebugReportPage.shareViaWireButton"
+        case sendEmailButton = "ShareDebugReportPage.sendEmailButton"
+        case shareButton = "ShareDebugReportPage.shareButton"
+        case cancelButton = "ShareDebugReportPage.cancelButton"
+    }
+
+    public enum ShareViaWirePage: AutoPrefixedEnum {
+
+        case sendButton
+        case closeButton
+    }
+
+    public enum ActivitySheetPage: String {
+
+        case sheet = "ActivityListView"
+        case saveToFiles = "Save to Files"
     }
 
     public enum AccountSettingsPage: String {

WireUI/Sources/WireReusableUIComponents/BlockingActivityIndicator/BlockingActivityIndicator.swift

@@ -17,24 +17,35 @@
 //
 
 import SwiftUI
+import WireDesign
 import WireFoundation
 
 /// Adds an activity indicator subview to the provided `UIView` instance and disables user interaction.
 public final class BlockingActivityIndicator {
 
+    public enum Style {
+        /// Full-screen dimmed overlay with a white spinner centered on it.
+        case fullScreen
+        /// Full-screen dimmed overlay with a centered white card containing a dark spinner and text.
+        case card
+    }
+
     // MARK: - Private Properties
 
     private weak var view: UIView?
     private let accessibilityAnnouncement: String?
+    private let style: Style
 
     // MARK: - Life Cycle
 
     public init(
         view: UIView,
-        accessibilityAnnouncement: String?
+        accessibilityAnnouncement: String?,
+        style: Style = .fullScreen
     ) {
         self.view = view
         self.accessibilityAnnouncement = accessibilityAnnouncement
+        self.style = style
     }
 
     deinit {
@@ -62,7 +73,7 @@ public final class BlockingActivityIndicator {
         if let accessibilityAnnouncement {
             UIAccessibility.post(notification: .announcement, argument: accessibilityAnnouncement)
         }
-        view?.blockAndStartAnimating(blockingActivityIndicator: self, text: text)
+        view?.blockAndStartAnimating(blockingActivityIndicator: self, text: text, style: style)
     }
 
     @MainActor
@@ -76,6 +87,7 @@ public final class BlockingActivityIndicator {
 private struct BlockingActivityIndicatorState {
     var weakReferences = [WeakReference<BlockingActivityIndicator>]()
     private(set) var activityIndicatorView = ProgressSpinner()
+    var blockingView: UIView?
 }
 
 // MARK: - UIView + BlockingActivityIndicators
@@ -84,37 +96,73 @@ private extension UIView {
 
     func blockAndStartAnimating(
         blockingActivityIndicator reference: BlockingActivityIndicator,
-        text: String
+        text: String,
+        style: BlockingActivityIndicator.Style
     ) {
         var state: BlockingActivityIndicatorState! = blockingActivityIndicatorState
 
         // set up subviews
         if state == nil {
             state = .init()
 
-            // view with dimmed background which swallows touch events
+            // dim overlay which swallows touch events
             let blockingView = UIView()
+            state.blockingView = blockingView
             blockingView.backgroundColor = .black.withAlphaComponent(0.5)
             blockingView.isUserInteractionEnabled = true
             blockingView.translatesAutoresizingMaskIntoConstraints = false
             addSubview(blockingView)
 
-            // activity indicator view
-            state.activityIndicatorView.color = .white
-            state.activityIndicatorView.text = text
-            state.activityIndicatorView.isAnimating = true
-            state.activityIndicatorView.translatesAutoresizingMaskIntoConstraints = false
-            blockingView.addSubview(state.activityIndicatorView)
-
             NSLayoutConstraint.activate([
                 blockingView.leadingAnchor.constraint(equalTo: leadingAnchor),
                 blockingView.topAnchor.constraint(equalTo: topAnchor),
                 trailingAnchor.constraint(equalTo: blockingView.trailingAnchor),
-                bottomAnchor.constraint(equalTo: blockingView.bottomAnchor),
-
-                state.activityIndicatorView.centerXAnchor.constraint(equalTo: blockingView.centerXAnchor),
-                state.activityIndicatorView.centerYAnchor.constraint(equalTo: blockingView.centerYAnchor)
+                bottomAnchor.constraint(equalTo: blockingView.bottomAnchor)
             ])
+
+            state.activityIndicatorView.text = text
+            state.activityIndicatorView.isAnimating = true
+            state.activityIndicatorView.translatesAutoresizingMaskIntoConstraints = false
+
+            switch style {
+            case .fullScreen:
+                state.activityIndicatorView.color = .white
+                blockingView.addSubview(state.activityIndicatorView)
+                NSLayoutConstraint.activate([
+                    state.activityIndicatorView.centerXAnchor.constraint(equalTo: blockingView.centerXAnchor),
+                    state.activityIndicatorView.centerYAnchor.constraint(equalTo: blockingView.centerYAnchor)
+                ])
+
+            case .card:
+                state.activityIndicatorView.color = .label
+                state.activityIndicatorView.textColor = .label
+
+                let card = UIView()
+                card.backgroundColor = ColorTheme.Backgrounds.surface
+                card.layer.cornerRadius = 16
+                card.layer.masksToBounds = true
+                card.translatesAutoresizingMaskIntoConstraints = false
+                blockingView.addSubview(card)
+                card.addSubview(state.activityIndicatorView)
+
+                // Card prefers 65% of the overlay width (wide enough for label text on iPhone)
+                // but is capped at 300pt so it stays compact on iPad.
+                // Spinner uses equalTo horizontal margins so it fills the card — this overrides
+                // ProgressSpinner.intrinsicContentSize (32pt) which ignores the label width.
+                let preferredWidth = card.widthAnchor.constraint(equalTo: blockingView.widthAnchor, multiplier: 0.65)
+                preferredWidth.priority = .defaultHigh
+                NSLayoutConstraint.activate([
+                    card.centerXAnchor.constraint(equalTo: blockingView.centerXAnchor),
+                    card.centerYAnchor.constraint(equalTo: blockingView.centerYAnchor),
+                    preferredWidth,
+                    card.widthAnchor.constraint(lessThanOrEqualToConstant: 300),
+
+                    state.activityIndicatorView.topAnchor.constraint(equalTo: card.topAnchor, constant: 24),
+                    state.activityIndicatorView.leadingAnchor.constraint(equalTo: card.leadingAnchor, constant: 24),
+                    card.trailingAnchor.constraint(equalTo: state.activityIndicatorView.trailingAnchor, constant: 24),
+                    card.bottomAnchor.constraint(equalTo: state.activityIndicatorView.bottomAnchor, constant: 24)
+                ])
+            }
         }
 
         // add the reference into the `weakReferences` array
@@ -127,7 +175,7 @@ private extension UIView {
 
         state.weakReferences = state.weakReferences.filter { $0.reference != nil && $0.reference !== reference }
         if state.weakReferences.isEmpty {
-            state.activityIndicatorView.superview!.removeFromSuperview()
+            state.blockingView?.removeFromSuperview()
             blockingActivityIndicatorState = nil
         }
     }

WireUI/Sources/WireReusableUIComponents/ProgressIndicator/ProgressSpinner.swift

@@ -28,6 +28,10 @@ public final class ProgressSpinner: UIView {
         didSet { updateSpinnerIcon() }
     }
 
+    public var textColor: UIColor = .white {
+        didSet { label.textColor = textColor }
+    }
+
     public var iconSize: CGFloat = 32 {
         didSet { updateSpinnerIcon() }
     }
@@ -37,6 +41,7 @@ public final class ProgressSpinner: UIView {
         set {
             label.text = newValue
             label.isHidden = newValue.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+            invalidateIntrinsicContentSize()
         }
     }
 
@@ -82,6 +87,7 @@ public final class ProgressSpinner: UIView {
         stackView.translatesAutoresizingMaskIntoConstraints = false
         addSubview(stackView)
 
+        spinner.accessibilityElementsHidden = true
         spinner.contentMode = .center
         updateSpinnerIcon()
         stackView.addArrangedSubview(spinner)
@@ -133,7 +139,7 @@ public final class ProgressSpinner: UIView {
     }
 
     public override var intrinsicContentSize: CGSize {
-        spinner.image?.size ?? super.intrinsicContentSize
+        stackView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
     }
 
     private func startAnimationInternal() {

WireUI/Tests/TestPlans/AllTests.xctestplan

@@ -18,6 +18,11 @@
       {
         "key" : "CI",
         "value" : "${CI}"
+      },
+      {
+        "enabled" : false,
+        "key" : "SNAPSHOT_TESTING_RECORD",
+        "value" : "failed"
       }
     ],
     "language" : "en",