refactor

Sources/Swift/Integrations/UserFeedback/SentryUserFeedbackForm.swift

@@ -16,283 +16,267 @@
     weak var delegate: (any SentryUserFeedbackFormDelegate)?
 
     init(config: SentryUserFeedbackConfiguration, delegate: any SentryUserFeedbackFormDelegate) {
         self.config = config
         self.delegate = delegate
         super.init(nibName: nil, bundle: nil)
 
         view.backgroundColor = .systemBackground
 
         let formElementHeight: CGFloat = 50
         NSLayoutConstraint.activate([
             scrollView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: config.margin),
             scrollView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor, constant: config.margin),
             scrollView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor, constant: -config.margin),
             scrollView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor, constant: -config.margin),
 
             stack.topAnchor.constraint(equalTo: scrollView.topAnchor),
             stack.leadingAnchor.constraint(equalTo: scrollView.leadingAnchor),
             stack.trailingAnchor.constraint(equalTo: scrollView.trailingAnchor),
             stack.bottomAnchor.constraint(equalTo: scrollView.bottomAnchor),
             stack.widthAnchor.constraint(equalTo: scrollView.widthAnchor),
 
             messageTextView.heightAnchor.constraint(equalToConstant: config.theme.font.lineHeight * 5),
 
             sentryLogoView.widthAnchor.constraint(equalToConstant: 50),
             sentryLogoView.heightAnchor.constraint(equalTo: sentryLogoView.widthAnchor, multiplier: 66 / 72),
 
             fullNameTextField.heightAnchor.constraint(equalToConstant: formElementHeight),
             emailTextField.heightAnchor.constraint(equalToConstant: formElementHeight),
             addScreenshotButton.heightAnchor.constraint(equalToConstant: formElementHeight),
             removeScreenshotButton.heightAnchor.constraint(equalToConstant: formElementHeight),
             submitButton.heightAnchor.constraint(equalToConstant: formElementHeight),
             cancelButton.heightAnchor.constraint(equalToConstant: formElementHeight),
 
             messageTextViewPlaceholder.leadingAnchor.constraint(equalTo: messageTextView.leadingAnchor, constant: messageTextView.textContainerInset.left + 5),
             messageTextViewPlaceholder.topAnchor.constraint(equalTo: messageTextView.topAnchor, constant: messageTextView.textContainerInset.top)
         ])
+
+        [fullNameTextField, emailTextField].forEach {
+            $0.font = config.theme.font
+            if config.theme.outlineStyle == config.theme.defaultOutlineStyle {
+                $0.borderStyle = .roundedRect
+            } else {
+                $0.layer.cornerRadius = config.theme.outlineStyle.cornerRadius
+                $0.layer.borderWidth = config.theme.outlineStyle.outlineWidth
+                $0.layer.borderColor = config.theme.outlineStyle.outlineColor.cgColor
+            }
+        }
+
+        [fullNameLabel, emailLabel, messageLabel].forEach {
+            $0.font = config.theme.headingFont
+        }
+
+        [submitButton, addScreenshotButton, removeScreenshotButton, cancelButton].forEach {
+            $0.titleLabel?.font = config.theme.headingFont
+        }
+
+        [submitButton, addScreenshotButton, removeScreenshotButton, cancelButton, messageTextView].forEach {
+            $0.layer.cornerRadius = config.theme.outlineStyle.cornerRadius
+            $0.layer.borderWidth = config.theme.outlineStyle.outlineWidth
+            $0.layer.borderColor = config.theme.outlineStyle.outlineColor.cgColor
+        }
+
+        [addScreenshotButton, removeScreenshotButton, cancelButton].forEach {
+            $0.backgroundColor = config.theme.buttonBackground
+            $0.setTitleColor(config.theme.buttonForeground, for: .normal)
+        }
     }
 
     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: UI
 
     lazy var formTitleLabel = {
         let label = UILabel(frame: .zero)
         label.text = config.formConfig.formTitle
         label.font = config.theme.titleFont
         label.setContentCompressionResistancePriority(.required, for: .horizontal)
         return label
     }()
 
     lazy var sentryLogoView = {
         let shapeLayer = CAShapeLayer()
         shapeLayer.path = SentryIconography.logo
         shapeLayer.fillColor = self.config.theme.foreground.cgColor
 
         let view = UIView(frame: .zero)
         view.layer.addSublayer(shapeLayer)
         view.accessibilityLabel = "provided by Sentry" // ???: what do we want to say here?
         return view
     }()
 
     lazy var fullNameLabel = {
         let label = UILabel(frame: .zero)
         label.text = config.formConfig.nameLabelContents
-        label.font = config.theme.headingFont
         return label
     }()
 
     lazy var fullNameTextField = {
         let field = UITextField(frame: .zero)
         field.placeholder = config.formConfig.namePlaceholder
-        field.font = config.theme.font
-        if config.theme.outlineStyle == config.theme.defaultOutlineStyle {
-            field.borderStyle = .roundedRect
-        } else {
-            field.layer.cornerRadius = config.theme.outlineStyle.cornerRadius
-            field.layer.borderWidth = config.theme.outlineStyle.outlineWidth
-            field.layer.borderColor = config.theme.outlineStyle.outlineColor.cgColor
-        }
         field.accessibilityLabel = config.formConfig.nameTextFieldAccessibilityLabel
         return field
     }()
 
     lazy var emailLabel = {
         let label = UILabel(frame: .zero)
         label.text = config.formConfig.emailLabelContents
-        label.font = config.theme.headingFont
         return label
     }()
 
     lazy var emailTextField = {
         let field = UITextField(frame: .zero)
         field.placeholder = config.formConfig.emailPlaceholder
-        field.font = config.theme.font
-        if config.theme.outlineStyle == config.theme.defaultOutlineStyle {
-            field.borderStyle = .roundedRect
-        } else {
-            field.layer.cornerRadius = config.theme.outlineStyle.cornerRadius
-            field.layer.borderWidth = config.theme.outlineStyle.outlineWidth
-            field.layer.borderColor = config.theme.outlineStyle.outlineColor.cgColor
-        }
         field.accessibilityLabel = config.formConfig.emailTextFieldAccessibilityLabel
         return field
     }()
 
     lazy var messageLabel = {
         let label = UILabel(frame: .zero)
         label.text = config.formConfig.messageLabelContents
-        label.font = config.theme.headingFont
         return label
     }()
 
     lazy var messageTextViewPlaceholder = {
         let label = UILabel(frame: .zero)
         label.text = config.formConfig.messagePlaceholder
         label.font = config.theme.font
         label.textColor = .placeholderText
         label.translatesAutoresizingMaskIntoConstraints = false
         return label
     }()
 
     lazy var messageTextView = {
         let textView = UITextView(frame: .zero)
         textView.font = config.theme.font
-        textView.isScrollEnabled = true
-        textView.isEditable = true
-        textView.layer.cornerRadius = config.theme.outlineStyle.cornerRadius
-        textView.layer.borderWidth = config.theme.outlineStyle.outlineWidth
-        textView.layer.borderColor = config.theme.outlineStyle.outlineColor.cgColor
         textView.accessibilityLabel = config.formConfig.messageTextViewAccessibilityLabel
         textView.textContainerInset = .init(top: 13, left: 2, bottom: 13, right: 2)
         textView.delegate = self
         return textView
     }()
 
     lazy var addScreenshotButton = {
         let button = UIButton(frame: .zero)
         button.setTitle(config.formConfig.addScreenshotButtonLabel, for: .normal)
-        button.titleLabel?.font = config.theme.headingFont
         button.accessibilityLabel = config.formConfig.addScreenshotButtonAccessibilityLabel
-        button.backgroundColor = config.theme.buttonBackground
-        button.setTitleColor(config.theme.buttonForeground, for: .normal)
         button.addTarget(self, action: #selector(addScreenshotButtonTapped), for: .touchUpInside)
-        button.layer.cornerRadius = config.theme.outlineStyle.cornerRadius
-        button.layer.borderWidth = config.theme.outlineStyle.outlineWidth
-        button.layer.borderColor = config.theme.outlineStyle.outlineColor.cgColor
         return button
     }()
 
     lazy var removeScreenshotButton = {
         let button = UIButton(frame: .zero)
         button.setTitle(config.formConfig.removeScreenshotButtonLabel, for: .normal)
-        button.titleLabel?.font = config.theme.headingFont
         button.accessibilityLabel = config.formConfig.removeScreenshotButtonAccessibilityLabel
-        button.backgroundColor = config.theme.buttonBackground
-        button.setTitleColor(config.theme.buttonForeground, for: .normal)
         button.addTarget(self, action: #selector(removeScreenshotButtonTapped), for: .touchUpInside)
-        button.layer.cornerRadius = config.theme.outlineStyle.cornerRadius
-        button.layer.borderWidth = config.theme.outlineStyle.outlineWidth
-        button.layer.borderColor = config.theme.outlineStyle.outlineColor.cgColor
         return button
     }()
 
     lazy var submitButton = {
         let button = UIButton(frame: .zero)
         button.setTitle(config.formConfig.submitButtonLabel, for: .normal)
-        button.titleLabel?.font = config.theme.headingFont
         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)
-        button.layer.cornerRadius = config.theme.outlineStyle.cornerRadius
-        button.layer.borderWidth = config.theme.outlineStyle.outlineWidth
-        button.layer.borderColor = config.theme.outlineStyle.outlineColor.cgColor
         return button
     }()
 
     lazy var cancelButton = {
         let button = UIButton(frame: .zero)
         button.setTitle(config.formConfig.cancelButtonLabel, for: .normal)
-        button.titleLabel?.font = config.theme.headingFont
         button.accessibilityLabel = config.formConfig.cancelButtonAccessibilityLabel
-        button.backgroundColor = config.theme.buttonBackground
-        button.setTitleColor(config.theme.buttonForeground, for: .normal)
         button.addTarget(self, action: #selector(cancelButtonTapped), for: .touchUpInside)
-        button.layer.cornerRadius = config.theme.outlineStyle.cornerRadius
-        button.layer.borderWidth = config.theme.outlineStyle.outlineWidth
-        button.layer.borderColor = config.theme.outlineStyle.outlineColor.cgColor
         return button
     }()
 
     lazy var stack = {
         let headerStack = UIStackView(arrangedSubviews: [self.formTitleLabel])
         if self.config.formConfig.showBranding {
             headerStack.addArrangedSubview(self.sentryLogoView)
         }
 
         let stack = UIStackView()
         stack.axis = .vertical
         stack.spacing = 50
 
         stack.addArrangedSubview(headerStack)
 
         let inputStack = UIStackView()
         inputStack.axis = .vertical
         inputStack.spacing = config.theme.font.xHeight
 
         if self.config.formConfig.showName {
             inputStack.addArrangedSubview(self.fullNameLabel)
             inputStack.addArrangedSubview(self.fullNameTextField)
         }
 
         if self.config.formConfig.showEmail {
             inputStack.addArrangedSubview(self.emailLabel)
             inputStack.addArrangedSubview(self.emailTextField)
         }
 
         inputStack.addArrangedSubview(self.messageLabel)
 
         let messageAndScreenshotStack = UIStackView(arrangedSubviews: [self.messageTextView])
         messageAndScreenshotStack.axis = .vertical
 
         if self.config.formConfig.enableScreenshot {
             messageAndScreenshotStack.addArrangedSubview(self.addScreenshotButton)
         }
         messageAndScreenshotStack.spacing = config.theme.font.lineHeight - config.theme.font.xHeight
 
         inputStack.addArrangedSubview(messageAndScreenshotStack)
 
         stack.addArrangedSubview(inputStack)
 
         let controlsStack = UIStackView()
         controlsStack.axis = .vertical
         controlsStack.spacing = config.theme.font.lineHeight - config.theme.font.xHeight
         controlsStack.addArrangedSubview(self.submitButton)
         controlsStack.addArrangedSubview(self.cancelButton)
         stack.addArrangedSubview(controlsStack)
 
         stack.translatesAutoresizingMaskIntoConstraints = false
 
         return stack
     }()
 
     lazy var scrollView = {
         let scrollView = UIScrollView(frame: view.bounds)
         view.addSubview(scrollView)
         scrollView.addSubview(stack)
         scrollView.translatesAutoresizingMaskIntoConstraints = false
         scrollView.addSubview(messageTextViewPlaceholder)
         return scrollView
     }()
 }
 
 @available(iOS 13.0, *)
 extension SentryUserFeedbackForm: UITextViewDelegate {
     func textViewDidChange(_ textView: UITextView) {
         messageTextViewPlaceholder.isHidden = textView.text != ""
     }
 }
 
 #endif // os(iOS) && !SENTRY_NO_UIKIT