test: more override config

Samples/SentrySampleShared/SentrySampleShared.xcconfig

@@ -30,3 +30,5 @@ CODE_SIGN_IDENTITY =
 CODE_SIGN_IDENTITY[sdk=macosx*] =
 PROVISIONING_PROFILE_SPECIFIER =
 DEVELOPMENT_TEAM =
+
+TARGETED_DEVICE_FAMILY = 1,2,3,4,7

Samples/iOS-Swift/iOS-Swift/Tools/DSNDisplayViewController.swift → Samples/SentrySampleShared/SentrySampleShared/DSNDisplayViewController.swift

@@ -1,15 +1,10 @@
-import SentrySampleShared
+#if !os(macOS) && !os(tvOS) && !os(watchOS) && !os(visionOS)
+
+import Sentry
 import UIKit
 
 let fontSize: CGFloat = 12
 
-func addDSNDisplay(_ vc: UIViewController, vcview: UIView) {
-    let dsnVC = DSNDisplayViewController(nibName: nil, bundle: nil)
-    vcview.addSubview(dsnVC.view)
-    dsnVC.view.matchEdgeAnchors(from: vcview)
-    vc.addChild(dsnVC)
-}
-
 class DSNDisplayViewController: UIViewController {
     let dispatchQueue = DispatchQueue(label: "io.sentry.iOS-Swift.queue.dsn-management", attributes: .concurrent)
     let label = UILabel(frame: .zero)
@@ -48,7 +43,7 @@ class DSNDisplayViewController: UIViewController {
         ])
 
         view.addSubview(stack)
-        stack.matchEdgeAnchors(from: view, leadingPad: 20)
+        stack.matchEdgeAnchors(from: view)
         buttonStack.translatesAutoresizingMaskIntoConstraints = false
         buttonStack.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.3).isActive = true
     }
@@ -172,3 +167,5 @@ class DSNDisplayViewController: UIViewController {
         return attributedString
     }
 }
+
+#endif // !os(macOS) && !os(tvOS) && !os(watchOS) && !os(visionOS)

Samples/SentrySampleShared/SentrySampleShared/EnvironmentVariableTableViewCell.swift

@@ -1,4 +1,4 @@
-#if !os(macOS) && !os(tvOS) && !os(watchOS)
+#if !os(macOS) && !os(tvOS) && !os(watchOS) && !os(visionOS)
 import UIKit
 
 class EnvironmentVariableTableViewCell: UITableViewCell, UITextFieldDelegate {
@@ -10,15 +10,14 @@ class EnvironmentVariableTableViewCell: UITableViewCell, UITextFieldDelegate {
         return field
     }()
 
-    var float: Bool = false
     var override: (any SentrySDKOverride)?
 
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         let stack = UIStackView(arrangedSubviews: [valueField, titleLabel])
         stack.spacing = 8
         contentView.addSubview(stack)
-        stack.matchEdgeAnchors(from: contentView, topPad: 8, bottomPad: 8)
+        stack.matchEdgeAnchors(from: contentView)
 
         valueField.borderStyle = .roundedRect
     }
@@ -27,29 +26,31 @@ class EnvironmentVariableTableViewCell: UITableViewCell, UITextFieldDelegate {
         fatalError("init(coder:) has not been implemented")
     }
 
-    func configure(with override: any SentrySDKOverride, float: Bool) {
-        titleLabel.text = override.rawValue as? String
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        if override?.overrideType == .float {
+            override?.floatValue = textField.text.flatMap { Float($0) }
+        } else {
+            override?.stringValue = textField.text
+        }
+        SentrySDKWrapper.shared.startSentry()
+    }
+}
+
+extension EnvironmentVariableTableViewCell: FeatureFlagCell {
+    func configure(with override: any SentrySDKOverride) {
+        titleLabel.text = override.rawValue
 
         var text: String
-        if let value = override.floatValue {
+        if override.overrideType == .float, let value = override.floatValue {
             text = String(format: "%.2f", value)
-        } else if let value = override.stringValue {
+        } else if override.overrideType == .string, let value = override.stringValue {
             text = value
         } else {
             text = "nil"
         }
         valueField.text = text
 
-        self.float = float
         self.override = override
     }
-
-    func textFieldDidEndEditing(_ textField: UITextField) {
-        if self.float {
-            override?.floatValue = textField.text.flatMap { Float($0) }
-        } else {
-            override?.stringValue = textField.text
-        }
-    }
 }
-#endif // !os(macOS) && !os(tvOS) && !os(watchOS)
+#endif // !os(macOS) && !os(tvOS) && !os(watchOS) && !os(visionOS)

Samples/SentrySampleShared/SentrySampleShared/FeatureFlagCell.swift

@@ -0,0 +1,9 @@
+#if !os(macOS) && !os(tvOS) && !os(watchOS) && !os(visionOS)
+
+import UIKit
+
+protocol FeatureFlagCell: UITableViewCell {
+    func configure(with override: any SentrySDKOverride)
+}
+
+#endif // !os(macOS) && !os(tvOS) && !os(watchOS) && !os(visionOS)

Samples/SentrySampleShared/SentrySampleShared/FeaturesViewController.swift

@@ -1,15 +1,30 @@
-#if !os(macOS) && !os(tvOS) && !os(watchOS)
+#if !os(macOS) && !os(tvOS) && !os(watchOS) && !os(visionOS)
+
 import UIKit
 
-public class FeaturesViewController: UITableViewController {
-    public override func viewDidLoad() {
-        super.viewDidLoad()
+public class FeaturesViewController: UIViewController {
+    let tableView = UITableView(frame: .zero, style: .plain)
+
+    public override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+
         tableView.register(LaunchArgumentTableViewCell.self, forCellReuseIdentifier: "launchArgumentCell")
         tableView.register(EnvironmentVariableTableViewCell.self, forCellReuseIdentifier: "environmentVariableCell")
-        tableView.tableHeaderView = tableHeader
+        tableView.dataSource = self
+
+        let stack = UIStackView(arrangedSubviews: [headerView, tableView])
+        stack.axis = .vertical
+        view.addSubview(stack)
+        stack.matchEdgeAnchors(from: view, safeArea: true)
+
+        view.backgroundColor = .white
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) not supported")
     }
 
-    var tableHeader: UIView {
+    var headerView: UIView {
         let resetButton = UIButton(type: .custom)
         resetButton.setTitle("Reset Defaults", for: .normal)
         resetButton.setTitleColor(.blue, for: .normal)
@@ -18,103 +33,52 @@ public class FeaturesViewController: UITableViewController {
         let label = UILabel(frame: .zero)
         label.text = SentrySDKOverrides.schemaPrecedenceForEnvironmentVariables ? "Schema Precedence" : "Defaults Precedence"
 
-        let stack = UIStackView(arrangedSubviews: [label, resetButton])
-        stack.spacing = 8
+        let hstack = UIStackView(arrangedSubviews: [label, resetButton])
+        hstack.spacing = 8
 
-        let header = UIView(frame: .zero)
-        header.addSubview(stack)
+        let dsnVC = DSNDisplayViewController(nibName: nil, bundle: nil)
+        addChild(dsnVC)
 
-        stack.matchEdgeAnchors(from: header)
-        header.heightAnchor.constraint(equalToConstant: 50).isActive = true
-
-        return header
+        let vStack = UIStackView(arrangedSubviews: [dsnVC.view, hstack])
+        vStack.axis = .vertical
+        return vStack
     }
 
     @objc func resetDefaults() {
         SentrySDKOverrides.resetDefaults()
+        SentrySDKWrapper.shared.startSentry()
         tableView.reloadData()
     }
+}
 
-    public override func numberOfSections(in tableView: UITableView) -> Int {
-        6
+extension FeaturesViewController: UITableViewDataSource {
+    public func numberOfSections(in tableView: UITableView) -> Int {
+        SentrySDKOverrides.allCases.count
     }
 
-    public override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        if section == 0 {
-            return "Special"
-        } else if section == 1 {
-            return "Performance"
-        } else if section == 2 {
-            return "Tracing"
-        } else if section == 3 {
-            return "Profiling"
-        } else if section == 4 {
-            return "Feedback"
-        } else if section == 5 {
-            return "Other"
-        }
-        return nil
+    public func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+        SentrySDKOverrides.allCases[section].rawValue
     }
 
-    public override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if section == 0 {
-            return SentrySDKOverrides.Special.allCases.count
-        } else if section == 1 {
-            return SentrySDKOverrides.Performance.allCases.count
-        } else if section == 2 {
-            return SentrySDKOverrides.Tracing.allCases.count
-        } else if section == 3 {
-            return SentrySDKOverrides.Profiling.allCases.count
-        } else if section == 4 {
-            return SentrySDKOverrides.Feedback.allCases.count
-        } else if section == 5 {
-            return SentrySDKOverrides.Other.allCases.count
-        }
-        return 0
+    public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        SentrySDKOverrides.allCases[section].featureFlags.count
     }
 
-    public override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        if indexPath.section == 2 {
-            if SentrySDKOverrides.Tracing.boolValues.contains(SentrySDKOverrides.Tracing.allCases[indexPath.row]) {
-                let cell = tableView.dequeueReusableCell(withIdentifier: "launchArgumentCell", for: indexPath) as! LaunchArgumentTableViewCell
-                cell.configure(with: SentrySDKOverrides.Tracing.allCases[indexPath.row])
-                return cell
-            } else {
-                let cell = tableView.dequeueReusableCell(withIdentifier: "environmentVariableCell", for: indexPath) as! EnvironmentVariableTableViewCell
-                cell.configure(with: SentrySDKOverrides.Tracing.allCases[indexPath.row], float: true)
-                return cell
-            }
-        } else if indexPath.section == 3 {
-            if SentrySDKOverrides.Profiling.boolValues.contains(SentrySDKOverrides.Profiling.allCases[indexPath.row]) {
-                let cell = tableView.dequeueReusableCell(withIdentifier: "launchArgumentCell", for: indexPath) as! LaunchArgumentTableViewCell
-                cell.configure(with: SentrySDKOverrides.Profiling.allCases[indexPath.row])
-                return cell
-            } else {
-                let cell = tableView.dequeueReusableCell(withIdentifier: "environmentVariableCell", for: indexPath) as! EnvironmentVariableTableViewCell
-                cell.configure(with: SentrySDKOverrides.Profiling.allCases[indexPath.row], float: true)
-                return cell
-            }
-        } else if indexPath.section == 5 {
-            if SentrySDKOverrides.Other.boolValues.contains(SentrySDKOverrides.Other.allCases[indexPath.row]) {
-                let cell = tableView.dequeueReusableCell(withIdentifier: "launchArgumentCell", for: indexPath) as! LaunchArgumentTableViewCell
-                cell.configure(with: SentrySDKOverrides.Other.allCases[indexPath.row])
-                return cell
-            } else {
-                let cell = tableView.dequeueReusableCell(withIdentifier: "environmentVariableCell", for: indexPath) as! EnvironmentVariableTableViewCell
-                cell.configure(with: SentrySDKOverrides.Other.allCases[indexPath.row], float: false)
-                return cell
-            }
-        }
+    public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let featureType = SentrySDKOverrides.allCases[indexPath.section]
+        let featureFlag = featureType.featureFlags[indexPath.row]
 
-        let cell = tableView.dequeueReusableCell(withIdentifier: "launchArgumentCell", for: indexPath) as! LaunchArgumentTableViewCell
-        if indexPath.section == 0 {
-            cell.configure(with: SentrySDKOverrides.Special.allCases[indexPath.row])
-        } else if indexPath.section == 1 {
-            cell.configure(with: SentrySDKOverrides.Performance.allCases[indexPath.row])
-        } else if indexPath.section == 4 {
-            cell.configure(with: SentrySDKOverrides.Feedback.allCases[indexPath.row])
+        let reuseIdentifier: String
+        switch featureFlag.overrideType {
+        case .boolean:
+            reuseIdentifier = "launchArgumentCell"
+        case .float, .string:
+            reuseIdentifier = "environmentVariableCell"
         }
+
+        let cell = tableView.dequeueReusableCell(withIdentifier: reuseIdentifier, for: indexPath) as! FeatureFlagCell
+        cell.configure(with: featureFlag)
         return cell
     }
 }
-#endif // !os(macOS) && !os(tvOS) && !os(watchOS)
+#endif // !os(macOS) && !os(tvOS) && !os(watchOS) && !os(visionOS)

Samples/SentrySampleShared/SentrySampleShared/LaunchArgumentTableViewCell.swift

@@ -1,4 +1,4 @@
-#if !os(macOS) && !os(tvOS) && !os(watchOS)
+#if !os(macOS) && !os(tvOS) && !os(watchOS) && !os(visionOS)
 import UIKit
 
 class LaunchArgumentTableViewCell: UITableViewCell {
@@ -12,24 +12,27 @@ class LaunchArgumentTableViewCell: UITableViewCell {
 
     @objc func toggleFlag() {
         override?.boolValue = flagSwitch.isOn
+        SentrySDKWrapper.shared.startSentry()
     }
 
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         let stack = UIStackView(arrangedSubviews: [flagSwitch, titleLabel])
         stack.spacing = 8
         contentView.addSubview(stack)
-        stack.matchEdgeAnchors(from: contentView, topPad: 8, bottomPad: 8)
+        stack.matchEdgeAnchors(from: contentView)
     }
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+}
 
+extension LaunchArgumentTableViewCell: FeatureFlagCell {
     func configure(with override: any SentrySDKOverride) {
-        titleLabel.text = override.rawValue as? String
+        titleLabel.text = override.rawValue
         flagSwitch.isOn = override.boolValue
         self.override = override
     }
 }
-#endif // !os(macOS) && !os(tvOS) && !os(watchOS)
+#endif // !os(macOS) && !os(tvOS) && !os(watchOS) && !os(visionOS)