Skip to content

Clean up legacy Swift syntax for current compilers #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lm2343635 merged 4 commits into from
Sep 10, 2026
Merged

Clean up legacy Swift syntax for current compilers #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eee6abc
Use AnyObject for event binder protocol
lm2343635 Sep 10, 2026
850de6c
Use AnyObject for event router protocol
lm2343635 Sep 10, 2026
942ca71
Use compactMap for unwrapped event values
lm2343635 Sep 10, 2026
634cc5d
Qualify UIKit lifecycle selectors
lm2343635 Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions RxController/Classes/RxControllerEvent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,8 @@ extension ObservableType where Element == RxControllerEvent {
}

public func unwrappedValue<T>(of identifier: RxControllerEvent.Identifier, type: T.Type = T.self) -> Observable<T> {
return value(of: identifier)
.filter { $0 != nil }
.map { $0! }
return value(of: identifier, type: type)
.compactMap { $0 }
}

}
2 changes: 1 addition & 1 deletion RxController/Classes/RxControllerEventBinder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import RxCocoa
import RxSwift

public protocol RxControllerEventBinder: class {
public protocol RxControllerEventBinder: AnyObject {
var events: PublishRelay<RxControllerEvent> { get }
var parentEvents: PublishRelay<RxControllerEvent> { get }
var disposeBag: DisposeBag { get }
Expand Down
2 changes: 1 addition & 1 deletion RxController/Classes/RxControllerEventRouter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import RxCocoa
import RxSwift

public protocol RxControllerEventRouter: class {
public protocol RxControllerEventRouter: AnyObject {
var events: PublishRelay<RxControllerEvent> { get }
var parentEvents: PublishRelay<RxControllerEvent> { get }
var disposeBag: DisposeBag { get }
Expand Down
18 changes: 9 additions & 9 deletions RxController/Classes/RxViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,50 +45,50 @@ open class RxViewController<ViewModel: RxViewModel>: UIViewController, RxViewCon
self.viewModel = viewModel
super.init(nibName: nil, bundle: nil)

rx.methodInvoked(#selector(viewDidLoad))
rx.methodInvoked(#selector(UIViewController.viewDidLoad))
.map { _ in }
.bind(to: viewModel.viewDidLoadSubject)
.disposed(by: disposeBag)

rx.methodInvoked(#selector(viewWillAppear(_:)))
rx.methodInvoked(#selector(UIViewController.viewWillAppear(_:)))
.map { _ in }
.bind(to: viewModel.viewWillAppearSubject)
.disposed(by: disposeBag)

rx.methodInvoked(#selector(viewDidAppear))
rx.methodInvoked(#selector(UIViewController.viewDidAppear(_:)))
.map { _ in }
.bind(to: viewModel.viewDidAppearSubject)
.disposed(by: disposeBag)

rx.methodInvoked(#selector(viewWillDisappear(_:)))
rx.methodInvoked(#selector(UIViewController.viewWillDisappear(_:)))
.map { _ in }
.bind(to: viewModel.viewWillDisappearSubject)
.disposed(by: disposeBag)

rx.methodInvoked(#selector(viewDidDisappear(_:)))
rx.methodInvoked(#selector(UIViewController.viewDidDisappear(_:)))
.map { _ in }
.bind(to: viewModel.viewDidDisappearSubject)
.disposed(by: disposeBag)

rx.methodInvoked(#selector(viewWillLayoutSubviews))
rx.methodInvoked(#selector(UIViewController.viewWillLayoutSubviews))
.map { _ in }
.bind(to: viewModel.viewWillLayoutSubviewsSubject)
.disposed(by: disposeBag)

rx.methodInvoked(#selector(viewDidLayoutSubviews))
rx.methodInvoked(#selector(UIViewController.viewDidLayoutSubviews))
.map { _ in }
.bind(to: viewModel.viewDidLayoutSubviewsSubject)
.disposed(by: disposeBag)

if #available(iOS 11.0, *) {
rx.methodInvoked(#selector(viewSafeAreaInsetsDidChange))
rx.methodInvoked(#selector(UIViewController.viewSafeAreaInsetsDidChange))
.map { _ in }
.bind(to: viewModel.viewSafeAreaInsetsDidChangeSubject)
.disposed(by: disposeBag)
}

if #available(iOS 13.0, *) {
rx.methodInvoked(#selector(viewIsAppearing))
rx.methodInvoked(#selector(UIViewController.viewIsAppearing(_:)))
.map { _ in }
.bind(to: viewModel.viewIsAppearingSubject)
.disposed(by: disposeBag)
Expand Down
Loading