diff --git a/lib/ios/AnimationObserver.h b/lib/ios/Animations/AnimationObserver.h similarity index 100% rename from lib/ios/AnimationObserver.h rename to lib/ios/Animations/AnimationObserver.h diff --git a/lib/ios/AnimationObserver.mm b/lib/ios/Animations/AnimationObserver.mm similarity index 100% rename from lib/ios/AnimationObserver.mm rename to lib/ios/Animations/AnimationObserver.mm diff --git a/lib/ios/BaseAnimator.h b/lib/ios/Animations/BaseAnimator.h similarity index 100% rename from lib/ios/BaseAnimator.h rename to lib/ios/Animations/BaseAnimator.h diff --git a/lib/ios/BaseAnimator.mm b/lib/ios/Animations/BaseAnimator.mm similarity index 100% rename from lib/ios/BaseAnimator.mm rename to lib/ios/Animations/BaseAnimator.mm diff --git a/lib/ios/DisplayLinkAnimation.h b/lib/ios/Animations/DisplayLinkAnimation.h similarity index 100% rename from lib/ios/DisplayLinkAnimation.h rename to lib/ios/Animations/DisplayLinkAnimation.h diff --git a/lib/ios/DisplayLinkAnimator.h b/lib/ios/Animations/DisplayLinkAnimator.h similarity index 100% rename from lib/ios/DisplayLinkAnimator.h rename to lib/ios/Animations/DisplayLinkAnimator.h diff --git a/lib/ios/DisplayLinkAnimator.mm b/lib/ios/Animations/DisplayLinkAnimator.mm similarity index 100% rename from lib/ios/DisplayLinkAnimator.mm rename to lib/ios/Animations/DisplayLinkAnimator.mm diff --git a/lib/ios/DisplayLinkAnimatorDelegate.h b/lib/ios/Animations/DisplayLinkAnimatorDelegate.h similarity index 100% rename from lib/ios/DisplayLinkAnimatorDelegate.h rename to lib/ios/Animations/DisplayLinkAnimatorDelegate.h diff --git a/lib/ios/ElementAnimator.h b/lib/ios/Animations/ElementAnimator.h similarity index 100% rename from lib/ios/ElementAnimator.h rename to lib/ios/Animations/ElementAnimator.h diff --git a/lib/ios/ElementAnimator.mm b/lib/ios/Animations/ElementAnimator.mm similarity index 100% rename from lib/ios/ElementAnimator.mm rename to lib/ios/Animations/ElementAnimator.mm diff --git a/lib/ios/RNNEnterExitAnimation.h b/lib/ios/Animations/RNNEnterExitAnimation.h similarity index 100% rename from lib/ios/RNNEnterExitAnimation.h rename to lib/ios/Animations/RNNEnterExitAnimation.h diff --git a/lib/ios/RNNEnterExitAnimation.mm b/lib/ios/Animations/RNNEnterExitAnimation.mm similarity index 100% rename from lib/ios/RNNEnterExitAnimation.mm rename to lib/ios/Animations/RNNEnterExitAnimation.mm diff --git a/lib/ios/RNNInterpolator.h b/lib/ios/Animations/RNNInterpolator.h similarity index 100% rename from lib/ios/RNNInterpolator.h rename to lib/ios/Animations/RNNInterpolator.h diff --git a/lib/ios/RNNInterpolator.mm b/lib/ios/Animations/RNNInterpolator.mm similarity index 100% rename from lib/ios/RNNInterpolator.mm rename to lib/ios/Animations/RNNInterpolator.mm diff --git a/lib/ios/RNNPushAnimation.h b/lib/ios/Animations/RNNPushAnimation.h similarity index 100% rename from lib/ios/RNNPushAnimation.h rename to lib/ios/Animations/RNNPushAnimation.h diff --git a/lib/ios/RNNPushAnimation.mm b/lib/ios/Animations/RNNPushAnimation.mm similarity index 100% rename from lib/ios/RNNPushAnimation.mm rename to lib/ios/Animations/RNNPushAnimation.mm diff --git a/lib/ios/RNNSetRootAnimator.h b/lib/ios/Animations/RNNSetRootAnimator.h similarity index 100% rename from lib/ios/RNNSetRootAnimator.h rename to lib/ios/Animations/RNNSetRootAnimator.h diff --git a/lib/ios/RNNSetRootAnimator.mm b/lib/ios/Animations/RNNSetRootAnimator.mm similarity index 100% rename from lib/ios/RNNSetRootAnimator.mm rename to lib/ios/Animations/RNNSetRootAnimator.mm diff --git a/lib/ios/ScreenAnimationController.h b/lib/ios/Animations/ScreenAnimationController.h similarity index 100% rename from lib/ios/ScreenAnimationController.h rename to lib/ios/Animations/ScreenAnimationController.h diff --git a/lib/ios/ScreenAnimationController.mm b/lib/ios/Animations/ScreenAnimationController.mm similarity index 100% rename from lib/ios/ScreenAnimationController.mm rename to lib/ios/Animations/ScreenAnimationController.mm diff --git a/lib/ios/ScreenReversedAnimationController.h b/lib/ios/Animations/ScreenReversedAnimationController.h similarity index 100% rename from lib/ios/ScreenReversedAnimationController.h rename to lib/ios/Animations/ScreenReversedAnimationController.h diff --git a/lib/ios/ScreenReversedAnimationController.mm b/lib/ios/Animations/ScreenReversedAnimationController.mm similarity index 100% rename from lib/ios/ScreenReversedAnimationController.mm rename to lib/ios/Animations/ScreenReversedAnimationController.mm diff --git a/lib/ios/SharedElementAnimator.h b/lib/ios/Animations/SharedElementAnimator.h similarity index 100% rename from lib/ios/SharedElementAnimator.h rename to lib/ios/Animations/SharedElementAnimator.h diff --git a/lib/ios/SharedElementAnimator.mm b/lib/ios/Animations/SharedElementAnimator.mm similarity index 100% rename from lib/ios/SharedElementAnimator.mm rename to lib/ios/Animations/SharedElementAnimator.mm diff --git a/lib/ios/RNNAppDelegate.h b/lib/ios/AppDelegate/RNNAppDelegate.h similarity index 100% rename from lib/ios/RNNAppDelegate.h rename to lib/ios/AppDelegate/RNNAppDelegate.h diff --git a/lib/ios/RNNAppDelegate.mm b/lib/ios/AppDelegate/RNNAppDelegate.mm similarity index 100% rename from lib/ios/RNNAppDelegate.mm rename to lib/ios/AppDelegate/RNNAppDelegate.mm diff --git a/lib/ios/BottomTabsAfterInitialTabAttacher.h b/lib/ios/BottomTabsAttachers/BottomTabsAfterInitialTabAttacher.h similarity index 100% rename from lib/ios/BottomTabsAfterInitialTabAttacher.h rename to lib/ios/BottomTabsAttachers/BottomTabsAfterInitialTabAttacher.h diff --git a/lib/ios/BottomTabsAfterInitialTabAttacher.mm b/lib/ios/BottomTabsAttachers/BottomTabsAfterInitialTabAttacher.mm similarity index 100% rename from lib/ios/BottomTabsAfterInitialTabAttacher.mm rename to lib/ios/BottomTabsAttachers/BottomTabsAfterInitialTabAttacher.mm diff --git a/lib/ios/BottomTabsAttachMode.h b/lib/ios/BottomTabsAttachers/BottomTabsAttachMode.h similarity index 100% rename from lib/ios/BottomTabsAttachMode.h rename to lib/ios/BottomTabsAttachers/BottomTabsAttachMode.h diff --git a/lib/ios/BottomTabsAttachMode.mm b/lib/ios/BottomTabsAttachers/BottomTabsAttachMode.mm similarity index 100% rename from lib/ios/BottomTabsAttachMode.mm rename to lib/ios/BottomTabsAttachers/BottomTabsAttachMode.mm diff --git a/lib/ios/BottomTabsBaseAttacher.h b/lib/ios/BottomTabsAttachers/BottomTabsBaseAttacher.h similarity index 100% rename from lib/ios/BottomTabsBaseAttacher.h rename to lib/ios/BottomTabsAttachers/BottomTabsBaseAttacher.h diff --git a/lib/ios/BottomTabsBaseAttacher.mm b/lib/ios/BottomTabsAttachers/BottomTabsBaseAttacher.mm similarity index 100% rename from lib/ios/BottomTabsBaseAttacher.mm rename to lib/ios/BottomTabsAttachers/BottomTabsBaseAttacher.mm diff --git a/lib/ios/BottomTabsOnSwitchToTabAttacher.h b/lib/ios/BottomTabsAttachers/BottomTabsOnSwitchToTabAttacher.h similarity index 100% rename from lib/ios/BottomTabsOnSwitchToTabAttacher.h rename to lib/ios/BottomTabsAttachers/BottomTabsOnSwitchToTabAttacher.h diff --git a/lib/ios/BottomTabsOnSwitchToTabAttacher.mm b/lib/ios/BottomTabsAttachers/BottomTabsOnSwitchToTabAttacher.mm similarity index 100% rename from lib/ios/BottomTabsOnSwitchToTabAttacher.mm rename to lib/ios/BottomTabsAttachers/BottomTabsOnSwitchToTabAttacher.mm diff --git a/lib/ios/BottomTabsTogetherAttacher.h b/lib/ios/BottomTabsAttachers/BottomTabsTogetherAttacher.h similarity index 100% rename from lib/ios/BottomTabsTogetherAttacher.h rename to lib/ios/BottomTabsAttachers/BottomTabsTogetherAttacher.h diff --git a/lib/ios/BottomTabsTogetherAttacher.mm b/lib/ios/BottomTabsAttachers/BottomTabsTogetherAttacher.mm similarity index 100% rename from lib/ios/BottomTabsTogetherAttacher.mm rename to lib/ios/BottomTabsAttachers/BottomTabsTogetherAttacher.mm diff --git a/lib/ios/Legacy/RNNBridgeManager.h b/lib/ios/Bridge/RNNBridgeManager.h similarity index 100% rename from lib/ios/Legacy/RNNBridgeManager.h rename to lib/ios/Bridge/RNNBridgeManager.h diff --git a/lib/ios/Legacy/RNNBridgeManager.mm b/lib/ios/Bridge/RNNBridgeManager.mm similarity index 88% rename from lib/ios/Legacy/RNNBridgeManager.mm rename to lib/ios/Bridge/RNNBridgeManager.mm index 05e2200fd29..fb69ea3a612 100644 --- a/lib/ios/Legacy/RNNBridgeManager.mm +++ b/lib/ios/Bridge/RNNBridgeManager.mm @@ -7,7 +7,6 @@ #import "RNNModalHostViewManagerHandler.h" #import "RNNReactComponentRegistry.h" #import "RNNReactRootViewCreator.h" -#import "RNNSplashScreen.h" #import #import @@ -75,21 +74,21 @@ - (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCrea id rootViewCreator = [[RNNReactRootViewCreator alloc] initWithBridge:bridge eventEmitter:eventEmitter]; _componentRegistry = [[RNNReactComponentRegistry alloc] initWithCreator:rootViewCreator]; - RNNControllerFactory *controllerFactory = - [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator + RNNViewControllerFactory *controllerFactory = + [[RNNViewControllerFactory alloc] initWithRootViewCreator:rootViewCreator eventEmitter:eventEmitter store:_store componentRegistry:_componentRegistry andBridge:bridge bottomTabsAttachModeFactory:[BottomTabsAttachModeFactory new]]; RNNSetRootAnimator *setRootAnimator = [RNNSetRootAnimator new]; - _commandsHandler = [[RNNCommandsHandler alloc] initWithControllerFactory:controllerFactory - layoutManager:_layoutManager - eventEmitter:eventEmitter - modalManager:_modalManager - overlayManager:_overlayManager - setRootAnimator:setRootAnimator - mainWindow:_mainWindow]; + _commandsHandler = [[RNNCommandsHandler alloc] initWithViewControllerFactory:controllerFactory + layoutManager:_layoutManager + eventEmitter:eventEmitter + modalManager:_modalManager + overlayManager:_overlayManager + setRootAnimator:setRootAnimator + mainWindow:_mainWindow]; RNNBridgeModule *bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:_commandsHandler]; diff --git a/lib/ios/Legacy/RNNBridgeModule.h b/lib/ios/Bridge/RNNBridgeModule.h similarity index 100% rename from lib/ios/Legacy/RNNBridgeModule.h rename to lib/ios/Bridge/RNNBridgeModule.h diff --git a/lib/ios/Legacy/RNNBridgeModule.mm b/lib/ios/Bridge/RNNBridgeModule.mm similarity index 100% rename from lib/ios/Legacy/RNNBridgeModule.mm rename to lib/ios/Bridge/RNNBridgeModule.mm diff --git a/lib/ios/RNNCommandsHandler.h b/lib/ios/Commands/RNNCommandsHandler.h similarity index 96% rename from lib/ios/RNNCommandsHandler.h rename to lib/ios/Commands/RNNCommandsHandler.h index eede9b7911c..5adaa8cdd8e 100644 --- a/lib/ios/RNNCommandsHandler.h +++ b/lib/ios/Commands/RNNCommandsHandler.h @@ -1,4 +1,4 @@ -#import "RNNControllerFactory.h" +#import "RNNViewControllerFactory.h" #import "RNNLayoutManager.h" #import "RNNModalManager.h" #import "RNNOverlayManager.h" @@ -14,7 +14,7 @@ @interface RNNCommandsHandler : NSObject -- (instancetype)initWithControllerFactory:(RNNControllerFactory *)controllerFactory +- (instancetype)initWithViewControllerFactory:(RNNViewControllerFactory *)controllerFactory layoutManager:(RNNLayoutManager *)layoutManager eventEmitter:(RNNEventEmitter *)eventEmitter modalManager:(RNNModalManager *)modalManager diff --git a/lib/ios/RNNCommandsHandler.mm b/lib/ios/Commands/RNNCommandsHandler.mm similarity index 97% rename from lib/ios/RNNCommandsHandler.mm rename to lib/ios/Commands/RNNCommandsHandler.mm index 67238ef2766..0a2ae2b0d33 100644 --- a/lib/ios/RNNCommandsHandler.mm +++ b/lib/ios/Commands/RNNCommandsHandler.mm @@ -30,7 +30,7 @@ @interface RNNCommandsHandler () @end @implementation RNNCommandsHandler { - RNNControllerFactory *_controllerFactory; + RNNViewControllerFactory *_controllerFactory; RNNLayoutManager *_layoutManager; RNNModalManager *_modalManager; RNNOverlayManager *_overlayManager; @@ -39,13 +39,13 @@ @implementation RNNCommandsHandler { RNNSetRootAnimator *_setRootAnimator; } -- (instancetype)initWithControllerFactory:(RNNControllerFactory *)controllerFactory - layoutManager:(RNNLayoutManager *)layoutManager - eventEmitter:(RNNEventEmitter *)eventEmitter - modalManager:(RNNModalManager *)modalManager - overlayManager:(RNNOverlayManager *)overlayManager - setRootAnimator:(RNNSetRootAnimator *)setRootAnimator - mainWindow:(UIWindow *)mainWindow { +- (instancetype)initWithViewControllerFactory:(RNNViewControllerFactory *)controllerFactory + layoutManager:(RNNLayoutManager *)layoutManager + eventEmitter:(RNNEventEmitter *)eventEmitter + modalManager:(RNNModalManager *)modalManager + overlayManager:(RNNOverlayManager *)overlayManager + setRootAnimator:(RNNSetRootAnimator *)setRootAnimator + mainWindow:(UIWindow *)mainWindow { self = [super init]; _controllerFactory = controllerFactory; _layoutManager = layoutManager; diff --git a/lib/ios/RNNEventEmitter.h b/lib/ios/Events/RNNEventEmitter.h similarity index 100% rename from lib/ios/RNNEventEmitter.h rename to lib/ios/Events/RNNEventEmitter.h diff --git a/lib/ios/RNNEventEmitter.mm b/lib/ios/Events/RNNEventEmitter.mm similarity index 100% rename from lib/ios/RNNEventEmitter.mm rename to lib/ios/Events/RNNEventEmitter.mm diff --git a/lib/ios/NSArray+utils.h b/lib/ios/Extensions/Array/NSArray+utils.h similarity index 100% rename from lib/ios/NSArray+utils.h rename to lib/ios/Extensions/Array/NSArray+utils.h diff --git a/lib/ios/NSArray+utils.mm b/lib/ios/Extensions/Array/NSArray+utils.mm similarity index 100% rename from lib/ios/NSArray+utils.mm rename to lib/ios/Extensions/Array/NSArray+utils.mm diff --git a/lib/ios/Color+Interpolation.h b/lib/ios/Extensions/Color/Color+Interpolation.h similarity index 100% rename from lib/ios/Color+Interpolation.h rename to lib/ios/Extensions/Color/Color+Interpolation.h diff --git a/lib/ios/Color+Interpolation.mm b/lib/ios/Extensions/Color/Color+Interpolation.mm similarity index 100% rename from lib/ios/Color+Interpolation.mm rename to lib/ios/Extensions/Color/Color+Interpolation.mm diff --git a/lib/ios/Utils/UIColor+RNNUtils.h b/lib/ios/Extensions/Color/UIColor+RNNUtils.h similarity index 100% rename from lib/ios/Utils/UIColor+RNNUtils.h rename to lib/ios/Extensions/Color/UIColor+RNNUtils.h diff --git a/lib/ios/Utils/UIColor+RNNUtils.mm b/lib/ios/Extensions/Color/UIColor+RNNUtils.mm similarity index 100% rename from lib/ios/Utils/UIColor+RNNUtils.mm rename to lib/ios/Extensions/Color/UIColor+RNNUtils.mm diff --git a/lib/ios/UINavigationController+RNNCommands.h b/lib/ios/Extensions/Controller/UINavigationController+RNNCommands.h similarity index 100% rename from lib/ios/UINavigationController+RNNCommands.h rename to lib/ios/Extensions/Controller/UINavigationController+RNNCommands.h diff --git a/lib/ios/UINavigationController+RNNCommands.mm b/lib/ios/Extensions/Controller/UINavigationController+RNNCommands.mm similarity index 100% rename from lib/ios/UINavigationController+RNNCommands.mm rename to lib/ios/Extensions/Controller/UINavigationController+RNNCommands.mm diff --git a/lib/ios/UINavigationController+RNNOptions.h b/lib/ios/Extensions/Controller/UINavigationController+RNNOptions.h similarity index 100% rename from lib/ios/UINavigationController+RNNOptions.h rename to lib/ios/Extensions/Controller/UINavigationController+RNNOptions.h diff --git a/lib/ios/UINavigationController+RNNOptions.mm b/lib/ios/Extensions/Controller/UINavigationController+RNNOptions.mm similarity index 100% rename from lib/ios/UINavigationController+RNNOptions.mm rename to lib/ios/Extensions/Controller/UINavigationController+RNNOptions.mm diff --git a/lib/ios/UISplitViewController+RNNOptions.h b/lib/ios/Extensions/Controller/UISplitViewController+RNNOptions.h similarity index 100% rename from lib/ios/UISplitViewController+RNNOptions.h rename to lib/ios/Extensions/Controller/UISplitViewController+RNNOptions.h diff --git a/lib/ios/UISplitViewController+RNNOptions.mm b/lib/ios/Extensions/Controller/UISplitViewController+RNNOptions.mm similarity index 100% rename from lib/ios/UISplitViewController+RNNOptions.mm rename to lib/ios/Extensions/Controller/UISplitViewController+RNNOptions.mm diff --git a/lib/ios/UITabBarController+RNNOptions.h b/lib/ios/Extensions/Controller/UITabBarController+RNNOptions.h similarity index 100% rename from lib/ios/UITabBarController+RNNOptions.h rename to lib/ios/Extensions/Controller/UITabBarController+RNNOptions.h diff --git a/lib/ios/UITabBarController+RNNOptions.mm b/lib/ios/Extensions/Controller/UITabBarController+RNNOptions.mm similarity index 100% rename from lib/ios/UITabBarController+RNNOptions.mm rename to lib/ios/Extensions/Controller/UITabBarController+RNNOptions.mm diff --git a/lib/ios/Utils/UITabBarController+RNNUtils.h b/lib/ios/Extensions/Controller/UITabBarController+RNNUtils.h similarity index 100% rename from lib/ios/Utils/UITabBarController+RNNUtils.h rename to lib/ios/Extensions/Controller/UITabBarController+RNNUtils.h diff --git a/lib/ios/Utils/UITabBarController+RNNUtils.mm b/lib/ios/Extensions/Controller/UITabBarController+RNNUtils.mm similarity index 100% rename from lib/ios/Utils/UITabBarController+RNNUtils.mm rename to lib/ios/Extensions/Controller/UITabBarController+RNNUtils.mm diff --git a/lib/ios/UIViewController+LayoutProtocol.h b/lib/ios/Extensions/Controller/UIViewController+LayoutProtocol.h similarity index 100% rename from lib/ios/UIViewController+LayoutProtocol.h rename to lib/ios/Extensions/Controller/UIViewController+LayoutProtocol.h diff --git a/lib/ios/UIViewController+LayoutProtocol.mm b/lib/ios/Extensions/Controller/UIViewController+LayoutProtocol.mm similarity index 100% rename from lib/ios/UIViewController+LayoutProtocol.mm rename to lib/ios/Extensions/Controller/UIViewController+LayoutProtocol.mm diff --git a/lib/ios/UIViewController+RNNOptions.h b/lib/ios/Extensions/Controller/UIViewController+RNNOptions.h similarity index 100% rename from lib/ios/UIViewController+RNNOptions.h rename to lib/ios/Extensions/Controller/UIViewController+RNNOptions.h diff --git a/lib/ios/UIViewController+RNNOptions.mm b/lib/ios/Extensions/Controller/UIViewController+RNNOptions.mm similarity index 100% rename from lib/ios/UIViewController+RNNOptions.mm rename to lib/ios/Extensions/Controller/UIViewController+RNNOptions.mm diff --git a/lib/ios/Extensions/Controller/UIViewController+SideMenuController.mm b/lib/ios/Extensions/Controller/UIViewController+SideMenuController.mm new file mode 100644 index 00000000000..1d699a90d6e --- /dev/null +++ b/lib/ios/Extensions/Controller/UIViewController+SideMenuController.mm @@ -0,0 +1,18 @@ +#import "UIViewController+SideMenuViewController.h" + +@implementation UIViewController (SideMenuController) + +- (RNNSideMenuViewController *)sideMenuController { + UIViewController *vc = self; + while (vc) { + if ([vc isKindOfClass:[RNNSideMenuViewController class]]) { + return (RNNSideMenuViewController *)vc; + } + + vc = vc.parentViewController; + } + + return nil; +} + +@end diff --git a/lib/ios/Extensions/Controller/UIViewController+SideMenuViewController.h b/lib/ios/Extensions/Controller/UIViewController+SideMenuViewController.h new file mode 100644 index 00000000000..d992ad5b1b8 --- /dev/null +++ b/lib/ios/Extensions/Controller/UIViewController+SideMenuViewController.h @@ -0,0 +1,8 @@ +#import "RNNSideMenuViewController.h" +#import + +@interface UIViewController (RNNSideMenuViewController) + +- (RNNSideMenuViewController *)sideMenuController; + +@end diff --git a/lib/ios/UIImage+utils.h b/lib/ios/Extensions/Image/UIImage+utils.h similarity index 100% rename from lib/ios/UIImage+utils.h rename to lib/ios/Extensions/Image/UIImage+utils.h diff --git a/lib/ios/UIImage+utils.mm b/lib/ios/Extensions/Image/UIImage+utils.mm similarity index 100% rename from lib/ios/UIImage+utils.mm rename to lib/ios/Extensions/Image/UIImage+utils.mm diff --git a/lib/ios/UIImageView+Transition.h b/lib/ios/Extensions/Image/UIImageView+Transition.h similarity index 100% rename from lib/ios/UIImageView+Transition.h rename to lib/ios/Extensions/Image/UIImageView+Transition.h diff --git a/lib/ios/UIImageView+Transition.mm b/lib/ios/Extensions/Image/UIImageView+Transition.mm similarity index 100% rename from lib/ios/UIImageView+Transition.mm rename to lib/ios/Extensions/Image/UIImageView+Transition.mm diff --git a/lib/ios/RCTConvert+Interpolation.h b/lib/ios/Extensions/RCTConvert/RCTConvert+Interpolation.h similarity index 100% rename from lib/ios/RCTConvert+Interpolation.h rename to lib/ios/Extensions/RCTConvert/RCTConvert+Interpolation.h diff --git a/lib/ios/RCTConvert+Interpolation.mm b/lib/ios/Extensions/RCTConvert/RCTConvert+Interpolation.mm similarity index 100% rename from lib/ios/RCTConvert+Interpolation.mm rename to lib/ios/Extensions/RCTConvert/RCTConvert+Interpolation.mm diff --git a/lib/ios/RCTConvert+SideMenuOpenGestureMode.h b/lib/ios/Extensions/RCTConvert/RCTConvert+SideMenuOpenGestureMode.h similarity index 100% rename from lib/ios/RCTConvert+SideMenuOpenGestureMode.h rename to lib/ios/Extensions/RCTConvert/RCTConvert+SideMenuOpenGestureMode.h diff --git a/lib/ios/RCTConvert+SideMenuOpenGestureMode.mm b/lib/ios/Extensions/RCTConvert/RCTConvert+SideMenuOpenGestureMode.mm similarity index 100% rename from lib/ios/RCTConvert+SideMenuOpenGestureMode.mm rename to lib/ios/Extensions/RCTConvert/RCTConvert+SideMenuOpenGestureMode.mm diff --git a/lib/ios/RCTConvert+UIBarButtonSystemItem.h b/lib/ios/Extensions/RCTConvert/RCTConvert+UIBarButtonSystemItem.h similarity index 100% rename from lib/ios/RCTConvert+UIBarButtonSystemItem.h rename to lib/ios/Extensions/RCTConvert/RCTConvert+UIBarButtonSystemItem.h diff --git a/lib/ios/RCTConvert+UIBarButtonSystemItem.mm b/lib/ios/Extensions/RCTConvert/RCTConvert+UIBarButtonSystemItem.mm similarity index 100% rename from lib/ios/RCTConvert+UIBarButtonSystemItem.mm rename to lib/ios/Extensions/RCTConvert/RCTConvert+UIBarButtonSystemItem.mm diff --git a/lib/ios/RCTConvert+UIFontWeight.h b/lib/ios/Extensions/RCTConvert/RCTConvert+UIFontWeight.h similarity index 100% rename from lib/ios/RCTConvert+UIFontWeight.h rename to lib/ios/Extensions/RCTConvert/RCTConvert+UIFontWeight.h diff --git a/lib/ios/RCTConvert+UIFontWeight.mm b/lib/ios/Extensions/RCTConvert/RCTConvert+UIFontWeight.mm similarity index 100% rename from lib/ios/RCTConvert+UIFontWeight.mm rename to lib/ios/Extensions/RCTConvert/RCTConvert+UIFontWeight.mm diff --git a/lib/ios/UITabBar+utils.h b/lib/ios/Extensions/UIView/UITabBar+utils.h similarity index 100% rename from lib/ios/UITabBar+utils.h rename to lib/ios/Extensions/UIView/UITabBar+utils.h diff --git a/lib/ios/UITabBar+utils.mm b/lib/ios/Extensions/UIView/UITabBar+utils.mm similarity index 100% rename from lib/ios/UITabBar+utils.mm rename to lib/ios/Extensions/UIView/UITabBar+utils.mm diff --git a/lib/ios/Utils/UIView+Utils.h b/lib/ios/Extensions/UIView/UIView+Utils.h similarity index 100% rename from lib/ios/Utils/UIView+Utils.h rename to lib/ios/Extensions/UIView/UIView+Utils.h diff --git a/lib/ios/Utils/UIView+Utils.mm b/lib/ios/Extensions/UIView/UIView+Utils.mm similarity index 100% rename from lib/ios/Utils/UIView+Utils.mm rename to lib/ios/Extensions/UIView/UIView+Utils.mm diff --git a/lib/ios/Utils/UIViewController+Utils.h b/lib/ios/Extensions/UIView/UIViewController+Utils.h similarity index 100% rename from lib/ios/Utils/UIViewController+Utils.h rename to lib/ios/Extensions/UIView/UIViewController+Utils.h diff --git a/lib/ios/Utils/UIViewController+Utils.mm b/lib/ios/Extensions/UIView/UIViewController+Utils.mm similarity index 100% rename from lib/ios/Utils/UIViewController+Utils.mm rename to lib/ios/Extensions/UIView/UIViewController+Utils.mm diff --git a/lib/ios/AnimatedViewFactory.h b/lib/ios/Factories/AnimatedViewFactory.h similarity index 100% rename from lib/ios/AnimatedViewFactory.h rename to lib/ios/Factories/AnimatedViewFactory.h diff --git a/lib/ios/AnimatedViewFactory.mm b/lib/ios/Factories/AnimatedViewFactory.mm similarity index 100% rename from lib/ios/AnimatedViewFactory.mm rename to lib/ios/Factories/AnimatedViewFactory.mm diff --git a/lib/ios/BottomTabPresenterCreator.h b/lib/ios/Factories/BottomTabPresenterCreator.h similarity index 100% rename from lib/ios/BottomTabPresenterCreator.h rename to lib/ios/Factories/BottomTabPresenterCreator.h diff --git a/lib/ios/BottomTabPresenterCreator.mm b/lib/ios/Factories/BottomTabPresenterCreator.mm similarity index 100% rename from lib/ios/BottomTabPresenterCreator.mm rename to lib/ios/Factories/BottomTabPresenterCreator.mm diff --git a/lib/ios/BottomTabsAttachModeFactory.h b/lib/ios/Factories/BottomTabsAttachModeFactory.h similarity index 100% rename from lib/ios/BottomTabsAttachModeFactory.h rename to lib/ios/Factories/BottomTabsAttachModeFactory.h diff --git a/lib/ios/BottomTabsAttachModeFactory.mm b/lib/ios/Factories/BottomTabsAttachModeFactory.mm similarity index 100% rename from lib/ios/BottomTabsAttachModeFactory.mm rename to lib/ios/Factories/BottomTabsAttachModeFactory.mm diff --git a/lib/ios/BottomTabsPresenterCreator.h b/lib/ios/Factories/BottomTabsPresenterCreator.h similarity index 100% rename from lib/ios/BottomTabsPresenterCreator.h rename to lib/ios/Factories/BottomTabsPresenterCreator.h diff --git a/lib/ios/BottomTabsPresenterCreator.mm b/lib/ios/Factories/BottomTabsPresenterCreator.mm similarity index 100% rename from lib/ios/BottomTabsPresenterCreator.mm rename to lib/ios/Factories/BottomTabsPresenterCreator.mm diff --git a/lib/ios/RNNBaseIconCreator.h b/lib/ios/Factories/RNNBaseIconCreator.h similarity index 100% rename from lib/ios/RNNBaseIconCreator.h rename to lib/ios/Factories/RNNBaseIconCreator.h diff --git a/lib/ios/RNNBaseIconCreator.mm b/lib/ios/Factories/RNNBaseIconCreator.mm similarity index 100% rename from lib/ios/RNNBaseIconCreator.mm rename to lib/ios/Factories/RNNBaseIconCreator.mm diff --git a/lib/ios/RNNButtonBuilder.h b/lib/ios/Factories/RNNButtonBuilder.h similarity index 100% rename from lib/ios/RNNButtonBuilder.h rename to lib/ios/Factories/RNNButtonBuilder.h diff --git a/lib/ios/RNNButtonBuilder.mm b/lib/ios/Factories/RNNButtonBuilder.mm similarity index 100% rename from lib/ios/RNNButtonBuilder.mm rename to lib/ios/Factories/RNNButtonBuilder.mm diff --git a/lib/ios/RNNComponentViewCreator.h b/lib/ios/Factories/RNNComponentViewCreator.h similarity index 100% rename from lib/ios/RNNComponentViewCreator.h rename to lib/ios/Factories/RNNComponentViewCreator.h diff --git a/lib/ios/RNNControllerFactory.mm b/lib/ios/Factories/RNNControllerFactory.mm similarity index 97% rename from lib/ios/RNNControllerFactory.mm rename to lib/ios/Factories/RNNControllerFactory.mm index 6e3eeee642a..734e54e3bf1 100644 --- a/lib/ios/RNNControllerFactory.mm +++ b/lib/ios/Factories/RNNControllerFactory.mm @@ -1,15 +1,15 @@ -#import "RNNControllerFactory.h" +#import "RNNViewControllerFactory.h" #import "BottomTabPresenterCreator.h" #import "BottomTabsPresenterCreator.h" #import "RNNBottomTabsController.h" #import "RNNComponentViewController.h" #import "RNNExternalViewController.h" -#import "RNNSideMenuController.h" +#import "RNNSideMenuViewController.h" #import "RNNSplitViewController.h" #import "RNNStackController.h" #import "RNNTopTabsViewController.h" -@implementation RNNControllerFactory { +@implementation RNNViewControllerFactory { id _creator; RNNExternalComponentStore *_store; RCTBridge *_bridge; @@ -267,8 +267,8 @@ - (UIViewController *)createSideMenu:(RNNLayoutNode *)node { NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node]; - RNNSideMenuController *sideMenu = - [[RNNSideMenuController alloc] initWithLayoutInfo:layoutInfo + RNNSideMenuViewController *sideMenu = + [[RNNSideMenuViewController alloc] initWithLayoutInfo:layoutInfo creator:_creator childViewControllers:childViewControllers options:options @@ -285,7 +285,7 @@ - (UIViewController *)createSideMenuChild:(RNNLayoutNode *)node type:(RNNSideMen RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]]; - RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] + RNNSideMenuChildViewController *sideMenuChild = [[RNNSideMenuChildViewController alloc] initWithLayoutInfo:layoutInfo creator:_creator options:options diff --git a/lib/ios/RNNDynamicIconCreator.h b/lib/ios/Factories/RNNDynamicIconCreator.h similarity index 100% rename from lib/ios/RNNDynamicIconCreator.h rename to lib/ios/Factories/RNNDynamicIconCreator.h diff --git a/lib/ios/RNNDynamicIconCreator.mm b/lib/ios/Factories/RNNDynamicIconCreator.mm similarity index 100% rename from lib/ios/RNNDynamicIconCreator.mm rename to lib/ios/Factories/RNNDynamicIconCreator.mm diff --git a/lib/ios/RNNFontAttributesCreator.h b/lib/ios/Factories/RNNFontAttributesCreator.h similarity index 100% rename from lib/ios/RNNFontAttributesCreator.h rename to lib/ios/Factories/RNNFontAttributesCreator.h diff --git a/lib/ios/RNNFontAttributesCreator.mm b/lib/ios/Factories/RNNFontAttributesCreator.mm similarity index 100% rename from lib/ios/RNNFontAttributesCreator.mm rename to lib/ios/Factories/RNNFontAttributesCreator.mm diff --git a/lib/ios/RNNIconCreator.h b/lib/ios/Factories/RNNIconCreator.h similarity index 100% rename from lib/ios/RNNIconCreator.h rename to lib/ios/Factories/RNNIconCreator.h diff --git a/lib/ios/RNNIconCreator.mm b/lib/ios/Factories/RNNIconCreator.mm similarity index 100% rename from lib/ios/RNNIconCreator.mm rename to lib/ios/Factories/RNNIconCreator.mm diff --git a/lib/ios/RNNIconDrawer.h b/lib/ios/Factories/RNNIconDrawer.h similarity index 100% rename from lib/ios/RNNIconDrawer.h rename to lib/ios/Factories/RNNIconDrawer.h diff --git a/lib/ios/RNNIconDrawer.mm b/lib/ios/Factories/RNNIconDrawer.mm similarity index 100% rename from lib/ios/RNNIconDrawer.mm rename to lib/ios/Factories/RNNIconDrawer.mm diff --git a/lib/ios/RNNReactRootViewCreator.h b/lib/ios/Factories/RNNReactRootViewCreator.h similarity index 100% rename from lib/ios/RNNReactRootViewCreator.h rename to lib/ios/Factories/RNNReactRootViewCreator.h diff --git a/lib/ios/RNNReactRootViewCreator.mm b/lib/ios/Factories/RNNReactRootViewCreator.mm similarity index 100% rename from lib/ios/RNNReactRootViewCreator.mm rename to lib/ios/Factories/RNNReactRootViewCreator.mm diff --git a/lib/ios/RNNTabBarItemCreator.h b/lib/ios/Factories/RNNTabBarItemCreator.h similarity index 100% rename from lib/ios/RNNTabBarItemCreator.h rename to lib/ios/Factories/RNNTabBarItemCreator.h diff --git a/lib/ios/RNNTabBarItemCreator.mm b/lib/ios/Factories/RNNTabBarItemCreator.mm similarity index 100% rename from lib/ios/RNNTabBarItemCreator.mm rename to lib/ios/Factories/RNNTabBarItemCreator.mm diff --git a/lib/ios/RNNControllerFactory.h b/lib/ios/Factories/RNNViewControllerFactory.h similarity index 96% rename from lib/ios/RNNControllerFactory.h rename to lib/ios/Factories/RNNViewControllerFactory.h index 6118551bbb2..e3b5677f78c 100644 --- a/lib/ios/RNNControllerFactory.h +++ b/lib/ios/Factories/RNNViewControllerFactory.h @@ -8,7 +8,7 @@ #import #import -@interface RNNControllerFactory : NSObject +@interface RNNViewControllerFactory : NSObject - (instancetype)initWithRootViewCreator:(id)creator eventEmitter:(RNNEventEmitter *)eventEmitter diff --git a/lib/ios/TabBarItemAppearanceCreator.h b/lib/ios/Factories/TabBarItemAppearanceCreator.h similarity index 100% rename from lib/ios/TabBarItemAppearanceCreator.h rename to lib/ios/Factories/TabBarItemAppearanceCreator.h diff --git a/lib/ios/TabBarItemAppearanceCreator.mm b/lib/ios/Factories/TabBarItemAppearanceCreator.mm similarity index 100% rename from lib/ios/TabBarItemAppearanceCreator.mm rename to lib/ios/Factories/TabBarItemAppearanceCreator.mm diff --git a/lib/ios/TabBarItemIOS15Creator.h b/lib/ios/Factories/TabBarItemIOS15Creator.h similarity index 100% rename from lib/ios/TabBarItemIOS15Creator.h rename to lib/ios/Factories/TabBarItemIOS15Creator.h diff --git a/lib/ios/TabBarItemIOS15Creator.mm b/lib/ios/Factories/TabBarItemIOS15Creator.mm similarity index 100% rename from lib/ios/TabBarItemIOS15Creator.mm rename to lib/ios/Factories/TabBarItemIOS15Creator.mm diff --git a/lib/ios/TopBarPresenterCreator.h b/lib/ios/Factories/TopBarPresenterCreator.h similarity index 100% rename from lib/ios/TopBarPresenterCreator.h rename to lib/ios/Factories/TopBarPresenterCreator.h diff --git a/lib/ios/TopBarPresenterCreator.mm b/lib/ios/Factories/TopBarPresenterCreator.mm similarity index 100% rename from lib/ios/TopBarPresenterCreator.mm rename to lib/ios/Factories/TopBarPresenterCreator.mm diff --git a/lib/ios/RNNLayoutInfo.h b/lib/ios/Layout/RNNLayoutInfo.h similarity index 100% rename from lib/ios/RNNLayoutInfo.h rename to lib/ios/Layout/RNNLayoutInfo.h diff --git a/lib/ios/RNNLayoutInfo.mm b/lib/ios/Layout/RNNLayoutInfo.mm similarity index 100% rename from lib/ios/RNNLayoutInfo.mm rename to lib/ios/Layout/RNNLayoutInfo.mm diff --git a/lib/ios/RNNLayoutManager.h b/lib/ios/Layout/RNNLayoutManager.h similarity index 100% rename from lib/ios/RNNLayoutManager.h rename to lib/ios/Layout/RNNLayoutManager.h diff --git a/lib/ios/RNNLayoutManager.mm b/lib/ios/Layout/RNNLayoutManager.mm similarity index 100% rename from lib/ios/RNNLayoutManager.mm rename to lib/ios/Layout/RNNLayoutManager.mm diff --git a/lib/ios/RNNLayoutNode.h b/lib/ios/Layout/RNNLayoutNode.h similarity index 100% rename from lib/ios/RNNLayoutNode.h rename to lib/ios/Layout/RNNLayoutNode.h diff --git a/lib/ios/RNNLayoutNode.mm b/lib/ios/Layout/RNNLayoutNode.mm similarity index 100% rename from lib/ios/RNNLayoutNode.mm rename to lib/ios/Layout/RNNLayoutNode.mm diff --git a/lib/ios/RNNLayoutProtocol.h b/lib/ios/Layout/RNNLayoutProtocol.h similarity index 100% rename from lib/ios/RNNLayoutProtocol.h rename to lib/ios/Layout/RNNLayoutProtocol.h diff --git a/lib/ios/RNNModalHostViewManagerHandler.h b/lib/ios/Modal/RNNModalHostViewManagerHandler.h similarity index 100% rename from lib/ios/RNNModalHostViewManagerHandler.h rename to lib/ios/Modal/RNNModalHostViewManagerHandler.h diff --git a/lib/ios/RNNModalHostViewManagerHandler.mm b/lib/ios/Modal/RNNModalHostViewManagerHandler.mm similarity index 100% rename from lib/ios/RNNModalHostViewManagerHandler.mm rename to lib/ios/Modal/RNNModalHostViewManagerHandler.mm diff --git a/lib/ios/RNNModalManager.h b/lib/ios/Modal/RNNModalManager.h similarity index 100% rename from lib/ios/RNNModalManager.h rename to lib/ios/Modal/RNNModalManager.h diff --git a/lib/ios/RNNModalManager.mm b/lib/ios/Modal/RNNModalManager.mm similarity index 100% rename from lib/ios/RNNModalManager.mm rename to lib/ios/Modal/RNNModalManager.mm diff --git a/lib/ios/RNNModalManagerEventHandler.h b/lib/ios/Modal/RNNModalManagerEventHandler.h similarity index 100% rename from lib/ios/RNNModalManagerEventHandler.h rename to lib/ios/Modal/RNNModalManagerEventHandler.h diff --git a/lib/ios/RNNModalManagerEventHandler.mm b/lib/ios/Modal/RNNModalManagerEventHandler.mm similarity index 100% rename from lib/ios/RNNModalManagerEventHandler.mm rename to lib/ios/Modal/RNNModalManagerEventHandler.mm diff --git a/lib/ios/DeprecationOptions.h b/lib/ios/Options/DeprecationOptions.h similarity index 100% rename from lib/ios/DeprecationOptions.h rename to lib/ios/Options/DeprecationOptions.h diff --git a/lib/ios/DeprecationOptions.mm b/lib/ios/Options/DeprecationOptions.mm similarity index 100% rename from lib/ios/DeprecationOptions.mm rename to lib/ios/Options/DeprecationOptions.mm diff --git a/lib/ios/DotIndicatorOptions.h b/lib/ios/Options/DotIndicatorOptions.h similarity index 100% rename from lib/ios/DotIndicatorOptions.h rename to lib/ios/Options/DotIndicatorOptions.h diff --git a/lib/ios/DotIndicatorOptions.mm b/lib/ios/Options/DotIndicatorOptions.mm similarity index 100% rename from lib/ios/DotIndicatorOptions.mm rename to lib/ios/Options/DotIndicatorOptions.mm diff --git a/lib/ios/ElementTransitionOptions.h b/lib/ios/Options/ElementTransitionOptions.h similarity index 100% rename from lib/ios/ElementTransitionOptions.h rename to lib/ios/Options/ElementTransitionOptions.h diff --git a/lib/ios/ElementTransitionOptions.mm b/lib/ios/Options/ElementTransitionOptions.mm similarity index 100% rename from lib/ios/ElementTransitionOptions.mm rename to lib/ios/Options/ElementTransitionOptions.mm diff --git a/lib/ios/RNNAnimationsOptions.h b/lib/ios/Options/RNNAnimationsOptions.h similarity index 100% rename from lib/ios/RNNAnimationsOptions.h rename to lib/ios/Options/RNNAnimationsOptions.h diff --git a/lib/ios/RNNAnimationsOptions.mm b/lib/ios/Options/RNNAnimationsOptions.mm similarity index 100% rename from lib/ios/RNNAnimationsOptions.mm rename to lib/ios/Options/RNNAnimationsOptions.mm diff --git a/lib/ios/RNNBackButtonOptions.h b/lib/ios/Options/RNNBackButtonOptions.h similarity index 100% rename from lib/ios/RNNBackButtonOptions.h rename to lib/ios/Options/RNNBackButtonOptions.h diff --git a/lib/ios/RNNBackButtonOptions.mm b/lib/ios/Options/RNNBackButtonOptions.mm similarity index 100% rename from lib/ios/RNNBackButtonOptions.mm rename to lib/ios/Options/RNNBackButtonOptions.mm diff --git a/lib/ios/RNNBackgroundOptions.h b/lib/ios/Options/RNNBackgroundOptions.h similarity index 100% rename from lib/ios/RNNBackgroundOptions.h rename to lib/ios/Options/RNNBackgroundOptions.h diff --git a/lib/ios/RNNBackgroundOptions.mm b/lib/ios/Options/RNNBackgroundOptions.mm similarity index 100% rename from lib/ios/RNNBackgroundOptions.mm rename to lib/ios/Options/RNNBackgroundOptions.mm diff --git a/lib/ios/RNNBottomTabOptions.h b/lib/ios/Options/RNNBottomTabOptions.h similarity index 100% rename from lib/ios/RNNBottomTabOptions.h rename to lib/ios/Options/RNNBottomTabOptions.h diff --git a/lib/ios/RNNBottomTabOptions.mm b/lib/ios/Options/RNNBottomTabOptions.mm similarity index 100% rename from lib/ios/RNNBottomTabOptions.mm rename to lib/ios/Options/RNNBottomTabOptions.mm diff --git a/lib/ios/RNNBottomTabsOptions.h b/lib/ios/Options/RNNBottomTabsOptions.h similarity index 100% rename from lib/ios/RNNBottomTabsOptions.h rename to lib/ios/Options/RNNBottomTabsOptions.h diff --git a/lib/ios/RNNBottomTabsOptions.mm b/lib/ios/Options/RNNBottomTabsOptions.mm similarity index 100% rename from lib/ios/RNNBottomTabsOptions.mm rename to lib/ios/Options/RNNBottomTabsOptions.mm diff --git a/lib/ios/RNNButtonOptions.h b/lib/ios/Options/RNNButtonOptions.h similarity index 100% rename from lib/ios/RNNButtonOptions.h rename to lib/ios/Options/RNNButtonOptions.h diff --git a/lib/ios/RNNButtonOptions.mm b/lib/ios/Options/RNNButtonOptions.mm similarity index 100% rename from lib/ios/RNNButtonOptions.mm rename to lib/ios/Options/RNNButtonOptions.mm diff --git a/lib/ios/RNNComponentOptions.h b/lib/ios/Options/RNNComponentOptions.h similarity index 100% rename from lib/ios/RNNComponentOptions.h rename to lib/ios/Options/RNNComponentOptions.h diff --git a/lib/ios/RNNComponentOptions.mm b/lib/ios/Options/RNNComponentOptions.mm similarity index 100% rename from lib/ios/RNNComponentOptions.mm rename to lib/ios/Options/RNNComponentOptions.mm diff --git a/lib/ios/RNNDefaultOptionsHelper.h b/lib/ios/Options/RNNDefaultOptionsHelper.h similarity index 100% rename from lib/ios/RNNDefaultOptionsHelper.h rename to lib/ios/Options/RNNDefaultOptionsHelper.h diff --git a/lib/ios/RNNDefaultOptionsHelper.mm b/lib/ios/Options/RNNDefaultOptionsHelper.mm similarity index 100% rename from lib/ios/RNNDefaultOptionsHelper.mm rename to lib/ios/Options/RNNDefaultOptionsHelper.mm diff --git a/lib/ios/RNNIconBackgroundOptions.h b/lib/ios/Options/RNNIconBackgroundOptions.h similarity index 100% rename from lib/ios/RNNIconBackgroundOptions.h rename to lib/ios/Options/RNNIconBackgroundOptions.h diff --git a/lib/ios/RNNIconBackgroundOptions.mm b/lib/ios/Options/RNNIconBackgroundOptions.mm similarity index 100% rename from lib/ios/RNNIconBackgroundOptions.mm rename to lib/ios/Options/RNNIconBackgroundOptions.mm diff --git a/lib/ios/RNNInsetsOptions.h b/lib/ios/Options/RNNInsetsOptions.h similarity index 100% rename from lib/ios/RNNInsetsOptions.h rename to lib/ios/Options/RNNInsetsOptions.h diff --git a/lib/ios/RNNInsetsOptions.mm b/lib/ios/Options/RNNInsetsOptions.mm similarity index 100% rename from lib/ios/RNNInsetsOptions.mm rename to lib/ios/Options/RNNInsetsOptions.mm diff --git a/lib/ios/RNNLargeTitleOptions.h b/lib/ios/Options/RNNLargeTitleOptions.h similarity index 100% rename from lib/ios/RNNLargeTitleOptions.h rename to lib/ios/Options/RNNLargeTitleOptions.h diff --git a/lib/ios/RNNLargeTitleOptions.mm b/lib/ios/Options/RNNLargeTitleOptions.mm similarity index 100% rename from lib/ios/RNNLargeTitleOptions.mm rename to lib/ios/Options/RNNLargeTitleOptions.mm diff --git a/lib/ios/RNNLayoutOptions.h b/lib/ios/Options/RNNLayoutOptions.h similarity index 100% rename from lib/ios/RNNLayoutOptions.h rename to lib/ios/Options/RNNLayoutOptions.h diff --git a/lib/ios/RNNLayoutOptions.mm b/lib/ios/Options/RNNLayoutOptions.mm similarity index 100% rename from lib/ios/RNNLayoutOptions.mm rename to lib/ios/Options/RNNLayoutOptions.mm diff --git a/lib/ios/RNNModalOptions.h b/lib/ios/Options/RNNModalOptions.h similarity index 100% rename from lib/ios/RNNModalOptions.h rename to lib/ios/Options/RNNModalOptions.h diff --git a/lib/ios/RNNModalOptions.mm b/lib/ios/Options/RNNModalOptions.mm similarity index 100% rename from lib/ios/RNNModalOptions.mm rename to lib/ios/Options/RNNModalOptions.mm diff --git a/lib/ios/RNNNavigationOptions.h b/lib/ios/Options/RNNNavigationOptions.h similarity index 100% rename from lib/ios/RNNNavigationOptions.h rename to lib/ios/Options/RNNNavigationOptions.h diff --git a/lib/ios/RNNNavigationOptions.mm b/lib/ios/Options/RNNNavigationOptions.mm similarity index 99% rename from lib/ios/RNNNavigationOptions.mm rename to lib/ios/Options/RNNNavigationOptions.mm index c7c4488b480..8fba57f898d 100644 --- a/lib/ios/RNNNavigationOptions.mm +++ b/lib/ios/Options/RNNNavigationOptions.mm @@ -1,7 +1,7 @@ #import "RNNNavigationOptions.h" #import "RNNBottomTabsController.h" #import "RNNComponentViewController.h" -#import "RNNSideMenuController.h" +#import "RNNSideMenuViewController.h" #import "RNNSplitViewController.h" #import "RNNSplitViewOptions.h" #import "RNNStackController.h" diff --git a/lib/ios/RNNOptions.h b/lib/ios/Options/RNNOptions.h similarity index 100% rename from lib/ios/RNNOptions.h rename to lib/ios/Options/RNNOptions.h diff --git a/lib/ios/RNNOptions.mm b/lib/ios/Options/RNNOptions.mm similarity index 100% rename from lib/ios/RNNOptions.mm rename to lib/ios/Options/RNNOptions.mm diff --git a/lib/ios/RNNOverlayOptions.h b/lib/ios/Options/RNNOverlayOptions.h similarity index 100% rename from lib/ios/RNNOverlayOptions.h rename to lib/ios/Options/RNNOverlayOptions.h diff --git a/lib/ios/RNNOverlayOptions.mm b/lib/ios/Options/RNNOverlayOptions.mm similarity index 100% rename from lib/ios/RNNOverlayOptions.mm rename to lib/ios/Options/RNNOverlayOptions.mm diff --git a/lib/ios/RNNPreviewOptions.h b/lib/ios/Options/RNNPreviewOptions.h similarity index 100% rename from lib/ios/RNNPreviewOptions.h rename to lib/ios/Options/RNNPreviewOptions.h diff --git a/lib/ios/RNNPreviewOptions.mm b/lib/ios/Options/RNNPreviewOptions.mm similarity index 100% rename from lib/ios/RNNPreviewOptions.mm rename to lib/ios/Options/RNNPreviewOptions.mm diff --git a/lib/ios/RNNScrollEdgeAppearanceBackgroundOptions.h b/lib/ios/Options/RNNScrollEdgeAppearanceBackgroundOptions.h similarity index 100% rename from lib/ios/RNNScrollEdgeAppearanceBackgroundOptions.h rename to lib/ios/Options/RNNScrollEdgeAppearanceBackgroundOptions.h diff --git a/lib/ios/RNNScrollEdgeAppearanceBackgroundOptions.mm b/lib/ios/Options/RNNScrollEdgeAppearanceBackgroundOptions.mm similarity index 100% rename from lib/ios/RNNScrollEdgeAppearanceBackgroundOptions.mm rename to lib/ios/Options/RNNScrollEdgeAppearanceBackgroundOptions.mm diff --git a/lib/ios/RNNScrollEdgeAppearanceOptions.h b/lib/ios/Options/RNNScrollEdgeAppearanceOptions.h similarity index 100% rename from lib/ios/RNNScrollEdgeAppearanceOptions.h rename to lib/ios/Options/RNNScrollEdgeAppearanceOptions.h diff --git a/lib/ios/RNNScrollEdgeAppearanceOptions.mm b/lib/ios/Options/RNNScrollEdgeAppearanceOptions.mm similarity index 100% rename from lib/ios/RNNScrollEdgeAppearanceOptions.mm rename to lib/ios/Options/RNNScrollEdgeAppearanceOptions.mm diff --git a/lib/ios/RNNSearchBarOptions.h b/lib/ios/Options/RNNSearchBarOptions.h similarity index 100% rename from lib/ios/RNNSearchBarOptions.h rename to lib/ios/Options/RNNSearchBarOptions.h diff --git a/lib/ios/RNNSearchBarOptions.mm b/lib/ios/Options/RNNSearchBarOptions.mm similarity index 100% rename from lib/ios/RNNSearchBarOptions.mm rename to lib/ios/Options/RNNSearchBarOptions.mm diff --git a/lib/ios/RNNShadowOptions.h b/lib/ios/Options/RNNShadowOptions.h similarity index 100% rename from lib/ios/RNNShadowOptions.h rename to lib/ios/Options/RNNShadowOptions.h diff --git a/lib/ios/RNNShadowOptions.mm b/lib/ios/Options/RNNShadowOptions.mm similarity index 100% rename from lib/ios/RNNShadowOptions.mm rename to lib/ios/Options/RNNShadowOptions.mm diff --git a/lib/ios/RNNSharedElementAnimationOptions.h b/lib/ios/Options/RNNSharedElementAnimationOptions.h similarity index 100% rename from lib/ios/RNNSharedElementAnimationOptions.h rename to lib/ios/Options/RNNSharedElementAnimationOptions.h diff --git a/lib/ios/RNNSharedElementAnimationOptions.mm b/lib/ios/Options/RNNSharedElementAnimationOptions.mm similarity index 100% rename from lib/ios/RNNSharedElementAnimationOptions.mm rename to lib/ios/Options/RNNSharedElementAnimationOptions.mm diff --git a/lib/ios/RNNSideMenuOptions.h b/lib/ios/Options/RNNSideMenuOptions.h similarity index 100% rename from lib/ios/RNNSideMenuOptions.h rename to lib/ios/Options/RNNSideMenuOptions.h diff --git a/lib/ios/RNNSideMenuOptions.mm b/lib/ios/Options/RNNSideMenuOptions.mm similarity index 100% rename from lib/ios/RNNSideMenuOptions.mm rename to lib/ios/Options/RNNSideMenuOptions.mm diff --git a/lib/ios/RNNSideMenuSideOptions.h b/lib/ios/Options/RNNSideMenuSideOptions.h similarity index 100% rename from lib/ios/RNNSideMenuSideOptions.h rename to lib/ios/Options/RNNSideMenuSideOptions.h diff --git a/lib/ios/RNNSideMenuSideOptions.mm b/lib/ios/Options/RNNSideMenuSideOptions.mm similarity index 100% rename from lib/ios/RNNSideMenuSideOptions.mm rename to lib/ios/Options/RNNSideMenuSideOptions.mm diff --git a/lib/ios/RNNSplitViewOptions.h b/lib/ios/Options/RNNSplitViewOptions.h similarity index 100% rename from lib/ios/RNNSplitViewOptions.h rename to lib/ios/Options/RNNSplitViewOptions.h diff --git a/lib/ios/RNNSplitViewOptions.mm b/lib/ios/Options/RNNSplitViewOptions.mm similarity index 100% rename from lib/ios/RNNSplitViewOptions.mm rename to lib/ios/Options/RNNSplitViewOptions.mm diff --git a/lib/ios/RNNStatusBarOptions.h b/lib/ios/Options/RNNStatusBarOptions.h similarity index 100% rename from lib/ios/RNNStatusBarOptions.h rename to lib/ios/Options/RNNStatusBarOptions.h diff --git a/lib/ios/RNNStatusBarOptions.mm b/lib/ios/Options/RNNStatusBarOptions.mm similarity index 100% rename from lib/ios/RNNStatusBarOptions.mm rename to lib/ios/Options/RNNStatusBarOptions.mm diff --git a/lib/ios/RNNSubtitleOptions.h b/lib/ios/Options/RNNSubtitleOptions.h similarity index 100% rename from lib/ios/RNNSubtitleOptions.h rename to lib/ios/Options/RNNSubtitleOptions.h diff --git a/lib/ios/RNNSubtitleOptions.mm b/lib/ios/Options/RNNSubtitleOptions.mm similarity index 100% rename from lib/ios/RNNSubtitleOptions.mm rename to lib/ios/Options/RNNSubtitleOptions.mm diff --git a/lib/ios/RNNTitleOptions.h b/lib/ios/Options/RNNTitleOptions.h similarity index 100% rename from lib/ios/RNNTitleOptions.h rename to lib/ios/Options/RNNTitleOptions.h diff --git a/lib/ios/RNNTitleOptions.mm b/lib/ios/Options/RNNTitleOptions.mm similarity index 100% rename from lib/ios/RNNTitleOptions.mm rename to lib/ios/Options/RNNTitleOptions.mm diff --git a/lib/ios/RNNTopBarOptions.h b/lib/ios/Options/RNNTopBarOptions.h similarity index 100% rename from lib/ios/RNNTopBarOptions.h rename to lib/ios/Options/RNNTopBarOptions.h diff --git a/lib/ios/RNNTopBarOptions.mm b/lib/ios/Options/RNNTopBarOptions.mm similarity index 100% rename from lib/ios/RNNTopBarOptions.mm rename to lib/ios/Options/RNNTopBarOptions.mm diff --git a/lib/ios/RNNTopTabOptions.h b/lib/ios/Options/RNNTopTabOptions.h similarity index 100% rename from lib/ios/RNNTopTabOptions.h rename to lib/ios/Options/RNNTopTabOptions.h diff --git a/lib/ios/RNNTopTabOptions.mm b/lib/ios/Options/RNNTopTabOptions.mm similarity index 100% rename from lib/ios/RNNTopTabOptions.mm rename to lib/ios/Options/RNNTopTabOptions.mm diff --git a/lib/ios/RNNTopTabsOptions.h b/lib/ios/Options/RNNTopTabsOptions.h similarity index 100% rename from lib/ios/RNNTopTabsOptions.h rename to lib/ios/Options/RNNTopTabsOptions.h diff --git a/lib/ios/RNNTopTabsOptions.mm b/lib/ios/Options/RNNTopTabsOptions.mm similarity index 100% rename from lib/ios/RNNTopTabsOptions.mm rename to lib/ios/Options/RNNTopTabsOptions.mm diff --git a/lib/ios/SharedElementTransitionOptions.h b/lib/ios/Options/SharedElementTransitionOptions.h similarity index 100% rename from lib/ios/SharedElementTransitionOptions.h rename to lib/ios/Options/SharedElementTransitionOptions.h diff --git a/lib/ios/SharedElementTransitionOptions.mm b/lib/ios/Options/SharedElementTransitionOptions.mm similarity index 100% rename from lib/ios/SharedElementTransitionOptions.mm rename to lib/ios/Options/SharedElementTransitionOptions.mm diff --git a/lib/ios/TransitionDetailsOptions.h b/lib/ios/Options/TransitionDetailsOptions.h similarity index 100% rename from lib/ios/TransitionDetailsOptions.h rename to lib/ios/Options/TransitionDetailsOptions.h diff --git a/lib/ios/TransitionDetailsOptions.mm b/lib/ios/Options/TransitionDetailsOptions.mm similarity index 100% rename from lib/ios/TransitionDetailsOptions.mm rename to lib/ios/Options/TransitionDetailsOptions.mm diff --git a/lib/ios/TransitionOptions.h b/lib/ios/Options/TransitionOptions.h similarity index 100% rename from lib/ios/TransitionOptions.h rename to lib/ios/Options/TransitionOptions.h diff --git a/lib/ios/TransitionOptions.mm b/lib/ios/Options/TransitionOptions.mm similarity index 100% rename from lib/ios/TransitionOptions.mm rename to lib/ios/Options/TransitionOptions.mm diff --git a/lib/ios/WindowOptions.h b/lib/ios/Options/WindowOptions.h similarity index 100% rename from lib/ios/WindowOptions.h rename to lib/ios/Options/WindowOptions.h diff --git a/lib/ios/WindowOptions.mm b/lib/ios/Options/WindowOptions.mm similarity index 100% rename from lib/ios/WindowOptions.mm rename to lib/ios/Options/WindowOptions.mm diff --git a/lib/ios/RNNOverlayManager.h b/lib/ios/Overlay/RNNOverlayManager.h similarity index 100% rename from lib/ios/RNNOverlayManager.h rename to lib/ios/Overlay/RNNOverlayManager.h diff --git a/lib/ios/RNNOverlayManager.mm b/lib/ios/Overlay/RNNOverlayManager.mm similarity index 100% rename from lib/ios/RNNOverlayManager.mm rename to lib/ios/Overlay/RNNOverlayManager.mm diff --git a/lib/ios/RNNOverlayWindow.h b/lib/ios/Overlay/RNNOverlayWindow.h similarity index 100% rename from lib/ios/RNNOverlayWindow.h rename to lib/ios/Overlay/RNNOverlayWindow.h diff --git a/lib/ios/RNNOverlayWindow.mm b/lib/ios/Overlay/RNNOverlayWindow.mm similarity index 100% rename from lib/ios/RNNOverlayWindow.mm rename to lib/ios/Overlay/RNNOverlayWindow.mm diff --git a/lib/ios/Bool.h b/lib/ios/Params/Bool.h similarity index 100% rename from lib/ios/Bool.h rename to lib/ios/Params/Bool.h diff --git a/lib/ios/Bool.mm b/lib/ios/Params/Bool.mm similarity index 100% rename from lib/ios/Bool.mm rename to lib/ios/Params/Bool.mm diff --git a/lib/ios/Color.h b/lib/ios/Params/Color.h similarity index 100% rename from lib/ios/Color.h rename to lib/ios/Params/Color.h diff --git a/lib/ios/Color.mm b/lib/ios/Params/Color.mm similarity index 100% rename from lib/ios/Color.mm rename to lib/ios/Params/Color.mm diff --git a/lib/ios/Double.h b/lib/ios/Params/Double.h similarity index 100% rename from lib/ios/Double.h rename to lib/ios/Params/Double.h diff --git a/lib/ios/Double.mm b/lib/ios/Params/Double.mm similarity index 100% rename from lib/ios/Double.mm rename to lib/ios/Params/Double.mm diff --git a/lib/ios/Enum.h b/lib/ios/Params/Enum.h similarity index 100% rename from lib/ios/Enum.h rename to lib/ios/Params/Enum.h diff --git a/lib/ios/Enum.mm b/lib/ios/Params/Enum.mm similarity index 100% rename from lib/ios/Enum.mm rename to lib/ios/Params/Enum.mm diff --git a/lib/ios/Image.h b/lib/ios/Params/Image.h similarity index 100% rename from lib/ios/Image.h rename to lib/ios/Params/Image.h diff --git a/lib/ios/Image.mm b/lib/ios/Params/Image.mm similarity index 100% rename from lib/ios/Image.mm rename to lib/ios/Params/Image.mm diff --git a/lib/ios/IntNumber.h b/lib/ios/Params/IntNumber.h similarity index 100% rename from lib/ios/IntNumber.h rename to lib/ios/Params/IntNumber.h diff --git a/lib/ios/IntNumber.mm b/lib/ios/Params/IntNumber.mm similarity index 100% rename from lib/ios/IntNumber.mm rename to lib/ios/Params/IntNumber.mm diff --git a/lib/ios/NoColor.h b/lib/ios/Params/NoColor.h similarity index 100% rename from lib/ios/NoColor.h rename to lib/ios/Params/NoColor.h diff --git a/lib/ios/NoColor.mm b/lib/ios/Params/NoColor.mm similarity index 100% rename from lib/ios/NoColor.mm rename to lib/ios/Params/NoColor.mm diff --git a/lib/ios/NullBool.h b/lib/ios/Params/NullBool.h similarity index 100% rename from lib/ios/NullBool.h rename to lib/ios/Params/NullBool.h diff --git a/lib/ios/NullBool.mm b/lib/ios/Params/NullBool.mm similarity index 100% rename from lib/ios/NullBool.mm rename to lib/ios/Params/NullBool.mm diff --git a/lib/ios/NullColor.h b/lib/ios/Params/NullColor.h similarity index 100% rename from lib/ios/NullColor.h rename to lib/ios/Params/NullColor.h diff --git a/lib/ios/NullColor.mm b/lib/ios/Params/NullColor.mm similarity index 100% rename from lib/ios/NullColor.mm rename to lib/ios/Params/NullColor.mm diff --git a/lib/ios/NullDictionary.h b/lib/ios/Params/NullDictionary.h similarity index 100% rename from lib/ios/NullDictionary.h rename to lib/ios/Params/NullDictionary.h diff --git a/lib/ios/NullDictionary.mm b/lib/ios/Params/NullDictionary.mm similarity index 100% rename from lib/ios/NullDictionary.mm rename to lib/ios/Params/NullDictionary.mm diff --git a/lib/ios/NullDouble.h b/lib/ios/Params/NullDouble.h similarity index 100% rename from lib/ios/NullDouble.h rename to lib/ios/Params/NullDouble.h diff --git a/lib/ios/NullDouble.mm b/lib/ios/Params/NullDouble.mm similarity index 100% rename from lib/ios/NullDouble.mm rename to lib/ios/Params/NullDouble.mm diff --git a/lib/ios/NullEnum.h b/lib/ios/Params/NullEnum.h similarity index 100% rename from lib/ios/NullEnum.h rename to lib/ios/Params/NullEnum.h diff --git a/lib/ios/NullEnum.mm b/lib/ios/Params/NullEnum.mm similarity index 100% rename from lib/ios/NullEnum.mm rename to lib/ios/Params/NullEnum.mm diff --git a/lib/ios/NullImage.h b/lib/ios/Params/NullImage.h similarity index 100% rename from lib/ios/NullImage.h rename to lib/ios/Params/NullImage.h diff --git a/lib/ios/NullImage.mm b/lib/ios/Params/NullImage.mm similarity index 100% rename from lib/ios/NullImage.mm rename to lib/ios/Params/NullImage.mm diff --git a/lib/ios/NullIntNumber.h b/lib/ios/Params/NullIntNumber.h similarity index 100% rename from lib/ios/NullIntNumber.h rename to lib/ios/Params/NullIntNumber.h diff --git a/lib/ios/NullIntNumber.mm b/lib/ios/Params/NullIntNumber.mm similarity index 100% rename from lib/ios/NullIntNumber.mm rename to lib/ios/Params/NullIntNumber.mm diff --git a/lib/ios/NullNumber.h b/lib/ios/Params/NullNumber.h similarity index 100% rename from lib/ios/NullNumber.h rename to lib/ios/Params/NullNumber.h diff --git a/lib/ios/NullNumber.mm b/lib/ios/Params/NullNumber.mm similarity index 100% rename from lib/ios/NullNumber.mm rename to lib/ios/Params/NullNumber.mm diff --git a/lib/ios/NullText.h b/lib/ios/Params/NullText.h similarity index 100% rename from lib/ios/NullText.h rename to lib/ios/Params/NullText.h diff --git a/lib/ios/NullText.mm b/lib/ios/Params/NullText.mm similarity index 100% rename from lib/ios/NullText.mm rename to lib/ios/Params/NullText.mm diff --git a/lib/ios/Number.h b/lib/ios/Params/Number.h similarity index 100% rename from lib/ios/Number.h rename to lib/ios/Params/Number.h diff --git a/lib/ios/Number.mm b/lib/ios/Params/Number.mm similarity index 100% rename from lib/ios/Number.mm rename to lib/ios/Params/Number.mm diff --git a/lib/ios/Param.h b/lib/ios/Params/Param.h similarity index 100% rename from lib/ios/Param.h rename to lib/ios/Params/Param.h diff --git a/lib/ios/Param.mm b/lib/ios/Params/Param.mm similarity index 100% rename from lib/ios/Param.mm rename to lib/ios/Params/Param.mm diff --git a/lib/ios/RNNDictionary.h b/lib/ios/Params/RNNDictionary.h similarity index 100% rename from lib/ios/RNNDictionary.h rename to lib/ios/Params/RNNDictionary.h diff --git a/lib/ios/RNNDictionary.mm b/lib/ios/Params/RNNDictionary.mm similarity index 100% rename from lib/ios/RNNDictionary.mm rename to lib/ios/Params/RNNDictionary.mm diff --git a/lib/ios/Text.h b/lib/ios/Params/Text.h similarity index 100% rename from lib/ios/Text.h rename to lib/ios/Params/Text.h diff --git a/lib/ios/Text.mm b/lib/ios/Params/Text.mm similarity index 100% rename from lib/ios/Text.mm rename to lib/ios/Params/Text.mm diff --git a/lib/ios/TimeInterval.h b/lib/ios/Params/TimeInterval.h similarity index 100% rename from lib/ios/TimeInterval.h rename to lib/ios/Params/TimeInterval.h diff --git a/lib/ios/TimeInterval.mm b/lib/ios/Params/TimeInterval.mm similarity index 100% rename from lib/ios/TimeInterval.mm rename to lib/ios/Params/TimeInterval.mm diff --git a/lib/ios/BottomTabPresenter.h b/lib/ios/Presenters/BottomTabPresenter.h similarity index 100% rename from lib/ios/BottomTabPresenter.h rename to lib/ios/Presenters/BottomTabPresenter.h diff --git a/lib/ios/BottomTabPresenter.mm b/lib/ios/Presenters/BottomTabPresenter.mm similarity index 100% rename from lib/ios/BottomTabPresenter.mm rename to lib/ios/Presenters/BottomTabPresenter.mm diff --git a/lib/ios/BottomTabsAppearancePresenter.h b/lib/ios/Presenters/BottomTabsAppearancePresenter.h similarity index 100% rename from lib/ios/BottomTabsAppearancePresenter.h rename to lib/ios/Presenters/BottomTabsAppearancePresenter.h diff --git a/lib/ios/BottomTabsAppearancePresenter.mm b/lib/ios/Presenters/BottomTabsAppearancePresenter.mm similarity index 100% rename from lib/ios/BottomTabsAppearancePresenter.mm rename to lib/ios/Presenters/BottomTabsAppearancePresenter.mm diff --git a/lib/ios/BottomTabsBasePresenter.h b/lib/ios/Presenters/BottomTabsBasePresenter.h similarity index 100% rename from lib/ios/BottomTabsBasePresenter.h rename to lib/ios/Presenters/BottomTabsBasePresenter.h diff --git a/lib/ios/BottomTabsBasePresenter.mm b/lib/ios/Presenters/BottomTabsBasePresenter.mm similarity index 100% rename from lib/ios/BottomTabsBasePresenter.mm rename to lib/ios/Presenters/BottomTabsBasePresenter.mm diff --git a/lib/ios/RNNBasePresenter.h b/lib/ios/Presenters/RNNBasePresenter.h similarity index 100% rename from lib/ios/RNNBasePresenter.h rename to lib/ios/Presenters/RNNBasePresenter.h diff --git a/lib/ios/RNNBasePresenter.mm b/lib/ios/Presenters/RNNBasePresenter.mm similarity index 100% rename from lib/ios/RNNBasePresenter.mm rename to lib/ios/Presenters/RNNBasePresenter.mm diff --git a/lib/ios/RNNBottomTabsPresenter.h b/lib/ios/Presenters/RNNBottomTabsPresenter.h similarity index 100% rename from lib/ios/RNNBottomTabsPresenter.h rename to lib/ios/Presenters/RNNBottomTabsPresenter.h diff --git a/lib/ios/RNNBottomTabsPresenter.mm b/lib/ios/Presenters/RNNBottomTabsPresenter.mm similarity index 100% rename from lib/ios/RNNBottomTabsPresenter.mm rename to lib/ios/Presenters/RNNBottomTabsPresenter.mm diff --git a/lib/ios/RNNButtonsPresenter.h b/lib/ios/Presenters/RNNButtonsPresenter.h similarity index 100% rename from lib/ios/RNNButtonsPresenter.h rename to lib/ios/Presenters/RNNButtonsPresenter.h diff --git a/lib/ios/RNNButtonsPresenter.mm b/lib/ios/Presenters/RNNButtonsPresenter.mm similarity index 100% rename from lib/ios/RNNButtonsPresenter.mm rename to lib/ios/Presenters/RNNButtonsPresenter.mm diff --git a/lib/ios/RNNComponentPresenter.h b/lib/ios/Presenters/RNNComponentPresenter.h similarity index 100% rename from lib/ios/RNNComponentPresenter.h rename to lib/ios/Presenters/RNNComponentPresenter.h diff --git a/lib/ios/RNNComponentPresenter.mm b/lib/ios/Presenters/RNNComponentPresenter.mm similarity index 100% rename from lib/ios/RNNComponentPresenter.mm rename to lib/ios/Presenters/RNNComponentPresenter.mm diff --git a/lib/ios/RNNDotIndicatorPresenter.h b/lib/ios/Presenters/RNNDotIndicatorPresenter.h similarity index 100% rename from lib/ios/RNNDotIndicatorPresenter.h rename to lib/ios/Presenters/RNNDotIndicatorPresenter.h diff --git a/lib/ios/RNNDotIndicatorPresenter.mm b/lib/ios/Presenters/RNNDotIndicatorPresenter.mm similarity index 100% rename from lib/ios/RNNDotIndicatorPresenter.mm rename to lib/ios/Presenters/RNNDotIndicatorPresenter.mm diff --git a/lib/ios/RNNSideMenuPresenter.h b/lib/ios/Presenters/RNNSideMenuPresenter.h similarity index 100% rename from lib/ios/RNNSideMenuPresenter.h rename to lib/ios/Presenters/RNNSideMenuPresenter.h diff --git a/lib/ios/RNNSideMenuPresenter.mm b/lib/ios/Presenters/RNNSideMenuPresenter.mm similarity index 97% rename from lib/ios/RNNSideMenuPresenter.mm rename to lib/ios/Presenters/RNNSideMenuPresenter.mm index 09ec475d8e3..598c7925ea4 100644 --- a/lib/ios/RNNSideMenuPresenter.mm +++ b/lib/ios/Presenters/RNNSideMenuPresenter.mm @@ -1,5 +1,5 @@ #import "RNNSideMenuPresenter.h" -#import "RNNSideMenuController.h" +#import "RNNSideMenuViewController.h" @implementation RNNSideMenuPresenter @@ -130,8 +130,8 @@ - (void)mergeOptions:(RNNNavigationOptions *)options } } -- (RNNSideMenuController *)sideMenuController { - return (RNNSideMenuController *)self.boundViewController; +- (RNNSideMenuViewController *)sideMenuController { + return (RNNSideMenuViewController *)self.boundViewController; } @end diff --git a/lib/ios/RNNSplitViewControllerPresenter.h b/lib/ios/Presenters/RNNSplitViewControllerPresenter.h similarity index 100% rename from lib/ios/RNNSplitViewControllerPresenter.h rename to lib/ios/Presenters/RNNSplitViewControllerPresenter.h diff --git a/lib/ios/RNNSplitViewControllerPresenter.mm b/lib/ios/Presenters/RNNSplitViewControllerPresenter.mm similarity index 100% rename from lib/ios/RNNSplitViewControllerPresenter.mm rename to lib/ios/Presenters/RNNSplitViewControllerPresenter.mm diff --git a/lib/ios/RNNStackPresenter.h b/lib/ios/Presenters/RNNStackPresenter.h similarity index 100% rename from lib/ios/RNNStackPresenter.h rename to lib/ios/Presenters/RNNStackPresenter.h diff --git a/lib/ios/RNNStackPresenter.mm b/lib/ios/Presenters/RNNStackPresenter.mm similarity index 100% rename from lib/ios/RNNStackPresenter.mm rename to lib/ios/Presenters/RNNStackPresenter.mm diff --git a/lib/ios/TopBarAppearancePresenter.h b/lib/ios/Presenters/TopBarAppearancePresenter.h similarity index 100% rename from lib/ios/TopBarAppearancePresenter.h rename to lib/ios/Presenters/TopBarAppearancePresenter.h diff --git a/lib/ios/TopBarAppearancePresenter.mm b/lib/ios/Presenters/TopBarAppearancePresenter.mm similarity index 100% rename from lib/ios/TopBarAppearancePresenter.mm rename to lib/ios/Presenters/TopBarAppearancePresenter.mm diff --git a/lib/ios/TopBarPresenter.h b/lib/ios/Presenters/TopBarPresenter.h similarity index 100% rename from lib/ios/TopBarPresenter.h rename to lib/ios/Presenters/TopBarPresenter.h diff --git a/lib/ios/TopBarPresenter.mm b/lib/ios/Presenters/TopBarPresenter.mm similarity index 100% rename from lib/ios/TopBarPresenter.mm rename to lib/ios/Presenters/TopBarPresenter.mm diff --git a/lib/ios/TopBarTitlePresenter.h b/lib/ios/Presenters/TopBarTitlePresenter.h similarity index 100% rename from lib/ios/TopBarTitlePresenter.h rename to lib/ios/Presenters/TopBarTitlePresenter.h diff --git a/lib/ios/TopBarTitlePresenter.mm b/lib/ios/Presenters/TopBarTitlePresenter.mm similarity index 100% rename from lib/ios/TopBarTitlePresenter.mm rename to lib/ios/Presenters/TopBarTitlePresenter.mm diff --git a/lib/ios/RNNElement.h b/lib/ios/RNNElement.h deleted file mode 100644 index cc82825a82f..00000000000 --- a/lib/ios/RNNElement.h +++ /dev/null @@ -1,6 +0,0 @@ -#import -#import - -@interface RNNElement : RCTViewManager - -@end diff --git a/lib/ios/RNNElement.mm b/lib/ios/RNNElement.mm deleted file mode 100644 index 98b50fe5dc1..00000000000 --- a/lib/ios/RNNElement.mm +++ /dev/null @@ -1,25 +0,0 @@ - -#import "RNNElement.h" -#import "RNNElementView.h" -#import -@interface RNNElement () - -@end -@implementation RNNElement - -RCT_CUSTOM_VIEW_PROPERTY(elementId, NSString, RNNElement) { - // [(RNNElementView*)view setElementId:json]; -} - -RCT_CUSTOM_VIEW_PROPERTY(resizeMode, NSString, RNNElement) { - // [(RNNElementView*)view. setResizeMode:json]; -} - -RCT_EXPORT_MODULE(); - -- (RNNElementView *)view { - RNNElementView *element = [[RNNElementView alloc] init]; - return element; -} - -@end diff --git a/lib/ios/RNNElementView.h b/lib/ios/RNNElementView.h deleted file mode 100644 index 03b1c241786..00000000000 --- a/lib/ios/RNNElementView.h +++ /dev/null @@ -1,5 +0,0 @@ -#import - -@interface RNNElementView : NSObject - -@end diff --git a/lib/ios/RNNElementView.mm b/lib/ios/RNNElementView.mm deleted file mode 100644 index 2ee6e65ad78..00000000000 --- a/lib/ios/RNNElementView.mm +++ /dev/null @@ -1,5 +0,0 @@ -#import "RNNElementView.h" - -@implementation RNNElementView - -@end diff --git a/lib/ios/RNNLeafProtocol.h b/lib/ios/RNNLeafProtocol.h deleted file mode 100644 index f90e7b0a9ca..00000000000 --- a/lib/ios/RNNLeafProtocol.h +++ /dev/null @@ -1,6 +0,0 @@ - -@protocol RNNLeafProtocol - -- (void)bindViewController:(UIViewController *)viewController; - -@end diff --git a/lib/ios/RNNSwizzles.h b/lib/ios/RNNSwizzles.h deleted file mode 100644 index afb311152e6..00000000000 --- a/lib/ios/RNNSwizzles.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// RNNSwizzles.h -// ReactNativeNavigation -// -// Created by Leo Natan (Wix) on 1/17/18. -// Copyright © 2018 Wix. All rights reserved. -// - -#import - -@interface RNNSwizzles : NSObject - -@end diff --git a/lib/ios/RNNSwizzles.m b/lib/ios/RNNSwizzles.m deleted file mode 100644 index 22c7cceff72..00000000000 --- a/lib/ios/RNNSwizzles.m +++ /dev/null @@ -1,97 +0,0 @@ -// -// RNNSwizzles.m -// ReactNativeNavigation -// -// Created by Leo Natan (Wix) on 1/17/18. -// Copyright © 2018 Wix. All rights reserved. -// - -#import "RNNSwizzles.h" -#import "AnimationObserver.h" -@import ObjectiveC; -@import UIKit; - -static id (*__SWZ_initWithEventDispatcher_orig)(id self, SEL _cmd, id eventDispatcher); -static void (*__SWZ_setFrame_orig)(id self, SEL _cmd, CGRect frame); -static void (*__SWZ_didMoveToWindow_orig)(id self, SEL _cmd); - -static void __RNN_setFrame_orig(UIScrollView *self, SEL _cmd, CGRect frame) { - CGPoint originalOffset = self.contentOffset; - - __SWZ_setFrame_orig(self, _cmd, frame); - - UIEdgeInsets contentInset = self.adjustedContentInset; - - CGSize contentSize = self.contentSize; - - // If contentSize has not been measured yet we can't check bounds. - if (CGSizeEqualToSize(contentSize, CGSizeZero)) { - self.contentOffset = originalOffset; - } else { - // Make sure offset don't exceed bounds. This could happen on screen - // rotation. - CGSize boundsSize = self.bounds.size; - self.contentOffset = CGPointMake( - MAX(-contentInset.left, - MIN(contentSize.width - boundsSize.width + contentInset.right, originalOffset.x)), - MAX(-contentInset.top, MIN(contentSize.height - boundsSize.height + contentInset.bottom, - originalOffset.y))); - } -} - -static void __RNN_didMoveToWindow(UIView *self, SEL _cmd) { - if (![[AnimationObserver sharedObserver] isAnimating] || !self.window) { - __SWZ_didMoveToWindow_orig(self, _cmd); - } else { - [[AnimationObserver sharedObserver] registerAnimationEndedBlock:^{ - __SWZ_didMoveToWindow_orig(self, _cmd); - }]; - } -} - -@implementation RNNSwizzles - -- (id)__swz_initWithEventDispatcher:(id)eventDispatcher { - id returnValue = __SWZ_initWithEventDispatcher_orig(self, _cmd, eventDispatcher); - - [(UIScrollView *)[returnValue valueForKey:@"scrollView"] - setContentInsetAdjustmentBehavior:UIScrollViewContentInsetAdjustmentScrollableAxes]; - - return returnValue; -} - -+ (void)load { - Class cls = NSClassFromString(@"RCTScrollView"); - if (cls == NULL) { - return; - } - Method m1 = class_getInstanceMethod(cls, NSSelectorFromString(@"initWithEventDispatcher:")); - - if (m1 == NULL) { - return; - } - - __SWZ_initWithEventDispatcher_orig = (void *)method_getImplementation(m1); - Method m2 = class_getInstanceMethod([RNNSwizzles class], - NSSelectorFromString(@"__swz_initWithEventDispatcher:")); - method_exchangeImplementations(m1, m2); - - cls = NSClassFromString(@"RCTCustomScrollView"); - if (cls == NULL) { - return; - } - - m1 = class_getInstanceMethod(cls, @selector(setFrame:)); - __SWZ_setFrame_orig = (void *)method_getImplementation(m1); - method_setImplementation(m1, (IMP)__RNN_setFrame_orig); - - cls = NSClassFromString(@"RCTBaseTextInputView"); - if (cls == NULL) { - return; - } - Method m4 = class_getInstanceMethod(cls, NSSelectorFromString(@"didMoveToWindow")); - __SWZ_didMoveToWindow_orig = (void *)method_getImplementation(m4); - method_setImplementation(m4, (IMP)__RNN_didMoveToWindow); -} - -@end diff --git a/lib/ios/ReactNativeNavigation.mm b/lib/ios/ReactNativeNavigation.mm index d603c97c11d..e7a6382df93 100644 --- a/lib/ios/ReactNativeNavigation.mm +++ b/lib/ios/ReactNativeNavigation.mm @@ -4,7 +4,7 @@ #import "RNNBridgeManager.h" #import "RNNLayoutManager.h" -#import "RNNSplashScreen.h" +#import "RNNSplashScreenViewController.h" @interface ReactNativeNavigation () @@ -47,7 +47,7 @@ + (void)registerExternalHostComponent:(NSString *)name callback:(RNNExternalHost - (void)bootstrapWithHost:(RCTHost *)host { self.turboManager = [[RNNTurboManager alloc] initWithHost:host mainWindow:[self mainWindow]]; - [RNNSplashScreen showOnWindow:[self mainWindow]]; + [RNNSplashScreenViewController showOnWindow:[self mainWindow]]; } + (RCTHost *)getHost { @@ -84,7 +84,7 @@ - (RNNBridgeManager *)getBridgeManagerForBridge:(RCTBridge *)bridge { } - (void)bootstrapWithBridge:(RCTBridge *)bridge { - [RNNSplashScreen showOnWindow:[self mainWindow]]; + [RNNSplashScreenViewController showOnWindow:[self mainWindow]]; } #pragma mark - instance diff --git a/lib/ios/RNNSideMenu/MMDrawerController/MMDrawerBarButtonItem.h b/lib/ios/SideMenu/MMDrawerController/MMDrawerBarButtonItem.h similarity index 100% rename from lib/ios/RNNSideMenu/MMDrawerController/MMDrawerBarButtonItem.h rename to lib/ios/SideMenu/MMDrawerController/MMDrawerBarButtonItem.h diff --git a/lib/ios/RNNSideMenu/MMDrawerController/MMDrawerBarButtonItem.mm b/lib/ios/SideMenu/MMDrawerController/MMDrawerBarButtonItem.mm similarity index 100% rename from lib/ios/RNNSideMenu/MMDrawerController/MMDrawerBarButtonItem.mm rename to lib/ios/SideMenu/MMDrawerController/MMDrawerBarButtonItem.mm diff --git a/lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController+Subclass.h b/lib/ios/SideMenu/MMDrawerController/MMDrawerController+Subclass.h similarity index 100% rename from lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController+Subclass.h rename to lib/ios/SideMenu/MMDrawerController/MMDrawerController+Subclass.h diff --git a/lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController.h b/lib/ios/SideMenu/MMDrawerController/MMDrawerController.h similarity index 100% rename from lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController.h rename to lib/ios/SideMenu/MMDrawerController/MMDrawerController.h diff --git a/lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController.mm b/lib/ios/SideMenu/MMDrawerController/MMDrawerController.mm similarity index 100% rename from lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController.mm rename to lib/ios/SideMenu/MMDrawerController/MMDrawerController.mm diff --git a/lib/ios/RNNSideMenu/MMDrawerController/MMDrawerVisualState.h b/lib/ios/SideMenu/MMDrawerController/MMDrawerVisualState.h similarity index 100% rename from lib/ios/RNNSideMenu/MMDrawerController/MMDrawerVisualState.h rename to lib/ios/SideMenu/MMDrawerController/MMDrawerVisualState.h diff --git a/lib/ios/RNNSideMenu/MMDrawerController/MMDrawerVisualState.mm b/lib/ios/SideMenu/MMDrawerController/MMDrawerVisualState.mm similarity index 100% rename from lib/ios/RNNSideMenu/MMDrawerController/MMDrawerVisualState.mm rename to lib/ios/SideMenu/MMDrawerController/MMDrawerVisualState.mm diff --git a/lib/ios/RNNSideMenu/MMDrawerController/MMExampleDrawerVisualStateManager.h b/lib/ios/SideMenu/MMDrawerController/MMExampleDrawerVisualStateManager.h similarity index 100% rename from lib/ios/RNNSideMenu/MMDrawerController/MMExampleDrawerVisualStateManager.h rename to lib/ios/SideMenu/MMDrawerController/MMExampleDrawerVisualStateManager.h diff --git a/lib/ios/RNNSideMenu/MMDrawerController/MMExampleDrawerVisualStateManager.mm b/lib/ios/SideMenu/MMDrawerController/MMExampleDrawerVisualStateManager.mm similarity index 100% rename from lib/ios/RNNSideMenu/MMDrawerController/MMExampleDrawerVisualStateManager.mm rename to lib/ios/SideMenu/MMDrawerController/MMExampleDrawerVisualStateManager.mm diff --git a/lib/ios/RNNSideMenu/MMDrawerController/UIViewController+MMDrawerController.h b/lib/ios/SideMenu/MMDrawerController/UIViewController+MMDrawerController.h similarity index 100% rename from lib/ios/RNNSideMenu/MMDrawerController/UIViewController+MMDrawerController.h rename to lib/ios/SideMenu/MMDrawerController/UIViewController+MMDrawerController.h diff --git a/lib/ios/RNNSideMenu/MMDrawerController/UIViewController+MMDrawerController.mm b/lib/ios/SideMenu/MMDrawerController/UIViewController+MMDrawerController.mm similarity index 100% rename from lib/ios/RNNSideMenu/MMDrawerController/UIViewController+MMDrawerController.mm rename to lib/ios/SideMenu/MMDrawerController/UIViewController+MMDrawerController.mm diff --git a/lib/ios/SideMenuOpenMode.h b/lib/ios/SideMenu/SideMenuOpenMode.h similarity index 51% rename from lib/ios/SideMenuOpenMode.h rename to lib/ios/SideMenu/SideMenuOpenMode.h index fd4564a8ee4..dd0cab1d39d 100644 --- a/lib/ios/SideMenuOpenMode.h +++ b/lib/ios/SideMenu/SideMenuOpenMode.h @@ -1,4 +1,4 @@ -#import "Number.h" +#import "ReactNativeNavigation/Number.h" @interface SideMenuOpenMode : Number diff --git a/lib/ios/SideMenuOpenMode.mm b/lib/ios/SideMenu/SideMenuOpenMode.mm similarity index 100% rename from lib/ios/SideMenuOpenMode.mm rename to lib/ios/SideMenu/SideMenuOpenMode.mm diff --git a/lib/ios/RNNExternalComponentStore.h b/lib/ios/Store/RNNExternalComponentStore.h similarity index 100% rename from lib/ios/RNNExternalComponentStore.h rename to lib/ios/Store/RNNExternalComponentStore.h diff --git a/lib/ios/RNNExternalComponentStore.mm b/lib/ios/Store/RNNExternalComponentStore.mm similarity index 100% rename from lib/ios/RNNExternalComponentStore.mm rename to lib/ios/Store/RNNExternalComponentStore.mm diff --git a/lib/ios/RNNReactComponentRegistry.h b/lib/ios/Store/RNNReactComponentRegistry.h similarity index 100% rename from lib/ios/RNNReactComponentRegistry.h rename to lib/ios/Store/RNNReactComponentRegistry.h diff --git a/lib/ios/RNNReactComponentRegistry.mm b/lib/ios/Store/RNNReactComponentRegistry.mm similarity index 100% rename from lib/ios/RNNReactComponentRegistry.mm rename to lib/ios/Store/RNNReactComponentRegistry.mm diff --git a/lib/ios/ElementAlphaTransition.h b/lib/ios/Transitions/Alpha/ElementAlphaTransition.h similarity index 100% rename from lib/ios/ElementAlphaTransition.h rename to lib/ios/Transitions/Alpha/ElementAlphaTransition.h diff --git a/lib/ios/ElementAlphaTransition.mm b/lib/ios/Transitions/Alpha/ElementAlphaTransition.mm similarity index 100% rename from lib/ios/ElementAlphaTransition.mm rename to lib/ios/Transitions/Alpha/ElementAlphaTransition.mm diff --git a/lib/ios/AnchorTransition.h b/lib/ios/Transitions/Anchor/AnchorTransition.h similarity index 100% rename from lib/ios/AnchorTransition.h rename to lib/ios/Transitions/Anchor/AnchorTransition.h diff --git a/lib/ios/AnchorTransition.mm b/lib/ios/Transitions/Anchor/AnchorTransition.mm similarity index 100% rename from lib/ios/AnchorTransition.mm rename to lib/ios/Transitions/Anchor/AnchorTransition.mm diff --git a/lib/ios/ElementBaseTransition.h b/lib/ios/Transitions/Base/ElementBaseTransition.h similarity index 100% rename from lib/ios/ElementBaseTransition.h rename to lib/ios/Transitions/Base/ElementBaseTransition.h diff --git a/lib/ios/ElementBaseTransition.mm b/lib/ios/Transitions/Base/ElementBaseTransition.mm similarity index 100% rename from lib/ios/ElementBaseTransition.mm rename to lib/ios/Transitions/Base/ElementBaseTransition.mm diff --git a/lib/ios/Transition.h b/lib/ios/Transitions/Base/Transition.h similarity index 100% rename from lib/ios/Transition.h rename to lib/ios/Transitions/Base/Transition.h diff --git a/lib/ios/Transition.mm b/lib/ios/Transitions/Base/Transition.mm similarity index 100% rename from lib/ios/Transition.mm rename to lib/ios/Transitions/Base/Transition.mm diff --git a/lib/ios/BoundsTransition.h b/lib/ios/Transitions/Bounds/BoundsTransition.h similarity index 100% rename from lib/ios/BoundsTransition.h rename to lib/ios/Transitions/Bounds/BoundsTransition.h diff --git a/lib/ios/BoundsTransition.mm b/lib/ios/Transitions/Bounds/BoundsTransition.mm similarity index 100% rename from lib/ios/BoundsTransition.mm rename to lib/ios/Transitions/Bounds/BoundsTransition.mm diff --git a/lib/ios/CenterTransition.h b/lib/ios/Transitions/Center/CenterTransition.h similarity index 100% rename from lib/ios/CenterTransition.h rename to lib/ios/Transitions/Center/CenterTransition.h diff --git a/lib/ios/CenterTransition.mm b/lib/ios/Transitions/Center/CenterTransition.mm similarity index 100% rename from lib/ios/CenterTransition.mm rename to lib/ios/Transitions/Center/CenterTransition.mm diff --git a/lib/ios/ColorTransition.h b/lib/ios/Transitions/Color/ColorTransition.h similarity index 100% rename from lib/ios/ColorTransition.h rename to lib/ios/Transitions/Color/ColorTransition.h diff --git a/lib/ios/ColorTransition.mm b/lib/ios/Transitions/Color/ColorTransition.mm similarity index 100% rename from lib/ios/ColorTransition.mm rename to lib/ios/Transitions/Color/ColorTransition.mm diff --git a/lib/ios/ElementTransitionsCreator.h b/lib/ios/Transitions/ElementTransitionsCreator.h similarity index 100% rename from lib/ios/ElementTransitionsCreator.h rename to lib/ios/Transitions/ElementTransitionsCreator.h diff --git a/lib/ios/ElementTransitionsCreator.mm b/lib/ios/Transitions/ElementTransitionsCreator.mm similarity index 100% rename from lib/ios/ElementTransitionsCreator.mm rename to lib/ios/Transitions/ElementTransitionsCreator.mm diff --git a/lib/ios/FloatTransition.h b/lib/ios/Transitions/Float/FloatTransition.h similarity index 100% rename from lib/ios/FloatTransition.h rename to lib/ios/Transitions/Float/FloatTransition.h diff --git a/lib/ios/FloatTransition.mm b/lib/ios/Transitions/Float/FloatTransition.mm similarity index 100% rename from lib/ios/FloatTransition.mm rename to lib/ios/Transitions/Float/FloatTransition.mm diff --git a/lib/ios/ElementFrameTransition.h b/lib/ios/Transitions/Frame/ElementFrameTransition.h similarity index 100% rename from lib/ios/ElementFrameTransition.h rename to lib/ios/Transitions/Frame/ElementFrameTransition.h diff --git a/lib/ios/ElementFrameTransition.mm b/lib/ios/Transitions/Frame/ElementFrameTransition.mm similarity index 100% rename from lib/ios/ElementFrameTransition.mm rename to lib/ios/Transitions/Frame/ElementFrameTransition.mm diff --git a/lib/ios/ElementHorizontalTransition.h b/lib/ios/Transitions/Horizontal/ElementHorizontalTransition.h similarity index 100% rename from lib/ios/ElementHorizontalTransition.h rename to lib/ios/Transitions/Horizontal/ElementHorizontalTransition.h diff --git a/lib/ios/ElementHorizontalTransition.mm b/lib/ios/Transitions/Horizontal/ElementHorizontalTransition.mm similarity index 100% rename from lib/ios/ElementHorizontalTransition.mm rename to lib/ios/Transitions/Horizontal/ElementHorizontalTransition.mm diff --git a/lib/ios/PathTransition.h b/lib/ios/Transitions/Path/PathTransition.h similarity index 100% rename from lib/ios/PathTransition.h rename to lib/ios/Transitions/Path/PathTransition.h diff --git a/lib/ios/PathTransition.mm b/lib/ios/Transitions/Path/PathTransition.mm similarity index 100% rename from lib/ios/PathTransition.mm rename to lib/ios/Transitions/Path/PathTransition.mm diff --git a/lib/ios/RNNTransitionStateHolder.h b/lib/ios/Transitions/RNNTransitionStateHolder.h similarity index 100% rename from lib/ios/RNNTransitionStateHolder.h rename to lib/ios/Transitions/RNNTransitionStateHolder.h diff --git a/lib/ios/RNNTransitionStateHolder.mm b/lib/ios/Transitions/RNNTransitionStateHolder.mm similarity index 100% rename from lib/ios/RNNTransitionStateHolder.mm rename to lib/ios/Transitions/RNNTransitionStateHolder.mm diff --git a/lib/ios/CornerRadiusTransition.h b/lib/ios/Transitions/Radius/CornerRadiusTransition.h similarity index 100% rename from lib/ios/CornerRadiusTransition.h rename to lib/ios/Transitions/Radius/CornerRadiusTransition.h diff --git a/lib/ios/CornerRadiusTransition.mm b/lib/ios/Transitions/Radius/CornerRadiusTransition.mm similarity index 100% rename from lib/ios/CornerRadiusTransition.mm rename to lib/ios/Transitions/Radius/CornerRadiusTransition.mm diff --git a/lib/ios/RectTransition.h b/lib/ios/Transitions/Rect/RectTransition.h similarity index 100% rename from lib/ios/RectTransition.h rename to lib/ios/Transitions/Rect/RectTransition.h diff --git a/lib/ios/RectTransition.mm b/lib/ios/Transitions/Rect/RectTransition.mm similarity index 100% rename from lib/ios/RectTransition.mm rename to lib/ios/Transitions/Rect/RectTransition.mm diff --git a/lib/ios/TransformRectTransition.h b/lib/ios/Transitions/Rect/TransformRectTransition.h similarity index 100% rename from lib/ios/TransformRectTransition.h rename to lib/ios/Transitions/Rect/TransformRectTransition.h diff --git a/lib/ios/TransformRectTransition.mm b/lib/ios/Transitions/Rect/TransformRectTransition.mm similarity index 100% rename from lib/ios/TransformRectTransition.mm rename to lib/ios/Transitions/Rect/TransformRectTransition.mm diff --git a/lib/ios/RotationTransition.h b/lib/ios/Transitions/Rotation/RotationTransition.h similarity index 100% rename from lib/ios/RotationTransition.h rename to lib/ios/Transitions/Rotation/RotationTransition.h diff --git a/lib/ios/RotationTransition.mm b/lib/ios/Transitions/Rotation/RotationTransition.mm similarity index 100% rename from lib/ios/RotationTransition.mm rename to lib/ios/Transitions/Rotation/RotationTransition.mm diff --git a/lib/ios/VerticalRotationTransition.h b/lib/ios/Transitions/Rotation/VerticalRotationTransition.h similarity index 100% rename from lib/ios/VerticalRotationTransition.h rename to lib/ios/Transitions/Rotation/VerticalRotationTransition.h diff --git a/lib/ios/VerticalRotationTransition.mm b/lib/ios/Transitions/Rotation/VerticalRotationTransition.mm similarity index 100% rename from lib/ios/VerticalRotationTransition.mm rename to lib/ios/Transitions/Rotation/VerticalRotationTransition.mm diff --git a/lib/ios/HorizontalScaleTransition.h b/lib/ios/Transitions/Scale/HorizontalScaleTransition.h similarity index 100% rename from lib/ios/HorizontalScaleTransition.h rename to lib/ios/Transitions/Scale/HorizontalScaleTransition.h diff --git a/lib/ios/HorizontalScaleTransition.mm b/lib/ios/Transitions/Scale/HorizontalScaleTransition.mm similarity index 100% rename from lib/ios/HorizontalScaleTransition.mm rename to lib/ios/Transitions/Scale/HorizontalScaleTransition.mm diff --git a/lib/ios/VerticalScaleTransition.h b/lib/ios/Transitions/Scale/VerticalScaleTransition.h similarity index 100% rename from lib/ios/VerticalScaleTransition.h rename to lib/ios/Transitions/Scale/VerticalScaleTransition.h diff --git a/lib/ios/VerticalScaleTransition.mm b/lib/ios/Transitions/Scale/VerticalScaleTransition.mm similarity index 100% rename from lib/ios/VerticalScaleTransition.mm rename to lib/ios/Transitions/Scale/VerticalScaleTransition.mm diff --git a/lib/ios/RNNScreenTransition.h b/lib/ios/Transitions/Screen/RNNScreenTransition.h similarity index 100% rename from lib/ios/RNNScreenTransition.h rename to lib/ios/Transitions/Screen/RNNScreenTransition.h diff --git a/lib/ios/RNNScreenTransition.mm b/lib/ios/Transitions/Screen/RNNScreenTransition.mm similarity index 100% rename from lib/ios/RNNScreenTransition.mm rename to lib/ios/Transitions/Screen/RNNScreenTransition.mm diff --git a/lib/ios/RNNScreenTransitionsCreator.h b/lib/ios/Transitions/Screen/RNNScreenTransitionsCreator.h similarity index 100% rename from lib/ios/RNNScreenTransitionsCreator.h rename to lib/ios/Transitions/Screen/RNNScreenTransitionsCreator.h diff --git a/lib/ios/RNNScreenTransitionsCreator.mm b/lib/ios/Transitions/Screen/RNNScreenTransitionsCreator.mm similarity index 100% rename from lib/ios/RNNScreenTransitionsCreator.mm rename to lib/ios/Transitions/Screen/RNNScreenTransitionsCreator.mm diff --git a/lib/ios/SharedElementTransition.h b/lib/ios/Transitions/SharedElement/SharedElementTransition.h similarity index 100% rename from lib/ios/SharedElementTransition.h rename to lib/ios/Transitions/SharedElement/SharedElementTransition.h diff --git a/lib/ios/SharedElementTransition.mm b/lib/ios/Transitions/SharedElement/SharedElementTransition.mm similarity index 100% rename from lib/ios/SharedElementTransition.mm rename to lib/ios/Transitions/SharedElement/SharedElementTransition.mm diff --git a/lib/ios/TextStorageTransition.h b/lib/ios/Transitions/TextStorage/TextStorageTransition.h similarity index 100% rename from lib/ios/TextStorageTransition.h rename to lib/ios/Transitions/TextStorage/TextStorageTransition.h diff --git a/lib/ios/TextStorageTransition.mm b/lib/ios/Transitions/TextStorage/TextStorageTransition.mm similarity index 100% rename from lib/ios/TextStorageTransition.mm rename to lib/ios/Transitions/TextStorage/TextStorageTransition.mm diff --git a/lib/ios/HorizontalTranslationTransition.h b/lib/ios/Transitions/Translation/HorizontalTranslationTransition.h similarity index 100% rename from lib/ios/HorizontalTranslationTransition.h rename to lib/ios/Transitions/Translation/HorizontalTranslationTransition.h diff --git a/lib/ios/HorizontalTranslationTransition.mm b/lib/ios/Transitions/Translation/HorizontalTranslationTransition.mm similarity index 100% rename from lib/ios/HorizontalTranslationTransition.mm rename to lib/ios/Transitions/Translation/HorizontalTranslationTransition.mm diff --git a/lib/ios/VerticalTranslationTransition.h b/lib/ios/Transitions/Translation/VerticalTranslationTransition.h similarity index 100% rename from lib/ios/VerticalTranslationTransition.h rename to lib/ios/Transitions/Translation/VerticalTranslationTransition.h diff --git a/lib/ios/VerticalTranslationTransition.mm b/lib/ios/Transitions/Translation/VerticalTranslationTransition.mm similarity index 100% rename from lib/ios/VerticalTranslationTransition.mm rename to lib/ios/Transitions/Translation/VerticalTranslationTransition.mm diff --git a/lib/ios/ElementVerticalTransition.h b/lib/ios/Transitions/Vertical/ElementVerticalTransition.h similarity index 100% rename from lib/ios/ElementVerticalTransition.h rename to lib/ios/Transitions/Vertical/ElementVerticalTransition.h diff --git a/lib/ios/ElementVerticalTransition.mm b/lib/ios/Transitions/Vertical/ElementVerticalTransition.mm similarity index 100% rename from lib/ios/ElementVerticalTransition.mm rename to lib/ios/Transitions/Vertical/ElementVerticalTransition.mm diff --git a/lib/ios/Turbomodules/RNNTurboManager.mm b/lib/ios/Turbomodules/RNNTurboManager.mm index f0cfa2c2647..1fd8801bff3 100644 --- a/lib/ios/Turbomodules/RNNTurboManager.mm +++ b/lib/ios/Turbomodules/RNNTurboManager.mm @@ -65,8 +65,8 @@ - (instancetype)initWithHost:(RCTHost *)host mainWindow:(UIWindow *)mainWindow { _componentRegistry = [[RNNReactComponentRegistry alloc] initWithCreator:rootViewCreator]; - RNNControllerFactory *controllerFactory = - [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator + RNNViewControllerFactory *controllerFactory = + [[RNNViewControllerFactory alloc] initWithRootViewCreator:rootViewCreator eventEmitter:_eventEmitter store:_store componentRegistry:_componentRegistry @@ -74,7 +74,7 @@ - (instancetype)initWithHost:(RCTHost *)host mainWindow:(UIWindow *)mainWindow { bottomTabsAttachModeFactory:[BottomTabsAttachModeFactory new]]; RNNSetRootAnimator *setRootAnimator = [RNNSetRootAnimator new]; - _commandsHandler = [[RNNCommandsHandler alloc] initWithControllerFactory:controllerFactory + _commandsHandler = [[RNNCommandsHandler alloc] initWithViewControllerFactory:controllerFactory layoutManager:_layoutManager eventEmitter:_eventEmitter modalManager:_modalManager diff --git a/lib/ios/UIViewController+SideMenuController.h b/lib/ios/UIViewController+SideMenuController.h deleted file mode 100644 index f7f20f2390c..00000000000 --- a/lib/ios/UIViewController+SideMenuController.h +++ /dev/null @@ -1,8 +0,0 @@ -#import "RNNSideMenuController.h" -#import - -@interface UIViewController (SideMenuController) - -- (RNNSideMenuController *)sideMenuController; - -@end diff --git a/lib/ios/UIViewController+SideMenuController.mm b/lib/ios/UIViewController+SideMenuController.mm deleted file mode 100644 index cabb37e4269..00000000000 --- a/lib/ios/UIViewController+SideMenuController.mm +++ /dev/null @@ -1,18 +0,0 @@ -#import "UIViewController+SideMenuController.h" - -@implementation UIViewController (SideMenuController) - -- (RNNSideMenuController *)sideMenuController { - UIViewController *vc = self; - while (vc) { - if ([vc isKindOfClass:[RNNSideMenuController class]]) { - return (RNNSideMenuController *)vc; - } - - vc = vc.parentViewController; - } - - return nil; -} - -@end diff --git a/lib/ios/Constants.h b/lib/ios/Utils/Constants.h similarity index 100% rename from lib/ios/Constants.h rename to lib/ios/Utils/Constants.h diff --git a/lib/ios/Constants.mm b/lib/ios/Utils/Constants.mm similarity index 100% rename from lib/ios/Constants.mm rename to lib/ios/Utils/Constants.mm diff --git a/lib/ios/LNInterpolable.h b/lib/ios/Utils/LNInterpolable.h similarity index 100% rename from lib/ios/LNInterpolable.h rename to lib/ios/Utils/LNInterpolable.h diff --git a/lib/ios/LNInterpolable.mm b/lib/ios/Utils/LNInterpolable.mm similarity index 100% rename from lib/ios/LNInterpolable.mm rename to lib/ios/Utils/LNInterpolable.mm diff --git a/lib/ios/BoolParser.h b/lib/ios/Utils/Parsers/BoolParser.h similarity index 77% rename from lib/ios/BoolParser.h rename to lib/ios/Utils/Parsers/BoolParser.h index e42a5ebf0fc..41284c8e91e 100644 --- a/lib/ios/BoolParser.h +++ b/lib/ios/Utils/Parsers/BoolParser.h @@ -1,4 +1,4 @@ -#import "Bool.h" +#import "ReactNativeNavigation/Bool.h" #import @interface BoolParser : NSObject diff --git a/lib/ios/BoolParser.mm b/lib/ios/Utils/Parsers/BoolParser.mm similarity index 100% rename from lib/ios/BoolParser.mm rename to lib/ios/Utils/Parsers/BoolParser.mm diff --git a/lib/ios/ColorParser.h b/lib/ios/Utils/Parsers/ColorParser.h similarity index 77% rename from lib/ios/ColorParser.h rename to lib/ios/Utils/Parsers/ColorParser.h index da1fc975096..a9707f387b6 100644 --- a/lib/ios/ColorParser.h +++ b/lib/ios/Utils/Parsers/ColorParser.h @@ -1,4 +1,4 @@ -#import "Color.h" +#import "ReactNativeNavigation/Color.h" #import @interface ColorParser : NSObject diff --git a/lib/ios/ColorParser.mm b/lib/ios/Utils/Parsers/ColorParser.mm similarity index 100% rename from lib/ios/ColorParser.mm rename to lib/ios/Utils/Parsers/ColorParser.mm diff --git a/lib/ios/DictionaryParser.h b/lib/ios/Utils/Parsers/DictionaryParser.h similarity index 100% rename from lib/ios/DictionaryParser.h rename to lib/ios/Utils/Parsers/DictionaryParser.h diff --git a/lib/ios/DictionaryParser.mm b/lib/ios/Utils/Parsers/DictionaryParser.mm similarity index 100% rename from lib/ios/DictionaryParser.mm rename to lib/ios/Utils/Parsers/DictionaryParser.mm diff --git a/lib/ios/DotIndicatorParser.h b/lib/ios/Utils/Parsers/DotIndicatorParser.h similarity index 100% rename from lib/ios/DotIndicatorParser.h rename to lib/ios/Utils/Parsers/DotIndicatorParser.h diff --git a/lib/ios/DotIndicatorParser.mm b/lib/ios/Utils/Parsers/DotIndicatorParser.mm similarity index 100% rename from lib/ios/DotIndicatorParser.mm rename to lib/ios/Utils/Parsers/DotIndicatorParser.mm diff --git a/lib/ios/DoubleParser.h b/lib/ios/Utils/Parsers/DoubleParser.h similarity index 100% rename from lib/ios/DoubleParser.h rename to lib/ios/Utils/Parsers/DoubleParser.h diff --git a/lib/ios/DoubleParser.mm b/lib/ios/Utils/Parsers/DoubleParser.mm similarity index 100% rename from lib/ios/DoubleParser.mm rename to lib/ios/Utils/Parsers/DoubleParser.mm diff --git a/lib/ios/EnumParser.h b/lib/ios/Utils/Parsers/EnumParser.h similarity index 100% rename from lib/ios/EnumParser.h rename to lib/ios/Utils/Parsers/EnumParser.h diff --git a/lib/ios/EnumParser.mm b/lib/ios/Utils/Parsers/EnumParser.mm similarity index 100% rename from lib/ios/EnumParser.mm rename to lib/ios/Utils/Parsers/EnumParser.mm diff --git a/lib/ios/ImageParser.h b/lib/ios/Utils/Parsers/ImageParser.h similarity index 100% rename from lib/ios/ImageParser.h rename to lib/ios/Utils/Parsers/ImageParser.h diff --git a/lib/ios/ImageParser.mm b/lib/ios/Utils/Parsers/ImageParser.mm similarity index 100% rename from lib/ios/ImageParser.mm rename to lib/ios/Utils/Parsers/ImageParser.mm diff --git a/lib/ios/IntNumberParser.h b/lib/ios/Utils/Parsers/IntNumberParser.h similarity index 100% rename from lib/ios/IntNumberParser.h rename to lib/ios/Utils/Parsers/IntNumberParser.h diff --git a/lib/ios/IntNumberParser.mm b/lib/ios/Utils/Parsers/IntNumberParser.mm similarity index 100% rename from lib/ios/IntNumberParser.mm rename to lib/ios/Utils/Parsers/IntNumberParser.mm diff --git a/lib/ios/NumberParser.h b/lib/ios/Utils/Parsers/NumberParser.h similarity index 76% rename from lib/ios/NumberParser.h rename to lib/ios/Utils/Parsers/NumberParser.h index a2791bcc6b0..123e6cc801b 100644 --- a/lib/ios/NumberParser.h +++ b/lib/ios/Utils/Parsers/NumberParser.h @@ -1,4 +1,4 @@ -#import "Number.h" +#import "ReactNativeNavigation/Number.h" #import @interface NumberParser : NSObject diff --git a/lib/ios/NumberParser.mm b/lib/ios/Utils/Parsers/NumberParser.mm similarity index 100% rename from lib/ios/NumberParser.mm rename to lib/ios/Utils/Parsers/NumberParser.mm diff --git a/lib/ios/OptionsArrayParser.h b/lib/ios/Utils/Parsers/OptionsArrayParser.h similarity index 100% rename from lib/ios/OptionsArrayParser.h rename to lib/ios/Utils/Parsers/OptionsArrayParser.h diff --git a/lib/ios/OptionsArrayParser.mm b/lib/ios/Utils/Parsers/OptionsArrayParser.mm similarity index 100% rename from lib/ios/OptionsArrayParser.mm rename to lib/ios/Utils/Parsers/OptionsArrayParser.mm diff --git a/lib/ios/RNNButtonsParser.h b/lib/ios/Utils/Parsers/RNNButtonsParser.h similarity index 100% rename from lib/ios/RNNButtonsParser.h rename to lib/ios/Utils/Parsers/RNNButtonsParser.h diff --git a/lib/ios/RNNButtonsParser.mm b/lib/ios/Utils/Parsers/RNNButtonsParser.mm similarity index 100% rename from lib/ios/RNNButtonsParser.mm rename to lib/ios/Utils/Parsers/RNNButtonsParser.mm diff --git a/lib/ios/SideMenuOpenGestureModeParser.h b/lib/ios/Utils/Parsers/SideMenuOpenGestureModeParser.h similarity index 100% rename from lib/ios/SideMenuOpenGestureModeParser.h rename to lib/ios/Utils/Parsers/SideMenuOpenGestureModeParser.h diff --git a/lib/ios/SideMenuOpenGestureModeParser.mm b/lib/ios/Utils/Parsers/SideMenuOpenGestureModeParser.mm similarity index 100% rename from lib/ios/SideMenuOpenGestureModeParser.mm rename to lib/ios/Utils/Parsers/SideMenuOpenGestureModeParser.mm diff --git a/lib/ios/TextParser.h b/lib/ios/Utils/Parsers/TextParser.h similarity index 100% rename from lib/ios/TextParser.h rename to lib/ios/Utils/Parsers/TextParser.h diff --git a/lib/ios/TextParser.mm b/lib/ios/Utils/Parsers/TextParser.mm similarity index 100% rename from lib/ios/TextParser.mm rename to lib/ios/Utils/Parsers/TextParser.mm diff --git a/lib/ios/TimeIntervalParser.h b/lib/ios/Utils/Parsers/TimeIntervalParser.h similarity index 100% rename from lib/ios/TimeIntervalParser.h rename to lib/ios/Utils/Parsers/TimeIntervalParser.h diff --git a/lib/ios/TimeIntervalParser.mm b/lib/ios/Utils/Parsers/TimeIntervalParser.mm similarity index 100% rename from lib/ios/TimeIntervalParser.mm rename to lib/ios/Utils/Parsers/TimeIntervalParser.mm diff --git a/lib/ios/RCTHelpers.h b/lib/ios/Utils/RCTHelpers.h similarity index 100% rename from lib/ios/RCTHelpers.h rename to lib/ios/Utils/RCTHelpers.h diff --git a/lib/ios/RCTHelpers.mm b/lib/ios/Utils/RCTHelpers.mm similarity index 100% rename from lib/ios/RCTHelpers.mm rename to lib/ios/Utils/RCTHelpers.mm diff --git a/lib/ios/RNNAssert.h b/lib/ios/Utils/RNNAssert.h similarity index 100% rename from lib/ios/RNNAssert.h rename to lib/ios/Utils/RNNAssert.h diff --git a/lib/ios/RNNConvert.h b/lib/ios/Utils/RNNConvert.h similarity index 100% rename from lib/ios/RNNConvert.h rename to lib/ios/Utils/RNNConvert.h diff --git a/lib/ios/RNNConvert.mm b/lib/ios/Utils/RNNConvert.mm similarity index 100% rename from lib/ios/RNNConvert.mm rename to lib/ios/Utils/RNNConvert.mm diff --git a/lib/ios/RNNElementFinder.h b/lib/ios/Utils/RNNElementFinder.h similarity index 100% rename from lib/ios/RNNElementFinder.h rename to lib/ios/Utils/RNNElementFinder.h diff --git a/lib/ios/RNNElementFinder.mm b/lib/ios/Utils/RNNElementFinder.mm similarity index 100% rename from lib/ios/RNNElementFinder.mm rename to lib/ios/Utils/RNNElementFinder.mm diff --git a/lib/ios/RNNErrorHandler.h b/lib/ios/Utils/RNNErrorHandler.h similarity index 100% rename from lib/ios/RNNErrorHandler.h rename to lib/ios/Utils/RNNErrorHandler.h diff --git a/lib/ios/RNNErrorHandler.mm b/lib/ios/Utils/RNNErrorHandler.mm similarity index 100% rename from lib/ios/RNNErrorHandler.mm rename to lib/ios/Utils/RNNErrorHandler.mm diff --git a/lib/ios/RNNUtils.h b/lib/ios/Utils/RNNUtils.h similarity index 100% rename from lib/ios/RNNUtils.h rename to lib/ios/Utils/RNNUtils.h diff --git a/lib/ios/RNNUtils.mm b/lib/ios/Utils/RNNUtils.mm similarity index 100% rename from lib/ios/RNNUtils.mm rename to lib/ios/Utils/RNNUtils.mm diff --git a/lib/ios/RNNViewLocation.h b/lib/ios/Utils/RNNViewLocation.h similarity index 100% rename from lib/ios/RNNViewLocation.h rename to lib/ios/Utils/RNNViewLocation.h diff --git a/lib/ios/RNNViewLocation.mm b/lib/ios/Utils/RNNViewLocation.mm similarity index 100% rename from lib/ios/RNNViewLocation.mm rename to lib/ios/Utils/RNNViewLocation.mm diff --git a/lib/ios/InteractivePopGestureDelegate.h b/lib/ios/ViewControllers/Navigation/Delegates/InteractivePopGestureDelegate.h similarity index 100% rename from lib/ios/InteractivePopGestureDelegate.h rename to lib/ios/ViewControllers/Navigation/Delegates/InteractivePopGestureDelegate.h diff --git a/lib/ios/InteractivePopGestureDelegate.mm b/lib/ios/ViewControllers/Navigation/Delegates/InteractivePopGestureDelegate.mm similarity index 100% rename from lib/ios/InteractivePopGestureDelegate.mm rename to lib/ios/ViewControllers/Navigation/Delegates/InteractivePopGestureDelegate.mm diff --git a/lib/ios/StackControllerDelegate.h b/lib/ios/ViewControllers/Navigation/Delegates/StackControllerDelegate.h similarity index 100% rename from lib/ios/StackControllerDelegate.h rename to lib/ios/ViewControllers/Navigation/Delegates/StackControllerDelegate.h diff --git a/lib/ios/StackControllerDelegate.mm b/lib/ios/ViewControllers/Navigation/Delegates/StackControllerDelegate.mm similarity index 100% rename from lib/ios/StackControllerDelegate.mm rename to lib/ios/ViewControllers/Navigation/Delegates/StackControllerDelegate.mm diff --git a/lib/ios/RNNBottomTabsController.h b/lib/ios/ViewControllers/Navigation/RNNBottomTabsController.h similarity index 100% rename from lib/ios/RNNBottomTabsController.h rename to lib/ios/ViewControllers/Navigation/RNNBottomTabsController.h diff --git a/lib/ios/RNNBottomTabsController.mm b/lib/ios/ViewControllers/Navigation/RNNBottomTabsController.mm similarity index 100% rename from lib/ios/RNNBottomTabsController.mm rename to lib/ios/ViewControllers/Navigation/RNNBottomTabsController.mm diff --git a/lib/ios/RNNStackController.h b/lib/ios/ViewControllers/Navigation/RNNStackController.h similarity index 100% rename from lib/ios/RNNStackController.h rename to lib/ios/ViewControllers/Navigation/RNNStackController.h diff --git a/lib/ios/RNNStackController.mm b/lib/ios/ViewControllers/Navigation/RNNStackController.mm similarity index 100% rename from lib/ios/RNNStackController.mm rename to lib/ios/ViewControllers/Navigation/RNNStackController.mm diff --git a/lib/ios/RNNComponentViewController.h b/lib/ios/ViewControllers/RNNComponentViewController.h similarity index 100% rename from lib/ios/RNNComponentViewController.h rename to lib/ios/ViewControllers/RNNComponentViewController.h diff --git a/lib/ios/RNNComponentViewController.mm b/lib/ios/ViewControllers/RNNComponentViewController.mm similarity index 100% rename from lib/ios/RNNComponentViewController.mm rename to lib/ios/ViewControllers/RNNComponentViewController.mm diff --git a/lib/ios/RNNExternalViewController.h b/lib/ios/ViewControllers/RNNExternalViewController.h similarity index 100% rename from lib/ios/RNNExternalViewController.h rename to lib/ios/ViewControllers/RNNExternalViewController.h diff --git a/lib/ios/RNNExternalViewController.mm b/lib/ios/ViewControllers/RNNExternalViewController.mm similarity index 100% rename from lib/ios/RNNExternalViewController.mm rename to lib/ios/ViewControllers/RNNExternalViewController.mm diff --git a/lib/ios/RNNSideMenuChildVC.h b/lib/ios/ViewControllers/RNNSideMenuChildViewController.h similarity index 92% rename from lib/ios/RNNSideMenuChildVC.h rename to lib/ios/ViewControllers/RNNSideMenuChildViewController.h index aa9114bc477..5feaef9c7c4 100644 --- a/lib/ios/RNNSideMenuChildVC.h +++ b/lib/ios/ViewControllers/RNNSideMenuChildViewController.h @@ -8,7 +8,7 @@ typedef NS_ENUM(NSInteger, RNNSideMenuChildType) { RNNSideMenuChildTypeRight, }; -@interface RNNSideMenuChildVC : UIViewController +@interface RNNSideMenuChildViewController : UIViewController - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id)creator diff --git a/lib/ios/RNNSideMenuChildVC.mm b/lib/ios/ViewControllers/RNNSideMenuChildViewController.mm similarity index 94% rename from lib/ios/RNNSideMenuChildVC.mm rename to lib/ios/ViewControllers/RNNSideMenuChildViewController.mm index 5777967489a..80758850e34 100644 --- a/lib/ios/RNNSideMenuChildVC.mm +++ b/lib/ios/ViewControllers/RNNSideMenuChildViewController.mm @@ -1,13 +1,14 @@ -#import "RNNSideMenuChildVC.h" +#import "RNNSideMenuChildViewController.h" #import "UIViewController+LayoutProtocol.h" -@interface RNNSideMenuChildVC () + +@interface RNNSideMenuChildViewController () @property(readwrite) RNNSideMenuChildType type; @property(nonatomic, retain) UIViewController *child; @end -@implementation RNNSideMenuChildVC +@implementation RNNSideMenuChildViewController - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id)creator diff --git a/lib/ios/RNNSideMenuController.h b/lib/ios/ViewControllers/RNNSideMenuViewController.h similarity index 73% rename from lib/ios/RNNSideMenuController.h rename to lib/ios/ViewControllers/RNNSideMenuViewController.h index 8efd47567f6..6cc349a4e1c 100644 --- a/lib/ios/RNNSideMenuController.h +++ b/lib/ios/ViewControllers/RNNSideMenuViewController.h @@ -1,10 +1,10 @@ #import "MMDrawerController.h" -#import "RNNSideMenuChildVC.h" +#import "RNNSideMenuChildViewController.h" #import "RNNSideMenuPresenter.h" #import "UIViewController+LayoutProtocol.h" #import -@interface RNNSideMenuController : MMDrawerController +@interface RNNSideMenuViewController : MMDrawerController - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id)creator @@ -14,9 +14,9 @@ presenter:(RNNBasePresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter; -@property(readonly) RNNSideMenuChildVC *center; -@property(readonly) RNNSideMenuChildVC *left; -@property(readonly) RNNSideMenuChildVC *right; +@property(readonly) RNNSideMenuChildViewController *center; +@property(readonly) RNNSideMenuChildViewController *left; +@property(readonly) RNNSideMenuChildViewController *right; - (void)side:(MMDrawerSide)side enabled:(BOOL)enabled; - (void)side:(MMDrawerSide)side visible:(BOOL)visible; diff --git a/lib/ios/RNNSideMenuController.mm b/lib/ios/ViewControllers/RNNSideMenuViewController.mm similarity index 91% rename from lib/ios/RNNSideMenuController.mm rename to lib/ios/ViewControllers/RNNSideMenuViewController.mm index 813b18179b2..8ad9f9b6202 100644 --- a/lib/ios/RNNSideMenuController.mm +++ b/lib/ios/ViewControllers/RNNSideMenuViewController.mm @@ -1,16 +1,16 @@ -#import "RNNSideMenuController.h" +#import "RNNSideMenuViewController.h" #import "MMDrawerVisualState.h" -@interface RNNSideMenuController () +@interface RNNSideMenuViewController () @property(nonatomic, strong) NSArray *childViewControllers; -@property(readwrite) RNNSideMenuChildVC *center; -@property(readwrite) RNNSideMenuChildVC *left; -@property(readwrite) RNNSideMenuChildVC *right; +@property(readwrite) RNNSideMenuChildViewController *center; +@property(readwrite) RNNSideMenuChildViewController *left; +@property(readwrite) RNNSideMenuChildViewController *right; @end -@implementation RNNSideMenuController +@implementation RNNSideMenuViewController - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id)creator @@ -121,8 +121,8 @@ - (void)side:(MMDrawerSide)side enabled:(BOOL)enabled { - (void)setChildViewControllers:(NSArray *)childViewControllers { _childViewControllers = childViewControllers; for (id controller in childViewControllers) { - if ([controller isKindOfClass:[RNNSideMenuChildVC class]]) { - RNNSideMenuChildVC *child = (RNNSideMenuChildVC *)controller; + if ([controller isKindOfClass:[RNNSideMenuChildViewController class]]) { + RNNSideMenuChildViewController *child = (RNNSideMenuChildViewController *)controller; if (child.type == RNNSideMenuChildTypeCenter) { self.center = child; diff --git a/lib/ios/RNNSplashScreen.h b/lib/ios/ViewControllers/RNNSplashScreenViewController.h similarity index 64% rename from lib/ios/RNNSplashScreen.h rename to lib/ios/ViewControllers/RNNSplashScreenViewController.h index 655c0ee63f2..0e2443f1af3 100644 --- a/lib/ios/RNNSplashScreen.h +++ b/lib/ios/ViewControllers/RNNSplashScreenViewController.h @@ -1,7 +1,7 @@ #import #import -@interface RNNSplashScreen : UIViewController +@interface RNNSplashScreenViewController : UIViewController + (void)showOnWindow:(UIWindow *)window; diff --git a/lib/ios/RNNSplashScreen.mm b/lib/ios/ViewControllers/RNNSplashScreenViewController.mm similarity index 93% rename from lib/ios/RNNSplashScreen.mm rename to lib/ios/ViewControllers/RNNSplashScreenViewController.mm index 58c4fff0e69..3c8c727bbc0 100644 --- a/lib/ios/RNNSplashScreen.mm +++ b/lib/ios/ViewControllers/RNNSplashScreenViewController.mm @@ -1,8 +1,7 @@ - -#import "RNNSplashScreen.h" +#import "RNNSplashScreenViewController.h" #import -@implementation RNNSplashScreen +@implementation RNNSplashScreenViewController + (void)showOnWindow:(UIWindow *)window { CGRect screenBounds = [UIScreen mainScreen].bounds; @@ -20,7 +19,7 @@ + (void)showOnWindow:(UIWindow *)window { bundle:nil]; UIViewController *launchVC = [storyboard instantiateInitialViewController]; - viewController = [[RNNSplashScreen alloc] init]; + viewController = [[RNNSplashScreenViewController alloc] init]; [viewController addChildViewController:launchVC]; [viewController.view addSubview:launchVC.view]; [launchVC didMoveToParentViewController:viewController]; @@ -31,7 +30,7 @@ + (void)showOnWindow:(UIWindow *)window { if (splashView != nil) { splashView.frame = CGRectMake(0, 0, screenBounds.size.width, screenBounds.size.height); - viewController = [[RNNSplashScreen alloc] init]; + viewController = [[RNNSplashScreenViewController alloc] init]; viewController.view = splashView; } } @@ -77,7 +76,7 @@ + (void)showOnWindow:(UIWindow *)window { } if (image != nil) { - viewController = [[RNNSplashScreen alloc] init]; + viewController = [[RNNSplashScreenViewController alloc] init]; viewController.view = [[UIImageView alloc] initWithImage:image]; } } diff --git a/lib/ios/RNNSplitViewController.h b/lib/ios/ViewControllers/RNNSplitViewController.h similarity index 100% rename from lib/ios/RNNSplitViewController.h rename to lib/ios/ViewControllers/RNNSplitViewController.h diff --git a/lib/ios/RNNSplitViewController.mm b/lib/ios/ViewControllers/RNNSplitViewController.mm similarity index 100% rename from lib/ios/RNNSplitViewController.mm rename to lib/ios/ViewControllers/RNNSplitViewController.mm diff --git a/lib/ios/RNNTopTabsViewController.h b/lib/ios/ViewControllers/RNNTopTabsViewController.h similarity index 100% rename from lib/ios/RNNTopTabsViewController.h rename to lib/ios/ViewControllers/RNNTopTabsViewController.h diff --git a/lib/ios/RNNTopTabsViewController.mm b/lib/ios/ViewControllers/RNNTopTabsViewController.mm similarity index 100% rename from lib/ios/RNNTopTabsViewController.mm rename to lib/ios/ViewControllers/RNNTopTabsViewController.mm diff --git a/lib/ios/AnimatedImageView.h b/lib/ios/Views/AnimatedImageView.h similarity index 100% rename from lib/ios/AnimatedImageView.h rename to lib/ios/Views/AnimatedImageView.h diff --git a/lib/ios/AnimatedImageView.mm b/lib/ios/Views/AnimatedImageView.mm similarity index 100% rename from lib/ios/AnimatedImageView.mm rename to lib/ios/Views/AnimatedImageView.mm diff --git a/lib/ios/AnimatedReactView.h b/lib/ios/Views/AnimatedReactView.h similarity index 100% rename from lib/ios/AnimatedReactView.h rename to lib/ios/Views/AnimatedReactView.h diff --git a/lib/ios/AnimatedReactView.mm b/lib/ios/Views/AnimatedReactView.mm similarity index 100% rename from lib/ios/AnimatedReactView.mm rename to lib/ios/Views/AnimatedReactView.mm diff --git a/lib/ios/AnimatedTextView.h b/lib/ios/Views/AnimatedTextView.h similarity index 100% rename from lib/ios/AnimatedTextView.h rename to lib/ios/Views/AnimatedTextView.h diff --git a/lib/ios/AnimatedTextView.mm b/lib/ios/Views/AnimatedTextView.mm similarity index 100% rename from lib/ios/AnimatedTextView.mm rename to lib/ios/Views/AnimatedTextView.mm diff --git a/lib/ios/AnimatedUIImageView.h b/lib/ios/Views/AnimatedUIImageView.h similarity index 100% rename from lib/ios/AnimatedUIImageView.h rename to lib/ios/Views/AnimatedUIImageView.h diff --git a/lib/ios/AnimatedUIImageView.mm b/lib/ios/Views/AnimatedUIImageView.mm similarity index 100% rename from lib/ios/AnimatedUIImageView.mm rename to lib/ios/Views/AnimatedUIImageView.mm diff --git a/lib/ios/RNNComponentRootView.h b/lib/ios/Views/RNNComponentRootView.h similarity index 100% rename from lib/ios/RNNComponentRootView.h rename to lib/ios/Views/RNNComponentRootView.h diff --git a/lib/ios/RNNComponentRootView.mm b/lib/ios/Views/RNNComponentRootView.mm similarity index 100% rename from lib/ios/RNNComponentRootView.mm rename to lib/ios/Views/RNNComponentRootView.mm diff --git a/lib/ios/RNNComponentView.h b/lib/ios/Views/RNNComponentView.h similarity index 100% rename from lib/ios/RNNComponentView.h rename to lib/ios/Views/RNNComponentView.h diff --git a/lib/ios/RNNComponentView.mm b/lib/ios/Views/RNNComponentView.mm similarity index 100% rename from lib/ios/RNNComponentView.mm rename to lib/ios/Views/RNNComponentView.mm diff --git a/lib/ios/RNNCustomTitleView.h b/lib/ios/Views/RNNCustomTitleView.h similarity index 100% rename from lib/ios/RNNCustomTitleView.h rename to lib/ios/Views/RNNCustomTitleView.h diff --git a/lib/ios/RNNCustomTitleView.mm b/lib/ios/Views/RNNCustomTitleView.mm similarity index 100% rename from lib/ios/RNNCustomTitleView.mm rename to lib/ios/Views/RNNCustomTitleView.mm diff --git a/lib/ios/RNNReactBackgroundView.h b/lib/ios/Views/RNNReactBackgroundView.h similarity index 100% rename from lib/ios/RNNReactBackgroundView.h rename to lib/ios/Views/RNNReactBackgroundView.h diff --git a/lib/ios/RNNReactBackgroundView.mm b/lib/ios/Views/RNNReactBackgroundView.mm similarity index 100% rename from lib/ios/RNNReactBackgroundView.mm rename to lib/ios/Views/RNNReactBackgroundView.mm diff --git a/lib/ios/RNNReactButtonView.h b/lib/ios/Views/RNNReactButtonView.h similarity index 100% rename from lib/ios/RNNReactButtonView.h rename to lib/ios/Views/RNNReactButtonView.h diff --git a/lib/ios/RNNReactButtonView.mm b/lib/ios/Views/RNNReactButtonView.mm similarity index 100% rename from lib/ios/RNNReactButtonView.mm rename to lib/ios/Views/RNNReactButtonView.mm diff --git a/lib/ios/RNNReactTitleView.h b/lib/ios/Views/RNNReactTitleView.h similarity index 100% rename from lib/ios/RNNReactTitleView.h rename to lib/ios/Views/RNNReactTitleView.h diff --git a/lib/ios/RNNReactTitleView.mm b/lib/ios/Views/RNNReactTitleView.mm similarity index 100% rename from lib/ios/RNNReactTitleView.mm rename to lib/ios/Views/RNNReactTitleView.mm diff --git a/lib/ios/RNNReactView.h b/lib/ios/Views/RNNReactView.h similarity index 100% rename from lib/ios/RNNReactView.h rename to lib/ios/Views/RNNReactView.h diff --git a/lib/ios/RNNReactView.mm b/lib/ios/Views/RNNReactView.mm similarity index 100% rename from lib/ios/RNNReactView.mm rename to lib/ios/Views/RNNReactView.mm diff --git a/lib/ios/RNNSegmentedControl.h b/lib/ios/Views/RNNSegmentedControl.h similarity index 100% rename from lib/ios/RNNSegmentedControl.h rename to lib/ios/Views/RNNSegmentedControl.h diff --git a/lib/ios/RNNSegmentedControl.mm b/lib/ios/Views/RNNSegmentedControl.mm similarity index 100% rename from lib/ios/RNNSegmentedControl.mm rename to lib/ios/Views/RNNSegmentedControl.mm diff --git a/lib/ios/RNNTitleViewHelper.h b/lib/ios/Views/RNNTitleViewHelper.h similarity index 100% rename from lib/ios/RNNTitleViewHelper.h rename to lib/ios/Views/RNNTitleViewHelper.h diff --git a/lib/ios/RNNTitleViewHelper.mm b/lib/ios/Views/RNNTitleViewHelper.mm similarity index 100% rename from lib/ios/RNNTitleViewHelper.mm rename to lib/ios/Views/RNNTitleViewHelper.mm diff --git a/lib/ios/RNNUIBarBackButtonItem.h b/lib/ios/Views/UIBar/RNNUIBarBackButtonItem.h similarity index 100% rename from lib/ios/RNNUIBarBackButtonItem.h rename to lib/ios/Views/UIBar/RNNUIBarBackButtonItem.h diff --git a/lib/ios/RNNUIBarBackButtonItem.mm b/lib/ios/Views/UIBar/RNNUIBarBackButtonItem.mm similarity index 100% rename from lib/ios/RNNUIBarBackButtonItem.mm rename to lib/ios/Views/UIBar/RNNUIBarBackButtonItem.mm diff --git a/lib/ios/RNNUIBarButtonItem.h b/lib/ios/Views/UIBar/RNNUIBarButtonItem.h similarity index 100% rename from lib/ios/RNNUIBarButtonItem.h rename to lib/ios/Views/UIBar/RNNUIBarButtonItem.h diff --git a/lib/ios/RNNUIBarButtonItem.mm b/lib/ios/Views/UIBar/RNNUIBarButtonItem.mm similarity index 100% rename from lib/ios/RNNUIBarButtonItem.mm rename to lib/ios/Views/UIBar/RNNUIBarButtonItem.mm diff --git a/lib/ios/VICMAImageView.h b/lib/ios/Views/VICMAImageView.h similarity index 100% rename from lib/ios/VICMAImageView.h rename to lib/ios/Views/VICMAImageView.h diff --git a/lib/ios/VICMAImageView.mm b/lib/ios/Views/VICMAImageView.mm similarity index 100% rename from lib/ios/VICMAImageView.mm rename to lib/ios/Views/VICMAImageView.mm