Add .moon & .star presets

ivanvorobei · ivanvorobei · commit 05bbae665525 · 2019-11-26T22:03:54.000+03:00
diff --git a/Assets/Readme/Miniature - Add.svg b/Assets/Readme/Miniature - Add.svg
@@ -5,9 +5,9 @@
     <desc>Created with Sketch.</desc>
     <g id="Miniature---Add" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <rect id="Area" fill="#F4F2F5" x="5" y="5" width="100" height="100" rx="8"></rect>
-        <g id="Icon" transform="translate(55.500000, 55.500000) rotate(45.000000) translate(-55.500000, -55.500000) translate(35.000000, 35.000000)" stroke="#59585A" stroke-linecap="round" stroke-width="7">
-            <line x1="40.4536051" y1="-1.42642188e-13" x2="-1.75439546e-17" y2="40.4522144" id="Line"></line>
-            <line x1="40.4499962" y1="1.9589485e-13" x2="-2.56516973e-13" y2="40.45464" id="Line" transform="translate(20.224998, 20.227320) scale(-1, 1) translate(-20.224998, -20.227320) "></line>
+        <g id="Icon" transform="translate(55.000000, 55.000000) rotate(45.000000) translate(-55.000000, -55.000000) translate(35.000000, 35.000000)" stroke="#59585A" stroke-linecap="round" stroke-width="7">
+            <line x1="39.4669318" y1="-1.3916311e-13" x2="-1.71160533e-17" y2="39.465575" id="Line"></line>
+            <line x1="39.4634109" y1="1.99435476e-13" x2="-2.53033311e-13" y2="39.4679415" id="Line" transform="translate(19.731705, 19.733971) scale(-1, 1) translate(-19.731705, -19.733971) "></line>
         </g>
     </g>
 </svg>
diff --git a/Assets/Readme/Miniature - Moon.svg b/Assets/Readme/Miniature - Moon.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="110px" height="110px" viewBox="0 0 110 110" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 59.1 (86144) - https://sketch.com -->
+    <title>Miniature - Moon</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Miniature---Moon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Area" fill="#F4F2F5" x="5" y="5" width="100" height="100" rx="8"></rect>
+        <path d="M71.8172883,61.7570565 C74.6737525,61.7570565 77.5522789,61.1613792 79.4468346,60.577836 L79.7376512,60.4858871 C80.2021169,60.3392137 80.4710181,60.265877 80.7888105,60.265877 C81.4732863,60.265877 82.2310988,60.8770161 82.2310988,61.781502 L82.224254,61.954381 C82.2046976,62.2352117 82.1382056,62.7006552 81.9621976,63.1504536 C78.9309476,71.1197077 69.812752,77.5 59.2767137,77.5 C44.9516129,77.5 34,67.2328629 34,52.858871 C34,42.6161794 40.0625,32.8868448 49.1073589,29.2689012 C49.6451613,29.0733367 50.2318548,29 50.500756,29 C51.4541331,29 51.9430444,29.7333669 51.9430444,30.3933972 C51.9430444,30.6378528 51.8941532,30.9800907 51.6741431,31.5423387 C50.7941028,33.5713206 50.1340726,37.4826109 50.1340726,40.2205141 C50.1340726,53.4700101 58.5922379,61.7570565 71.8172883,61.7570565 Z" id="Icon" fill="#59585A" fill-rule="nonzero"></path>
+    </g>
+</svg>
diff --git a/Assets/Readme/Miniature - Star.svg b/Assets/Readme/Miniature - Star.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="110px" height="110px" viewBox="0 0 110 110" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 59.1 (86144) - https://sketch.com -->
+    <title>Miniature - Star</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Miniature---Star" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Area" fill="#F4F2F5" x="5" y="5" width="100" height="100" rx="8"></rect>
+        <path d="M35.8451853,83.4897843 C34.7572207,82.6671769 34.4798018,81.3379785 35.061285,79.4780109 L40.9602615,61.8897071 L26.1154208,51.2425648 C24.3918625,50.0193944 23.66908,48.712826 24.1416686,47.350659 C24.5864578,45.988492 25.8930262,45.3213081 28.0335744,45.3491075 L46.2421337,45.4881041 L51.7741998,28.0857253 C52.4413836,26.0563744 53.4421594,25 54.8599251,25 C56.3054901,25 57.3062659,26.0563744 57.9734497,28.0857253 L63.5055158,45.4881041 L81.7140751,45.3491075 C83.8546233,45.3213081 85.1611916,45.988492 85.6059809,47.350659 C86.0507701,48.712826 85.3557869,50.0193944 83.6322287,51.2425648 L68.787388,61.8897071 L74.5974473,79.2086879 C75.2924305,81.2102395 75.0422366,82.6280052 73.9024642,83.4897843 C72.7348924,84.3793628 71.3171267,84.0735702 69.5935685,82.8226004 L54.8599251,72.0086622 L40.154081,82.8226004 C38.4305227,84.0735702 36.9849577,84.3793628 35.8451853,83.4897843 Z" id="Icon" fill="#59585A" fill-rule="nonzero"></path>
+    </g>
+</svg>
diff --git a/Assets/Sketch/Presets.sketch b/Assets/Sketch/Presets.sketch
diff --git a/Example/Controllers/ViewController.swift b/Example/Controllers/ViewController.swift
@@ -8,6 +8,8 @@ class ViewController: UITableViewController {
         Alert(key: "Heart", preset: .heart, title: "Love", subtitle: "We'll recommend more like this for you"),
         Alert(key: "Doc", preset: .doc, title: "Document saved", subtitle: "See in folder new file"),
         Alert(key: "Bookmark", preset: .bookmark, title: "Added to bookmark", subtitle: "See bookmarks screen"),
+        Alert(key: "Moon", preset: .moon, title: "Night Mode", subtitle: "You can disable it in settings"),
+        Alert(key: "Star", preset: .star, title: "Added to favorite", subtitle: nil),
         Alert(key: "Add", preset: .add, title: "Added to Folder", subtitle: nil),
         Alert(key: "Error", preset: .error, title: "Oops", subtitle: "Please try again later"),
         Alert(key: "Message", preset: nil, title: nil, subtitle: "Email required")
diff --git a/Readme.md b/Readme.md
@@ -80,6 +80,8 @@ For now supporting `Done`, `Add`, `Heart`, `Doc`, `Error`, `Bookmark` & `Message
     <img src="https://github.com/ivanvorobei/SPAlert/blob/master/Assets/Readme/Miniature%20-%20Heart.svg" width="80">
     <img src="https://github.com/ivanvorobei/SPAlert/blob/master/Assets/Readme/Miniature%20-%20Doc.svg" width="80">
     <img src="https://github.com/ivanvorobei/SPAlert/blob/master/Assets/Readme/Miniature%20-%20Bookmark.svg" width="80">
+    <img src="https://github.com/ivanvorobei/SPAlert/blob/master/Assets/Readme/Miniature%20-%20Moon.svg" width="80">
+    <img src="https://github.com/ivanvorobei/SPAlert/blob/master/Assets/Readme/Miniature%20-%20Star.svg" width="80">
     <img src="https://github.com/ivanvorobei/SPAlert/blob/master/Assets/Readme/Miniature%20-%20Error.svg" width="80">
 </p>
 
diff --git a/SPAlert.podspec b/SPAlert.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name          = "SPAlert"
-  s.version       = "2.0.5"
+  s.version       = "2.0.6"
   s.summary       = "Native alert from Apple Music & Feedback. Contains Done, Heart & Message presets."
   s.homepage      = "https://github.com/IvanVorobei/SPAlert"
   s.source        = { :git => "https://github.com/IvanVorobei/SPAlert.git", :tag => s.version }
diff --git a/SPAlert.xcodeproj/project.pbxproj b/SPAlert.xcodeproj/project.pbxproj
@@ -26,6 +26,8 @@
 		F4A5A92C2388792F00B0DFE0 /* SPAlertIconBookmarkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4A5A92B2388792F00B0DFE0 /* SPAlertIconBookmarkView.swift */; };
 		F4A8361A2385588300EB32E0 /* SPAlertIconDocView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4A836192385588300EB32E0 /* SPAlertIconDocView.swift */; };
 		F4CA67B5238ABD0100E72F79 /* SPAlertIconAddView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4CA67B4238ABD0100E72F79 /* SPAlertIconAddView.swift */; };
+		F4D3CD58238DA9FE006C3DE2 /* SPAlertIconMoonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D3CD57238DA9FE006C3DE2 /* SPAlertIconMoonView.swift */; };
+		F4D3CD5A238DAA49006C3DE2 /* SPAlertIconStarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D3CD59238DAA49006C3DE2 /* SPAlertIconStarView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -80,6 +82,8 @@
 		F4A5A92B2388792F00B0DFE0 /* SPAlertIconBookmarkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPAlertIconBookmarkView.swift; sourceTree = "<group>"; };
 		F4A836192385588300EB32E0 /* SPAlertIconDocView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPAlertIconDocView.swift; sourceTree = "<group>"; };
 		F4CA67B4238ABD0100E72F79 /* SPAlertIconAddView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPAlertIconAddView.swift; sourceTree = "<group>"; };
+		F4D3CD57238DA9FE006C3DE2 /* SPAlertIconMoonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPAlertIconMoonView.swift; sourceTree = "<group>"; };
+		F4D3CD59238DAA49006C3DE2 /* SPAlertIconStarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPAlertIconStarView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -163,6 +167,8 @@
 				F4A836192385588300EB32E0 /* SPAlertIconDocView.swift */,
 				F4A5A92B2388792F00B0DFE0 /* SPAlertIconBookmarkView.swift */,
 				F4CA67B4238ABD0100E72F79 /* SPAlertIconAddView.swift */,
+				F4D3CD57238DA9FE006C3DE2 /* SPAlertIconMoonView.swift */,
+				F4D3CD59238DAA49006C3DE2 /* SPAlertIconStarView.swift */,
 			);
 			path = Icons;
 			sourceTree = "<group>";
@@ -364,6 +370,8 @@
 				F4A5A92C2388792F00B0DFE0 /* SPAlertIconBookmarkView.swift in Sources */,
 				F41204EC2382AC9B009C2AC7 /* SPAlertIconDoneView.swift in Sources */,
 				F41204E92382AC9B009C2AC7 /* SPAlertView.swift in Sources */,
+				F4D3CD58238DA9FE006C3DE2 /* SPAlertIconMoonView.swift in Sources */,
+				F4D3CD5A238DAA49006C3DE2 /* SPAlertIconStarView.swift in Sources */,
 				706F894A2383277500ECF5D1 /* SPAlertIconErrorView.swift in Sources */,
 				F41205292382AF5C009C2AC7 /* SPAlertIconAnimatable.swift in Sources */,
 				F4CA67B5238ABD0100E72F79 /* SPAlertIconAddView.swift in Sources */,
diff --git a/Source/SPAlert/Models/SPAlertPreset.swift b/Source/SPAlert/Models/SPAlertPreset.swift
@@ -30,6 +30,8 @@ public enum SPAlertPreset {
     case heart
     case doc
     case bookmark
+    case moon
+    case star
     case add
     case error
     
@@ -48,6 +50,10 @@ public enum SPAlertPreset {
             return SPAlertIconBookmarkView()
         case .add:
             return SPAlertIconAddView()
+        case .moon:
+            return SPAlertIconMoonView()
+        case .star:
+            return SPAlertIconStarView()
         case .error:
             return SPAlertIconErrorView()
         }
@@ -87,9 +93,25 @@ public enum SPAlertPreset {
             layout.topSpace = 57
             layout.bottomSpace = 29
             layout.iconWidth = 112
-            layout.iconHeight = 94
+            layout.iconHeight = 90
             layout.bottomIconSpace = 36
             return layout
+        case .moon:
+            var layout = SPAlertLayout()
+            layout.topSpace = 49
+            layout.bottomSpace = 27
+            layout.iconWidth = 112
+            layout.iconHeight = 88
+            layout.bottomIconSpace = 35
+            return layout
+        case .star:
+            var layout = SPAlertLayout()
+            layout.topSpace = 49
+            layout.bottomSpace = 31
+            layout.iconWidth = 112
+            layout.iconHeight = 92
+            layout.bottomIconSpace = 35
+            return layout
         case .add:
             var layout = SPAlertLayout()
             layout.topSpace = 63
@@ -124,6 +146,10 @@ public enum SPAlertPreset {
             return .success
         case .add:
             return .success
+        case .star:
+            return .success
+        case .moon:
+            return .success
         case .error:
             return .error
         }
diff --git a/Source/SPAlert/Views/Icons/SPAlertIconDocView.swift b/Source/SPAlert/Views/Icons/SPAlertIconDocView.swift
@@ -40,14 +40,11 @@ public class SPAlertIconDocView: UIView {
     class DocDraw: NSObject {
         
         @objc dynamic public class func draw(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 70, height: 87), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 0.349, green: 0.345, blue: 0.353, alpha: 1.000)) {
-
             let context = UIGraphicsGetCurrentContext()!
-            
             context.saveGState()
             let resizedFrame: CGRect = resizing.apply(rect: CGRect(x: 0, y: 0, width: 70, height: 87), target: targetFrame)
             context.translateBy(x: resizedFrame.minX, y: resizedFrame.minY)
             context.scaleBy(x: resizedFrame.width / 70, y: resizedFrame.height / 87)
-
             let bezierPath = UIBezierPath()
             bezierPath.move(to: CGPoint(x: 13.73, y: 86.65))
             bezierPath.addLine(to: CGPoint(x: 55.38, y: 86.65))
diff --git a/Source/SPAlert/Views/Icons/SPAlertIconDoneView.swift b/Source/SPAlert/Views/Icons/SPAlertIconDoneView.swift
@@ -24,7 +24,6 @@ import UIKit
 public class SPAlertIconDoneView: UIView, SPAlertIconAnimatable {
 
     public func animate() {
-        
         let length = frame.width
         let animatablePath = UIBezierPath()
         animatablePath.move(to: CGPoint(x: length * 0.196, y: length * 0.527))
diff --git a/Source/SPAlert/Views/Icons/SPAlertIconHeartView.swift b/Source/SPAlert/Views/Icons/SPAlertIconHeartView.swift
@@ -45,7 +45,6 @@ public class SPAlertIconHeartView: UIView {
             let resizedFrame: CGRect = resizing.apply(rect: CGRect(x: 0, y: 0, width: 510, height: 470), target: targetFrame)
             context.translateBy(x: resizedFrame.minX, y: resizedFrame.minY)
             context.scaleBy(x: resizedFrame.width / 510, y: resizedFrame.height / 470)
-      
             let bezierPath = UIBezierPath()
             bezierPath.move(to: CGPoint(x: 255, y: 469.6))
             bezierPath.addLine(to: CGPoint(x: 219.3, y: 433.9))
diff --git a/Source/SPAlert/Views/Icons/SPAlertIconMoonView.swift b/Source/SPAlert/Views/Icons/SPAlertIconMoonView.swift
@@ -0,0 +1,110 @@
+// The MIT License (MIT)
+// Copyright © 2019 Ivan Vorobei (ivanvorobei@icloud.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import UIKit
+
+public class SPAlertIconMoonView: UIView {
+    
+    init() {
+        super.init(frame: .zero)
+        self.backgroundColor = .clear
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    public override func draw(_ rect: CGRect) {
+        super.draw(rect)
+        MoonDraw.draw(frame: rect, resizing: .aspectFit, fillColor: self.tintColor)
+    }
+    
+    class MoonDraw: NSObject {
+        
+        @objc dynamic public class func draw(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 53, height: 52), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 0.349, green: 0.345, blue: 0.353, alpha: 1.000)) {
+            let context = UIGraphicsGetCurrentContext()!
+            context.saveGState()
+            let resizedFrame: CGRect = resizing.apply(rect: CGRect(x: 0, y: 0, width: 53, height: 52), target: targetFrame)
+            context.translateBy(x: resizedFrame.minX, y: resizedFrame.minY)
+            context.scaleBy(x: resizedFrame.width / 53, y: resizedFrame.height / 52)
+            let bezierPath = UIBezierPath()
+            bezierPath.move(to: CGPoint(x: 40.82, y: 34.76))
+            bezierPath.addCurve(to: CGPoint(x: 48.45, y: 33.58), controlPoint1: CGPoint(x: 43.67, y: 34.76), controlPoint2: CGPoint(x: 46.55, y: 34.16))
+            bezierPath.addLine(to: CGPoint(x: 48.74, y: 33.49))
+            bezierPath.addCurve(to: CGPoint(x: 49.79, y: 33.27), controlPoint1: CGPoint(x: 49.2, y: 33.34), controlPoint2: CGPoint(x: 49.47, y: 33.27))
+            bezierPath.addCurve(to: CGPoint(x: 51.23, y: 34.78), controlPoint1: CGPoint(x: 50.47, y: 33.27), controlPoint2: CGPoint(x: 51.23, y: 33.88))
+            bezierPath.addLine(to: CGPoint(x: 51.22, y: 34.95))
+            bezierPath.addCurve(to: CGPoint(x: 50.96, y: 36.15), controlPoint1: CGPoint(x: 51.2, y: 35.24), controlPoint2: CGPoint(x: 51.14, y: 35.7))
+            bezierPath.addCurve(to: CGPoint(x: 28.28, y: 50.5), controlPoint1: CGPoint(x: 47.93, y: 44.12), controlPoint2: CGPoint(x: 38.81, y: 50.5))
+            bezierPath.addCurve(to: CGPoint(x: 3, y: 25.86), controlPoint1: CGPoint(x: 13.95, y: 50.5), controlPoint2: CGPoint(x: 3, y: 40.23))
+            bezierPath.addCurve(to: CGPoint(x: 18.11, y: 2.27), controlPoint1: CGPoint(x: 3, y: 15.62), controlPoint2: CGPoint(x: 9.06, y: 5.89))
+            bezierPath.addCurve(to: CGPoint(x: 19.5, y: 2), controlPoint1: CGPoint(x: 18.65, y: 2.07), controlPoint2: CGPoint(x: 19.23, y: 2))
+            bezierPath.addCurve(to: CGPoint(x: 20.94, y: 3.39), controlPoint1: CGPoint(x: 20.45, y: 2), controlPoint2: CGPoint(x: 20.94, y: 2.73))
+            bezierPath.addCurve(to: CGPoint(x: 20.67, y: 4.54), controlPoint1: CGPoint(x: 20.94, y: 3.64), controlPoint2: CGPoint(x: 20.89, y: 3.98))
+            bezierPath.addCurve(to: CGPoint(x: 19.13, y: 13.22), controlPoint1: CGPoint(x: 19.79, y: 6.57), controlPoint2: CGPoint(x: 19.13, y: 10.48))
+            bezierPath.addCurve(to: CGPoint(x: 40.82, y: 34.76), controlPoint1: CGPoint(x: 19.13, y: 26.47), controlPoint2: CGPoint(x: 27.59, y: 34.76))
+            bezierPath.close()
+            fillColor.setFill()
+            bezierPath.fill()
+            context.restoreGState()
+        }
+        
+        @objc(StyleKitNameResizingBehavior)
+        public enum ResizingBehavior: Int {
+            
+            case aspectFit
+            case aspectFill
+            case stretch
+            case center
+            
+            public func apply(rect: CGRect, target: CGRect) -> CGRect {
+                if rect == target || target == CGRect.zero {
+                    return rect
+                }
+                
+                var scales = CGSize.zero
+                scales.width = abs(target.width / rect.width)
+                scales.height = abs(target.height / rect.height)
+                
+                switch self {
+                case .aspectFit:
+                    scales.width = min(scales.width, scales.height)
+                    scales.height = scales.width
+                case .aspectFill:
+                    scales.width = max(scales.width, scales.height)
+                    scales.height = scales.width
+                case .stretch:
+                    break
+                case .center:
+                    scales.width = 1
+                    scales.height = 1
+                }
+                
+                var result = rect.standardized
+                result.size.width *= scales.width
+                result.size.height *= scales.height
+                result.origin.x = target.minX + (target.width - result.width) / 2
+                result.origin.y = target.minY + (target.height - result.height) / 2
+                return result
+            }
+        }
+    }
+}
diff --git a/Source/SPAlert/Views/Icons/SPAlertIconStarView.swift b/Source/SPAlert/Views/Icons/SPAlertIconStarView.swift
diff --git a/Source/SPAlert/Views/SPAlertView.swift b/Source/SPAlert/Views/SPAlertView.swift
