Skip to content

Commit 0664a66

Browse files
JanGormanJanGorman
committed
Formatting
1 parent 0aa25cc commit 0664a66

File tree

6 files changed

+197
-127
lines changed

6 files changed

+197
-127
lines changed

‎Example/SwiftMessageBarExample/SwiftMessageBarExample/ViewController.swift

+65-47
Original file line numberDiff line numberDiff line change
@@ -6,63 +6,81 @@ import UIKit
66
import SwiftMessageBar
77

88
final class ViewController: UIViewController {
9-
10-
private var uuid: UUID?
11-
12-
override func viewDidLoad() {
13-
super.viewDidLoad()
14-
let messageBarConfig = SwiftMessageBar.Config(successColor: .orange, isStatusBarHidden: true)
15-
SwiftMessageBar.setSharedConfig(messageBarConfig)
16-
}
179

18-
@IBAction private func showSuccess() {
19-
let message = "A really long message can go here, to provide a description for the user"
20-
uuid = SwiftMessageBar.showMessage(withTitle: nil, message: message, type: .success, duration: 3, dismiss: false) {
21-
print("Dismiss callback")
10+
private var uuid: UUID?
11+
12+
override func viewDidLoad() {
13+
super.viewDidLoad()
14+
let messageBarConfig = SwiftMessageBar.Config(successColor: .orange, isStatusBarHidden: true)
15+
SwiftMessageBar.setSharedConfig(messageBarConfig)
2216
}
23-
}
2417

25-
@IBAction private func showError() {
26-
let message = "A really long message can go here, to provide a description for the user"
27-
uuid = SwiftMessageBar.showMessage(withTitle: "Error", message: message, type: .error, duration: 3) {
28-
print("Dismiss callback")
18+
@IBAction private func showSuccess() {
19+
let message = "A really long message can go here, to provide a description for the user"
20+
uuid = SwiftMessageBar.showMessage(
21+
withTitle: nil,
22+
message: message,
23+
type: .success,
24+
duration: 3,
25+
dismiss: false
26+
) {
27+
print("Dismiss callback")
28+
}
2929
}
30-
}
31-
32-
@IBAction private func showInfo() {
33-
let message = "A really long message can go here, to provide a description for the user"
34-
uuid = SwiftMessageBar.showMessage(withTitle: "Info", message: message, type: .info, duration: 3) {
35-
print("Dismiss callback")
30+
31+
@IBAction private func showError() {
32+
let message = "A really long message can go here, to provide a description for the user"
33+
uuid = SwiftMessageBar.showMessage(
34+
withTitle: "Error",
35+
message: message,
36+
type: .error,
37+
duration: 3
38+
) {
39+
print("Dismiss callback")
40+
}
3641
}
37-
}
3842

39-
@IBAction private func clearAll() {
40-
SwiftMessageBar.sharedMessageBar.cancelAll(force: true)
41-
uuid = nil
42-
}
43+
@IBAction private func showInfo() {
44+
let message = "A really long message can go here, to provide a description for the user"
45+
uuid = SwiftMessageBar.showMessage(withTitle: "Info", message: message, type: .info, duration: 3) {
46+
print("Dismiss callback")
47+
}
48+
}
49+
50+
@IBAction private func clearAll() {
51+
SwiftMessageBar.sharedMessageBar.cancelAll(force: true)
52+
uuid = nil
53+
}
4354

44-
@IBAction private func clearCurrent() {
45-
if let id = uuid {
46-
SwiftMessageBar.sharedMessageBar.cancel(withId: id)
47-
uuid = nil
55+
@IBAction private func clearCurrent() {
56+
if let id = uuid {
57+
SwiftMessageBar.sharedMessageBar.cancel(withId: id)
58+
uuid = nil
59+
}
4860
}
49-
}
5061

51-
@IBAction private func showSuccessWithAccesoryView() {
52-
let message = "A really long message can go here, to provide a description for the user"
53-
let button = UIButton(type: .roundedRect, primaryAction: UIAction { _ in
54-
print("Button tapped")
55-
})
56-
button.contentEdgeInsets = UIEdgeInsets(top: 5, left: 5, bottom: 5, right: 5)
57-
button.setContentHuggingPriority(.required, for: .horizontal)
58-
button.setTitle("Open", for: .normal)
59-
button.tintColor = .orange
60-
button.backgroundColor = .white
61-
button.layer.cornerRadius = 6
62+
@IBAction private func showSuccessWithAccesoryView() {
63+
let message = "A really long message can go here, to provide a description for the user"
64+
let button = UIButton(type: .roundedRect, primaryAction: UIAction { _ in
65+
print("Button tapped")
66+
})
67+
button.contentEdgeInsets = UIEdgeInsets(top: 5, left: 5, bottom: 5, right: 5)
68+
button.setContentHuggingPriority(.required, for: .horizontal)
69+
button.setTitle("Open", for: .normal)
70+
button.tintColor = .orange
71+
button.backgroundColor = .white
72+
button.layer.cornerRadius = 6
6273

63-
uuid = SwiftMessageBar.showMessage(withTitle: nil, message: message, type: .success, duration: 3, dismiss: false, accessoryView: button ) {
64-
print("Dismiss callback")
74+
uuid = SwiftMessageBar.showMessage(
75+
withTitle: nil,
76+
message: message,
77+
type: .success,
78+
duration: 3,
79+
dismiss: false,
80+
accessoryView: button
81+
) {
82+
print("Dismiss callback")
83+
}
6584
}
66-
}
6785

6886
}

‎Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// swift-tools-version: 5.9
2-
// The swift-tools-version declares the minimum version of Swift required to build this package.
32

43
import PackageDescription
54

@@ -11,7 +10,8 @@ let package = Package(
1110
products: [
1211
.library(
1312
name: "SwiftMessageBar",
14-
targets: ["SwiftMessageBar"]),
13+
targets: ["SwiftMessageBar"]
14+
),
1515
],
1616
targets: [
1717
.target(

‎SwiftMessageBar.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = 'SwiftMessageBar'
4-
s.version = '5.6.1'
4+
s.version = '5.6.2'
55
s.summary = 'A Swift Message Bar'
66
s.swift_version = '5.0'
77

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
1919
s.authors = { 'Jan Gorman' => 'https://github.com/JanGorman/', 'Ramy Kfoury' => 'https://github.com/ramy-kfoury/' }
2020
s.social_media_url = 'http://twitter.com/JanGorman'
2121

22-
s.platform = :ios, '10.0'
22+
s.platform = :ios, '12.0'
2323

2424
s.source = { :git => 'https://github.com/JanGorman/SwiftMessageBar.git', :tag => s.version }
2525

‎SwiftMessageBar/DeviceType.swift

-11
This file was deleted.

‎SwiftMessageBar/Message.swift

+16-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,22 @@ final class Message: UIView {
3838
return paragraphStyle
3939
}
4040

41-
init(type: MessageType, title: String?, message: String?, backgroundColor: UIColor, titleFontColor: UIColor,
42-
messageFontColor: UIColor, icon: UIImage?, duration: TimeInterval, dismiss: Bool = true, callback: Callback?,
43-
languageDirection: NSLocale.LanguageDirection, titleFont: UIFont, messageFont: UIFont, accessoryView: UIView?) {
41+
init(
42+
type: MessageType,
43+
title: String?,
44+
message: String?,
45+
backgroundColor: UIColor,
46+
titleFontColor: UIColor,
47+
messageFontColor: UIColor,
48+
icon: UIImage?,
49+
duration: TimeInterval,
50+
dismiss: Bool = true,
51+
callback: Callback?,
52+
languageDirection: NSLocale.LanguageDirection,
53+
titleFont: UIFont,
54+
messageFont: UIFont,
55+
accessoryView: UIView?
56+
) {
4457
self.type = type
4558
self.title = title
4659
self.message = message

0 commit comments

Comments
 (0)