clean code using sub functions anf few more pr suggestions

Author: liatnetach

lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController.m

@@ -54,22 +54,19 @@ - (void)applyOptions:(RNNNavigationOptions *)options {
     [self.sideMenuController.view
         setBackgroundColor:[withDefault.layout.backgroundColor withDefault:nil]];
 
+    MMDrawerOpenMode openModeLeft = MMDrawerOpenModePushContent; // Default value
     if (withDefault.sideMenu.left.openMode.hasValue) {
         NSString *openModeString = withDefault.sideMenu.left.openMode.get;
-        MMDrawerOpenMode openMode = MMDrawerOpenModeFromString(openModeString);
-        [self.sideMenuController side:MMDrawerSideLeft openMode:openMode];
-    } else {
-        [self.sideMenuController side:MMDrawerSideLeft openMode:MMDrawerOpenModePushContent];
+        openModeLeft = MMDrawerOpenModeFromString(openModeString);
     }
+    [self.sideMenuController side:MMDrawerSideLeft openMode:openModeLeft];
 
+    MMDrawerOpenMode openModeRight = MMDrawerOpenModePushContent; // Default value
     if (withDefault.sideMenu.right.openMode.hasValue) {
         NSString *openModeString = withDefault.sideMenu.right.openMode.get;
-        MMDrawerOpenMode openMode = MMDrawerOpenModeFromString(openModeString);
-        [self.sideMenuController side:MMDrawerSideRight openMode:openMode];
-    } else {
-        [self.sideMenuController side:MMDrawerSideRight openMode:MMDrawerOpenModePushContent];
+        openModeRight = MMDrawerOpenModeFromString(openModeString);
     }
-
+    [self.sideMenuController side:MMDrawerSideRight openMode:openModeRight];
 }
 
 - (void)applyOptionsOnInit:(RNNNavigationOptions *)initialOptions {

lib/ios/RNNSideMenuPresenter.m

@@ -33,16 +33,10 @@ - (void)mergeOptions:(RNNSideMenuSideOptions *)options {
  Converts a string open mode to the equivalent MMDrawerOpenMode enum value
  */
 MMDrawerOpenMode MMDrawerOpenModeFromString(NSString *openModeString) {
-    if (!openModeString) {
-        return MMDrawerOpenModePushContent; // Default
-    }
-    
     if ([openModeString isEqualToString:@"aboveContent"]) {
         return MMDrawerOpenModeAboveContent;
-    } else {
-        // Default or explicit "pushContent"
-        return MMDrawerOpenModePushContent;
-    }
+    } 
+    return MMDrawerOpenModePushContent;
 }
 
 @end

lib/ios/RNNSideMenuSideOptions.m

@@ -1086,7 +1086,6 @@ export interface SideMenuSide {
    * Configure the opening mode of the side menu
    * #### (iOS specific)
    * @default 'pushContent'
-
    */
   openMode?: 'pushContent' | 'aboveContent';
 }

lib/src/interfaces/Options.ts

@@ -17,8 +17,7 @@ const {
   SET_ROOT_WITH_TWO_CHILDREN_HIDES_BOTTOM_TABS_BTN,
   SET_ROOT_WITHOUT_STACK_HIDES_BOTTOM_TABS_BTN,
   SET_ROOT_WITH_BUTTONS,
-  SET_ROOT_WITH_RIGHT_MENU,
-  SET_ROOT_WITH_LEFT_MENU,
+  SET_ROOT_WITH_MENUS,
   ROUND_BUTTON,
 } = testIDs;
 
@@ -89,14 +88,9 @@ export default class SetRootScreen extends React.Component<NavigationProps> {
           onPress={this.setRootWithButtons}
         />
         <Button
-          label="Set Root with left menu"
-          testID={SET_ROOT_WITH_LEFT_MENU}
-          onPress={this.setRootWithLeftMenu}
-        />
-        <Button
-          label="Set Root with right menu"
-          testID={SET_ROOT_WITH_RIGHT_MENU}
-          onPress={this.setRootWithRightMenu}
+          label="Set Root with left and right menus"
+          testID={SET_ROOT_WITH_MENUS}
+          onPress={this.setRootWithLeftAndRightMenus}
         />
       </Root>
     );
@@ -327,7 +321,7 @@ export default class SetRootScreen extends React.Component<NavigationProps> {
       },
     });
 
-  setRootWithLeftMenu = () =>
+  setRootWithLeftAndRightMenus = () =>
     Navigation.setRoot({
       root: {
         sideMenu: {
@@ -337,40 +331,6 @@ export default class SetRootScreen extends React.Component<NavigationProps> {
               name: Screens.SideMenuLeft,
             },
           },
-          center: {
-            stack: {
-              children: [
-                {
-                  component: {
-                    name: Screens.SideMenuCenter,
-                    id: 'SideMenuCenter',
-                    options: {
-                      animations: {
-                        setRoot: {
-                          waitForRender: true,
-                        },
-                      },
-                    },
-                  },
-                },
-              ],
-            },
-          },
-          options: {
-            sideMenu: {
-              left: {
-                openMode: 'aboveContent',
-              },
-            },
-          },
-        },
-      },
-    });
-
-  setRootWithRightMenu = () =>
-    Navigation.setRoot({
-      root: {
-        sideMenu: {
           right: {
             component: {
               id: 'sideMenu',
@@ -398,9 +358,12 @@ export default class SetRootScreen extends React.Component<NavigationProps> {
           },
           options: {
             sideMenu: {
-              right: {
+              left: {
                 openMode: 'aboveContent',
               },
+              // right: {
+              //   openMode: 'aboveContent',
+              // },
             },
           },
         },

playground/src/screens/SetRootScreen.tsx

@@ -120,8 +120,7 @@ const testIDs = {
     'SET_ROOT_WITH_TWO_CHILDREN_HIDES_BOTTOM_TABS_BTN',
   SET_ROOT_HIDES_BOTTOM_TABS_BTN: 'SET_ROOT_HIDES_BOTTOM_TABS_BTN',
   SET_ROOT_WITH_BUTTONS: 'SET_ROOT_WITH_BUTTONS',
-  SET_ROOT_WITH_RIGHT_MENU: 'SET_ROOT_WITH_RIGHT_MENU',
-  SET_ROOT_WITH_LEFT_MENU: 'SET_ROOT_WITH_LEFT_MENU',
+  SET_ROOT_WITH_MENUS: 'SET_ROOT_WITH_MENUS',
   ADD_BACK_HANDLER: 'ADD_BACK_HANDLER',
   REMOVE_BACK_HANDLER: 'REMOVE_BACK_HANDLER',
   OPEN_LEFT_SIDE_MENU_BTN: 'OPEN_LEFT_SIDE_MENU_BTN',