Skip to content

Commit

Permalink
Merge pull request #24 from xflagstudio/v1.1.0
Browse files Browse the repository at this point in the history
v1.1.0
  • Loading branch information
trad55 committed Oct 1, 2021
2 parents bac6706 + 92d4abc commit 383fe11
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 26 deletions.
44 changes: 22 additions & 22 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
PODS:
- Differentiator (5.0.0)
- Fakery (5.0.0)
- Reusable (4.1.1):
- Reusable/Storyboard (= 4.1.1)
- Reusable/View (= 4.1.1)
- Reusable/Storyboard (4.1.1)
- Reusable/View (4.1.1)
- Fakery (5.1.0)
- Reusable (4.1.2):
- Reusable/Storyboard (= 4.1.2)
- Reusable/View (= 4.1.2)
- Reusable/Storyboard (4.1.2)
- Reusable/View (4.1.2)
- RxBinding (0.5):
- RxCocoa (~> 6)
- RxSwift (~> 6)
- RxCocoa (6.0.0):
- RxRelay (= 6.0.0)
- RxSwift (= 6.0.0)
- RxController (1.0.0):
- RxCocoa (6.2.0):
- RxRelay (= 6.2.0)
- RxSwift (= 6.2.0)
- RxController (1.1.0):
- RxCocoa (~> 6)
- RxFlow (~> 2.12.0)
- RxSwift (~> 6)
Expand All @@ -25,12 +25,12 @@ PODS:
- RxCocoa (~> 6)
- RxDataSources (~> 5)
- RxSwift (~> 6)
- RxFlow (2.12.0):
- RxFlow (2.12.4):
- RxCocoa (>= 6.0.0)
- RxSwift (>= 6.0.0)
- RxRelay (6.0.0):
- RxSwift (= 6.0.0)
- RxSwift (6.0.0)
- RxRelay (6.2.0):
- RxSwift (= 6.2.0)
- RxSwift (6.2.0)
- SnapKit (5.0.1)

DEPENDENCIES:
Expand Down Expand Up @@ -60,18 +60,18 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
Differentiator: e8497ceab83c1b10ca233716d547b9af21b9344d
Fakery: 8146918b8dd6df98564dca10cbe8bd05354b8cc4
Reusable: 53a9acf5c536f229b31b5865782414b508252ddb
Fakery: a90caff00ca5cacde6c161c3eafc72314a03d34d
Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
RxBinding: e3c76d02d0ee3f1a306a0fb8e8ef6f2eda65a375
RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
RxController: 2590220770cc46f7918a399b46468fd06574c06c
RxCocoa: 4baf94bb35f2c0ab31bc0cb9f1900155f646ba42
RxController: e3b8e30891d56ee1e1751f056f0b3654a00e8a28
RxDataSources: aa47cc1ed6c500fa0dfecac5c979b723542d79cf
RxDataSourcesSingleSection: e646e523ad92109293b22e745b55dcb38bea7a58
RxFlow: b407eb6b5d956041a9e0930469346e104911a470
RxRelay: 8d593be109c06ea850df027351beba614b012ffb
RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
RxFlow: 03a73c83fb8f183107074b40ab2544c668583f73
RxRelay: e72dbfd157807478401ef1982e1c61c945c94b2f
RxSwift: d356ab7bee873611322f134c5f9ef379fa183d8f
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb

PODFILE CHECKSUM: ba6283578e076eb1e1d926dfc1c2610458f4d335

COCOAPODS: 1.10.1
COCOAPODS: 1.11.2
5 changes: 4 additions & 1 deletion Example/RxController/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

private let coordinator = FlowCoordinator()
private let disposeBag = DisposeBag()
private let window = UIWindow()

lazy var window: UIWindow? = UIWindow()

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
coordinator.rx.didNavigate.subscribe(onNext: {
Expand All @@ -30,6 +31,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}

private func coordinate(to: (UIWindow) -> (Flow, Step)) {
guard let window = window else { return }

let (flow, step) = to(window)
coordinator.coordinate(flow: flow, with: OneStepper(withSingleStep: step))
window.makeKeyAndVisible()
Expand Down
5 changes: 3 additions & 2 deletions Example/RxController/Controller/Child/NameViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ class NameViewModel: BaseViewModel {
private let faker = Faker(locale: "nb-NO")

private let nameRelay = BehaviorRelay<String?>(value: nil)

private let numberRelay = BehaviorRelay<String?>(value: nil)

override func prepareForParentEvents() {
bindParentEvents(to: nameRelay, with: InfoEvent.name)
bindParentEvents(to: numberRelay, with: InfoEvent.number)
}

var name: Observable<String?> {
Expand All @@ -39,7 +40,7 @@ class NameViewModel: BaseViewModel {
}

var number: Observable<String?> {
return parentEvents.value(of: InfoEvent.number)
numberRelay.asObservable()
}

func updateName() {
Expand Down
2 changes: 1 addition & 1 deletion RxController.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'RxController'
s.version = '1.0.0'
s.version = '1.1.0'
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.
Expand Down

0 comments on commit 383fe11

Please sign in to comment.