diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..1133129
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "java.configuration.updateBuildConfiguration": "automatic"
+}
\ No newline at end of file
diff --git a/android/.classpath b/android/.classpath
new file mode 100644
index 0000000..411e955
--- /dev/null
+++ b/android/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/android/.project b/android/.project
new file mode 100644
index 0000000..3865e0f
--- /dev/null
+++ b/android/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000..e889521
--- /dev/null
+++ b/android/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/android/build.gradle b/android/build.gradle
index 6ee8420..fecfb4d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,16 @@
 apply plugin: "com.android.library"
 
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 android {
-    compileSdkVersion 24
-    buildToolsVersion "25.0.3"
+    compileSdkVersion safeExtGet('compileSdkVersion', 24)
+    buildToolsVersion safeExtGet('buildToolsVersion', "28.0.3")
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 23
+        minSdkVersion safeExtGet('minSdkVersion', 16)
+        targetSdkVersion safeExtGet('targetSdkVersion', 23)
         versionCode 1
         versionName "1.0"
     }
@@ -14,16 +18,18 @@ android {
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 
 allprojects {
     repositories {
         mavenLocal()
+        google()
         jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -33,7 +39,7 @@ allprojects {
 }
 
 dependencies {
-    compile "com.facebook.react:react-native:+"
-    compile "com.android.support:appcompat-v7:24.1.1"
-    compile 'com.android.support:design:24.1.1'
+    implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
+    implementation "com.android.support:appcompat-v7:28.0.0"
+    implementation 'com.android.support:design:28.0.0'
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 1fd964e..d788d5a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -17,4 +17,4 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-android.useDeprecatedNdk=true
+# android.useDeprecatedNdk=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index dbdc05d..7ba0fb5 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Jun 19 21:53:47 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/android/src/main/java/com/mohtada/nestedscrollview/ReactNestedScrollViewManager.java b/android/src/main/java/com/mohtada/nestedscrollview/ReactNestedScrollViewManager.java
index 4499937..a21f482 100644
--- a/android/src/main/java/com/mohtada/nestedscrollview/ReactNestedScrollViewManager.java
+++ b/android/src/main/java/com/mohtada/nestedscrollview/ReactNestedScrollViewManager.java
@@ -169,11 +169,11 @@ public void scrollToEnd(
 
     public static Map createExportedCustomDirectEventTypeConstants() {
         return MapBuilder.builder()
-            .put(ScrollEventType.SCROLL.getJSEventName(), MapBuilder.of("registrationName", "onScroll"))
-            .put(ScrollEventType.BEGIN_DRAG.getJSEventName(), MapBuilder.of("registrationName", "onScrollBeginDrag"))
-            .put(ScrollEventType.END_DRAG.getJSEventName(), MapBuilder.of("registrationName", "onScrollEndDrag"))
-            .put(ScrollEventType.MOMENTUM_BEGIN.getJSEventName(), MapBuilder.of("registrationName", "onMomentumScrollBegin"))
-            .put(ScrollEventType.MOMENTUM_END.getJSEventName(), MapBuilder.of("registrationName", "onMomentumScrollEnd"))
+            .put(ScrollEventType.getJSEventName(ScrollEventType.SCROLL), MapBuilder.of("registrationName", "onScroll"))
+            .put(ScrollEventType.getJSEventName(ScrollEventType.BEGIN_DRAG), MapBuilder.of("registrationName", "onScrollBeginDrag"))
+            .put(ScrollEventType.getJSEventName(ScrollEventType.END_DRAG), MapBuilder.of("registrationName", "onScrollEndDrag"))
+            .put(ScrollEventType.getJSEventName(ScrollEventType.MOMENTUM_BEGIN), MapBuilder.of("registrationName", "onMomentumScrollBegin"))
+            .put(ScrollEventType.getJSEventName(ScrollEventType.MOMENTUM_END), MapBuilder.of("registrationName", "onMomentumScrollEnd"))
             .build();
     }
 }
diff --git a/index.js b/index.js
index eb145ee..3979932 100644
--- a/index.js
+++ b/index.js
@@ -27,9 +27,9 @@ const {
     requireNativeComponent,
 } = require('react-native');
 
-const ViewStylePropTypes = require('react-native/Libraries/Components/View/ViewStylePropTypes');
-const StyleSheetPropType = require('react-native/Libraries/StyleSheet/StyleSheetPropType');
-const ColorPropType = require('react-native/Libraries/StyleSheet/ColorPropType');
+const ViewStylePropTypes = require('react-native/Libraries/DeprecatedPropTypes/DeprecatedViewStylePropTypes');
+const StyleSheetPropType = require('react-native/Libraries/DeprecatedPropTypes/DeprecatedStyleSheetPropType');
+const ColorPropType = require('react-native/Libraries/DeprecatedPropTypes/DeprecatedColorPropType');
 const flattenStyle = require('react-native/Libraries/StyleSheet/flattenStyle');
 const ScrollResponder = require('react-native/Libraries/Components/ScrollResponder');
 const processDecelerationRate = require('react-native/Libraries/Components/ScrollView/processDecelerationRate');
diff --git a/package.json b/package.json
index 1292fd8..328db0d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-nested-scrollview",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "React native wrapper for android NestedScrollView",
   "author": "Mohtada Hassanpour <mohtada.h@gmail.com>",
   "homepage": "https://github.com/mohtada-h/react-native-nested-scrollview",