Skip to content

Commit 1793954

Browse files
committed
Fixed dismiss by tap flag.
1 parent 5893a0b commit 1793954

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

Example App/SPAlert.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXFileReference section */
21-
F43A587826564DDF009098ED /* SPAlert */ = {isa = PBXFileReference; lastKnownFileType = folder; name = SPAlert; path = ..; sourceTree = "<group>"; };
2221
F47E1DFA26564B6A008D901C /* iOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2322
F47E1E0B26564B6C008D901C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2423
F47E1E1226564BB3008D901C /* AlertPresetModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertPresetModel.swift; sourceTree = "<group>"; };
2524
F47E1E1426564BB3008D901C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2625
F47E1E1626564BB3008D901C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
2726
F47E1E1726564BB3008D901C /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
2827
F47E1E1926564BB3008D901C /* PresetsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresetsController.swift; sourceTree = "<group>"; };
28+
F482FBF42756A77100E40FDA /* SPAlert */ = {isa = PBXFileReference; lastKnownFileType = folder; name = SPAlert; path = ..; sourceTree = "<group>"; };
2929
/* End PBXFileReference section */
3030

3131
/* Begin PBXFrameworksBuildPhase section */
@@ -45,7 +45,7 @@
4545
F47E1DF126564B6A008D901C = {
4646
isa = PBXGroup;
4747
children = (
48-
F43A587826564DDF009098ED /* SPAlert */,
48+
F482FBF42756A77100E40FDA /* SPAlert */,
4949
F47E1DFC26564B6A008D901C /* iOS Example */,
5050
F47E1DFB26564B6A008D901C /* Products */,
5151
);

SPAlert.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = 'SPAlert'
4-
s.version = '3.5.0'
4+
s.version = '3.5.1'
55
s.summary = 'Native alert from Apple Music & Feedback. Contains Done, Heart & Message and other presets.'
66
s.homepage = 'https://github.com/ivanvorobei/SPAlert'
77
s.source = { :git => 'https://github.com/ivanvorobei/SPAlert.git', :tag => s.version }

Sources/SPAlert/SPAlertView.swift

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,33 +88,38 @@ open class SPAlertView: UIView {
8888

8989
public init(title: String, message: String? = nil, preset: SPAlertIconPreset) {
9090
super.init(frame: CGRect.zero)
91-
92-
switch preset {
93-
case .spinner:
94-
self.dismissInTime = false
95-
default:
96-
self.dismissInTime = true
97-
}
98-
9991
commonInit()
10092
layout = SPAlertLayout(for: preset)
10193
setTitle(title)
10294
if let message = message {
10395
setMessage(message)
10496
}
10597
setIcon(for: preset)
98+
99+
switch preset {
100+
case .spinner:
101+
dismissInTime = false
102+
dismissByTap = false
103+
default:
104+
dismissInTime = true
105+
dismissByTap = true
106+
}
106107
}
107108

108109
public init(message: String) {
109110
super.init(frame: CGRect.zero)
110111
commonInit()
111112
layout = SPAlertLayout.message()
112113
setMessage(message)
114+
dismissInTime = true
115+
dismissByTap = true
113116
}
114117

115118
public required init?(coder aDecoder: NSCoder) {
116119
super.init(coder: aDecoder)
117120
commonInit()
121+
dismissInTime = true
122+
dismissByTap = true
118123
}
119124

120125
private func commonInit() {
@@ -127,11 +132,6 @@ open class SPAlertView: UIView {
127132
backgroundColor = .clear
128133
addSubview(backgroundView)
129134

130-
if dismissByTap {
131-
let tapGesterRecognizer = UITapGestureRecognizer(target: self, action: #selector(dismiss))
132-
addGestureRecognizer(tapGesterRecognizer)
133-
}
134-
135135
setCornerRadius(self.cornerRadius)
136136
}
137137

@@ -217,6 +217,11 @@ open class SPAlertView: UIView {
217217
setFrame()
218218
transform = transform.scaledBy(x: self.presentDismissScale, y: self.presentDismissScale)
219219

220+
if dismissByTap {
221+
let tapGesterRecognizer = UITapGestureRecognizer(target: self, action: #selector(dismiss))
222+
addGestureRecognizer(tapGesterRecognizer)
223+
}
224+
220225
// Present
221226

222227
haptic.impact()

0 commit comments

Comments
 (0)