Merge pull request #9 from sgr-ksmt/release/1.2

Release/1.2

Alertift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Alertift"
-  s.version          = "1.1"
+  s.version          = "1.2"
   s.summary          = "UIAlertControlelr wrapper for Swift."
   s.homepage         = "https://github.com/sgr-ksmt/Alertift"
   # s.screenshots     = ""

README.md

@@ -20,7 +20,8 @@ Alertift.alert(title: "Alertift", message: "Alertift is swifty, modern, and awes
 - Method chain
 - UITextField support
 - iPad support(Action Sheet, popover)
-- Can change title/message/button text/ background color. (**without** private APIs.)
+- Can change title/message/button text/ background color **without** using private APIs.
+- Can change title/message's alignment **without** using private APIs.
 
 ## Examples
 

Sources/ActionSheet.swift

@@ -44,12 +44,23 @@ extension Alertift {
         /// - Parameters:
         ///   - view: sourceView
         ///   - rect: sourceRect
-        /// - Returns: MySelf
+        /// - Returns: Myself
         public func popover(sourceView view: UIView?, sourceRect rect: CGRect) -> Self {
             _alertController.popoverPresentationController?.sourceView = view
             _alertController.popoverPresentationController?.sourceRect = rect
             return self
         }
+
+        /// Add barButtonItem to **popoverPresentationController**.
+        ///
+        /// If you want to use action sheet on iPad, you have to use this method.
+        /// - Parameters:
+        ///   - barButtonItem: UIBarButtonItem
+        /// - Returns: Myself
+        public func popover(barButtonItem: UIBarButtonItem?) -> Self {
+            _alertController.popoverPresentationController?.barButtonItem = barButtonItem
+            return self
+        }
 
         deinit {
             Debug.log()

Sources/AlertType.swift

@@ -103,6 +103,25 @@ extension AlertType {
         return self
     }
 
+    /// Change text alignment of title
+    ///
+    /// - Parameter alignment: NSTextAlignment
+    /// - Returns: Myself
+    public func titleTextAlignment(_ alignment: NSTextAlignment) -> Self {
+        _alertController.titleTextAlignment = alignment
+        return self
+    }
+
+    /// Change text alignment of message
+    ///
+    /// - Parameter alignment: NSTextAlignment
+    /// - Returns: Myself
+    public func messageTextAlignment(_ alignment: NSTextAlignment) -> Self {
+        _alertController.messageTextAlignment = alignment
+        return self
+    }
+
+
     /// Show alert (or action sheet).
     ///
     /// - Parameters:

Sources/InnerAlertController.swift

@@ -21,7 +21,10 @@ class InnerAlertController: UIAlertController {
     var alertBackgroundColor: UIColor?
     var titleTextColor: UIColor? = .black
     var messageTextColor: UIColor? = .black
-
+    var titleTextAlignment: NSTextAlignment = .center
+    var messageTextAlignment: NSTextAlignment = .center
+
+
     /// Register UITextFieldTextDidChange notification
     ///
     /// - Parameter textField: textField
@@ -65,8 +68,8 @@ class InnerAlertController: UIAlertController {
         super.viewWillLayoutSubviews()
 
         adaptBackgroundColor()
-        adaptTitleColor()
-        adaptMessageColor()
+        updateTitleLabel()
+        updateMessageLabel()
     }
 
     private func adaptBackgroundColor() {
@@ -80,19 +83,28 @@ class InnerAlertController: UIAlertController {
         }
     }
 
-    private func adaptTitleColor() {
-        if let title = title, let titleLabel = searchLabel(from: title) {
-            print(titleLabel.textColor)
+    var titleLabel: UILabel? {
+        return title.flatMap(searchLabel(from:))
+    }
+
+    var messageLabel: UILabel? {
+        return message.flatMap(searchLabel(from:))
+    }
+
+    private func updateTitleLabel() {
+        if let titleLabel = titleLabel {
             titleLabel.textColor = titleTextColor
+            titleLabel.textAlignment = titleTextAlignment
         }
     }
 
-    private func adaptMessageColor() {
-        if let message = message, let messageLabel = searchLabel(from: message) {
+    private func updateMessageLabel() {
+        if let messageLabel = messageLabel {
             messageLabel.textColor = messageTextColor
+            messageLabel.textAlignment = messageTextAlignment
         }
     }
-
+    
     private var mainView: UIView? {
         return view.subviews.first?.subviews.first?.subviews.first
     }