Formatting

JanGorman · Nov 3, 2023 · 0664a66 · 0664a66
1 parent 0aa25cc
commit 0664a66
Show file tree

Hide file tree

Showing 6 changed files with 197 additions and 127 deletions.
diff --git a/Example/SwiftMessageBarExample/SwiftMessageBarExample/ViewController.swift b/Example/SwiftMessageBarExample/SwiftMessageBarExample/ViewController.swift
@@ -6,63 +6,81 @@ import UIKit
 import SwiftMessageBar
 
 final class ViewController: UIViewController {
-
-  private var uuid: UUID?
-
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    let messageBarConfig = SwiftMessageBar.Config(successColor: .orange, isStatusBarHidden: true)
-    SwiftMessageBar.setSharedConfig(messageBarConfig)
-  }
 
-  @IBAction private func showSuccess() {
-    let message = "A really long message can go here, to provide a description for the user"
-    uuid = SwiftMessageBar.showMessage(withTitle: nil, message: message, type: .success, duration: 3, dismiss: false) {
-      print("Dismiss callback")
+    private var uuid: UUID?
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        let messageBarConfig = SwiftMessageBar.Config(successColor: .orange, isStatusBarHidden: true)
+        SwiftMessageBar.setSharedConfig(messageBarConfig)
     }
-  }
 
-  @IBAction private func showError() {
-    let message = "A really long message can go here, to provide a description for the user"
-    uuid = SwiftMessageBar.showMessage(withTitle: "Error", message: message, type: .error, duration: 3) {
-      print("Dismiss callback")
+    @IBAction private func showSuccess() {
+        let message = "A really long message can go here, to provide a description for the user"
+        uuid = SwiftMessageBar.showMessage(
+            withTitle: nil,
+            message: message,
+            type: .success,
+            duration: 3,
+            dismiss: false
+        ) {
+            print("Dismiss callback")
+        }
     }
-  }
-
-  @IBAction private func showInfo() {
-    let message = "A really long message can go here, to provide a description for the user"
-    uuid = SwiftMessageBar.showMessage(withTitle: "Info", message: message, type: .info, duration: 3) {
-      print("Dismiss callback")
+
+    @IBAction private func showError() {
+        let message = "A really long message can go here, to provide a description for the user"
+        uuid = SwiftMessageBar.showMessage(
+            withTitle: "Error",
+            message: message,
+            type: .error,
+            duration: 3
+        ) {
+            print("Dismiss callback")
+        }
     }
-  }
 
-  @IBAction private func clearAll() {
-    SwiftMessageBar.sharedMessageBar.cancelAll(force: true)
-    uuid = nil
-  }
+    @IBAction private func showInfo() {
+        let message = "A really long message can go here, to provide a description for the user"
+        uuid = SwiftMessageBar.showMessage(withTitle: "Info", message: message, type: .info, duration: 3) {
+            print("Dismiss callback")
+        }
+    }
+
+    @IBAction private func clearAll() {
+        SwiftMessageBar.sharedMessageBar.cancelAll(force: true)
+        uuid = nil
+    }
 
-  @IBAction private func clearCurrent() {
-    if let id = uuid {
-      SwiftMessageBar.sharedMessageBar.cancel(withId: id)
-      uuid = nil
+    @IBAction private func clearCurrent() {
+        if let id = uuid {
+            SwiftMessageBar.sharedMessageBar.cancel(withId: id)
+            uuid = nil
+        }
     }
-  }
 
-  @IBAction private func showSuccessWithAccesoryView() {
-    let message = "A really long message can go here, to provide a description for the user"
-    let button = UIButton(type: .roundedRect, primaryAction: UIAction { _ in
-      print("Button tapped")
-    })
-    button.contentEdgeInsets = UIEdgeInsets(top: 5, left: 5, bottom: 5, right: 5)
-    button.setContentHuggingPriority(.required, for: .horizontal)
-    button.setTitle("Open", for: .normal)
-    button.tintColor = .orange
-    button.backgroundColor = .white
-    button.layer.cornerRadius = 6
+    @IBAction private func showSuccessWithAccesoryView() {
+        let message = "A really long message can go here, to provide a description for the user"
+        let button = UIButton(type: .roundedRect, primaryAction: UIAction { _ in
+            print("Button tapped")
+        })
+        button.contentEdgeInsets = UIEdgeInsets(top: 5, left: 5, bottom: 5, right: 5)
+        button.setContentHuggingPriority(.required, for: .horizontal)
+        button.setTitle("Open", for: .normal)
+        button.tintColor = .orange
+        button.backgroundColor = .white
+        button.layer.cornerRadius = 6
 
-    uuid = SwiftMessageBar.showMessage(withTitle: nil, message: message, type: .success, duration: 3, dismiss: false, accessoryView: button ) {
-      print("Dismiss callback")
+        uuid = SwiftMessageBar.showMessage(
+            withTitle: nil,
+            message: message,
+            type: .success,
+            duration: 3,
+            dismiss: false,
+            accessoryView: button
+        ) {
+            print("Dismiss callback")
+        }
     }
-  }
 
 }
diff --git a/Package.swift b/Package.swift
@@ -1,5 +1,4 @@
 // swift-tools-version: 5.9
-// The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
@@ -11,7 +10,8 @@ let package = Package(
     products: [
         .library(
             name: "SwiftMessageBar",
-            targets: ["SwiftMessageBar"]),
+            targets: ["SwiftMessageBar"]
+        ),
     ],
     targets: [
         .target(

diff --git a/SwiftMessageBar.podspec b/SwiftMessageBar.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name          = 'SwiftMessageBar'
-  s.version       = '5.6.1'
+  s.version       = '5.6.2'
   s.summary       = 'A Swift Message Bar'
   s.swift_version = '5.0'
 
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.authors            = { 'Jan Gorman' => 'https://github.com/JanGorman/', 'Ramy Kfoury' => 'https://github.com/ramy-kfoury/' }
   s.social_media_url   = 'http://twitter.com/JanGorman'
 
-  s.platform     = :ios, '10.0'
+  s.platform     = :ios, '12.0'
 
   s.source       = { :git => 'https://github.com/JanGorman/SwiftMessageBar.git', :tag => s.version }
 

diff --git a/SwiftMessageBar/DeviceType.swift b/SwiftMessageBar/DeviceType.swift
diff --git a/SwiftMessageBar/Message.swift b/SwiftMessageBar/Message.swift
@@ -38,9 +38,22 @@ final class Message: UIView {
     return paragraphStyle
   }
 
-  init(type: MessageType, title: String?, message: String?, backgroundColor: UIColor, titleFontColor: UIColor,
-       messageFontColor: UIColor, icon: UIImage?, duration: TimeInterval, dismiss: Bool = true, callback: Callback?,
-       languageDirection: NSLocale.LanguageDirection, titleFont: UIFont, messageFont: UIFont, accessoryView: UIView?) {
+    init(
+        type: MessageType,
+        title: String?,
+        message: String?,
+        backgroundColor: UIColor,
+        titleFontColor: UIColor,
+        messageFontColor: UIColor,
+        icon: UIImage?,
+        duration: TimeInterval,
+        dismiss: Bool = true,
+        callback: Callback?,
+        languageDirection: NSLocale.LanguageDirection,
+        titleFont: UIFont,
+        messageFont: UIFont,
+        accessoryView: UIView?
+    ) {
     self.type = type
     self.title = title
     self.message = message