fixing conflicts

Author: rodriigovieira

.DS_Store

@@ -1,10 +1,9 @@
-# React Native Navigation Drawer Extension
+<h2 align="center">
+  <img src="https://user-images.githubusercontent.com/7014073/98849326-cca07f80-2431-11eb-82dd-fd2b4e52be44.png?s=300" width="500" /><br/>
+  React Native Navigation Drawer Extension
+</h2>
 
-[React Native Navigation by Wix](https://wix.github.io/react-native-navigation/#/) does not offer an in-built solution for displaying a drawer on iOS. Their current side-menu has limited functionality on both iOS and Android. This is a drawer solution using showOverlay under the hood to display a drawer on iOS and Android.
-
-If you are using React Native Navigation >= 3.0.0 then use version 3.x.x + of this library.
-
-<p align="left">
+<p align="center">
   <a href="https://www.npmjs.com/package/react-native-navigation-drawer-extension" rel="nofollow">
   <img src="https://img.shields.io/npm/v/react-native-navigation-drawer-extension.svg?style=flat-square" alt="version" style="max-width:100%;" />
   </a>
@@ -14,9 +13,12 @@ If you are using React Native Navigation >= 3.0.0 then use version 3.x.x + of th
   <a href="https://www.npmjs.com/package/react-native-navigation-drawer-extension" rel="nofollow">
     <img src="http://img.shields.io/npm/dt/react-native-navigation-drawer-extension.svg?style=flat-square" alt="downloads" style="max-width:100%;" />
   </a>
-  <hr />
 </p>
 
+[React Native Navigation by Wix](https://wix.github.io/react-native-navigation/#/) does not offer an in-built solution for displaying a drawer on iOS. Their current side-menu has limited functionality on both iOS and Android. This is a drawer solution using showOverlay under the hood to display a drawer on iOS and Android.
+
+If you are using React Native Navigation >= 3.0.0 then use version 3.x.x + of this library.
+
 <img align="left" src="https://raw.githubusercontent.com/LukeBrandonFarrell/open-source-images/master/react-native-navigation-drawer-extension/left-drawer.gif" width="48%" />
 <img src="https://raw.githubusercontent.com/LukeBrandonFarrell/open-source-images/master/react-native-navigation-drawer-extension/bottom-drawer.gif" width="48%" />
 
@@ -64,13 +66,11 @@ RNNDrawer.showDrawer({
       style: { // Styles the drawer container, supports any react-native style
         backgroundColor: "red",
       },
-      parentComponentId: this.props.componentId, // Custom prop, will be available in your custom drawer component props
+      parentComponentId: props.componentId, // Custom prop, will be available in your custom drawer component props
     },
   }
 });
-```
 
-```js
 RNNDrawer.dismissDrawer();
 ````
 

README.md

@@ -4,14 +4,68 @@
  */
 import * as React from 'react';
 import { Layout } from 'react-native-navigation';
+
+type DirectionType = "left" | "right" | "top" | "bottom";
+
+declare interface RNNDrawerOptions {
+    /**
+     * Id of parent component of the drawer.
+     * This field is necessary in order to be able
+     * to push screens inside the drawer
+     */
+    parentComponentId: string;
+
+    /**
+     * Time in milliseconds to execute the drawer opening animation
+     */
+    animationOpenTime?: number;
+
+    /**
+     * Time in milliseconds to execute the drawer closing animation
+     */
+    animationCloseTime?: number;
+
+    /**
+     * Direction to open the collage,
+     * one of: ["left", "right", "top", "bottom"]
+     */
+    direction?: DirectionType;
+
+    /**
+     * Whether the drawer be dismissed when a click is registered outside
+     */
+    dismissWhenTouchOutside?: boolean;
+
+    /**
+     * Opacity of the screen outside the drawer
+     */
+    fadeOpacity?: number;
+
+    /**
+     * Width of drawer in relation to the screen (0 to 1)
+     */
+    drawerScreenWidth?: number;
+
+    /**
+     * Height of drawer in relation to the screen (0 to 1)
+     */
+    drawerScreenHeight?: number;
+}
+
 declare class RNNDrawer {
+    /**
+     * Generates the drawer component to
+     * be used with react-native-navigation
+     * 
+     * @param component
+     */
     static create(Component: React.ComponentType): any;
     /**
      * Shows a drawer component
      *
      * @param layout
      */
-    static showDrawer(layout: Layout): void;
+    static showDrawer(layout: Layout<RNNDrawerOptions>): void;
     /**
      * Dismiss the drawer component
      */