Merge pull request #6 from RxSwiftCommunity/develop/lifecycle

Add lifecycle signal in RxViewModel

Author: lm2343635

Example/Podfile.lock

@@ -6,13 +6,13 @@ PODS:
     - Reusable/View (= 4.1.1)
   - Reusable/Storyboard (4.1.1)
   - Reusable/View (4.1.1)
-  - RxBinding (0.3.1):
-    - RxCocoa (~> 5)
-    - RxSwift (~> 5)
+  - RxBinding (0.4):
+    - RxCocoa (< 6.0.0, >= 5.0.0)
+    - RxSwift (< 6.0.0, >= 5.0.0)
   - RxCocoa (5.1.1):
     - RxRelay (~> 5)
     - RxSwift (~> 5)
-  - RxController (0.10):
+  - RxController (1.1):
     - RxCocoa (~> 5)
     - RxFlow (~> 2.7)
     - RxSwift (~> 5)
@@ -25,7 +25,7 @@ PODS:
     - RxCocoa (~> 5)
     - RxDataSources (~> 4)
     - RxSwift (~> 5)
-  - RxFlow (2.8.0):
+  - RxFlow (2.9.1):
     - RxCocoa (>= 5.1.1)
     - RxSwift (>= 5.1.1)
   - RxRelay (5.1.1):
@@ -62,16 +62,16 @@ SPEC CHECKSUMS:
   Differentiator: 886080237d9f87f322641dedbc5be257061b0602
   Fakery: d3380c4aa1efe7631c0831d7e26aa9db4491f014
   Reusable: 53a9acf5c536f229b31b5865782414b508252ddb
-  RxBinding: 58be2cf1311165489a66eacb4a3e33932d598a53
+  RxBinding: da433c012633802a72c2a5bec8775b86f4cddeb8
   RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601
-  RxController: c596ce5b2bc9ab933649690838d60118f0e4b110
+  RxController: f4b42f77e2298a81720de4fc4580e10b38ea0b69
   RxDataSources: efee07fa4de48477eca0a4611e6d11e2da9c1114
   RxDataSourcesSingleSection: 4394e57ae097f33e3845cf3a57bdf7826eca2d38
-  RxFlow: 41c9d56e7611c6470d00febdfee08b63b0b018f8
+  RxFlow: 029e260333ef843b349ba9cb9265929941830aee
   RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9
   RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
 
 PODFILE CHECKSUM: 0e048f42166325ac7ea57547d12ebbc2fc47fb5f
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3

RxController.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'RxController'
-  s.version          = '1.0'
+  s.version          = '1.1'
   s.summary          = 'A library for developing with MVVM-C based on RxFlow and RxSwift.'
 
 # This description is used to generate tags and improve search results.

RxController/Classes/RxViewController.swift

@@ -56,11 +56,37 @@ open class RxViewController<ViewModel: RxViewModel>: UIViewController, RxViewCon
     open override func viewDidLoad() {
         super.viewDidLoad()
 
+        viewModel.viewDidLoadSubject.onNext(())
+        
         subviews().forEach { view.addSubview($0) }
         createConstraints()
         bind().forEach { $0.disposed(by: disposeBag) }
     }
 
+    open override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        viewModel.viewWillAppearSubject.onNext(())
+    }
+    
+    open override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        viewModel.viewDidAppearSubject.onNext(())
+    }
+    
+    open override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        
+        viewModel.viewWillDisappearSubject.onNext(())
+    }
+    
+    open override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        
+        viewModel.viewDidDisappearSubject.onNext(())
+    }
+    
     open func subviews() -> [UIView] {
         Log.debug("[WARNING] \(type(of: self)).subview() has not been overrided")
         return []
@@ -74,10 +100,9 @@ open class RxViewController<ViewModel: RxViewModel>: UIViewController, RxViewCon
         Log.debug("[WARNING] \(type(of: self)).bind() has not been overrided.")
         return []
     }
-
+    
     /**
      Add a child view controller to the root view of the parent view controller.
-
      @param childController: a child view controller.
      */
     override open func addChild(_ childController: UIViewController) {
@@ -89,11 +114,11 @@ open class RxViewController<ViewModel: RxViewModel>: UIViewController, RxViewCon
         guard let childController = childController as? RxViewControllerProtocol else { return }
         viewModel.addChild(childController.rxViewModel)
     }
-
+    
     /**
      Add a child view controller to the a container view of the parent view controller.
      The edges of the child view controller is same as the container view by default.
-
+     
      @param childController: a child view controller.
      @param containerView: a container view of childController.
      */
@@ -102,7 +127,7 @@ open class RxViewController<ViewModel: RxViewModel>: UIViewController, RxViewCon
         // Add child view controller to a container view of the parent view controller.
         containerView.addSubview(childController.view)
         childController.didMove(toParent: self)
-
+        
         // Create constraints for the root view of the child view controller.
         childController.view.translatesAutoresizingMaskIntoConstraints = false
         childController.view.leftAnchor.constraint(equalTo: containerView.leftAnchor).isActive = true

RxController/Classes/RxViewModel.swift

@@ -29,6 +29,12 @@ import RxFlow
 
 open class RxViewModel: NSObject, Stepper {
 
+    let viewDidLoadSubject = PublishSubject<Void>()
+    let viewWillAppearSubject = PublishSubject<Void>()
+    let viewDidAppearSubject = PublishSubject<Void>()
+    let viewWillDisappearSubject = PublishSubject<Void>()
+    let viewDidDisappearSubject = PublishSubject<Void>()
+    
     public let steps = PublishRelay<Step>()
     public let events = PublishRelay<RxControllerEvent>()
     public let disposeBag = DisposeBag()
@@ -97,6 +103,25 @@ open class RxViewModel: NSObject, Stepper {
         return events
     }
 
+    public var viewDidLoad: Observable<Void> {
+        viewDidLoadSubject.asObservable()
+    }
+    
+    public var viewWillAppear: Observable<Void> {
+        viewWillAppearSubject.asObservable()
+    }
+    
+    public var viewDidAppear: Observable<Void> {
+        viewDidAppearSubject.asObservable()
+    }
+    
+    public var viewWillDisappear: Observable<Void> {
+        viewWillDisappearSubject.asObservable()
+    }
+    
+    public var viewDidDisappear: Observable<Void> {
+        viewDidDisappearSubject.asObservable()
+    }
 }
 
 extension RxViewModel: RxControllerEventBinder {}