Merge pull request #10 from nodes-ios/issue/appearence

Added ability to place toastview top, center or bottom, plus possibility for adjustments

ReachabilityUI/ReachabilityUI/Reachability/ReachabilityCoordinator.swift

@@ -27,7 +27,11 @@ public class ReachabilityCoordinator {
     ///    - dependencies
     ///    - height of the UIViewController. Default value is 30
     ///
-    public init(window: UIWindow, reachabilityListenerFactory: ReachabilityListenerFactoryProtocol, hasNavigationBar: Bool = true, configuration: ReachabilityConfiguration) {
+    public init(window: UIWindow,
+                reachabilityListenerFactory: ReachabilityListenerFactoryProtocol,
+                hasNavigationBar: Bool = true,
+                configuration: ReachabilityConfiguration) {
+
         self.window = window
         self.hasNavigationBar = hasNavigationBar
         self.reachabilityListenerFactory = reachabilityListenerFactory

ReachabilityUI/ReachabilityUI/Reachability/ReachabilityModels.swift

@@ -23,51 +23,115 @@ extension Reachability.ReachabilityListener {
     }
 }
 
-
 public struct ReachabilityConfiguration {
-    let noConnectionTitle: String
-    let noConnectionTitleColor: UIColor
-    let noConnectionBackgroundColor: UIColor
     let title: String
-    let titleColor: UIColor
-    let backgroundColor: UIColor
-    let height: CGFloat
-    let font: UIFont
-    let textAlignment: NSTextAlignment
-    let animation: Animation
+    let noConnectionTitle: String
+    let options: [ReachabilityConfiguration.Key : Any]
+    let defaultOptionsDict: [ReachabilityConfiguration.Key : Any] = [.titleColor : UIColor.white,
+                                                                     .noConnectionTitleColor : UIColor.white,
+                                                                     .noConnectionBackgroundColor : UIColor.red.withAlphaComponent(0.6),
+                                                                     .backgroundColor : UIColor.green.withAlphaComponent(0.6),
+                                                                     .height : CGFloat(30),
+                                                                     .font : UIFont.systemFont(ofSize: 12),
+                                                                     .textAlignment: NSTextAlignment.center,
+                                                                     .animation : Animation.fadeInOut,
+                                                                     .appearance : Appearance.top,
+                                                                     .appearanceAdjustment : CGFloat(0)]
 
-    public init(noConnectionTitle: String,
-                noConnectionTitleColor: UIColor,
-                noConnectionBackgroundColor: UIColor,
-                title: String,
-                titleColor: UIColor,
-                backgroundColor: UIColor,
-                height: CGFloat,
-                font: UIFont,
-                textAlignment: NSTextAlignment,
-                animation: Animation) {
-        self.noConnectionTitle = noConnectionTitle
-        self.noConnectionTitleColor = noConnectionTitleColor
-        self.noConnectionBackgroundColor = noConnectionBackgroundColor
+    public init(title: String, noConnectionTitle: String, options: [ReachabilityConfiguration.Key : Any]?) {
         self.title = title
-        self.titleColor = titleColor
-        self.backgroundColor = backgroundColor
-        self.height = height
-        self.font = font
-        self.textAlignment = textAlignment
-        self.animation = animation
+        self.noConnectionTitle = noConnectionTitle
+
+        var finalOptionsDict = defaultOptionsDict
+
+        if let options = options {            
+            //titleColor
+            if let titleColor = options[.titleColor] as? UIColor {
+                finalOptionsDict[.titleColor] = titleColor
+            }
+
+            //noConnectionTitleColor
+            if let noConnectionTitleColor = options[.noConnectionTitleColor] as? UIColor {
+                finalOptionsDict[.noConnectionTitleColor] = noConnectionTitleColor
+            }
+
+            //noConnectionBackgroundColor
+            if let noConnectionBackgroundColor = options[.noConnectionBackgroundColor] as? UIColor {
+                finalOptionsDict[.noConnectionBackgroundColor] = noConnectionBackgroundColor
+            }
+
+            //backgroundColor
+            if let backgroundColor = options[.backgroundColor] as? UIColor {
+                finalOptionsDict[.backgroundColor] = backgroundColor
+            }
+
+            //height
+            if let height = options[.height] as? CGFloat {
+                finalOptionsDict[.height] = height
+            }
+
+            //font
+            if let font = options[.font] as? UIFont {
+                finalOptionsDict[.font] = font
+            }
+
+            //textAlignment
+            if let textAlignment = options[.textAlignment] as? NSTextAlignment {
+                finalOptionsDict[.textAlignment] = textAlignment
+            }
+
+            //animation
+            if let animation = options[.animation] as? Animation {
+                finalOptionsDict[.animation] = animation
+            }
+
+            //appearance
+            if let appearance = options[.appearance] as? Appearance {
+                finalOptionsDict[.appearance] = appearance
+            }
+
+            //appearanceAdjustment
+            if let appearanceAdjustment = options[.appearanceAdjustment] as? CGFloat {
+                finalOptionsDict[.appearanceAdjustment] = appearanceAdjustment
+            }
+        }
+
+        self.options = finalOptionsDict
     }
 }
 
 extension ReachabilityConfiguration {
 
+    public enum Key: String {
+        case titleColor ///Has to be of type UIColor
+        case noConnectionTitleColor ///Has to be of type UIColor
+        case noConnectionBackgroundColor ///Has to be of type UIColor
+        case backgroundColor ///Has to be of type UIColor
+        case height ///Has to be of type CGFloat
+        case font ///Has to be of type UIFont
+        case textAlignment ///Has to be of type NSTextAlignment
+        case animation ///Has to be of type ReachabilityConfiguration.Animation
+        case appearance ///Has to be of type ReachabilityConfiguration.Appearance
+        case appearanceAdjustment ///Has to be of type CGFloat
+    }
+
     public enum Animation {
-        /// the banner will appear/dissapear from the screen by changing the view's alpha value
+        /// the banner will appear/disappear from the screen by changing the view's alpha value
         case fadeInOut
-        /// the banner will appear/dissapear from the screen by moving it's frame on and off the view
-        case slideInOut
-        /// the banner will appear/dissapear from the screen by moving it's frame on and off the view while simulatiously changing it's alpha values
-        case slideAndFadeInOut
+        /// the banner will appear/disappear from the screen by moving it's frame on and off the view from the top
+        case slideInOutFromTop
+        /// the banner will appear/disappear from the screen by moving it's frame on and off the view from the top, while simulatiously changing it's alpha values
+        case slideAndFadeInOutFromTop
+        /// the banner will appear/disappear from the screen by moving it's frame on and off the view from the bottom
+        case slideInOutFromBottom
+        /// the banner will appear/disappear from the screen by moving it's frame on and off the view from the bottom, while simulatiously changing it's alpha values
+        case slideAndFadeInOutFromBottom
+    }
+
+    public enum Appearance {
+        case top
+        case center
+        case bottom
     }
 
 }