% Added ability to turn off round corners

candostdagdeviren · Mar 14, 2018 · 628db4e · 628db4e
1 parent a736566
commit 628db4e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/CDAlertView/Classes/CDAlertHeaderView.swift b/CDAlertView/Classes/CDAlertHeaderView.swift
@@ -41,6 +41,7 @@ internal class CDAlertHeaderView: UIView {
     internal var isIconFilled: Bool = false
     internal var alertBackgroundColor: UIColor = UIColor.white.withAlphaComponent(0.9)
     internal var hasShadow: Bool = true
+    internal var hasRoundCorners = true
     private var fillColor: UIColor!
     private var type: CDAlertViewType?
     private var imageView: UIImageView?
@@ -57,19 +58,25 @@ internal class CDAlertHeaderView: UIView {
     // MARK: UIView
 
     override func draw(_ rect: CGRect) {
+        var cornerRadii = CGSize(width: 8, height: 8)
+        if hasRoundCorners == false {
+            cornerRadii = CGSize(width: 0, height: 0)
+        }
         let path = UIBezierPath(roundedRect: CGRect(x: 0, y: 16, width: rect.size.width, height: rect.size.height-16),
                                 byRoundingCorners: [.topLeft, .topRight],
-                                cornerRadii: CGSize(width: 8, height: 8))
+                                cornerRadii: cornerRadii)
         alertBackgroundColor.setFill()
         path.fill()
 
-        let curve = UIBezierPath(arcCenter: CGPoint(x: rect.size.width/2, y: 28),
-                                 radius: 28,
-                                 startAngle:6.84 * CGFloat.pi / 6,
-                                 endAngle: 11.155 * CGFloat.pi / 6,
-                                 clockwise: true)
-        alertBackgroundColor.setFill()
-        curve.fill()
+        if hasRoundCorners == true {
+            let curve = UIBezierPath(arcCenter: CGPoint(x: rect.size.width/2, y: 28),
+                                     radius: 28,
+                                     startAngle:6.84 * CGFloat.pi / 6,
+                                     endAngle: 11.155 * CGFloat.pi / 6,
+                                     clockwise: true)
+            alertBackgroundColor.setFill()
+            curve.fill()
+        }
 
         let innerCircle = UIBezierPath(arcCenter: CGPoint(x: rect.size.width/2, y: 28),
                                        radius: 24,

diff --git a/CDAlertView/Classes/CDAlertView.swift b/CDAlertView/Classes/CDAlertView.swift
@@ -170,6 +170,8 @@ open class CDAlertView: UIView {
         }
     }
 
+    public var hasRoundCorners = true
+
     public var customView: UIView?
 
     public var hideAnimations: CDAlertAnimationBlock?
@@ -472,6 +474,7 @@ open class CDAlertView: UIView {
 
 
     private func roundBottomOfCoverView() {
+        guard hasRoundCorners == false else {return}
         let roundCornersPath = UIBezierPath(roundedRect: CGRect(x: 0.0,
                                                                 y: 0.0,
                                                                 width: popupWidth,
@@ -521,6 +524,7 @@ open class CDAlertView: UIView {
         headerView = CDAlertHeaderView(type: type, isIconFilled: isHeaderIconFilled)
         headerView.backgroundColor = UIColor.clear
         headerView.hasShadow = hasShadow
+        headerView.hasRoundCorners = hasRoundCorners
         headerView.alertBackgroundColor = alertBackgroundColor
         headerView.circleFillColor = circleFillColor
         popupView.addSubview(headerView)
@@ -546,7 +550,9 @@ open class CDAlertView: UIView {
                                             cornerRadii: CGSize(width: 8.0, height: 8.0))
         let roundLayer = CAShapeLayer()
         roundLayer.path = roundCornersPath.cgPath
-        buttonView.layer.mask = roundLayer
+        if hasRoundCorners == true {
+            buttonView.layer.mask = roundLayer
+        }
         popupView.addSubview(buttonView)
         buttonView.translatesAutoresizingMaskIntoConstraints = false
         buttonView.cd_alignBottomToParent(with: 0)