Skip to content
This repository was archived by the owner on Dec 5, 2023. It is now read-only.

Android Fix for WebView 47+ #2

Open
WBasti wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Android Fix for WebView 47+ #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9778f98
Added workaround for missing communication between CoherentUI and Un…
Feb 8, 2016
f586f9f
Renamed function in workaround
Feb 8, 2016
b02a377
Added direct communication between js and WebView on Android
Feb 16, 2016
b702ace
Added missing iframe variable
Feb 16, 2016
eb6b136
Fixed version chaos in coherent js
Feb 16, 2016
d5a9cbf
Code style changes
Apr 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Src/Android/com/coherentlabs/ui/CoherentAndroidViewBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,16 @@ public class CoherentAndroidViewBridge {

private Activity mActivity;
private WebView mWebView;
private CoherentWebViewClient mClient;
private CoherentAndroidViewBridge mBridge;
private boolean mIsTransparent;

public CoherentAndroidViewBridge(Activity activity) {
if (activity == null) {
Log.wtf(LOG_TAG, "Trying to create Coherent UI View with null activity!");
}

mBridge = this;
mActivity = activity;
}

Expand Down Expand Up @@ -165,10 +168,11 @@ public void run() {
}

// WebViewClient must be set BEFORE calling loadUrl!
mWebView.setWebViewClient(new CoherentWebViewClient(mActivity, usesDefaultFileHandler));
mClient = new CoherentWebViewClient(mActivity, usesDefaultFileHandler);
mWebView.setWebViewClient(mClient);
mWebView.setWebChromeClient(new CoherentWebChromeClient());

mWebView.addJavascriptInterface(new CoherentJavaScriptInterface(mWebView), CoherentJavaScriptInterface.INTERFACE_NAME);
mWebView.addJavascriptInterface(new CoherentJavaScriptInterface(mWebView, mBridge), CoherentJavaScriptInterface.INTERFACE_NAME);

if (width != 0 && height != 0) {
mActivity.addContentView(mWebView,
Expand Down Expand Up @@ -367,6 +371,10 @@ public void run() {
}
});
}

public CoherentWebViewClient getWebViewClient(){
return mClient;
}

private native void notifySoftKeyboardVisible(boolean visible);
private native void notifyOnBitmapReady(int viewId, ByteBuffer buffer,
Expand Down
9 changes: 8 additions & 1 deletion Src/Android/com/coherentlabs/ui/CoherentJavaScriptInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
public class CoherentJavaScriptInterface {
public static final String INTERFACE_NAME = "__couiAndroid";
private WebView mWebView;
private CoherentAndroidViewBridge mBridge;
private float mDPtoPXCoef;

public CoherentJavaScriptInterface(WebView webView) {
public CoherentJavaScriptInterface(WebView webView, CoherentAndroidViewBridge bridge) {
mWebView = webView;
mBridge = bridge;

DisplayMetrics displayMetrics = webView.getContext().getResources().getDisplayMetrics();
mDPtoPXCoef = displayMetrics.densityDpi / 160.0f;
Expand All @@ -27,4 +29,9 @@ public void addTouchEvent(int fingerId, int phase, int x, int y) {
}

public native void addCoherentTouchEvent(int id, int fingerId, int phase, int x, int y);

@JavascriptInterface
public void triggerNativeCode(String event) {
this.mBridge.getWebViewClient().triggerNativeCode(mWebView.getId(), event);
}
}
2 changes: 1 addition & 1 deletion Src/Android/com/coherentlabs/ui/CoherentWebViewClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
if (url != null && !shouldStartLoad(view.getId(), url)) {
Log.v(LOG_TAG, "Overriding URL loading of \"" + url + "\" for view " + view.getId());
return true;
} else {
} else {
return false;
}
}
Expand Down
99 changes: 67 additions & 32 deletions UnityIntegration/Assets/WebPlayerTemplates/uiresources/MobileInput/javascript/coherent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,19 +238,31 @@

return promise;
};

var simpleEvent;

var simpleEvent = function (type) {
return function () {
var prefix = ['coherent-js', type],
frame = document.createElement('iframe');
prefix.push.apply(prefix, arguments);
frame.src = prefix.join(':');
frame.width = '1px';
frame.height = '1px';
document.documentElement.appendChild(frame);
frame.parentNode.removeChild(frame);
if (window.__couiAndroid == undefined) {
simpleEvent = function (type) {
return function () {
var prefix = ['coherent-js', type],
frame = document.createElement('iframe');
prefix.push.apply(prefix, arguments);
frame.src = prefix.join(':');
frame.width = '1px';
frame.height = '1px';
document.documentElement.appendChild(frame);
frame.parentNode.removeChild(frame);
};
};
};
} else {
simpleEvent = function (type) {
return function () {
var prefix = ['coherent-js', type];
prefix.push.apply(prefix, arguments);
__couiAndroid.triggerNativeCode(prefix.join(':'));
};
};
}

if (engine === undefined)
{
Expand Down Expand Up @@ -376,30 +388,53 @@
};
}

var frame = document.createElement('iframe');
var createSendMessage;
var createTriggerEvent;

if (window.__couiAndroid == undefined) {

var frame = document.createElement('iframe');

createSendMessage = function () {
var prefix = 'coherent-js:c:';
return function () {
var json = JSON.stringify(toArray.call(arguments, 2));
frame.src = prefix + arguments[0] + ':' + arguments[1] + ':' + encodeURIComponent(json);
frame.width = '1px';
frame.height = '1px';
document.documentElement.appendChild(frame);
frame.parentNode.removeChild(frame);
};
};
createTriggerEvent = function () {
var prefix = 'coherent-js:e:';
return function () {
var json = JSON.stringify(toArray.call(arguments, 1));
frame.src = prefix + arguments[0] + ':' + encodeURIComponent(json);
frame.width = '1px';
frame.height = '1px';
document.documentElement.appendChild(frame);
frame.parentNode.removeChild(frame);
};
};

var createSendMessage = function () {
var prefix = 'coherent-js:c:';
return function () {
var json = JSON.stringify(toArray.call(arguments, 2));
frame.src = prefix + arguments[0] + ':' + arguments[1] + ':' + encodeURIComponent(json);
frame.width = '1px';
frame.height = '1px';
document.documentElement.appendChild(frame);
frame.parentNode.removeChild(frame);
} else {
createSendMessage = function () {
var prefix = 'coherent-js:c:';
return function () {
var json = JSON.stringify(toArray.call(arguments, 2));
__couiAndroid.triggerNativeCode(prefix + arguments[0] + ':' + arguments[1] + ':' + encodeURIComponent(json));
};
};
};
var createTriggerEvent = function () {
var prefix = 'coherent-js:e:';
return function () {
var json = JSON.stringify(toArray.call(arguments, 1));
frame.src = prefix + arguments[0] + ':' + encodeURIComponent(json);
frame.width = '1px';
frame.height = '1px';
document.documentElement.appendChild(frame);
frame.parentNode.removeChild(frame);

createTriggerEvent = function () {
var prefix = 'coherent-js:e:';
return function () {
var json = JSON.stringify(toArray.call(arguments, 1));
__couiAndroid.triggerNativeCode(prefix + arguments[0] + ':' + encodeURIComponent(json));
};
};
};
}
engine.SendMessage = createSendMessage();
engine.TriggerEvent = createTriggerEvent();

Expand Down