Merge pull request #17 from jinSasaki/refactor

Refactor interface
jinSasaki · Dec 7, 2016 · acb365c · acb365c
2 parents a3ee702 + 7eefcdb
commit acb365c
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 55 deletions.
diff --git a/AlertBar.podspec b/AlertBar.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "AlertBar"
-  s.version          = "0.2.0"
+  s.version          = "0.3.0"
   s.summary          = "An easy alert on status bar."
   s.homepage         = "https://github.com/jinSasaki/AlertBar"
   s.screenshots      = "https://github.com/jinSasaki/AlertBar/raw/master/etc/demo.gif"

diff --git a/Example/AlertBar/ViewController.swift b/Example/AlertBar/ViewController.swift
@@ -16,7 +16,7 @@ class ViewController: UIViewController {
     }
 
     @IBAction func tapError(_ sender: AnyObject) {
-        AlertBar.showError(NSError(domain: "Page not found", code: 404, userInfo: nil), duration: 3)
+        AlertBar.show(error: NSError(domain: "Page not found", code: 404, userInfo: nil), duration: 3)
     }
 
     @IBAction func tapNotice(_ sender: AnyObject) {

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - AlertBar (0.2.0)
+  - AlertBar (0.3.0)
 
 DEPENDENCIES:
   - AlertBar (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  AlertBar: 3e6a111420c95e278e23e6fbe6668469e54c0be3
+  AlertBar: 1e17f957b65582b7a1610e6bc2eb9c169e9466df
 
 PODFILE CHECKSUM: d0b6cb35dafa29919b756447265020670bcb91c2
 
-COCOAPODS: 1.1.0.rc.2
+COCOAPODS: 1.1.1
diff --git a/Example/Pods/Local Podspecs/AlertBar.podspec.json b/Example/Pods/Local Podspecs/AlertBar.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/AlertBar/AlertBar-umbrella.h b/Example/Pods/Target Support Files/AlertBar/AlertBar-umbrella.h
diff --git a/Example/Pods/Target Support Files/AlertBar/Info.plist b/Example/Pods/Target Support Files/AlertBar/Info.plist
diff --git a/Example/Pods/Target Support Files/Pods-AlertBar_Example/Pods-AlertBar_Example-resources.sh b/Example/Pods/Target Support Files/Pods-AlertBar_Example/Pods-AlertBar_Example-resources.sh
diff --git a/Example/Pods/Target Support Files/Pods-AlertBar_Example/Pods-AlertBar_Example-umbrella.h b/Example/Pods/Target Support Files/Pods-AlertBar_Example/Pods-AlertBar_Example-umbrella.h
diff --git a/Example/Pods/Target Support Files/Pods-AlertBar_Tests/Pods-AlertBar_Tests-resources.sh b/Example/Pods/Target Support Files/Pods-AlertBar_Tests/Pods-AlertBar_Tests-resources.sh
diff --git a/Example/Pods/Target Support Files/Pods-AlertBar_Tests/Pods-AlertBar_Tests-umbrella.h b/Example/Pods/Target Support Files/Pods-AlertBar_Tests/Pods-AlertBar_Tests-umbrella.h
diff --git a/Pod/Classes/AlertBar.swift b/Pod/Classes/AlertBar.swift
@@ -19,15 +19,15 @@ public enum AlertBarType {
         get {
             switch self {
             case .success:
-                return AlertBarHelper.UIColorFromRGB(0x4CAF50)
+                return UIColor(0x4CAF50)
             case .error:
-                return AlertBarHelper.UIColorFromRGB(0xf44336)
+                return UIColor(0xf44336)
             case .notice:
-                return AlertBarHelper.UIColorFromRGB(0x2196F3)
+                return UIColor(0x2196F3)
             case .warning:
-                return AlertBarHelper.UIColorFromRGB(0xFFC107)
+                return UIColor(0xFFC107)
             case .info:
-                return AlertBarHelper.UIColorFromRGB(0x009688)
+                return UIColor(0x009688)
             case .custom(let backgroundColor, _):
                 return backgroundColor
             }
@@ -39,7 +39,7 @@ public enum AlertBarType {
             case .custom(_, let textColor):
                 return textColor
             default:
-                return AlertBarHelper.UIColorFromRGB(0xFFFFFF)
+                return UIColor(0xFFFFFF)
             }
         }
     }
@@ -130,16 +130,16 @@ open class AlertBar: UIView {
             })
     }
 
-    open class func showError(_ error: NSError, duration: Double = 2, completion: (() -> Void)? = nil) {
-        let code = error.code
+    open class func show(error: Error, duration: Double = 2, completion: (() -> Void)? = nil) {
+        let code = (error as NSError).code
         let localizedDescription = error.localizedDescription
-        self.show(.error, message: "(\(code)) " + localizedDescription)
+        self.show(.error, message: "(\(code)) " + localizedDescription, duration: duration, completion: completion)
     }
 }
 
-internal class AlertBarHelper {
-    class func UIColorFromRGB(_ rgbValue: UInt) -> UIColor {
-        return UIColor(
+internal extension UIColor {
+    convenience init(_ rgbValue: UInt) {
+        self.init(
             red: CGFloat((rgbValue & 0xFF0000) >> 16) / 255.0,
             green: CGFloat((rgbValue & 0x00FF00) >> 8) / 255.0,
             blue: CGFloat(rgbValue & 0x0000FF) / 255.0,