[Pod release] Status bar setup returned

* now using the main config
Athlee · Jan 17, 2017 · 1c09827 · 1c09827
1 parent e5d3560
commit 1c09827
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 36 deletions.
diff --git a/ATHKit.podspec b/ATHKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name                  = "ATHKit"
-s.version               = "0.0.9.3"
+s.version               = "0.0.9.4"
 s.summary               = "ATHKit is a collection of customizable UI components such as ImagePickerController and more."
 s.homepage              = "https://github.com/Athlee/ATHKit"
 s.license               = { :type => "MIT", :file => "LICENSE" }

diff --git a/Source/ATHImagePickerCaptureViewController.swift b/Source/ATHImagePickerCaptureViewController.swift
@@ -105,15 +105,13 @@ final public class ATHImagePickerCaptureViewController: UIViewController, PhotoC
 
     fileprivate var isStatusBarHidden: Bool = false {
         didSet {
-            //updateStatusBar(with: ATHImagePickerController.statusBarConfig)
-          updateStatusBar(with: ATHImagePickerStatusBarConfig())
+            updateStatusBar(with: config.statusBarConfig)
         }
     }
 
     fileprivate var statusBarAnimation: UIStatusBarAnimation = .none {
         didSet {
-            //updateStatusBar(with: ATHImagePickerController.statusBarConfig)
-          updateStatusBar(with: ATHImagePickerStatusBarConfig())
+            updateStatusBar(with: config.statusBarConfig)
         }
     }
 
@@ -160,8 +158,8 @@ final public class ATHImagePickerCaptureViewController: UIViewController, PhotoC
         pageTabBarItem.titleColor = view.window != nil ? config.titleColor : config.titleInactiveColor
         pageTabBarItem.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: UIFontWeightMedium)
 
-        isStatusBarHidden = config.isStatusBarHidden
-        statusBarAnimation = config.statusBarAnimation
+        isStatusBarHidden = config.statusBarConfig.isStatusBarHidden
+        statusBarAnimation = config.statusBarConfig.statusBarAnimation
 
         let bundle = Bundle(for: self.classForCoder)
         let image = /*config.assets?.switchCameraIcon ??*/

diff --git a/Source/ATHImagePickerController.swift b/Source/ATHImagePickerController.swift
@@ -31,14 +31,6 @@ extension StatusBarUpdatable where Self: UIViewController, Self.Config == ATHIma
     }
 }
 
-internal final class ATHImagePickerStatusBarAppearance {
-    internal var config = ATHImagePickerStatusBarConfig()
-
-    internal let shared = ATHImagePickerStatusBarAppearance()
-
-    private init() { }
-}
-
 //
 // MARK: - `ATHImagePickerController` public components
 //
@@ -108,9 +100,7 @@ public struct ATHImagePickerPageConfig {
     public let leftButtonColor: UIColor
     public let rightButtonColor: UIColor
 
-    public let isStatusBarHidden: Bool
-    public let statusBarAnimation: UIStatusBarAnimation
-
+    public let statusBarConfig: ATHImagePickerStatusBarConfig
     public let assets: ATHImagePickerAssets?
 
     public init(leftButtonTitle: String,
@@ -122,8 +112,7 @@ public struct ATHImagePickerPageConfig {
                 titleInactiveColor: UIColor,
                 leftButtonColor: UIColor,
                 rightButtonColor: UIColor,
-                isStatusBarHidden: Bool = false,
-                statusBarAnimation: UIStatusBarAnimation = .none,
+                statusBarConfig: ATHImagePickerStatusBarConfig = ATHImagePickerStatusBarConfig(),
                 assets: ATHImagePickerAssets? = nil) {
         self.leftButtonTitle = leftButtonTitle
         self.rightButtonTitle = rightButtonTitle
@@ -135,16 +124,26 @@ public struct ATHImagePickerPageConfig {
         self.leftButtonColor = leftButtonColor
         self.rightButtonColor = rightButtonColor
 
-        self.isStatusBarHidden = isStatusBarHidden
-        self.statusBarAnimation = statusBarAnimation
-
+        self.statusBarConfig = statusBarConfig
         self.assets = assets
     }
 }
 
 public struct ATHImagePickerStatusBarConfig {
-    public var isAnimated: Bool = false
+    public var isStatusBarHidden = false
+    public var statusBarAnimation: UIStatusBarAnimation = .none
+    public var isAnimated = false
     public var animationDuration: TimeInterval = 0.3
+
+    public init(isStatusBarHidden: Bool = false,
+                statusBarAnimation: UIStatusBarAnimation = .none,
+                isAnimated: Bool = false,
+                animationDuration: TimeInterval = 0.3) {
+        self.isStatusBarHidden = isStatusBarHidden
+        self.statusBarAnimation = statusBarAnimation
+        self.isAnimated = isAnimated
+        self.animationDuration = animationDuration
+    }
 }
 
 open class ATHImagePickerController: UINavigationController, ATHImagePickerCommiterDelegate {

diff --git a/Source/ATHImagePickerSelectionViewController.swift b/Source/ATHImagePickerSelectionViewController.swift
@@ -80,15 +80,13 @@ open class ATHImagePickerSelectionViewController: UIViewController, SelectionCon
 
     fileprivate var isStatusBarHidden: Bool = false {
         didSet {
-            //updateStatusBar(with: ATHImagePickerController.statusBarConfig)
-          updateStatusBar(with: ATHImagePickerStatusBarConfig())
+            updateStatusBar(with: config.statusBarConfig)
         }
     }
 
     fileprivate var statusBarAnimation: UIStatusBarAnimation = .none {
         didSet {
-            //updateStatusBar(with: ATHImagePickerController.statusBarConfig)
-          updateStatusBar(with: ATHImagePickerStatusBarConfig())
+            updateStatusBar(with: config.statusBarConfig)
         }
     }
 
@@ -134,8 +132,8 @@ open class ATHImagePickerSelectionViewController: UIViewController, SelectionCon
         pageTabBarItem.titleColor = view.window != nil ? config.titleColor : config.titleInactiveColor
         pageTabBarItem.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: UIFontWeightMedium)
 
-        isStatusBarHidden = config.isStatusBarHidden
-        statusBarAnimation = config.statusBarAnimation
+        isStatusBarHidden = config.statusBarConfig.isStatusBarHidden
+        statusBarAnimation = config.statusBarConfig.statusBarAnimation
     }
 
     // MARK: - SelectionController

diff --git a/Source/ATHImagePickerTabBarController.swift b/Source/ATHImagePickerTabBarController.swift
@@ -54,15 +54,13 @@ open class ATHImagePickerTabBarController: PageTabBarController, StatusBarUpdata
 
     fileprivate var isStatusBarHidden: Bool = false {
         didSet {
-            //updateStatusBar(with: ATHImagePickerController.statusBarConfig)
-          updateStatusBar(with: ATHImagePickerStatusBarConfig())
+            updateStatusBar(with: config.statusBarConfig)
         }
     }
 
     fileprivate var statusBarAnimation: UIStatusBarAnimation = .none {
         didSet {
-            //updateStatusBar(with: ATHImagePickerController.statusBarConfig)
-          updateStatusBar(with: ATHImagePickerStatusBarConfig())
+            updateStatusBar(with: config.statusBarConfig)
         }
     }
 
@@ -109,8 +107,8 @@ open class ATHImagePickerTabBarController: PageTabBarController, StatusBarUpdata
         pageTabBarItem.titleColor = config.titleColor
         pageTabBarItem.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: UIFontWeightMedium)
 
-        isStatusBarHidden = config.isStatusBarHidden
-        statusBarAnimation = config.statusBarAnimation
+        isStatusBarHidden = config.statusBarConfig.isStatusBarHidden
+        statusBarAnimation = config.statusBarConfig.statusBarAnimation
     }
 }