@dashx/react-native 0.1.25 → 1.0.2

package/android/build.gradle

@@ -1,176 +1,50 @@
-import groovy.json.JsonSlurper
-
-// android/build.gradle
-
-// based on:
-//
-// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle
-//   original location:
-//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/build.gradle
-//
-// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle
-//   original location:
-//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
-
-def DEFAULT_COMPILE_SDK_VERSION = 30
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
-def DEFAULT_MIN_SDK_VERSION = 16
-def DEFAULT_TARGET_SDK_VERSION = 30
-
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
 
 buildscript {
-  ext.kotlin_version = '1.5.20'
-  ext.apollo_version = '2.5.3'
-  // The Android Gradle plugin is only required when opening the android folder stand-alone.
-  // This avoids unnecessary downloads and potential conflicts when the library is included as a
-  // module dependency in an application project.
-  // ref: https://docs.gradle.org/current/userguide/tutorial_using_tasks.html#sec:build_script_external_dependencies
-  repositories {
-    if (project == rootProject) {
-      google()
-      jcenter()
+    ext {
+        kotlinVersion = '1.5.31'
+        androidToolsVersion = '7.0.4'
     }
 
-    mavenCentral()
-  }
-
-
-  dependencies {
-    if (project == rootProject) {
-      classpath 'com.android.tools.build:gradle:3.4.1'
+    repositories {
+      mavenCentral()
+      google()
     }
 
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    classpath "com.apollographql.apollo:apollo-gradle-plugin:$apollo_version"
-  }
+    dependencies {
+        classpath "com.android.tools.build:gradle:${project.ext.androidToolsVersion}"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinVersion}"
+    }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.apollographql.apollo'
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
+    compileSdkVersion 30
+    buildToolsVersion '28.0.3'
+
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
+        minSdkVersion 16
+        targetSdkVersion 30
+        compileSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
     lintOptions {
         abortOnError false
     }
-    kotlinOptions {
-      jvmTarget = "1.8"
-    }
 }
 
 repositories {
-    // ref: https://www.baeldung.com/maven-local-repository
-    mavenLocal()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url "$rootDir/../node_modules/react-native/android"
-    }
-    maven {
-        // Android JSC is installed from npm
-        url "$rootDir/../node_modules/jsc-android/dist"
-    }
+    mavenCentral()
     google()
-    jcenter()
-    maven { url "https://jitpack.io" }
 }
 
 dependencies {
-  implementation 'com.github.dashxhq.dashx-android:app:0498742785'
-    //noinspection GradleDynamicVersion
-  implementation 'com.facebook.react:react-native:+'   // From node_modules
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-  implementation 'com.google.code.gson:gson:2.8.6'
-
-  // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
-  implementation platform('com.google.firebase:firebase-bom:28.3.0')
-  implementation 'com.google.firebase:firebase-messaging-ktx'
-
-  // The Firebase SDK for Google Analytics is needed for delivery reports
-  implementation 'com.google.firebase:firebase-analytics-ktx'
-}
-
-def configureReactNativePom(def pom) {
-    def packageJson = new JsonSlurper().parseText(file('../package.json').text)
-
-    pom.project {
-        name packageJson.title
-        artifactId packageJson.name
-        version = packageJson.version
-        group = 'com.dashx.rn.sdk'
-        description packageJson.description
-        url packageJson.repository.baseUrl
-
-        licenses {
-            license {
-                name packageJson.license
-                url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-
-        developers {
-            developer {
-                id packageJson.author.username
-                name packageJson.author.name
-            }
-        }
-    }
-}
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${project.ext.kotlinVersion}"
+    implementation 'com.facebook.react:react-native:+'
+    implementation 'com.google.code.gson:gson:2.9.0'
 
-afterEvaluate { project ->
-    // some Gradle build hooks ref:
-    // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
-    task androidJavadoc(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-        classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('compile').asList())
-        include '**/*.java'
-    }
-
-    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = 'javadoc'
-        from androidJavadoc.destinationDir
-    }
-
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        def javaCompileTask = variant.javaCompileProvider.get()
-
-        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
-            from javaCompileTask.destinationDir
-        }
-    }
-
-    artifacts {
-        archives androidSourcesJar
-        archives androidJavadocJar
-    }
-
-    task installArchives(type: Upload) {
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-            // Deploy to react-native-event-bridge/maven, ready to publish to npm
-            repository url: "file://${projectDir}/../android/maven"
-            configureReactNativePom pom
-        }
-    }
+    implementation "com.dashx:dashx-android:1.0.3"
 }
+  

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Aug 19 17:17:29 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip

package/android/gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -56,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -66,6 +82,7 @@ esac
 
 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
@@ -109,10 +126,11 @@ 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
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $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" ;;
+        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
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

package/android/gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @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 DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @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
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_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=%*
-
 :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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

package/android/src/main/AndroidManifest.xml

@@ -1,11 +1,6 @@
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.dashx.rn.sdk">
 
-  <application>
-    <service android:name=".DashXMessagingService" android:exported="false">
-      <intent-filter>
-        <action android:name="com.google.firebase.MESSAGING_EVENT" />
-      </intent-filter>
-    </service>
-  </application>
 </manifest>
+  

package/android/src/main/java/com/dashx/rn/sdk/DashXReactNativeModule.kt

@@ -0,0 +1,250 @@
+package com.dashx.rn.sdk
+
+import android.annotation.TargetApi
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import android.os.Build
+import android.provider.DocumentsContract
+import android.provider.MediaStore
+import com.dashx.rn.sdk.util.*
+import com.dashx.sdk.DashXLog
+import com.dashx.sdk.data.ExternalAsset
+import com.facebook.react.bridge.*
+import com.google.gson.Gson
+import java.io.File
+import com.dashx.sdk.DashXClient as DashX
+
+
+class DashXReactNativeModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+    private val tag = DashXReactNativeModule::class.java.simpleName
+    private var dashXClient: DashX? = null
+
+    override fun getName(): String {
+        return "DashXReactNative"
+    }
+
+    @ReactMethod
+    fun setLogLevel(logLevel: Int) {
+        DashXLog.setLogLevel(logLevel)
+    }
+
+    @ReactMethod
+    fun configure(options: ReadableMap) {
+        dashXClient = DashX.createInstance(
+            reactContext, 
+            options.getString("publicKey")!!,
+            options.getStringIfPresent("baseURI"),
+            options.getStringIfPresent("targetEnvironment")
+        )
+    }
+
+    @ReactMethod
+    fun identify(options: ReadableMap?) {
+        val optionsHashMap = MapUtil.toMap(options)
+        dashXClient?.identify(optionsHashMap as HashMap<String, String>?)
+    }
+
+    @ReactMethod
+    fun setIdentity(uid: String?, token: String?) {
+        dashXClient?.setIdentity(uid, token)
+    }
+
+    @ReactMethod
+    fun reset() {
+        dashXClient?.reset()
+    }
+
+    @ReactMethod
+    fun track(event: String, data: ReadableMap?) {
+        val jsonData = try {
+            MapUtil.toMap(data) as HashMap<String, String>
+        } catch (e: Exception) {
+            DashXLog.d(tag, e.message)
+            return
+        }
+
+        dashXClient?.track(event, jsonData)
+    }
+
+    @ReactMethod
+    fun screen(screenName: String, data: ReadableMap?) {
+        dashXClient?.screen(screenName, MapUtil.toMap(data) as HashMap<String, String>)
+    }
+
+    @ReactMethod
+    fun fetchContent(urn: String, options: ReadableMap?, promise: Promise) {
+        dashXClient?.fetchContent(
+            urn,
+            options?.getBooleanIfPresent("preview"),
+            options?.getStringIfPresent("language"),
+            listOf(options?.getArray("fields")) as List<String>?,
+            listOf(options?.getArray("include")) as List<String>?,
+            listOf(options?.getArray("exclude")) as List<String>?,
+            onError = {
+                promise.reject("EUNSPECIFIED", it)
+            },
+            onSuccess = {
+                promise.resolve(convertJsonToMap(it))
+            }
+        )
+    }
+
+    @ReactMethod
+    fun searchContent(contentType: String, options: ReadableMap?, promise: Promise) {
+        val jsonFilter = try {
+            convertMapToJson(options?.getMap("filter"))
+        } catch (e: Exception) {
+            DashXLog.d(tag, e.message)
+            throw Exception("Encountered an error while parsing filter")
+        }
+
+        val jsonOrder = try {
+            convertMapToJson(options?.getMap("order"))
+        } catch (e: Exception) {
+            DashXLog.d(tag, e.message)
+            throw Exception("Encountered an error while parsing order")
+        }
+
+        dashXClient?.searchContent(
+            contentType,
+            options?.getString("returnType") ?: "all",
+            jsonFilter,
+            jsonOrder,
+            options?.getIntIfPresent("limit"),
+            options?.getBooleanIfPresent("preview"),
+            options?.getStringIfPresent("language"),
+            listOf(options?.getArray("fields")) as List<String>?,
+            listOf(options?.getArray("include")) as List<String>?,
+            listOf(options?.getArray("exclude")) as List<String>?,
+            onError = {
+                promise.reject("EUNSPECIFIED", it)
+            },
+            onSuccess = { content ->
+                val readableArray = Arguments.createArray()
+                content.forEach {
+                    readableArray.pushMap(convertJsonToMap(it))
+                }
+                promise.resolve(readableArray)
+            }
+        )
+    }
+
+    @ReactMethod
+    fun addItemToCart(
+        itemId: String,
+        pricingId: String,
+        quantity: String,
+        reset: Boolean? = false,
+        custom: ReadableMap? = null,
+        promise: Promise
+    ) {
+        val jsonCustom = try {
+            convertMapToJson(custom)
+        } catch (e: Exception) {
+            DashXLog.d(tag, e.message)
+            throw Exception("Encountered an error while parsing custom")
+        }
+
+        dashXClient?.addItemToCart(
+            itemId,
+            pricingId,
+            quantity,
+            reset ?: false,
+            jsonCustom,
+            onError = {
+                promise.reject("EUNSPECIFIED", it)
+            },
+            onSuccess = { content ->
+                promise.resolve(convertJsonToMap(content))
+            }
+        )
+    }
+
+    @ReactMethod
+    fun fetchCart(promise: Promise) {
+        dashXClient?.fetchCart(
+            onError = {
+                promise.reject("EUNSPECIFIED", it)
+            },
+            onSuccess = { content ->
+                promise.resolve(convertJsonToMap(content))
+            }
+        )
+    }
+
+    @ReactMethod
+    fun fetchStoredPreferences(promise: Promise) {
+        dashXClient?.fetchStoredPreferences(
+            onError = {
+                promise.reject("EUNSPECIFIED", it)
+            },
+            onSuccess = { content ->
+                promise.resolve(convertJsonToMap(content))
+            }
+        )
+    }
+
+    @ReactMethod
+    fun uploadExternalAsset(
+        file: ReadableMap, 
+        externalColumnId: String, 
+        promise: Promise
+    ) {
+        val jsonFile = try {
+            convertMapToJson(file)
+        } catch (e: Exception) {
+            DashXLog.d(tag, e.message)
+            throw Exception("Encountered an error while parsing file")
+        }
+
+        // Remove unnecessary double quotes from RN URI
+        val filePath = getFilePathFromURIString(jsonFile?.get("uri").toString())
+        val fileObject = File(filePath)
+
+        dashXClient?.uploadExternalAsset(
+            fileObject,
+            externalColumnId,
+            onError = {
+                promise.reject("EUNSPECIFIED", it)
+            },
+            onSuccess = { content ->
+                val jsonObject = Gson().toJsonTree(content, ExternalAsset::class.java).asJsonObject
+                promise.resolve(convertJsonToMap(jsonObject))
+            }
+        )
+    }
+
+    @ReactMethod
+    fun externalAsset(
+            id: String,
+            promise: Promise
+    ) {
+        dashXClient?.externalAsset(
+            id,
+            onError = {
+                promise.reject("EUNSPECIFIED", it)
+            },
+            onSuccess = { content ->
+                val jsonObject = Gson().toJsonTree(content, ExternalAsset::class.java).asJsonObject
+                promise.resolve(convertJsonToMap(jsonObject))
+            }
+        )
+    }
+
+    @ReactMethod
+    fun subscribe() {
+        dashXClient?.subscribe()
+    }
+
+    //FIXME Amend the logic to work with React Native content URIs
+    fun getFilePathFromURIString(contentUriString: String): String {
+        val sanitizedURI = contentUriString.replace("\"", "")
+        val path = Uri.parse(sanitizedURI).path
+
+        // Remove unnecessary URI component
+        val filePath = path!!.substring(path?.indexOf(':') + 1)
+
+        return filePath
+    }
+}

package/android/src/main/java/com/dashx/rn/sdk/{DashXPackage.kt → DashXReactNativePackage.kt}

@@ -1,6 +1,7 @@
 package com.dashx.rn.sdk
 
 import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.JavaScriptModule
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
@@ -8,7 +9,7 @@ import java.util.Arrays
 
 class DashXPackage : ReactPackage {
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return Arrays.asList<NativeModule>(DashXModule(reactContext))
+        return Arrays.asList<NativeModule>(DashXReactNativeModule(reactContext))
     }
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {