Merge remote-tracking branch 'origin/main' into armcknight/feat(user-…

…feedback)/ui-tests

Samples/iOS-Swift/iOS-Swift-UITests/UserFeedbackUITests.swift

@@ -1,3 +1,5 @@
+//swiftlint:disable todo
+
 import XCTest
 
 class UserFeedbackUITests: BaseUITest {
@@ -152,3 +154,5 @@ class UserFeedbackUITests: BaseUITest {
         XCTAssertEqual(try XCTUnwrap(messageTextView.value as? String), "")
     }
 }
+
+//swiftlint:enable todo

Sources/Swift/Integrations/UserFeedback/SentryUserFeedbackForm.swift

@@ -1,3 +1,5 @@
+//swiftlint:disable todo type_body_length
+
 import Foundation
 #if os(iOS) && !SENTRY_NO_UIKIT
 @_implementationOnly import _SentryPrivate
@@ -26,7 +28,49 @@
         self.delegate = delegate
         super.init(nibName: nil, bundle: nil)
         view.backgroundColor = config.theme.background
+        initLayout()
+        themeElements()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    // MARK: Actions
+
+    func addScreenshotButtonTapped() {
 
+    }
+
+    func removeScreenshotButtonTapped() {
+
+    }
+
+    func submitFeedbackButtonTapped() {
+        // TODO: validate and package entries
+        delegate?.confirmed()
+    }
+
+    func cancelButtonTapped() {
+        delegate?.cancelled()
+    }
+
+    // MARK: Layout
+
+    let formElementHeight: CGFloat = 40
+    let logoWidth: CGFloat = 47
+    lazy var messageTextViewHeightConstraint = messageTextView.heightAnchor.constraint(equalToConstant: config.theme.font.lineHeight * 5)
+    lazy var logoViewWidthConstraint = sentryLogoView.widthAnchor.constraint(equalToConstant: logoWidth * config.scaleFactor)
+    lazy var messagePlaceholderLeadingConstraint = messageTextViewPlaceholder.leadingAnchor.constraint(equalTo: messageTextView.leadingAnchor, constant: messageTextView.textContainerInset.left + 5)
+    lazy var messagePlaceholderTopConstraint = messageTextViewPlaceholder.topAnchor.constraint(equalTo: messageTextView.topAnchor, constant: messageTextView.textContainerInset.top)
+    lazy var fullNameTextFieldHeightConstraint = fullNameTextField.heightAnchor.constraint(equalToConstant: formElementHeight * config.scaleFactor)
+    lazy var emailTextFieldHeightConstraint = emailTextField.heightAnchor.constraint(equalToConstant: formElementHeight * config.scaleFactor)
+    lazy var addScreenshotButtonHeightConstraint = addScreenshotButton.heightAnchor.constraint(equalToConstant: formElementHeight * config.scaleFactor)
+    lazy var removeScreenshotButtonHeightConstraint = removeScreenshotButton.heightAnchor.constraint(equalToConstant: formElementHeight * config.scaleFactor)
+    lazy var submitButtonHeightConstraint = submitButton.heightAnchor.constraint(equalToConstant: formElementHeight * config.scaleFactor)
+    lazy var cancelButtonHeightConstraint = cancelButton.heightAnchor.constraint(equalToConstant: formElementHeight * config.scaleFactor)
+
+    func initLayout() {
         NSLayoutConstraint.activate([
             scrollView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: config.margin),
             scrollView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor, constant: config.margin),
@@ -55,7 +99,28 @@
             messagePlaceholderLeadingConstraint,
             messagePlaceholderTopConstraint
         ])
+    }
+
+    /// Update the constants of constraints and any other layout, like transforms, in response to e.g. accessibility dynamic text size changes.
+    func updateLayout() {
+        let verticalPadding: CGFloat = 8
+        messageTextView.textContainerInset = .init(top: verticalPadding * config.scaleFactor, left: 2 * config.scaleFactor, bottom: verticalPadding * config.scaleFactor, right: 2 * config.scaleFactor)
 
+        messageTextViewHeightConstraint.constant = config.theme.font.lineHeight * 5
+        logoViewWidthConstraint.constant = logoWidth * config.scaleFactor
+        messagePlaceholderLeadingConstraint.constant = messageTextView.textContainerInset.left + 5
+        messagePlaceholderTopConstraint.constant = messageTextView.textContainerInset.top
+        fullNameTextFieldHeightConstraint.constant = formElementHeight * config.scaleFactor
+        emailTextFieldHeightConstraint.constant = formElementHeight * config.scaleFactor
+        addScreenshotButtonHeightConstraint.constant = formElementHeight * config.scaleFactor
+        removeScreenshotButtonHeightConstraint.constant = formElementHeight * config.scaleFactor
+        submitButtonHeightConstraint.constant = formElementHeight * config.scaleFactor
+        cancelButtonHeightConstraint.constant = formElementHeight * config.scaleFactor
+    }
+
+    // MARK: UI Elements
+
+    func themeElements() {
         [fullNameTextField, emailTextField].forEach {
             $0.font = config.theme.font
             $0.adjustsFontForContentSizeCategory = true
@@ -122,11 +187,11 @@
     let formElementHeight: CGFloat = 40
     let logoWidth: CGFloat = 47
     lazy var messageTextViewHeightConstraint = messageTextView.heightAnchor.constraint(equalToConstant: config.theme.font.lineHeight * 5)
     lazy var logoViewWidthConstraint = sentryLogoView.widthAnchor.constraint(equalToConstant: logoWidth * config.scaleFactor)
     lazy var messagePlaceholderLeadingConstraint = messageTextViewPlaceholder.leadingAnchor.constraint(equalTo: messageTextView.leadingAnchor, constant: messageTextView.textContainerInset.left + 5)
     lazy var messagePlaceholderTopConstraint = messageTextViewPlaceholder.topAnchor.constraint(equalTo: messageTextView.topAnchor, constant: messageTextView.textContainerInset.top)
     lazy var fullNameTextFieldHeightConstraint = fullNameTextField.heightAnchor.constraint(equalToConstant: formElementHeight * config.scaleFactor)
     lazy var emailTextFieldHeightConstraint = emailTextField.heightAnchor.constraint(equalToConstant: formElementHeight * config.scaleFactor)
     lazy var addScreenshotButtonHeightConstraint = addScreenshotButton.heightAnchor.constraint(equalToConstant: formElementHeight * config.scaleFactor)
     lazy var removeScreenshotButtonHeightConstraint = removeScreenshotButton.heightAnchor.constraint(equalToConstant: formElementHeight * config.scaleFactor)
     lazy var submitButtonHeightConstraint = submitButton.heightAnchor.constraint(equalToConstant: formElementHeight * config.scaleFactor)
@@ -225,7 +290,7 @@
         let button = UIButton(frame: .zero)
         button.setTitle(config.formConfig.addScreenshotButtonLabel, for: .normal)
         button.accessibilityLabel = config.formConfig.addScreenshotButtonAccessibilityLabel
         button.addTarget(self, action: #selector(addScreenshotButtonTapped), for: .touchUpInside)
         return button
     }()
 
@@ -233,7 +298,7 @@
         let button = UIButton(frame: .zero)
         button.setTitle(config.formConfig.removeScreenshotButtonLabel, for: .normal)
         button.accessibilityLabel = config.formConfig.removeScreenshotButtonAccessibilityLabel
         button.addTarget(self, action: #selector(removeScreenshotButtonTapped), for: .touchUpInside)
         return button
     }()
 
@@ -243,7 +308,7 @@
         button.accessibilityLabel = config.formConfig.submitButtonAccessibilityLabel
         button.backgroundColor = config.theme.submitBackground
         button.setTitleColor(config.theme.submitForeground, for: .normal)
         button.addTarget(self, action: #selector(submitFeedbackButtonTapped), for: .touchUpInside)
         return button
     }()
 
@@ -251,7 +316,7 @@
         let button = UIButton(frame: .zero)
         button.setTitle(config.formConfig.cancelButtonLabel, for: .normal)
         button.accessibilityLabel = config.formConfig.cancelButtonAccessibilityLabel
         button.addTarget(self, action: #selector(cancelButtonTapped), for: .touchUpInside)
         return button
     }()
 
@@ -326,3 +391,5 @@
 }
 
 #endif // os(iOS) && !SENTRY_NO_UIKIT
+
+//swiftlint:enable todo type_body_length

Sources/Swift/Integrations/UserFeedback/SentryUserFeedbackWidget.swift

@@ -1,3 +1,5 @@
+//swiftlint:disable todo
+
 import Foundation
 #if os(iOS) && !SENTRY_NO_UIKIT
 @_implementationOnly import _SentryPrivate
@@ -109,3 +111,5 @@ struct SentryUserFeedbackWidget {
 }
 
 #endif // os(iOS) && !SENTRY_NO_UIKIT
+
+//swiftlint:enable todo