Merge pull request #15 from rock88/master

Another implementation of view factory without storyboard
rambler-digital-solutions · Jul 19, 2016 · e6dc3d3 · e6dc3d3
2 parents 21936ba + ad61523
commit e6dc3d3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Code/IntermoduleDataTransfer/RamblerViperModuleFactory.h b/Code/IntermoduleDataTransfer/RamblerViperModuleFactory.h
@@ -14,6 +14,8 @@
 @interface RamblerViperModuleFactory : NSObject<RamblerViperModuleFactoryProtocol>
 
 - (instancetype)initWithStoryboard:(UIStoryboard*)storyboard andRestorationId:(NSString*)restorationId;
+- (instancetype)initWithViewHandler:(id<RamblerViperModuleTransitionHandlerProtocol>(^)(void))viewHandler;
+
 @property (nonatomic,strong,readonly) UIStoryboard *storyboard;
 @property (nonatomic,strong,readonly) NSString* restorationId;
 

diff --git a/Code/IntermoduleDataTransfer/RamblerViperModuleFactory.m b/Code/IntermoduleDataTransfer/RamblerViperModuleFactory.m
@@ -12,6 +12,7 @@ @interface RamblerViperModuleFactory ()
 
 @property (nonatomic,strong) UIStoryboard *storyboard;
 @property (nonatomic,strong) NSString* restorationId;
+@property (nonatomic,copy) id<RamblerViperModuleTransitionHandlerProtocol>(^viewHandler)(void);
 
 @end
 
@@ -26,9 +27,21 @@ - (instancetype)initWithStoryboard:(UIStoryboard*)storyboard andRestorationId:(N
     return self;
 }
 
+- (instancetype)initWithViewHandler:(id<RamblerViperModuleTransitionHandlerProtocol>(^)(void))viewHandler {
+    self = [super init];
+    if (self) {
+        self.viewHandler = viewHandler;
+    }
+    return self;
+}
+
 #pragma mark - RDSModuleFactoryProtocol
 
 - (__nullable id<RamblerViperModuleTransitionHandlerProtocol>)instantiateModuleTransitionHandler {
+    if (self.viewHandler) {
+        return self.viewHandler();
+    }
+
     id<RamblerViperModuleTransitionHandlerProtocol> destinationViewController = [self.storyboard instantiateViewControllerWithIdentifier:self.restorationId];
     return destinationViewController;
 }