Update some files

touyulab · Mar 19, 2019 · d3bddca · d3bddca
1 parent 5cc6f53
commit d3bddca
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 22 deletions.
diff --git a/FluxerKit.xcodeproj/project.pbxproj b/FluxerKit.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
 		D11AAD5922409FA100537CB0 /* RecursiveLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = D11AAD5822409FA100537CB0 /* RecursiveLock.swift */; };
 		D11AAD5B22409FB600537CB0 /* FluxerBindable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D11AAD5A22409FB600537CB0 /* FluxerBindable.swift */; };
 		D11AAD5D22409FF800537CB0 /* FluxerStoryboardBindable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D11AAD5C22409FF800537CB0 /* FluxerStoryboardBindable.swift */; };
+		D11AAD842240ECBC00537CB0 /* UIViewController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D11AAD832240ECBC00537CB0 /* UIViewController+Extension.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -30,6 +31,7 @@
 		D11AAD5822409FA100537CB0 /* RecursiveLock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecursiveLock.swift; sourceTree = "<group>"; };
 		D11AAD5A22409FB600537CB0 /* FluxerBindable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FluxerBindable.swift; sourceTree = "<group>"; };
 		D11AAD5C22409FF800537CB0 /* FluxerStoryboardBindable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FluxerStoryboardBindable.swift; sourceTree = "<group>"; };
+		D11AAD832240ECBC00537CB0 /* UIViewController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extension.swift"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -65,14 +67,9 @@
 		D11AAD1F22409C4500537CB0 /* FluxerKit */ = {
 			isa = PBXGroup;
 			children = (
+				D11AAD822240ECA200537CB0 /* Sources */,
 				D11AAD2022409C4500537CB0 /* FluxerKit.h */,
 				D11AAD2122409C4500537CB0 /* Info.plist */,
-				D11AAD4C22409D0100537CB0 /* Fluxer.swift */,
-				D11AAD5422409F7100537CB0 /* AssociatedObjectStore.swift */,
-				D11AAD5622409F8900537CB0 /* ActionSubject.swift */,
-				D11AAD5822409FA100537CB0 /* RecursiveLock.swift */,
-				D11AAD5A22409FB600537CB0 /* FluxerBindable.swift */,
-				D11AAD5C22409FF800537CB0 /* FluxerStoryboardBindable.swift */,
 			);
 			path = FluxerKit;
 			sourceTree = "<group>";
@@ -86,6 +83,20 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		D11AAD822240ECA200537CB0 /* Sources */ = {
+			isa = PBXGroup;
+			children = (
+				D11AAD5622409F8900537CB0 /* ActionSubject.swift */,
+				D11AAD5422409F7100537CB0 /* AssociatedObjectStore.swift */,
+				D11AAD4C22409D0100537CB0 /* Fluxer.swift */,
+				D11AAD5A22409FB600537CB0 /* FluxerBindable.swift */,
+				D11AAD5C22409FF800537CB0 /* FluxerStoryboardBindable.swift */,
+				D11AAD5822409FA100537CB0 /* RecursiveLock.swift */,
+				D11AAD832240ECBC00537CB0 /* UIViewController+Extension.swift */,
+			);
+			path = Sources;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -193,6 +204,7 @@
 				D11AAD5D22409FF800537CB0 /* FluxerStoryboardBindable.swift in Sources */,
 				D11AAD5722409F8900537CB0 /* ActionSubject.swift in Sources */,
 				D11AAD4D22409D0100537CB0 /* Fluxer.swift in Sources */,
+				D11AAD842240ECBC00537CB0 /* UIViewController+Extension.swift in Sources */,
 				D11AAD5B22409FB600537CB0 /* FluxerBindable.swift in Sources */,
 				D11AAD5922409FA100537CB0 /* RecursiveLock.swift in Sources */,
 			);

diff --git a/FluxerKit/ActionSubject.swift → FluxerKit/Sources/ActionSubject.swift b/FluxerKit/ActionSubject.swift → FluxerKit/Sources/ActionSubject.swift
diff --git a/FluxerKit/AssociatedObjectStore.swift → ...erKit/Sources/AssociatedObjectStore.swift b/FluxerKit/AssociatedObjectStore.swift → ...erKit/Sources/AssociatedObjectStore.swift
diff --git a/FluxerKit/Fluxer.swift → FluxerKit/Sources/Fluxer.swift b/FluxerKit/Fluxer.swift → FluxerKit/Sources/Fluxer.swift
diff --git a/FluxerKit/FluxerBindable.swift → FluxerKit/Sources/FluxerBindable.swift b/FluxerKit/FluxerBindable.swift → FluxerKit/Sources/FluxerBindable.swift
diff --git a/FluxerKit/FluxerStoryboardBindable.swift → ...it/Sources/FluxerStoryboardBindable.swift b/FluxerKit/FluxerStoryboardBindable.swift → ...it/Sources/FluxerStoryboardBindable.swift
@@ -7,7 +7,6 @@
 //
 
 import RxSwift
-import RxCocoa
 import UIKit
 
 public protocol FluxerStoryboardBindable: FluxerBindable {}
@@ -51,18 +50,3 @@ extension FluxerStoryboardBindable {
         return (self as? UIViewController)?.isViewLoaded == false
     }
 }
-
-extension Reactive where Base: UIViewController {
-    var viewDidLoad: Observable<Void> {
-        return sentMessage(#selector(base.viewDidLoad))
-            .map { _ in () }
-            .share(replay: 1)
-    }
-
-    var viewDidLoadInvoked: Observable<Void> {
-        return methodInvoked(#selector(base.viewDidLoad))
-            .map { _ in () }
-            .share(replay: 1)
-    }
-}
-
diff --git a/FluxerKit/RecursiveLock.swift → FluxerKit/Sources/RecursiveLock.swift b/FluxerKit/RecursiveLock.swift → FluxerKit/Sources/RecursiveLock.swift
diff --git a/FluxerKit/Sources/UIViewController+Extension.swift b/FluxerKit/Sources/UIViewController+Extension.swift
@@ -0,0 +1,25 @@
+//
+//  UIViewController+Extension.swift
+//  FluxerKit
+//
+//  Created by Yuto Akiba on 2019/03/19.
+//  Copyright © 2019 Yuto Akiba. All rights reserved.
+//
+
+import UIKit
+import RxSwift
+import RxCocoa
+
+extension Reactive where Base: UIViewController {
+    var viewDidLoad: Observable<Void> {
+        return sentMessage(#selector(base.viewDidLoad))
+            .map { _ in () }
+            .share(replay: 1)
+    }
+
+    var viewDidLoadInvoked: Observable<Void> {
+        return methodInvoked(#selector(base.viewDidLoad))
+            .map { _ in () }
+            .share(replay: 1)
+    }
+}