refactor(Android): New project setup + kotlin events (#121)

.gitignore

@@ -48,3 +48,7 @@ bundles/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+
+android/gradle
+android/gradlew
+android/gradlew.bat

android/build.gradle

@@ -1,22 +1,91 @@
+buildscript {
+    ext.kotlin_version = '1.2.71'
+    repositories {
+        google()
+        jcenter()
+        maven {
+            url 'https://maven.fabric.io/public'
+        }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
-def DEFAULT_COMPILE_SDK_VERSION             = 27
-def DEFAULT_BUILD_TOOLS_VERSION             = "27.0.3"
-def DEFAULT_MIN_SDK_VERSION                 = 16
-def DEFAULT_TARGET_SDK_VERSION              = 26
 
-android {
-    compileSdkVersion rootProject.findProperty('compileSdkVersion') ?: DEFAULT_COMPILE_SDK_VERSION
-    buildToolsVersion rootProject.findProperty('buildToolsVersion') ?: DEFAULT_BUILD_TOOLS_VERSION
+def DEFAULT_COMPILE_SDK_VERSION = 27
+def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3"
+def DEFAULT_TARGET_SDK_VERSION = 27
 
+android {
+    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
+    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
     defaultConfig {
-        minSdkVersion rootProject.findProperty('minSdkVersion') ?: DEFAULT_MIN_SDK_VERSION
-        targetSdkVersion rootProject.findProperty('targetSdkVersion') ?: DEFAULT_TARGET_SDK_VERSION
+        minSdkVersion 16
+        targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
         versionCode 1
         versionName "1.0"
     }
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    productFlavors {
+    }
+    lintOptions {
+        disable 'GradleCompatible'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+repositories {
+    mavenCentral()
+    maven {
+        url 'https://maven.google.com/'
+        name 'Google'
+    }
+
+    // Stolen from react-native-firebase, thanks dudes!
+    def found = false
+    def parentDir = rootProject.projectDir
+    def reactNativeAndroidName = 'React Native (Node Modules)'
+
+    1.upto(4, {
+        if (found) return true
+        parentDir = parentDir.parentFile
+        def reactNativeAndroid = new File(
+                parentDir,
+                'node_modules/react-native/android'
+        )
+
+        if (reactNativeAndroid.exists()) {
+            maven {
+                url reactNativeAndroid.toString()
+                name reactNativeAndroidName
+            }
+
+            println "${project.name}: using React Native sources from ${reactNativeAndroid.toString()}"
+            found = true
+        }
+    })
+
+    if (!found) {
+        throw new GradleException(
+                "${project.name}: unable to locate React Native Android sources, " +
+                        "ensure you have you installed React Native as a dependency and try again."
+        )
+    }
 }
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java

@@ -56,12 +56,6 @@ import com.reactnativecommunity.webview.events.TopLoadingFinishEvent;
 import com.reactnativecommunity.webview.events.TopLoadingStartEvent;
 import com.reactnativecommunity.webview.events.TopMessageEvent;
 import com.reactnativecommunity.webview.events.TopLoadingProgressEvent;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -510,6 +504,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     }
   }
 
+  @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
   @ReactProp(name = "mediaPlaybackRequiresUserAction")
   public void setMediaPlaybackRequiresUserAction(WebView view, boolean requires) {
     view.getSettings().setMediaPlaybackRequiresUserGesture(requires);

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingErrorEvent.java

@@ -1,40 +0,0 @@
-package com.reactnativecommunity.webview.events;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-/**
- * Event emitted when there is an error in loading.
- */
-public class TopLoadingErrorEvent extends Event<TopLoadingErrorEvent> {
-
-  public static final String EVENT_NAME = "topLoadingError";
-  private WritableMap mEventData;
-
-  public TopLoadingErrorEvent(int viewId, WritableMap eventData) {
-    super(viewId);
-    mEventData = eventData;
-  }
-
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
-  }
-
-  @Override
-  public boolean canCoalesce() {
-    return false;
-  }
-
-  @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEventData);
-  }
-}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingErrorEvent.kt

@@ -0,0 +1,25 @@
+package com.reactnativecommunity.webview.events
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+/**
+ * Event emitted when there is an error in loading.
+ */
+class TopLoadingErrorEvent(viewId: Int, private val mEventData: WritableMap) :
+    Event<TopLoadingErrorEvent>(viewId) {
+    companion object {
+        const val EVENT_NAME = "topLoadingError"
+    }
+
+    override fun getEventName(): String = EVENT_NAME
+
+    override fun canCoalesce(): Boolean = false
+
+    override fun getCoalescingKey(): Short = 0
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) =
+        rctEventEmitter.receiveEvent(viewTag, eventName, mEventData)
+
+}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingFinishEvent.java

@@ -1,40 +0,0 @@
-package com.reactnativecommunity.webview.events;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-/**
- * Event emitted when loading is completed.
- */
-public class TopLoadingFinishEvent extends Event<TopLoadingFinishEvent> {
-
-  public static final String EVENT_NAME = "topLoadingFinish";
-  private WritableMap mEventData;
-
-  public TopLoadingFinishEvent(int viewId, WritableMap eventData) {
-    super(viewId);
-    mEventData = eventData;
-  }
-
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
-  }
-
-  @Override
-  public boolean canCoalesce() {
-    return false;
-  }
-
-  @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEventData);
-  }
-}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingFinishEvent.kt

@@ -0,0 +1,24 @@
+package com.reactnativecommunity.webview.events
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+/**
+ * Event emitted when loading is completed.
+ */
+class TopLoadingFinishEvent(viewId: Int, private val mEventData: WritableMap) :
+    Event<TopLoadingFinishEvent>(viewId) {
+    companion object {
+        const val EVENT_NAME = "topLoadingFinish"
+    }
+
+    override fun getEventName(): String = EVENT_NAME
+
+    override fun canCoalesce(): Boolean = false
+
+    override fun getCoalescingKey(): Short = 0
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) =
+        rctEventEmitter.receiveEvent(viewTag, eventName, mEventData)
+}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingProgressEvent.java

@@ -1,36 +0,0 @@
-package com.reactnativecommunity.webview.events;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-public class TopLoadingProgressEvent extends Event<TopLoadingProgressEvent> {
-    public static final String EVENT_NAME = "topLoadingProgress";
-    private WritableMap mEventData;
-
-    public TopLoadingProgressEvent(int viewId, WritableMap eventData) {
-        super(viewId);
-        mEventData = eventData;
-    }
-
-    @Override
-    public String getEventName() {
-        return EVENT_NAME;
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        return false;
-    }
-
-    @Override
-    public short getCoalescingKey() {
-        // All events for a given view can be coalesced.
-        return 0;
-    }
-
-    @Override
-    public void dispatch(RCTEventEmitter rctEventEmitter) {
-        rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEventData);
-    }
-}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingProgressEvent.kt

@@ -0,0 +1,24 @@
+package com.reactnativecommunity.webview.events
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+/**
+ * Event emitted when there is a loading progress event.
+ */
+class TopLoadingProgressEvent(viewId: Int, private val mEventData: WritableMap) :
+    Event<TopLoadingProgressEvent>(viewId) {
+    companion object {
+        const val EVENT_NAME = "topLoadingProgress"
+    }
+
+    override fun getEventName(): String = EVENT_NAME
+
+    override fun canCoalesce(): Boolean = false
+
+    override fun getCoalescingKey(): Short = 0
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) =
+        rctEventEmitter.receiveEvent(viewTag, eventName, mEventData)
+}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingStartEvent.java

@@ -1,40 +0,0 @@
-package com.reactnativecommunity.webview.events;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-/**
- * Event emitted when loading has started
- */
-public class TopLoadingStartEvent extends Event<TopLoadingStartEvent> {
-
-  public static final String EVENT_NAME = "topLoadingStart";
-  private WritableMap mEventData;
-
-  public TopLoadingStartEvent(int viewId, WritableMap eventData) {
-    super(viewId);
-    mEventData = eventData;
-  }
-
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
-  }
-
-  @Override
-  public boolean canCoalesce() {
-    return false;
-  }
-
-  @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEventData);
-  }
-}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingStartEvent.kt

@@ -0,0 +1,25 @@
+package com.reactnativecommunity.webview.events
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+/**
+ * Event emitted when loading has started
+ */
+class TopLoadingStartEvent(viewId: Int, private val mEventData: WritableMap) :
+    Event<TopLoadingStartEvent>(viewId) {
+    companion object {
+        const val EVENT_NAME = "topLoadingStart"
+    }
+
+    override fun getEventName(): String = EVENT_NAME
+
+    override fun canCoalesce(): Boolean = false
+
+    override fun getCoalescingKey(): Short = 0
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) =
+        rctEventEmitter.receiveEvent(viewTag, eventName, mEventData)
+
+}

android/src/main/java/com/reactnativecommunity/webview/events/TopMessageEvent.java

@@ -1,43 +0,0 @@
-package com.reactnativecommunity.webview.events;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-/**
- * Event emitted when there is an error in loading.
- */
-public class TopMessageEvent extends Event<TopMessageEvent> {
-
-  public static final String EVENT_NAME = "topMessage";
-  private final String mData;
-
-  public TopMessageEvent(int viewId, String data) {
-    super(viewId);
-    mData = data;
-  }
-
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
-  }
-
-  @Override
-  public boolean canCoalesce() {
-    return false;
-  }
-
-  @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    WritableMap data = Arguments.createMap();
-    data.putString("data", mData);
-    rctEventEmitter.receiveEvent(getViewTag(), EVENT_NAME, data);
-  }
-}

android/src/main/java/com/reactnativecommunity/webview/events/TopMessageEvent.kt

@@ -0,0 +1,26 @@
+package com.reactnativecommunity.webview.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+/**
+ * Event emitted when there is an error in loading.
+ */
+class TopMessageEvent(viewId: Int, private val mData: String) : Event<TopMessageEvent>(viewId) {
+    companion object {
+        const val EVENT_NAME = "topMessage"
+    }
+
+    override fun getEventName(): String = EVENT_NAME
+
+    override fun canCoalesce(): Boolean = false
+
+    override fun getCoalescingKey(): Short = 0
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
+        val data = Arguments.createMap()
+        data.putString("data", mData)
+        rctEventEmitter.receiveEvent(viewTag, EVENT_NAME, data)
+    }
+}

docs/Reference.md

@@ -110,7 +110,7 @@ Set this to provide JavaScript that will be injected into the web page when the
 
 ### `mediaPlaybackRequiresUserAction`
 
-Boolean that determines whether HTML5 audio and video requires the user to tap them before they start playing. The default value is `true`.
+Boolean that determines whether HTML5 audio and video requires the user to tap them before they start playing. The default value is `true`. (Android API minimum version 17)
 
 | Type | Required |
 | ---- | -------- |
@@ -497,6 +497,8 @@ If true, this will be able horizontal swipe gestures when using the WKWebView. T
 | ------- | -------- | -------- |
 | boolean | No       | iOS      |
 
+---
+
 ### `allowFileAccess`
 
 If true, this will allow access to the file system via `file://` URI's. The default value is `false`.
@@ -505,6 +507,8 @@ If true, this will allow access to the file system via `file://` URI's. The defa
 | ------- | -------- | -------- |
 | boolean | No       | Android  |
 
+---
+
 ### `saveFormDataDisabled`
 
 Sets whether the WebView should disable saving form data. The default value is `false`. This function does not have any effect from Android API level 26 onwards as there is an Autofill feature which stores form data.
@@ -556,7 +560,7 @@ Stop loading the current page.
 ### `injectJavaScript(str)`
 
 ```javascript
-injectJavaScript("... javascript string ...");
+injectJavaScript('... javascript string ...');
 ```
 
 Executes the JavaScript string.