Skip to content

Commit

Permalink
Swiftlint warning corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
rynecheow committed Oct 14, 2017
1 parent d510142 commit af54cc5
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Carthage/Checkouts/RxSwift
Submodule RxSwift updated 330 files
4 changes: 2 additions & 2 deletions Example/RxGesture.xcodeproj/project.pbxproj
Expand Up @@ -538,7 +538,7 @@
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Debug;
Expand All @@ -556,7 +556,7 @@
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Release;
Expand Down
Expand Up @@ -39,7 +39,7 @@ public struct MagnificationGestureRecognizerFactory: GestureRecognizerFactory {
public init(
configuration: ((NSMagnificationGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = NSMagnificationGestureRecognizerDefaults.configuration
) {
self.configuration = configuration ?? { _,_ in }
self.configuration = configuration ?? { _, _ in }
}
}

Expand Down
4 changes: 2 additions & 2 deletions Pod/Classes/iOS/UILongPressGestureRecognizer+RxGesture.swift
Expand Up @@ -28,7 +28,7 @@ public enum LongPressGestureRecognizerDefaults {
public static var numberOfTapsRequired: Int = 0
public static var minimumPressDuration: CFTimeInterval = 0.5
public static var allowableMovement: CGFloat = 10
public static var configuration: ((UILongPressGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = nil
public static var configuration: ((UILongPressGestureRecognizer, RxGestureRecognizerDelegate) -> Void)?
}

fileprivate typealias Defaults = LongPressGestureRecognizerDefaults
Expand All @@ -53,7 +53,7 @@ public struct LongPressGestureRecognizerFactory: GestureRecognizerFactory {
minimumPressDuration: CFTimeInterval = Defaults.minimumPressDuration,
allowableMovement: CGFloat = Defaults.allowableMovement,
configuration: ((UILongPressGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = Defaults.configuration
){
) {
self.configuration = { gestureRecognizer, delegate in
gestureRecognizer.numberOfTouchesRequired = numberOfTouchesRequired
gestureRecognizer.numberOfTapsRequired = numberOfTapsRequired
Expand Down
5 changes: 2 additions & 3 deletions Pod/Classes/iOS/UIPanGestureRecognizer+RxGesture.swift
Expand Up @@ -22,12 +22,11 @@ import UIKit
import RxSwift
import RxCocoa


/// Default values for `UIPanGestureRecognizer` configuration
public enum PanGestureRecognizerDefaults {
public static var minimumNumberOfTouches: Int = 1
public static var maximumNumberOfTouches: Int = Int.max
public static var configuration: ((UIPanGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = nil
public static var configuration: ((UIPanGestureRecognizer, RxGestureRecognizerDelegate) -> Void)?
}

fileprivate typealias Defaults = PanGestureRecognizerDefaults
Expand All @@ -47,7 +46,7 @@ public struct PanGestureRecognizerFactory: GestureRecognizerFactory {
minimumNumberOfTouches: Int = Defaults.minimumNumberOfTouches,
maximumNumberOfTouches: Int = Defaults.maximumNumberOfTouches,
configuration: ((UIPanGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = Defaults.configuration
){
) {
self.configuration = { gesture, delegate in
gesture.minimumNumberOfTouches = minimumNumberOfTouches
gesture.maximumNumberOfTouches = maximumNumberOfTouches
Expand Down
6 changes: 3 additions & 3 deletions Pod/Classes/iOS/UIPinchGestureRecognizer+RxGesture.swift
Expand Up @@ -24,7 +24,7 @@ import RxCocoa

/// Default values for `UIPinchGestureRecognizer` configuration
public enum PinchGestureRecognizerDefaults {
public static var configuration: ((UIPinchGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = nil
public static var configuration: ((UIPinchGestureRecognizer, RxGestureRecognizerDelegate) -> Void)?
}

fileprivate typealias Defaults = PinchGestureRecognizerDefaults
Expand All @@ -40,8 +40,8 @@ public struct PinchGestureRecognizerFactory: GestureRecognizerFactory {
*/
public init(
configuration: ((UIPinchGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = Defaults.configuration
){
self.configuration = configuration ?? { _,_ in }
) {
self.configuration = configuration ?? { _, _ in }
}
}

Expand Down
4 changes: 2 additions & 2 deletions Pod/Classes/iOS/UIRotationGestureRecognizer+RxGesture.swift
Expand Up @@ -24,7 +24,7 @@ import RxCocoa

/// Default values for `UIRotationGestureRecognizer` configuration
public enum RotationGestureRecognizerDefaults {
public static var configuration: ((UIRotationGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = nil
public static var configuration: ((UIRotationGestureRecognizer, RxGestureRecognizerDelegate) -> Void)?
}

fileprivate typealias Defaults = RotationGestureRecognizerDefaults
Expand All @@ -40,7 +40,7 @@ public struct RotationGestureRecognizerFactory: GestureRecognizerFactory {
*/
public init(
configuration: ((UIRotationGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = Defaults.configuration
){
) {
self.configuration = { gesture, delegate in
configuration?(gesture, delegate)
}
Expand Down
Expand Up @@ -24,7 +24,7 @@ import RxCocoa

/// Default values for `UIScreenEdgePanGestureRecognizer` configuration
public enum UIScreenEdgePanGestureRecognizerDefaults {
public static var configuration: ((UIScreenEdgePanGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = nil
public static var configuration: ((UIScreenEdgePanGestureRecognizer, RxGestureRecognizerDelegate) -> Void)?
}

fileprivate typealias Defaults = UIScreenEdgePanGestureRecognizerDefaults
Expand All @@ -42,7 +42,7 @@ public struct ScreenEdgePanGestureRecognizerFactory: GestureRecognizerFactory {
public init(
edges: UIRectEdge,
configuration: ((UIScreenEdgePanGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = Defaults.configuration
){
) {
self.configuration = { gestureRecognizer, delegate in
gestureRecognizer.edges = edges
configuration?(gestureRecognizer, delegate)
Expand Down
5 changes: 2 additions & 3 deletions Pod/Classes/iOS/UISwipeGestureRecognizer+RxGesture.swift
Expand Up @@ -25,7 +25,7 @@ import RxCocoa
/// Default values for `UISwipeGestureRecognizer` configuration
public enum UISwipeGestureRecognizerDefaults {
public static var numberOfTouchesRequired: Int = 1
public static var configuration: ((UISwipeGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = nil
public static var configuration: ((UISwipeGestureRecognizer, RxGestureRecognizerDelegate) -> Void)?
}

fileprivate typealias Defaults = UISwipeGestureRecognizerDefaults
Expand All @@ -44,7 +44,7 @@ public struct SwipeGestureRecognizerFactory: GestureRecognizerFactory {
_ direction: UISwipeGestureRecognizerDirection,
numberOfTouchesRequired: Int = Defaults.numberOfTouchesRequired,
configuration: ((UISwipeGestureRecognizer, RxGestureRecognizerDelegate) -> Void)? = Defaults.configuration
){
) {
self.configuration = { gesture, delegate in
gesture.direction = direction
gesture.numberOfTouchesRequired = numberOfTouchesRequired
Expand Down Expand Up @@ -74,7 +74,6 @@ extension AnyGestureRecognizerFactory {
}
}


public extension Reactive where Base: UIView {

/**
Expand Down
12 changes: 6 additions & 6 deletions README.md
Expand Up @@ -32,7 +32,7 @@ You can also react to more than one gesture. For example to dismiss a photo pre
view.rx
.anyGesture(.tap(), .swipe([.up, .down]))
.when(.recognized)
.subscribe(onNext: { _ in
.subscribe(onNext: { _ in
//dismiss presented photo
})
.disposed(by: stepBag)
Expand Down Expand Up @@ -111,15 +111,15 @@ view.rx
// Called whenever a tap, a swipe-up or a swipe-down is recognized (state == .recognized)
})
.disposed(by: bag)

view.rx
.anyGesture(
(.tap(), when: .recognized),
(.pan(), when: .ended)
)
.subscribe(onNext: { gesture in
// Called whenever:
// - a tap is recognized (state == .recognized)
// - a tap is recognized (state == .recognized)
// - or a pan is ended (state == .ended)
})
.disposed(by: bag)
Expand Down Expand Up @@ -148,7 +148,7 @@ pressReceptionPolicy -> gestureRecognizer(_:shouldReceive:) // iOS only

This delegate can be customized in the configuration closure:
```swift
view.rx.tapGesture(configuration: { gestureRecognizer, delegate in
view.rx.tapGesture(configuration: { gestureRecognizer, delegate in
delegate.simultaneousRecognitionPolicy = .always // (default value)
// or
delegate.simultaneousRecognitionPolicy = .never
Expand All @@ -167,7 +167,7 @@ Default values can be found in [`RxGestureRecognizerDelegate.swift`](Pod/Classes
### Full customization
You can also replace the default delegate by your own, or remove it.
```swift
view.rx.tapGesture { [unowned self] gestureRecognizer, delegate in
view.rx.tapGesture { [unowned self] gestureRecognizer, delegate in
gestureRecognizer.delegate = nil
// or
gestureRecognizer.delegate = self
Expand Down Expand Up @@ -198,7 +198,7 @@ $ pod install
Add this to `Cartfile`

```
github "RxSwiftCommunity/RxGesture" ~> 1.1.0
github "RxSwiftCommunity/RxGesture" ~> 1.1.1
```

```bash
Expand Down

0 comments on commit af54cc5

Please sign in to comment.