Skip to content

Commit

Permalink
fixup! only support ios 13+ for now
Browse files Browse the repository at this point in the history
  • Loading branch information
@armcknight
armcknight committed Oct 18, 2024
1 parent 0f7ba54 commit a2f8120
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 176 deletions.
34 changes: 5 additions & 29 deletions .../Swift/Integrations/UserFeedback/Configuration/SentryUserFeedbackThemeConfiguration.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,13 @@ public class SentryUserFeedbackThemeConfiguration: NSObject {
* Foreground text color of the widget and form.
* - note: Default light mode: `rgb(43, 34, 51)`; dark mode: `rgb(235, 230, 239)`
*/
public var foreground: UIColor = {
UIScreen.main.traitCollection.userInterfaceStyle == .dark ? UIColor(red: 235 / 255, green: 230 / 255, blue: 239 / 255, alpha: 1) : UIColor(red: 43 / 255, green: 34 / 255, blue: 51 / 255, alpha: 1)
}()
public var foreground = UIScreen.main.traitCollection.userInterfaceStyle == .dark ? UIColor(red: 235 / 255, green: 230 / 255, blue: 239 / 255, alpha: 1) : UIColor(red: 43 / 255, green: 34 / 255, blue: 51 / 255, alpha: 1)

/**
* Background color of the widget and form.
* - note: Default light mode: `rgb(255, 255, 255)`; dark mode: `rgb(41, 35, 47)`
*/
public var background: UIColor = {
UIScreen.main.traitCollection.userInterfaceStyle == .dark ? UIColor(red: 41 / 255, green: 35 / 255, blue: 47 / 255, alpha: 1) : UIColor.white
}()
public var background = UIScreen.main.traitCollection.userInterfaceStyle == .dark ? UIColor(red: 41 / 255, green: 35 / 255, blue: 47 / 255, alpha: 1) : UIColor.white

/**
* Foreground color for the form submit button.
Expand All @@ -47,39 +43,19 @@ public class SentryUserFeedbackThemeConfiguration: NSObject {
* Color used for success-related components (such as text color when feedback is submitted successfully).
* - note: Default light mode: `rgb(38, 141, 117)`; dark mode: `rgb(45, 169, 140)`
*/
public var successColor: UIColor = {
let lightModeDefault = UIColor(red: 38 / 255, green: 141 / 255, blue: 117 / 255, alpha: 1)
if #available(iOS 12.0, *) {
return UIScreen.main.traitCollection.userInterfaceStyle == .dark ? UIColor(red: 45 / 255, green: 169 / 255, blue: 140 / 255, alpha: 1) : lightModeDefault
} else {
return lightModeDefault
}
}()
public var successColor = UIScreen.main.traitCollection.userInterfaceStyle == .dark ? UIColor(red: 45 / 255, green: 169 / 255, blue: 140 / 255, alpha: 1) : UIColor(red: 38 / 255, green: 141 / 255, blue: 117 / 255, alpha: 1)

/**
* Color used for error-related components (such as text color when there's an error submitting feedback).
* - note: Default light mode: `rgb(223, 51, 56)`; dark mode: `rgb(245, 84, 89)`
*/
public var errorColor: UIColor = {
let lightModeDefault = UIColor(red: 223 / 255, green: 51 / 255, blue: 56 / 255, alpha: 1)
if #available(iOS 12.0, *) {
return UIScreen.main.traitCollection.userInterfaceStyle == .dark ? UIColor(red: 245 / 255, green: 84 / 255, blue: 89 / 255, alpha: 1) : lightModeDefault
} else {
return lightModeDefault
}
}()
public var errorColor = UIScreen.main.traitCollection.userInterfaceStyle == .dark ? UIColor(red: 245 / 255, green: 84 / 255, blue: 89 / 255, alpha: 1) : UIColor(red: 223 / 255, green: 51 / 255, blue: 56 / 255, alpha: 1)

/**
* Normal outline color for form inputs.
* - note: Default: `nil (system default)`
*/
public var outlineColor: UIColor = {
if #available(iOS 13.0, *) {
return UIColor.systemGray3
} else {
return UIColor.lightGray
}
}()
public var outlineColor = UIColor.systemGray3

/**
* Outline color for form inputs when focused.
Expand Down
158 changes: 21 additions & 137 deletions ...ces/Swift/Integrations/UserFeedback/SentryUserFeedbackWidgetButtonMegaphoneIconView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ class SentryUserFeedbackWidgetButtonMegaphoneIconView: UIView {

let svgLayer = CAShapeLayer()
svgLayer.path = megaphoneShape
svgLayer.fillColor = UIColor.clear.cgColor

if UIScreen.main.traitCollection.userInterfaceStyle == .dark {
svgLayer.fillColor = config.darkTheme.foreground.cgColor
svgLayer.strokeColor = config.darkTheme.foreground.cgColor
} else {
svgLayer.fillColor = config.theme.foreground.cgColor
svgLayer.strokeColor = config.theme.foreground.cgColor
}

svgLayer.fillRule = .evenOdd

layer.addSublayer(svgLayer)
translatesAutoresizingMaskIntoConstraints = false

Expand All @@ -40,139 +39,24 @@ class SentryUserFeedbackWidgetButtonMegaphoneIconView: UIView {

//swiftlint:disable function_body_length
lazy var megaphoneShape: CGPath = {
let bezier = UIBezierPath()

//
// megaphone outline; clockwise
//

// bottom right corner of megaphone exit
bezier.move(to: CGPoint(x: 12.5297, y: 12.03))

// horizontal line leftwards
bezier.addLine(to: CGPoint(x: 9.91972, y: 12.03))

// angled line up/leftwards
bezier.addCurve(to: CGPoint(x: 9.49972, y: 11.9), controlPoint1: CGPoint(x: 9.77033, y: 12.0268), controlPoint2: CGPoint(x: 9.62483, y: 11.9817))

// soft corner at top right of megaphone handle
let topRightOuterHandleCorner = CGPoint(x: 6.43972, y: 9.79003)
bezier.addLine(to: topRightOuterHandleCorner)
bezier.addLine(to: CGPoint(x: 5.99965, y: 9.79003))

// right edge of handle, straight downwards
let bottomRightOuterHandleCorner = CGPoint(x: 5.99965, y: 15.31)
bezier.addLine(to: bottomRightOuterHandleCorner)

// soft corner at bottom right of handle
bezier.addCurve(to: CGPoint(x: 5.77805, y: 15.8084), controlPoint1: CGPoint(x: 5.99, y: 15.4979), controlPoint2: CGPoint(x: 5.91104, y: 15.6754))
bezier.addCurve(to: CGPoint(x: 5.27965, y: 16.03), controlPoint1: CGPoint(x: 5.64506, y: 15.9414), controlPoint2: CGPoint(x: 5.46748, y: 16.0204))

// line to the bottom left corner of the handle
let bottomLeftHandleCornerOuter = CGPoint(x: 1.63965, y: 16.03)
bezier.addLine(to: bottomLeftHandleCornerOuter)

// soft corner at bottom left of handle
bezier.addCurve(to: CGPoint(x: 1.11218, y: 15.8075), controlPoint1: CGPoint(x: 1.44154, y: 16.0274), controlPoint2: CGPoint(x: 1.25228, y: 15.9476))
bezier.addCurve(to: CGPoint(x: 0.889648, y: 15.28), controlPoint1: CGPoint(x: 0.972088, y: 15.6674), controlPoint2: CGPoint(x: 0.892238, y: 15.4781))

// left vertical side of handle upwards
let topLeftHandleOuterCorner = CGPoint(x: 0.889648, y: 9.79003)
bezier.addLine(to: topLeftHandleOuterCorner)

// soft corners to the bottom left edge of the megaphone back
bezier.addLine(to: CGPoint(x: 0.759722, y: 9.79003))
bezier.addCurve(to: CGPoint(x: 0.467299, y: 9.73492), controlPoint1: CGPoint(x: 0.659545, y: 9.79137), controlPoint2: CGPoint(x: 0.560114, y: 9.77264))
bezier.addCurve(to: CGPoint(x: 0.219324, y: 9.57043), controlPoint1: CGPoint(x: 0.290166, y: 9.64127), controlPoint2: CGPoint(x: 0.374484, y: 9.6972))
bezier.addCurve(to: CGPoint(x: 0.0548335, y: 9.32245), controlPoint1: CGPoint(x: 0.148482, y: 9.49959), controlPoint2: CGPoint(x: 0.0925509, y: 9.41527))
bezier.addCurve(to: CGPoint(x: -0.000278464, y: 9.03003), controlPoint1: CGPoint(x: 0.0171161, y: 9.22964), controlPoint2: CGPoint(x: -0.0016233, y: 9.13021))

// vertical line upwards at the megaphone back
bezier.addLine(to: CGPoint(x: -0.000278464, y: 3.03003))

bezier.addCurve(to: CGPoint(x: 0.0426121, y: 2.72526), controlPoint1: CGPoint(x: -0.00720398, y: 2.92657), controlPoint2: CGPoint(x: 0.00740032, y: 2.82279))
bezier.addCurve(to: CGPoint(x: 0.204297, y: 2.46338), controlPoint1: CGPoint(x: 0.0778238, y: 2.62773), controlPoint2: CGPoint(x: 0.132878, y: 2.53855))
bezier.addCurve(to: CGPoint(x: 0.45755, y: 2.28848), controlPoint1: CGPoint(x: 0.275717, y: 2.3882), controlPoint2: CGPoint(x: 0.36195, y: 2.32865))
bezier.addCurve(to: CGPoint(x: 0.759722, y: 2.23003), controlPoint1: CGPoint(x: 0.55315, y: 2.24832), controlPoint2: CGPoint(x: 0.65604, y: 2.22842))

bezier.addLine(to: CGPoint(x: 6.43972, y: 2.23003))

// diagonal
bezier.addLine(to: CGPoint(x: 9.49972, y: 0.160029))

bezier.addCurve(to: CGPoint(x: 9.91972, y: 0.0300293), controlPoint1: CGPoint(x: 9.62483, y: 0.0783212), controlPoint2: CGPoint(x: 9.77033, y: 0.0332871))

bezier.addLine(to: CGPoint(x: 12.5297, y: 0.0300293))
bezier.addCurve(to: CGPoint(x: 13.0572, y: 0.252563), controlPoint1: CGPoint(x: 12.7278, y: 0.0326193), controlPoint2: CGPoint(x: 12.9171, y: 0.112468))
bezier.addCurve(to: CGPoint(x: 13.2797, y: 0.780029), controlPoint1: CGPoint(x: 13.1973, y: 0.392658), controlPoint2: CGPoint(x: 13.2771, y: 0.581922))

let topSoundExitPoint = CGPoint(x: 13.2797, y: 2.63218)
bezier.addLine(to: topSoundExitPoint)
bezier.addCurve(to: CGPoint(x: 14.9769, y: 3.56346), controlPoint1: CGPoint(x: 13.9175, y: 2.7737), controlPoint2: CGPoint(x: 14.5076, y: 3.09424))
bezier.addCurve(to: CGPoint(x: 15.9903, y: 6.01005), controlPoint1: CGPoint(x: 15.6257, y: 4.21234), controlPoint2: CGPoint(x: 15.9903, y: 5.0924))
bezier.addCurve(to: CGPoint(x: 14.9769, y: 8.45664), controlPoint1: CGPoint(x: 15.9903, y: 6.9277), controlPoint2: CGPoint(x: 15.6257, y: 7.80776))
bezier.addCurve(to: CGPoint(x: 13.2797, y: 9.38792), controlPoint1: CGPoint(x: 14.5076, y: 8.92586), controlPoint2: CGPoint(x: 13.9175, y: 9.2464))

let bottomSoundExitPoint = CGPoint(x: 13.2797, y: 11.24)
bezier.addLine(to: bottomSoundExitPoint) // vertical line extending upwards from top of sound exiting megaphone
bezier.addCurve(to: CGPoint(x: 13.2316, y: 11.5378), controlPoint1: CGPoint(x: 13.2837, y: 11.3415), controlPoint2: CGPoint(x: 13.2674, y: 11.4427))
bezier.addCurve(to: CGPoint(x: 13.0715, y: 11.7934), controlPoint1: CGPoint(x: 13.1959, y: 11.6328), controlPoint2: CGPoint(x: 13.1414, y: 11.7197))
bezier.addCurve(to: CGPoint(x: 12.8246, y: 11.9665), controlPoint1: CGPoint(x: 13.0016, y: 11.867), controlPoint2: CGPoint(x: 12.9176, y: 11.9259))
bezier.addCurve(to: CGPoint(x: 12.5297, y: 12.03), controlPoint1: CGPoint(x: 12.5297, y: 12.03), controlPoint2: CGPoint(x: 12.6313, y: 12.0288))
bezier.close()

//
// inner part of the megaphone
//

bezier.move(to: CGPoint(x: 1.51756, y: 8.29003))
bezier.addLine(to: CGPoint(x: 1.50972, y: 8.29003))
bezier.addLine(to: CGPoint(x: 1.50972, y: 3.73003))
bezier.addLine(to: CGPoint(x: 6.66972, y: 3.72844))
bezier.addCurve(to: CGPoint(x: 7.08972, y: 3.60003), controlPoint1: CGPoint(x: 6.81938, y: 3.72844), controlPoint2: CGPoint(x: 6.96533, y: 3.68326))
bezier.addLine(to: CGPoint(x: 10.1497, y: 1.53003))
bezier.addLine(to: CGPoint(x: 11.7797, y: 1.53003))
bezier.addLine(to: CGPoint(x: 11.7797, y: 10.53))
bezier.addLine(to: CGPoint(x: 10.1497, y: 10.53))
bezier.addLine(to: CGPoint(x: 7.08972, y: 8.42003))
bezier.addCurve(to: CGPoint(x: 6.66972, y: 8.29003), controlPoint1: CGPoint(x: 6.96533, y: 8.3368), controlPoint2: CGPoint(x: 6.81938, y: 8.29162))
bezier.addLine(to: CGPoint(x: 1.76173, y: 8.29003))
bezier.addCurve(to: CGPoint(x: 1.63965, y: 8.28003), controlPoint1: CGPoint(x: 1.72164, y: 8.28341), controlPoint2: CGPoint(x: 1.68082, y: 8.28003))
bezier.addCurve(to: CGPoint(x: 1.51756, y: 8.29003), controlPoint1: CGPoint(x: 1.59848, y: 8.28003), controlPoint2: CGPoint(x: 1.55766, y: 8.28341))
bezier.close()

//
// inner part of the handle; counterclockwise
//

let topRightInnerHandleCorner = CGPoint(x: 4.52965, y: 9.79003)
let bottomRightInnerHandleCorner = CGPoint(x: 4.52965, y: 14.56)
let bottomLeftInnerHandleCorner = CGPoint(x: 2.38965, y: 14.56)
let topLeftHandleInnerCorner = CGPoint(x: 2.38965, y: 9.79003)
bezier.move(to: topLeftHandleInnerCorner) // top left corner
bezier.addLine(to: bottomLeftInnerHandleCorner) // bottom left
bezier.addLine(to: bottomRightInnerHandleCorner) // bottom right
bezier.addLine(to: topRightInnerHandleCorner) // top right
bezier.addLine(to: topLeftHandleInnerCorner) // end at top left again
bezier.close()

//
// inside the "sound" coming out of the megaphone
//

bezier.move(to: topSoundExitPoint)
bezier.addLine(to: bottomSoundExitPoint)
bezier.addCurve(to: CGPoint(x: 13.4084, y: 4.06854), controlPoint1: CGPoint(x: 13.3228, y: 4.04887), controlPoint2: CGPoint(x: 13.3658, y: 4.05799))
bezier.addCurve(to: CGPoint(x: 14.194, y: 4.4615), controlPoint1: CGPoint(x: 13.6962, y: 4.1397), controlPoint2: CGPoint(x: 13.9645, y: 4.27393))
bezier.addCurve(to: CGPoint(x: 14.7354, y: 5.15314), controlPoint1: CGPoint(x: 14.4235, y: 4.64908), controlPoint2: CGPoint(x: 14.6084, y: 4.88532))
bezier.addCurve(to: CGPoint(x: 14.9283, y: 6.01005), controlPoint1: CGPoint(x: 14.8624, y: 5.42095), controlPoint2: CGPoint(x: 14.9283, y: 5.71365))
bezier.addCurve(to: CGPoint(x: 14.7354, y: 6.86696), controlPoint1: CGPoint(x: 14.9283, y: 6.30645), controlPoint2: CGPoint(x: 14.8624, y: 6.59914))
bezier.addCurve(to: CGPoint(x: 14.194, y: 7.55859), controlPoint1: CGPoint(x: 14.6084, y: 7.13478), controlPoint2: CGPoint(x: 14.4235, y: 7.37102))
bezier.addCurve(to: CGPoint(x: 13.4084, y: 7.95156), controlPoint1: CGPoint(x: 13.9645, y: 7.74617), controlPoint2: CGPoint(x: 13.6962, y: 7.8804))
bezier.addCurve(to: CGPoint(x: 13.2797, y: 7.97893), controlPoint1: CGPoint(x: 13.3658, y: 7.9621), controlPoint2: CGPoint(x: 13.3228, y: 7.97123))
bezier.close()

return bezier.cgPath
let path = CGMutablePath()

path.move(to: CGPoint(x: 1, y: 3))
path.addLine(to: CGPoint(x: 7, y: 3))
path.addLine(to: CGPoint(x: 10, y: 1))
path.addLine(to: CGPoint(x: 12, y: 1))
path.addLine(to: CGPoint(x: 12, y: 11))
path.addLine(to: CGPoint(x: 10, y: 11))
path.addLine(to: CGPoint(x: 7, y: 9))
path.addLine(to: CGPoint(x: 1, y: 9))
path.closeSubpath()

path.addRect(CGRect(x: 2, y: 9, width: 3.5, height: 6))

path.move(to: CGPoint(x: 12, y: 6))
path.addRelativeArc(center: CGPoint(x: 12, y: 6), radius: 3, startAngle: -(.pi / 2), delta: .pi)

return path
}()
//swiftlint:enable function_body_length
}
Expand Down
13 changes: 3 additions & 10 deletions Sources/Swift/Integrations/UserFeedback/SentryUserFeedbackWidgetButtonView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,10 @@ class SentryUserFeedbackWidgetButtonView: UIView {
label.text = text
label.translatesAutoresizingMaskIntoConstraints = false

func configureLightTheme() {
label.textColor = config.theme.foreground
}
if #available(iOS 12.0, *) {
if UIScreen.main.traitCollection.userInterfaceStyle == .dark {
label.textColor = config.darkTheme.foreground
} else {
configureLightTheme()
}
if UIScreen.main.traitCollection.userInterfaceStyle == .dark {
label.textColor = config.darkTheme.foreground
} else {
configureLightTheme()
label.textColor = config.theme.foreground
}

label.font = config.theme.font
Expand Down

0 comments on commit a2f8120

Please sign in to comment.