Skip to content

Commit 186b87a

Browse files
ivanvorobeiivanvorobei
committed
Fixed delegate bug for dialog controller. Added dismissCondition property for controller, allow dismiss controller when all permissions determinated.
1 parent 5334899 commit 186b87a

File tree

10 files changed

+134
-36
lines changed

10 files changed

+134
-36
lines changed

‎Example Apps/SPPermissions.xcodeproj/project.xcworkspace/xcuserdata/ivanvorobei.xcuserdatad/UserInterfaceState.xcuserstate‎

15.3 KB
Binary file not shown.

‎Example Apps/iOS Example/Scenes/RootController.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class RootController: SPTableViewController {
7171
let segmentedControl = UISegmentedControl(items: ["List", "Dialog", "Native"])
7272
navigationItem.titleView = segmentedControl
7373
segmentedControl.selectedSegmentIndex = 0
74-
7574
navigationItem.rightBarButtonItem = UIBarButtonItem.init(barButtonSystemItem: .play, target: self, action: #selector(self.requestPermissions))
7675
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "cell")
7776
}
@@ -128,7 +127,7 @@ extension RootController: SPPermissionsDataSource {
128127
*/
129128
}
130129

131-
func deniedAlertTexts(for permission: SPPermissions.Permission) -> SPPermissionDeniedAlertTexts? {
130+
func deniedAlertTexts(for permission: SPPermissions.Permission) -> SPPermissionsDeniedAlertTexts? {
132131
// You can create custom texts
133132

134133
/*

‎README.md‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,12 @@ controller.footerText = "Footer Text"
230230
controller.dataSource = self
231231
controller.delegate = self
232232

233+
// If you want auto dismiss controler,
234+
// when all permissions has any determinated state
235+
// set dismiss mode `allPermissionsDeterminated`.
236+
// By default dismiss controller happen only when all permission allowed.
237+
controller.dismissCondition = .allPermissionsDeterminated
238+
233239
// Always use this method for present
234240
controller.present(on: self)
235241
```
@@ -251,6 +257,12 @@ controller.footerText = "Footer Text"
251257
controller.dataSource = self
252258
controller.delegate = self
253259

260+
// If you want auto dismiss controler,
261+
// when all permissions has any determinated state
262+
// set dismiss mode `allPermissionsDeterminated`.
263+
// By default dismiss controller happen only when all permission allowed.
264+
controller.dismissCondition = .allPermissionsDeterminated
265+
254266
// Always use this method for present
255267
controller.present(on: self)
256268
```
@@ -299,7 +311,7 @@ extension Controller: SPPermissionsDataSource {
299311
If a permission is denied, you can provide an alert to the user with an option to open settings. An example of how you can customize the alert text:
300312

301313
```swift
302-
let texts = SPPermissionDeniedAlertTexts()
314+
let texts = SPPermissionsDeniedAlertTexts()
303315
texts.titleText = "Permission denied"
304316
texts.descriptionText = "Please, go to Settings and allow permission."
305317
texts.actionText = "Settings"
@@ -309,7 +321,7 @@ texts.cancelText = "Cancel"
309321
Next implement the following method and return:
310322

311323
```swift
312-
func deniedAlertTexts(for permission: SPPermissions.Permission) -> SPPermissionDeniedAlertTexts? {
324+
func deniedAlertTexts(for permission: SPPermissions.Permission) -> SPPermissionsDeniedAlertTexts? {
313325

314326
// Custom texts:
315327
return texts

‎SPPermissions.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 = "SPPermissions"
4-
s.version = "6.5.4"
4+
s.version = "6.5.5"
55
s.summary = "Ask permissions on Swift. Available List, Dialog & Native interface. Can check state permission."
66
s.homepage = "https://github.com/ivanvorobei/SPPermissions"
77
s.source = { :git => "https://github.com/ivanvorobei/SPPermissions.git", :tag => s.version }

‎Sources/SPPermissions/Interface/Dialog Style/SPPermissionsDialogController.swift‎

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ public class SPPermissionsDialogController: UIViewController, SPPermissionsContr
3838
*/
3939
public var allowSwipeDismiss: Bool = true
4040

41+
/**
42+
SPPermissions: Manage dismising condition.
43+
44+
By default dismiss controller hapen when all permission allowed.
45+
If you need dismiss controller when all permissions has state determinated, change it to `allPermissionsDeterminated`.
46+
*/
47+
public var dismissCondition: SPPermissionsDismissCondition = .default
48+
4149
/**
4250
SPPermissions: Manage bounce animation. If `false`,
4351
dialog can't be tracked. Default value is `true`.
@@ -50,7 +58,7 @@ public class SPPermissionsDialogController: UIViewController, SPPermissionsContr
5058
public var titleText = Texts.header
5159
public var headerText = Texts.sub_header
5260
public var footerText = Texts.comment
53-
61+
5462
private let dialogView = SPPermissionsDialogView()
5563
private let backgroundView = SPPermissionsDialogGradeBlurView()
5664

@@ -178,29 +186,44 @@ public class SPPermissionsDialogController: UIViewController, SPPermissionsContr
178186
}
179187
}
180188

181-
// Check if all permissions allowed
182-
183-
let allowedPermissions = self.permissions.filter { $0.authorized }
184-
if allowedPermissions.count == self.permissions.count {
185-
Delay.wait(0.2, closure: {
186-
self.dismiss(animated: true)
187-
})
189+
let dismissByCondition: () -> Bool = {
190+
switch self.dismissCondition {
191+
case .allPermissionsAuthorized:
192+
let allowedPermissions = self.permissions.filter { $0.authorized }
193+
if allowedPermissions.count == self.permissions.count {
194+
Delay.wait(0.2, closure: {
195+
self.dismiss(withDialog: true)
196+
})
197+
return true
198+
}
199+
case .allPermissionsDeterminated:
200+
let determiatedPermissions = self.permissions.filter { !$0.notDetermined }
201+
if determiatedPermissions.count == self.permissions.count {
202+
Delay.wait(0.2, closure: {
203+
self.dismiss(withDialog: true)
204+
})
205+
return true
206+
}
207+
}
208+
209+
return false
188210
}
189211

212+
190213
if permission.authorized {
191214
self.delegate?.didAllowPermission(permission)
215+
let _ = dismissByCondition()
192216
} else {
193217
self.delegate?.didDeniedPermission(permission)
194-
195-
if !firstRequest {
196-
218+
if firstRequest {
219+
let _ = dismissByCondition()
220+
} else {
197221
// Delay using for fix animation freeze.
198222
Delay.wait(0.3, closure: { [weak self] in
199223
guard let self = self else { return }
200224
Presenter.presentAlertAboutDeniedPermission(permission, dataSource: self.dataSource, on: self)
201225
})
202226
}
203-
204227
}
205228
}
206229
}
@@ -226,9 +249,16 @@ public class SPPermissionsDialogController: UIViewController, SPPermissionsContr
226249
}
227250

228251
public override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
252+
let shoudCallDelegate: Bool = {
253+
if presentedViewController == nil { return true }
254+
if presentedViewController is UIAlertController { return false }
255+
return true
256+
}()
229257
super.dismiss(animated: flag, completion: {
230258
completion?()
231-
self.delegate?.didHidePermissions(self.permissions)
259+
if shoudCallDelegate {
260+
self.delegate?.didHidePermissions(self.permissions)
261+
}
232262
})
233263
}
234264

‎Sources/SPPermissions/Interface/List Style/SPPermissionsListController.swift‎

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ public class SPPermissionsListController: UITableViewController, SPPermissionsCo
3838
*/
3939
public var allowSwipeDismiss: Bool = true
4040

41+
/**
42+
SPPermissions: Manage dismising condition.
43+
44+
By default dismiss controller hapen when all permission allowed.
45+
If you need dismiss controller when all permissions has state determinated, change it to `allPermissionsDeterminated`.
46+
*/
47+
public var dismissCondition: SPPermissionsDismissCondition = .default
48+
4149
public weak var dataSource: SPPermissionsDataSource?
4250
public weak var delegate: SPPermissionsDelegate?
4351

@@ -132,28 +140,44 @@ public class SPPermissionsListController: UITableViewController, SPPermissionsCo
132140
}
133141
}
134142

135-
// Check if all permissions allowed
136-
137-
let allowedPermissions = self.permissions.filter { $0.authorized }
138-
if allowedPermissions.count == self.permissions.count {
139-
Delay.wait(0.2, closure: {
140-
self.dismiss(animated: true)
141-
})
143+
let dismissByCondition: () -> Bool = {
144+
switch self.dismissCondition {
145+
case .allPermissionsAuthorized:
146+
let allowedPermissions = self.permissions.filter { $0.authorized }
147+
if allowedPermissions.count == self.permissions.count {
148+
Delay.wait(0.2, closure: {
149+
self.dismiss(animated: true)
150+
})
151+
return true
152+
}
153+
154+
case .allPermissionsDeterminated:
155+
let determiatedPermissions = self.permissions.filter { !$0.notDetermined }
156+
if determiatedPermissions.count == self.permissions.count {
157+
Delay.wait(0.2, closure: {
158+
self.dismiss(animated: true)
159+
})
160+
return true
161+
}
162+
}
163+
164+
return false
142165
}
143-
166+
144167
if permission.authorized {
145168
self.delegate?.didAllowPermission(permission)
169+
let _ = dismissByCondition()
146170
} else {
147171
self.delegate?.didDeniedPermission(permission)
148-
149-
if !firstRequest {
150-
172+
if firstRequest {
173+
let _ = dismissByCondition()
174+
} else {
151175
// Delay using for fix animation freeze.
152176
Delay.wait(0.3, closure: { [weak self] in
153177
guard let self = self else { return }
154178
Presenter.presentAlertAboutDeniedPermission(permission, dataSource: self.dataSource, on: self)
155179
})
156-
}
180+
}
157181
}
158182
}
159183
}
@@ -170,7 +194,7 @@ public class SPPermissionsListController: UITableViewController, SPPermissionsCo
170194
}
171195

172196
private func processDissmissedEvent() {
173-
self.delegate?.didHidePermissions(permissions)
197+
delegate?.didHidePermissions(permissions)
174198
}
175199
}
176200

Sources/SPPermissions/Models/SPPermissionDeniedAlertTexts.swift renamed to Sources/SPPermissions/Models/SPPermissionsDeniedAlertTexts.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import UIKit
2424
/**
2525
SPPermissions: Content for denied alert.
2626
*/
27-
public class SPPermissionDeniedAlertTexts: NSObject {
27+
public class SPPermissionsDeniedAlertTexts: NSObject {
2828

2929
public var titleText = Texts.denied_alert_title
3030
public var descriptionText = Texts.denied_alert_description
@@ -44,7 +44,7 @@ public class SPPermissionDeniedAlertTexts: NSObject {
4444
super.init()
4545
}
4646

47-
public static var `default`: SPPermissionDeniedAlertTexts {
48-
return SPPermissionDeniedAlertTexts()
47+
public static var `default`: SPPermissionsDeniedAlertTexts {
48+
return SPPermissionsDeniedAlertTexts()
4949
}
5050
}

‎Sources/SPPermissions/Models/SPPermissionsDismissCondition.swift‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// The MIT License (MIT)
2+
// Copyright © 2020 Ivan Vorobei ([email protected])
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a copy
5+
// of this software and associated documentation files (the "Software"), to deal
6+
// in the Software without restriction, including without limitation the rights
7+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
// copies of the Software, and to permit persons to whom the Software is
9+
// furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included in all
12+
// copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
// SOFTWARE.
21+
22+
import UIKit
23+
24+
/**
25+
SPPermissions: Mode of dismissing controller.
26+
*/
27+
public enum SPPermissionsDismissCondition {
28+
29+
case allPermissionsAuthorized
30+
case allPermissionsDeterminated
31+
32+
static var `default`: SPPermissionsDismissCondition { allPermissionsDeterminated }
33+
}

‎Sources/SPPermissions/Protocols/SPPermissionsDataSource.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public protocol SPPermissionsDataSource: AnyObject {
4242

4343
- parameter permission: Text for this permission.
4444
*/
45-
func deniedAlertTexts(for permission: SPPermissions.Permission) -> SPPermissionDeniedAlertTexts?
45+
func deniedAlertTexts(for permission: SPPermissions.Permission) -> SPPermissionsDeniedAlertTexts?
4646
}
4747

4848
// Using like default for allow it like optional.

‎Sources/SPPermissions/Services/Presenter.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ enum Presenter {
3333
In this case developer don't want show alert.
3434
*/
3535
if (data == nil) && (dataSource != nil) { return }
36-
let texts = data ?? SPPermissionDeniedAlertTexts.default
36+
let texts = data ?? SPPermissionsDeniedAlertTexts.default
3737

3838
let alertController = UIAlertController(title: texts.titleText, message: texts.descriptionText, preferredStyle: .alert)
3939
alertController.addAction(.init(title: texts.cancelText, style: .cancel))

0 commit comments

Comments
 (0)