Getting Problem incompatible Titanium Modules

Classes/DeMarcelpociotSidemenuSideMenu.h

@@ -17,7 +17,8 @@ UIViewController * ControllerForProxy(TiViewProxy * proxy);
 }
 -(RESideMenu*)controller;
 
--(void)presentMenuViewController:(id)args;
+-(void)presentLeftMenuViewController:(id)args;
+-(void)presentRightMenuViewController:(id)args;
 -(void)hideMenuViewController:(id)args;
 
 

Classes/DeMarcelpociotSidemenuSideMenu.m

@@ -8,12 +8,13 @@
 #import "DeMarcelpociotSidemenuSideMenu.h"
 #import "DeMarcelpociotSidemenuSideMenuProxy.h"
 #import "TiUtils.h"
+#import "TiApp.h"
 #import "TiViewController.h"
 #import "TiUIiOSNavWindowProxy.h"
 
-UIViewController * ControllerForViewProxy(TiViewProxy * proxy);
+UIViewController * TiSideMenuControllerForViewProxy(TiViewProxy * proxy);
 
-UIViewController * ControllerForViewProxy(TiViewProxy * proxy)
+UIViewController * TiSideMenuControllerForViewProxy(TiViewProxy * proxy)
 {
     [[proxy view] setAutoresizingMask:UIViewAutoresizingNone];
 
@@ -26,7 +27,7 @@
     return [[TiViewController alloc] initWithViewProxy:proxy];
 }
 
-UINavigationController * NavigationControllerForViewProxy(TiUIiOSNavWindowProxy *proxy)
+UINavigationController * TiSideMenuNavigationControllerForViewProxy(TiUIiOSNavWindowProxy *proxy)
 {
     return [proxy controller];
 }
@@ -45,16 +46,41 @@ -(RESideMenu*)controller
         }
 
         // navController or TiWindow ?
-        UIViewController *centerWindow = useNavController ? NavigationControllerForViewProxy([self.proxy valueForUndefinedKey:@"contentView"]) : ControllerForViewProxy([self.proxy valueForUndefinedKey:@"contentView"]);
+        UIViewController *centerWindow = useNavController ? TiSideMenuNavigationControllerForViewProxy([self.proxy valueForUndefinedKey:@"contentView"]) : TiSideMenuControllerForViewProxy([self.proxy valueForUndefinedKey:@"contentView"]);
 
-		TiViewProxy *leftWindow = [self.proxy valueForUndefinedKey:@"menuView"];
-        UIViewController *menuViewController = ControllerForViewProxy(leftWindow);
+		TiViewProxy *leftWindow                 = [self.proxy valueForUndefinedKey:@"leftMenuView"];
+		TiViewProxy *rightWindow                = [self.proxy valueForUndefinedKey:@"rightMenuView"];
+        UIViewController *leftMenuViewController    = TiSideMenuControllerForViewProxy(leftWindow);
+        UIViewController *rightMenuViewController    = TiSideMenuControllerForViewProxy(rightWindow);
 
-        controller = [[RESideMenu alloc] initWithContentViewController:centerWindow
-                                                    menuViewController:menuViewController];
+        controller = [[RESideMenu alloc]    initWithContentViewController:centerWindow
+                                                   leftMenuViewController:leftMenuViewController
+                                                  rightMenuViewController:rightMenuViewController];
 
-        controller.backgroundImage = [TiUtils image:[self.proxy valueForUndefinedKey:@"backgroundImage"] proxy:self.proxy];
 
+        bool blurView = [TiUtils boolValue:[self.proxy valueForUndefinedKey:@"blurBackground"] def:NO];
+        UIImage *backgroundImageView = [TiUtils image:[self.proxy valueForUndefinedKey:@"backgroundImage"] proxy:self.proxy];
+        controller.tintColor            = [TiUtils colorValue:[self.proxy valueForUndefinedKey:@"tintColor"]].color;
+        controller.backgroundImage      = backgroundImageView;
+
+        // Check creation time parameters
+        // setContentViewScaleValue
+        [controller setContentViewScaleValue:[TiUtils floatValue:[self.proxy valueForUndefinedKey:@"contentViewScaleValue"] def:0.5]];
+
+        [controller setScaleContentView:[TiUtils boolValue:[self.proxy valueForUndefinedKey:@"scaleContentView"] def:YES]];
+
+        [controller setPanGestureEnabled:[TiUtils boolValue:[self.proxy valueForUndefinedKey:@"panGestureEnabled"] def:YES]];
+
+        [controller setLeftPanEnabled:[TiUtils boolValue:[self.proxy valueForUndefinedKey:@"leftPanEnabled"] def:YES]];
+
+        [controller setRightPanEnabled:[TiUtils boolValue:[self.proxy valueForUndefinedKey:@"rightPanEnabled"] def:YES]];
+
+        [controller setScaleBackgroundImageView:[TiUtils boolValue:[self.proxy valueForUndefinedKey:@"scaleBackgroundImageView"] def:YES]];
+
+        [controller setScaleMenuView:[TiUtils boolValue:[self.proxy valueForUndefinedKey:@"scaleMenuView"] def:YES]];
+
+        [controller setParallaxEnabled:[TiUtils boolValue:[self.proxy valueForUndefinedKey:@"parallaxEnabled"] def:YES]];
+
         UIView * controllerView = [controller view];
         [controllerView setFrame:[self bounds]];
         [self addSubview:controllerView];
@@ -77,19 +103,35 @@ -(void)frameSizeChanged:(CGRect)frame bounds:(CGRect)bounds
 -(void)setContentWindow_:(id)args
 {
 	ENSURE_UI_THREAD(setContentWindow_, args);
+    id window;
+    BOOL animated = FALSE;
+    if( [args respondsToSelector:@selector(objectForKey:)] )
+    {
+        window      = [args objectForKey:@"window"];
+        animated    = [TiUtils boolValue:[args objectForKey:@"animated"] def:FALSE];
+    } else {
+        window = args;
+    }
 	BOOL useNavController = FALSE;
-    if([[[args class] description] isEqualToString:@"TiUIiOSNavWindowProxy"]) {
+    if([[[window class] description] isEqualToString:@"TiUIiOSNavWindowProxy"]) {
         useNavController = TRUE;
     }
-    UIViewController *centerWindow = useNavController ? NavigationControllerForViewProxy(args) : ControllerForViewProxy(args);
-    [controller setContentViewController:centerWindow];
+    UIViewController *centerWindow = useNavController ? TiSideMenuNavigationControllerForViewProxy(window) : TiSideMenuControllerForViewProxy(window);
+    [controller setContentViewController:centerWindow animated:animated];
+}
+
+-(void)setLeftMenuWindow_:(id)args
+{
+    ENSURE_UI_THREAD(setLeftMenuWindow_, args);
+    ENSURE_SINGLE_ARG(args, TiViewProxy);
+    [controller setLeftMenuViewController:args];
 }
 
--(void)setMenuWindow_:(id)args
+-(void)setRightMenuWindow_:(id)args
 {
-	ENSURE_UI_THREAD(setMenuWindow_, args);
-	ENSURE_SINGLE_ARG(args, TiViewProxy);
-	[controller setMenuViewController:args];
+    ENSURE_UI_THREAD(setRightMenuWindow_, args);
+    ENSURE_SINGLE_ARG(args, TiViewProxy);
+    [controller setRightMenuViewController:args];
 }
 
 -(void)setContentViewScaleValue_:(id)args
@@ -110,23 +152,59 @@ -(void)setPanGestureEnabled_:(id)args
     [controller setPanGestureEnabled:[TiUtils boolValue:args]];
 }
 
+-(void)setPanFromEdge_:(id)args
+{
+    ENSURE_UI_THREAD(setPanFromEdge_, args);
+    [controller setPanFromEdge:[TiUtils boolValue:args]];
+}
+
+-(void)setMenuPrefersStatusBarHidden_:(id)args
+{
+    ENSURE_UI_THREAD(setMenuPrefersStatusBarHidden_, args);
+    [controller setMenuPrefersStatusBarHidden:[TiUtils boolValue:args]];
+}
+
+
 -(void)setScaleBackgroundImageView_:(id)args
 {
     ENSURE_UI_THREAD(setScaleBackgroundImageView_, args);
     [controller setScaleBackgroundImageView:[TiUtils boolValue:args]];
 }
 
+-(void)setScaleMenuView_:(id)args
+{
+    ENSURE_UI_THREAD(setScaleMenuView_, args);
+    [controller setScaleMenuView:[TiUtils boolValue:args]];
+}
+
 -(void)setParallaxEnabled_:(id)args
 {
     ENSURE_UI_THREAD(setParallaxEnabled_, args);
     [controller setParallaxEnabled:[TiUtils boolValue:args]];
 }
 
+-(void)setLeftPanEnabled_:(id)args
+{
+    ENSURE_UI_THREAD(setLeftPanEnabled_, args);
+    [controller setLeftPanEnabled:[TiUtils boolValue:args]];
+}
+
+-(void)setRightPanEnabled_:(id)args
+{
+    ENSURE_UI_THREAD(setRightPanEnabled_, args);
+    [controller setRightPanEnabled:[TiUtils boolValue:args]];
+}
+
 #pragma API
--(void)presentMenuViewController:(id)args
+-(void)presentLeftMenuViewController:(id)args
+{
+    ENSURE_UI_THREAD(presentLeftMenuViewController,args);
+    [controller presentLeftMenuViewController];
+}
+-(void)presentRightMenuViewController:(id)args
 {
-    ENSURE_UI_THREAD(presentMenuViewController,args);
-    [controller presentMenuViewController];
+    ENSURE_UI_THREAD(presentRightMenuViewController,args);
+    [controller presentRightMenuViewController];
 }
 
 -(void)hideMenuViewController:(id)args

Classes/DeMarcelpociotSidemenuSideMenuProxy.m

@@ -12,6 +12,10 @@
 
 @implementation DeMarcelpociotSidemenuSideMenuProxy
 
+-(void)windowDidOpen {
+    [super windowDidOpen];
+    [self reposition];
+}
 
 -(UIViewController *)_controller {
 	return [(DeMarcelpociotSidemenuSideMenu*)[self view] controller];
@@ -23,8 +27,11 @@ -(TiUIView*)newView {
 
 # pragma API
 
--(void)presentMenuViewController:(id)args {
-    TiThreadPerformOnMainThread(^{[(DeMarcelpociotSidemenuSideMenu*)[self view] presentMenuViewController:args];}, NO);
+-(void)presentLeftMenuViewController:(id)args {
+    TiThreadPerformOnMainThread(^{[(DeMarcelpociotSidemenuSideMenu*)[self view] presentLeftMenuViewController:args];}, NO);
+}
+-(void)presentRightMenuViewController:(id)args {
+    TiThreadPerformOnMainThread(^{[(DeMarcelpociotSidemenuSideMenu*)[self view] presentRightMenuViewController:args];}, NO);
 }
 
 -(void)hideMenuViewController:(id)args {

Classes/RESideMenu/RECommonFunctions.h

@@ -2,7 +2,7 @@
 // RECommonFunctions.h
 // RESideMenu
 //
-// Copyright (c) 2013 Roman Efimov (https://github.com/romaonthego)
+// Copyright (c) 2013-2014 Roman Efimov (https://github.com/romaonthego)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,9 +25,9 @@
 
 #import <Foundation/Foundation.h>
 
-#ifndef REUIKitIsFlatModeFunction
-#define REUIKitIsFlatModeFunction
-BOOL REUIKitIsFlatMode();
+
+#ifndef REUIKitIsFlatMode
+#define REUIKitIsFlatMode() RESideMenuUIKitIsFlatMode()
 #endif
 
 #ifndef kCFCoreFoundationVersionNumber_iOS_6_1
@@ -44,4 +44,4 @@ __VA_ARGS__ \
 #define IF_IOS7_OR_GREATER(...)
 #endif
 
-BOOL REDeviceIsUIKit7() __attribute__ ((deprecated));
+BOOL RESideMenuUIKitIsFlatMode(void);

Classes/RESideMenu/RECommonFunctions.m

@@ -2,7 +2,7 @@
 // RECommonFunctions.m
 // RESideMenu
 //
-// Copyright (c) 2013 Roman Efimov (https://github.com/romaonthego)
+// Copyright (c) 2013-2014 Roman Efimov (https://github.com/romaonthego)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,12 +25,8 @@
 
 #import "RECommonFunctions.h"
 #import <UIKit/UIKit.h>
-BOOL REDeviceIsUIKit7()
-{
-    return REUIKitIsFlatMode();
-}
 
-BOOL REUIKitIsFlatMode()
+BOOL RESideMenuUIKitIsFlatMode(void)
 {
     static BOOL isUIKitFlatMode = NO;
     static dispatch_once_t onceToken;

Classes/RESideMenu/RESideMenu.h

@@ -2,7 +2,7 @@
 // REFrostedViewController.h
 // RESideMenu
 //
-// Copyright (c) 2013 Roman Efimov (https://github.com/romaonthego)
+// Copyright (c) 2013-2014 Roman Efimov (https://github.com/romaonthego)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,32 +26,66 @@
 #import <UIKit/UIKit.h>
 #import "UIViewController+RESideMenu.h"
 
+#ifndef IBInspectable
+#define IBInspectable
+#endif
+
+
 @protocol RESideMenuDelegate;
 
-@interface RESideMenu : UIViewController
+@interface RESideMenu : UIViewController <UIGestureRecognizerDelegate>
+
+#if __IPHONE_8_0
+@property (strong, readwrite, nonatomic) IBInspectable NSString *contentViewStoryboardID;
+@property (strong, readwrite, nonatomic) IBInspectable NSString *leftMenuViewStoryboardID;
+@property (strong, readwrite, nonatomic) IBInspectable NSString *rightMenuViewStoryboardID;
+#endif
+
+@property (strong, readwrite, nonatomic) UIViewController *contentViewController;
+@property (strong, readwrite, nonatomic) UIViewController *leftMenuViewController;
+@property (strong, readwrite, nonatomic) UIViewController *rightMenuViewController;
+@property (weak, readwrite, nonatomic) id<RESideMenuDelegate> delegate;
 
 @property (assign, readwrite, nonatomic) NSTimeInterval animationDuration;
 @property (strong, readwrite, nonatomic) UIImage *backgroundImage;
 @property (assign, readwrite, nonatomic) BOOL panGestureEnabled;
-@property (assign, readwrite, nonatomic) BOOL scaleContentView;
-@property (assign, readwrite, nonatomic) BOOL scaleBackgroundImageView;
-@property (assign, readwrite, nonatomic) CGFloat contentViewScaleValue;
-@property (assign, readwrite, nonatomic) CGFloat contentViewInLandscapeOffsetCenterX;
-@property (assign, readwrite, nonatomic) CGFloat contentViewInPortraitOffsetCenterX;
-@property (strong, readwrite, nonatomic) id parallaxMenuMinimumRelativeValue;
-@property (strong, readwrite, nonatomic) id parallaxMenuMaximumRelativeValue;
-@property (strong, readwrite, nonatomic) id parallaxContentMinimumRelativeValue;
-@property (strong, readwrite, nonatomic) id parallaxContentMaximumRelativeValue;
-@property (assign, readwrite, nonatomic) BOOL parallaxEnabled;
+@property (assign, readwrite, nonatomic) BOOL leftPanEnabled;
+@property (assign, readwrite, nonatomic) BOOL rightPanEnabled;
+@property (assign, readwrite, nonatomic) BOOL panFromEdge;
+@property (assign, readwrite, nonatomic) NSUInteger panMinimumOpenThreshold;
+@property (assign, readwrite, nonatomic) IBInspectable BOOL interactivePopGestureRecognizerEnabled;
+@property (assign, readwrite, nonatomic) IBInspectable BOOL fadeMenuView;
+@property (assign, readwrite, nonatomic) IBInspectable BOOL scaleContentView;
+@property (assign, readwrite, nonatomic) IBInspectable BOOL scaleBackgroundImageView;
+@property (assign, readwrite, nonatomic) IBInspectable BOOL scaleMenuView;
+@property (assign, readwrite, nonatomic) IBInspectable BOOL contentViewShadowEnabled;
+@property (strong, readwrite, nonatomic) IBInspectable UIColor *contentViewShadowColor;
+@property (assign, readwrite, nonatomic) IBInspectable CGSize contentViewShadowOffset;
+@property (assign, readwrite, nonatomic) IBInspectable CGFloat contentViewShadowOpacity;
+@property (assign, readwrite, nonatomic) IBInspectable CGFloat contentViewShadowRadius;
+@property (assign, readwrite, nonatomic) IBInspectable CGFloat contentViewScaleValue;
+@property (assign, readwrite, nonatomic) IBInspectable CGFloat contentViewInLandscapeOffsetCenterX;
+@property (assign, readwrite, nonatomic) IBInspectable CGFloat contentViewInPortraitOffsetCenterX;
+@property (assign, readwrite, nonatomic) IBInspectable CGFloat parallaxMenuMinimumRelativeValue;
+@property (assign, readwrite, nonatomic) IBInspectable CGFloat parallaxMenuMaximumRelativeValue;
+@property (assign, readwrite, nonatomic) IBInspectable CGFloat parallaxContentMinimumRelativeValue;
+@property (assign, readwrite, nonatomic) IBInspectable CGFloat parallaxContentMaximumRelativeValue;
+@property (assign, readwrite, nonatomic) CGAffineTransform menuViewControllerTransformation;
+@property (assign, readwrite, nonatomic) IBInspectable BOOL parallaxEnabled;
+@property (assign, readwrite, nonatomic) IBInspectable BOOL bouncesHorizontally;
+@property (assign, readwrite, nonatomic) UIStatusBarStyle menuPreferredStatusBarStyle;
+@property (assign, readwrite, nonatomic) IBInspectable BOOL menuPrefersStatusBarHidden;
 
-@property (strong, readwrite, nonatomic) UIViewController *contentViewController;
-@property (strong, readwrite, nonatomic) UIViewController *menuViewController;
+@property (assign, readwrite, nonatomic) UIColor *tintColor;
 
-@property (weak, readwrite, nonatomic) id<RESideMenuDelegate> delegate;
 
-- (id)initWithContentViewController:(UIViewController *)contentViewController menuViewController:(UIViewController *)menuViewController;
-- (void)presentMenuViewController;
+- (id)initWithContentViewController:(UIViewController *)contentViewController
+             leftMenuViewController:(UIViewController *)leftMenuViewController
+            rightMenuViewController:(UIViewController *)rightMenuViewController;
+- (void)presentLeftMenuViewController;
+- (void)presentRightMenuViewController;
 - (void)hideMenuViewController;
+- (void)setContentViewController:(UIViewController *)contentViewController animated:(BOOL)animated;
 
 @end
 
@@ -64,4 +98,4 @@
 - (void)sideMenu:(RESideMenu *)sideMenu willHideMenuViewController:(UIViewController *)menuViewController;
 - (void)sideMenu:(RESideMenu *)sideMenu didHideMenuViewController:(UIViewController *)menuViewController;
 
-@end
+@end