diff --git a/android/.gitignore b/android/.gitignore
deleted file mode 100644
index 796b96d1c402326528b4ba3c12ee9d92d0e212e9..0000000000000000000000000000000000000000
--- a/android/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/android/.gradle/4.4/fileChanges/last-build.bin b/android/.gradle/4.4/fileChanges/last-build.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d
Binary files /dev/null and b/android/.gradle/4.4/fileChanges/last-build.bin differ
diff --git a/android/.gradle/4.4/fileHashes/fileHashes.bin b/android/.gradle/4.4/fileHashes/fileHashes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..214a41fb9fe6a129963150db829e99a410f7e4d8
Binary files /dev/null and b/android/.gradle/4.4/fileHashes/fileHashes.bin differ
diff --git a/android/.gradle/4.4/fileHashes/resourceHashesCache.bin b/android/.gradle/4.4/fileHashes/resourceHashesCache.bin
new file mode 100644
index 0000000000000000000000000000000000000000..fa87a24899414469a68d22b62e4fb7a34bc9f5fb
Binary files /dev/null and b/android/.gradle/4.4/fileHashes/resourceHashesCache.bin differ
diff --git a/android/.gradle/4.4/javaCompile/classAnalysis.bin b/android/.gradle/4.4/javaCompile/classAnalysis.bin
new file mode 100644
index 0000000000000000000000000000000000000000..aea6eb43d50667366de7200bb3a8baa105c6c828
Binary files /dev/null and b/android/.gradle/4.4/javaCompile/classAnalysis.bin differ
diff --git a/android/.gradle/4.4/javaCompile/jarAnalysis.bin b/android/.gradle/4.4/javaCompile/jarAnalysis.bin
new file mode 100644
index 0000000000000000000000000000000000000000..bef726e7163badc837e94006e249db9239e7b06b
Binary files /dev/null and b/android/.gradle/4.4/javaCompile/jarAnalysis.bin differ
diff --git a/android/.gradle/4.4/javaCompile/taskHistory.bin b/android/.gradle/4.4/javaCompile/taskHistory.bin
new file mode 100644
index 0000000000000000000000000000000000000000..00c31f57724568b64d31cefc01e01004572cf6e2
Binary files /dev/null and b/android/.gradle/4.4/javaCompile/taskHistory.bin differ
diff --git a/android/.gradle/4.4/javaCompile/taskJars.bin b/android/.gradle/4.4/javaCompile/taskJars.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6e30b744b3de289c68d3410812c04002a9d504db
Binary files /dev/null and b/android/.gradle/4.4/javaCompile/taskJars.bin differ
diff --git a/android/.gradle/4.4/taskHistory/taskHistory.bin b/android/.gradle/4.4/taskHistory/taskHistory.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ef66e8d1987155cc661ce4401ae11a18a4af52b4
Binary files /dev/null and b/android/.gradle/4.4/taskHistory/taskHistory.bin differ
diff --git a/android/.gradle/buildOutputCleanup/cache.properties b/android/.gradle/buildOutputCleanup/cache.properties
new file mode 100644
index 0000000000000000000000000000000000000000..80e6674a2937e9f0c84d10be19af589b776584f3
--- /dev/null
+++ b/android/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Tue Mar 05 16:05:24 EET 2019
+gradle.version=4.4
diff --git a/android/.gradle/buildOutputCleanup/outputFiles.bin b/android/.gradle/buildOutputCleanup/outputFiles.bin
new file mode 100644
index 0000000000000000000000000000000000000000..486eefe0dc65f65119160365573c86c04c74d204
Binary files /dev/null and b/android/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/android/.project b/android/.project
new file mode 100644
index 0000000000000000000000000000000000000000..3964dd3f5b7fea7ecf391254ba292fcfe96bb513
--- /dev/null
+++ b/android/.project
@@ -0,0 +1,17 @@
+
+
+ android
+ Project android created by Buildship.
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+
+
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..e8895216fd3c0c3af4c4522334775f41b7deb42e
--- /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/app/.gitignore b/android/app/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..65d12b95469b46008614734d430ea36c91c3f1d9
--- /dev/null
+++ b/android/app/.gitignore
@@ -0,0 +1,2 @@
+/build
+google-services.json
\ No newline at end of file
diff --git a/android/app/.gradle/4.10/fileChanges/last-build.bin b/android/app/.gradle/4.10/fileChanges/last-build.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d
Binary files /dev/null and b/android/app/.gradle/4.10/fileChanges/last-build.bin differ
diff --git a/android/app/.gradle/4.10/fileHashes/fileHashes.bin b/android/app/.gradle/4.10/fileHashes/fileHashes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..41ddb885173b0e754e01eb80332b6a7f7b15bba8
Binary files /dev/null and b/android/app/.gradle/4.10/fileHashes/fileHashes.bin differ
diff --git a/android/app/.gradle/4.10/gc.properties b/android/app/.gradle/4.10/gc.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/android/app/.gradle/5.5.1/fileChanges/last-build.bin b/android/app/.gradle/5.5.1/fileChanges/last-build.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d
Binary files /dev/null and b/android/app/.gradle/5.5.1/fileChanges/last-build.bin differ
diff --git a/android/app/.gradle/5.5.1/gc.properties b/android/app/.gradle/5.5.1/gc.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/android/app/app.iml b/android/app/app.iml
new file mode 100644
index 0000000000000000000000000000000000000000..120b1fa06365ca498784a3b6f28a411f0164bb60
--- /dev/null
+++ b/android/app/app.iml
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..19ca5d068039324b83f51fb6bd1d9dcc7278acb1
--- /dev/null
+++ b/android/app/build.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'com.android.library'
+apply from: '../prepare-robolectric.gradle'
+
+android {
+ compileSdkVersion 27
+ buildToolsVersion '28.0.3'
+
+ defaultConfig {
+ minSdkVersion 19
+ targetSdkVersion 27
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ implementation 'com.google.firebase:firebase-core:16.0.0'
+ implementation "com.google.firebase:firebase-messaging:17.3.0"
+ implementation 'com.facebook.react:react-native:+'
+
+ // tests
+ testImplementation 'junit:junit:4.12'
+ testImplementation 'org.robolectric:robolectric:3.5.1'
+ testImplementation 'org.assertj:assertj-core:3.8.0'
+ testImplementation 'com.squareup.assertj:assertj-android:1.1.1'
+ testImplementation 'org.mockito:mockito-core:2.13.0'
+}
+
+apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/android/app/local.properties b/android/app/local.properties
new file mode 100644
index 0000000000000000000000000000000000000000..8891df9df348e68160433e8aa7f2d463f760dc10
--- /dev/null
+++ b/android/app/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Wed Jan 30 11:37:18 IST 2019
+sdk.dir=/Users/yogevbd/android-sdk-macosx
diff --git a/android/proguard-rules.pro b/android/app/proguard-rules.pro
similarity index 100%
rename from android/proguard-rules.pro
rename to android/app/proguard-rules.pro
diff --git a/android/app/react-native-notifications.iml b/android/app/react-native-notifications.iml
new file mode 100644
index 0000000000000000000000000000000000000000..53a3963cbcb6590923ea7b2bd2eda029f1090a36
--- /dev/null
+++ b/android/app/react-native-notifications.iml
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android/src/main/AndroidManifest.xml
rename to android/app/src/main/AndroidManifest.xml
diff --git a/android/src/main/java/com/wix/reactnativenotifications/Defs.java b/android/app/src/main/java/com/wix/reactnativenotifications/Defs.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/Defs.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/Defs.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java b/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java b/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/AppLaunchHelper.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLaunchHelper.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/AppLaunchHelper.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/AppLaunchHelper.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacade.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacade.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacade.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacade.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacadeHolder.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacadeHolder.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacadeHolder.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacadeHolder.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/InitialNotificationHolder.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/InitialNotificationHolder.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/InitialNotificationHolder.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/InitialNotificationHolder.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/JsIOHelper.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/JsIOHelper.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/JsIOHelper.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/JsIOHelper.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/ProxyService.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/ProxyService.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/ProxyService.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/ProxyService.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/notification/INotificationsApplication.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/INotificationsApplication.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/notification/INotificationsApplication.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/notification/INotificationsApplication.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/notification/IPushNotification.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/IPushNotification.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/notification/IPushNotification.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/notification/IPushNotification.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
similarity index 99%
rename from android/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
index 2c970e940693c796645d42d7ef80c5cd1e691392..f0a6d1056282323c712e770fcb93c21078d45b1c 100644
--- a/android/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
+++ b/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
@@ -162,7 +162,7 @@ public class PushNotification implements IPushNotification {
.setContentTitle(mNotificationProps.getTitle())
.setContentText(mNotificationProps.getBody())
.setSmallIcon(mContext.getApplicationInfo().icon)
- .setContentIntent(intent)
+// .setContentIntent(intent)
.setDefaults(Notification.DEFAULT_ALL)
.setAutoCancel(true);
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java
similarity index 91%
rename from android/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java
index b155dfa030021809938eb3bb89c6d22d908f71cf..00695023a604664b4b05517dd086222246aa3108 100644
--- a/android/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java
+++ b/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java
@@ -21,11 +21,11 @@ public class PushNotificationProps {
}
public String getTitle() {
- return mBundle.getString("title");
+ return mBundle.getString("title", "");
}
public String getBody() {
- return mBundle.getString("body");
+ return mBundle.getString("body", "");
}
public Bundle asBundle() {
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/INotificationsDrawerApplication.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/INotificationsDrawerApplication.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/INotificationsDrawerApplication.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/INotificationsDrawerApplication.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/IPushNotificationsDrawer.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/IPushNotificationsDrawer.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/IPushNotificationsDrawer.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/IPushNotificationsDrawer.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/gcm/FcmInstanceIdListenerService.java b/android/app/src/main/java/com/wix/reactnativenotifications/gcm/FcmInstanceIdListenerService.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/gcm/FcmInstanceIdListenerService.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/gcm/FcmInstanceIdListenerService.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/gcm/FcmInstanceIdRefreshHandlerService.java b/android/app/src/main/java/com/wix/reactnativenotifications/gcm/FcmInstanceIdRefreshHandlerService.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/gcm/FcmInstanceIdRefreshHandlerService.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/gcm/FcmInstanceIdRefreshHandlerService.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/gcm/FcmToken.java b/android/app/src/main/java/com/wix/reactnativenotifications/gcm/FcmToken.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/gcm/FcmToken.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/gcm/FcmToken.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/gcm/IFcmToken.java b/android/app/src/main/java/com/wix/reactnativenotifications/gcm/IFcmToken.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/gcm/IFcmToken.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/gcm/IFcmToken.java
diff --git a/android/src/main/java/com/wix/reactnativenotifications/gcm/INotificationsGcmApplication.java b/android/app/src/main/java/com/wix/reactnativenotifications/gcm/INotificationsGcmApplication.java
similarity index 100%
rename from android/src/main/java/com/wix/reactnativenotifications/gcm/INotificationsGcmApplication.java
rename to android/app/src/main/java/com/wix/reactnativenotifications/gcm/INotificationsGcmApplication.java
diff --git a/android/src/test/java/com/wix/reactnativenotifications/core/AppLaunchHelperTest.java b/android/app/src/test/java/com/wix/reactnativenotifications/core/AppLaunchHelperTest.java
similarity index 100%
rename from android/src/test/java/com/wix/reactnativenotifications/core/AppLaunchHelperTest.java
rename to android/app/src/test/java/com/wix/reactnativenotifications/core/AppLaunchHelperTest.java
diff --git a/android/src/test/java/com/wix/reactnativenotifications/core/InitialNotificationHolderTest.java b/android/app/src/test/java/com/wix/reactnativenotifications/core/InitialNotificationHolderTest.java
similarity index 100%
rename from android/src/test/java/com/wix/reactnativenotifications/core/InitialNotificationHolderTest.java
rename to android/app/src/test/java/com/wix/reactnativenotifications/core/InitialNotificationHolderTest.java
diff --git a/android/src/test/java/com/wix/reactnativenotifications/core/JsIOHelperTest.java b/android/app/src/test/java/com/wix/reactnativenotifications/core/JsIOHelperTest.java
similarity index 100%
rename from android/src/test/java/com/wix/reactnativenotifications/core/JsIOHelperTest.java
rename to android/app/src/test/java/com/wix/reactnativenotifications/core/JsIOHelperTest.java
diff --git a/android/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java b/android/app/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java
similarity index 100%
rename from android/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java
rename to android/app/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java
diff --git a/android/src/test/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawerTest.java b/android/app/src/test/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawerTest.java
similarity index 100%
rename from android/src/test/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawerTest.java
rename to android/app/src/test/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawerTest.java
diff --git a/android/build.gradle b/android/build.gradle
index 0e3def547a8dcbe2902a8794bca141a93172b1a9..e3c64c96688465f5b592c2a046397b3b94c21477 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,29 +1,29 @@
-apply plugin: 'com.android.library'
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
-android {
- compileSdkVersion 27
- buildToolsVersion '28.0.0'
-
- defaultConfig {
- minSdkVersion 19
- targetSdkVersion 27
- versionCode 1
- versionName "1.0"
+buildscript {
+ repositories {
+ mavenLocal()
+ mavenCentral()
+ google()
+ jcenter()
}
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:3.0.1'
+ classpath 'com.google.gms:google-services:4.0.0'
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
}
}
-
-dependencies {
- implementation "com.google.firebase:firebase-messaging:17.3.0"
- implementation 'com.facebook.react:react-native:+'
-
- testImplementation 'junit:junit:4.12'
- testImplementation 'org.mockito:mockito-core:2.+'
- testImplementation 'org.robolectric:robolectric:3.1.4'
+allprojects {
+ repositories {
+ mavenLocal()
+ mavenCentral()
+ google()
+ jcenter()
+ maven {
+ // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+ url "$rootDir/../node_modules/react-native/android"
+ }
+ }
}
diff --git a/android/gradle.properties b/android/gradle.properties
new file mode 100644
index 0000000000000000000000000000000000000000..1d3591c8a4c9c29578c36c87f80c05a6aea3ee3f
--- /dev/null
+++ b/android/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659
Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000000000000000000000000000000000..297208b24f942e15bb26677d597d8d398dae3a0c
--- /dev/null
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Thu Jan 04 11:01:32 EET 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/android/gradlew b/android/gradlew
new file mode 100755
index 0000000000000000000000000000000000000000..9d82f78915133e1c35a6ea51252590fb38efac2f
--- /dev/null
+++ b/android/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/android/gradlew.bat b/android/gradlew.bat
new file mode 100644
index 0000000000000000000000000000000000000000..aec99730b4e8fcd90b57a0e8e01544fea7c31a89
--- /dev/null
+++ b/android/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/android/prepare-robolectric.gradle b/android/prepare-robolectric.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..7570b17e472c1df288d81960569cfcdd376fa008
--- /dev/null
+++ b/android/prepare-robolectric.gradle
@@ -0,0 +1,43 @@
+def robolectricDependenciesFolder = new File(rootProject.buildDir, "robolectric-3.5.1-dependencies")
+
+configurations.create('robolectricRuntime')
+
+dependencies {
+ testImplementation "org.khronos:opengl-api:gl1.1-android-2.1_r1"
+
+ robolectricRuntime "org.robolectric:android-all:8.1.0-robolectric-4402310"
+
+ robolectricRuntime "org.robolectric:annotations:3.5.1"
+ robolectricRuntime "org.robolectric:junit:3.5.1"
+ robolectricRuntime "org.robolectric:resources:3.5.1"
+ robolectricRuntime "org.robolectric:sandbox:3.5.1"
+ robolectricRuntime "org.robolectric:utils:3.5.1"
+ robolectricRuntime "org.robolectric:shadows-framework:3.5.1"
+}
+
+rootProject.task(type: Copy, overwrite: true, "downloadRobolectricDependencies") {
+ println "downloadRobolectricDependencies into " + robolectricDependenciesFolder
+ from configurations.robolectricRuntime
+ into robolectricDependenciesFolder
+}
+
+project.afterEvaluate {
+ tasks.all {
+ if (it.name.startsWith("test")) {
+ it.dependsOn(rootProject.tasks.findByName("downloadRobolectricDependencies"))
+ }
+ }
+}
+
+android {
+ testOptions {
+ unitTests {
+ includeAndroidResources = true
+ }
+ unitTests.all {
+ systemProperty 'robolectric.offline', 'true'
+ systemProperty 'robolectric.dependency.dir', robolectricDependenciesFolder
+ }
+ }
+}
+
diff --git a/android/settings.gradle b/android/settings.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..e7b4def49cb53d9aa04228dd3edb14c9e635e003
--- /dev/null
+++ b/android/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 3048e5154871cbcaf6295b0180f9cc2b3a077d9b..194ad63e7071c8f7fc362d9f54957f8bcab31874 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -2,11 +2,11 @@
buildscript {
ext {
- buildToolsVersion = "28.0.0"
+ buildToolsVersion = "28.0.3"
minSdkVersion = 16
compileSdkVersion = 28
targetSdkVersion = 26
- supportLibVersion = "28.0.0"
+ supportLibVersion = "28.0.3"
}
repositories {
google()
diff --git a/example/android/myapplication/build.gradle b/example/android/myapplication/build.gradle
index 01a97b4f5bc0c488971eee7aa056faad00b2041d..b354d5a61a16d77ea6cfba9b369baf4631980a43 100644
--- a/example/android/myapplication/build.gradle
+++ b/example/android/myapplication/build.gradle
@@ -12,7 +12,7 @@ apply from: "../../../node_modules/react-native/react.gradle"
android {
compileSdkVersion 28
- buildToolsVersion "28.0.0"
+ buildToolsVersion "28.0.3"
defaultConfig {
applicationId "com.wix.reactnativenotifications.app"
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
index c8e6f6b681a6f84a46b8eacef628c0aba8f8b0d3..8e11e07977ef2c2b523d9634448ee393b32c5492 100644
--- a/example/android/settings.gradle
+++ b/example/android/settings.gradle
@@ -1,4 +1,4 @@
include ':myapplication'
include ':react-native-notifications'
-project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../../android')
\ No newline at end of file
+project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../../android/app')
\ No newline at end of file
diff --git a/package.json b/package.json
index 18145ce709ea852ba92aef944a1ffecde7268246..83c63a48d12c12012d5928baac5a89dc2ce3029b 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,10 @@
"pretest": "./node_modules/.bin/eslint *.js test",
"test": "jest",
"start": "node ./scripts/start",
- "test-e2e-ios": "node ./scripts/test-e2e --ios"
+ "test-e2e-ios": "node ./scripts/test-e2e --ios",
+ "test-unit-ios": "node ./scripts/test-unit --ios",
+ "test-unit-android": "node ./scripts/test-unit --android",
+ "test-js": "node ./scripts/test-js"
},
"nativePackage": true,
"dependencies": {
diff --git a/scripts/test-unit.js b/scripts/test-unit.js
new file mode 100644
index 0000000000000000000000000000000000000000..dcc8f88968ad957895237c5262a42f0b735480b9
--- /dev/null
+++ b/scripts/test-unit.js
@@ -0,0 +1,52 @@
+const _ = require('lodash');
+const exec = require('shell-utils').exec;
+
+const android = _.includes(process.argv, '--android');
+const release = _.includes(process.argv, '--release');
+
+function run() {
+ if (android) {
+ runAndroidUnitTests();
+ } else {
+ runIosUnitTests();
+ }
+}
+
+function runAndroidUnitTests() {
+ const conf = release ? 'testReleaseUnitTest' : 'testDebugUnitTest';
+ if (android && process.env.JENKINS_CI) {
+ const sdkmanager = '/usr/local/share/android-sdk/tools/bin/sdkmanager';
+ exec.execSync(`yes | ${sdkmanager} --licenses`);
+ // exec.execSync(`echo y | ${sdkmanager} --update && echo y | ${sdkmanager} --licenses`);
+ }
+ exec.execSync(`cd android && ./gradlew ${conf}`);
+}
+
+function runIosUnitTests() {
+ const conf = release ? `Release` : `Debug`;
+
+ exec.execSync(`cd ./example/ios &&
+ RCT_NO_LAUNCH_PACKAGER=true
+ xcodebuild build build-for-testing
+ -scheme "NotificationsExampleApp"
+ -project NotificationsExampleApp.xcodeproj
+ -sdk iphonesimulator
+ -configuration ${conf}
+ -derivedDataPath ./example/ios/DerivedData/NotificationsExampleApp
+ -quiet
+ -UseModernBuildSystem=NO
+ ONLY_ACTIVE_ARCH=YES`);
+
+ exec.execSync(`cd ./example/ios &&
+ RCT_NO_LAUNCH_PACKAGER=true
+ xcodebuild test-without-building
+ -scheme "NotificationsExampleApp"
+ -project NotificationsExampleApp.xcodeproj
+ -sdk iphonesimulator
+ -configuration ${conf}
+ -destination 'platform=iOS Simulator,name=iPhone X'
+ -derivedDataPath ./example/ios/DerivedData/NotificationsExampleApp
+ ONLY_ACTIVE_ARCH=YES`);
+}
+
+run();